improve deployment scripts, get rid of unnecessary delays in integrat…

…ion tests

.dockerignore

@@ -7,7 +7,8 @@
 !setup.py
 !README.md
 !run-test-faucet.sh
-!run-test-airdropper.sh
+!run-faucet.sh
+!run-airdropper.sh
 
 # Ignore __pycache__ directory
 proxy/__pycache__

proxy/common_neon/erc20_wrapper.py

@@ -9,6 +9,8 @@
 from solana.system_program import SYS_PROGRAM_ID
 from solana.sysvar import SYSVAR_RENT_PUBKEY
 from solana.rpc.types import TxOpts, RPCResponse, Commitment
+from solana.transaction import Transaction
+import spl.token.instructions as spl_token
 from typing import Union, Dict
 from logging import getLogger
 import struct
@@ -138,8 +140,17 @@ def get_neon_erc20_account_address(self, neon_account_address: str):
                  neon_account_address_bytes]
         return PublicKey.find_program_address(seeds, self.evm_loader_id)[0]
 
-    def create_associated_token_account(self, owner: PublicKey):
-        return self.token.create_associated_token_account(owner)
+    def create_associated_token_account(self, owner: PublicKey, payer: SolanaAccount):
+        # Construct transaction
+        # This part of code is based on original implementation of Token.create_associated_token_account
+        # except that skip_preflight is set to True
+        txn = Transaction()
+        create_txn = spl_token.create_associated_token_account(
+            payer=payer.public_key(), owner=owner, mint=self.token.pubkey
+        )
+        txn.add(create_txn)
+        self.token._conn.send_transaction(txn, payer, opts=TxOpts(skip_preflight = True, skip_confirmation=False))
+        return create_txn.keys[1].pubkey
 
     def create_neon_erc20_account_instruction(self, payer: PublicKey, eth_address: str):
         return TransactionInstruction(

proxy/docker-compose-test.yml

@@ -97,6 +97,7 @@ services:
       SOLANA_URL: http://solana:8899
       NEON_OPERATOR_KEYFILE: /root/.config/solana/id.json
       NEON_ETH_MAX_AMOUNT: 10
+      TEST_FAUCET_INIT_NEON_BALANCE: 10000
     hostname: faucet
     expose:
       - "3333"
@@ -131,7 +132,6 @@ services:
     container_name: airdropper
     image: neonlabsorg/proxy:${REVISION}
     environment:
-      AIRDROPPER_MODE: 'true'
       POSTGRES_DB: airdropper-db
       POSTGRES_USER: neon-airdropper
       POSTGRES_PASSWORD: neon-airdropper-pass
@@ -144,7 +144,7 @@ services:
       PRICE_UPDATE_INTERVAL: 10
       START_SLOT: LATEST
     hostname: airdropper
-    entrypoint: ./run-test-airdropper.sh
+    entrypoint: ./run-airdropper.sh
     networks:
       - net
     depends_on:

proxy/testing/test_airdropper_integration.py

@@ -65,7 +65,6 @@ def create_token_mint(self):
             9,
             TOKEN_PROGRAM_ID,
         )
-        sleep(20)
 
     def deploy_erc20_wrapper_contract(self):
         self.wrapper = ERC20Wrapper(proxy, NAME, SYMBOL,
@@ -98,7 +97,7 @@ def create_sol_account(self):
         return account
 
     def create_token_account(self, owner: PublicKey, mint_amount: int):
-        new_token_account = self.wrapper.create_associated_token_account(owner)
+        new_token_account = self.wrapper.create_associated_token_account(owner, self.mint_authority)
         self.wrapper.mint_to(new_token_account, mint_amount)
         return new_token_account
 
@@ -113,7 +112,7 @@ def test_success_airdrop_simple_case(self):
         mint_amount = 1000_000_000_000
         from_spl_token_acc = self.create_token_account(from_owner.public_key(), mint_amount)
         to_neon_acc = self.create_eth_account().address
-        sleep(15)
+
         self.assertEqual(self.wrapper.get_balance(from_spl_token_acc), mint_amount)
         self.assertEqual(self.wrapper.get_balance(to_neon_acc), 0)
 
@@ -141,7 +140,6 @@ def test_success_airdrop_complex_case(self):
         from_spl_token_acc = self.create_token_account(from_owner.public_key(), mint_amount)
         to_neon_acc1 = self.create_eth_account().address
         to_neon_acc2 = self.create_eth_account().address
-        sleep(15)
 
         self.assertEqual(self.wrapper.get_balance(from_spl_token_acc), mint_amount)
         self.assertEqual(self.wrapper.get_balance(to_neon_acc1), 0)

run-airdropper.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ -z "$EVM_LOADER" ]; then
+    echo "Extracting EVM_LOADER address from keypair file..."
+    export EVM_LOADER=$(solana address -k /spl/bin/evm_loader-keypair.json)
+    echo "EVM_LOADER=$EVM_LOADER"
+fi
+export AIRDROPPER_MODE='true'
+
+python3 -m proxy

run-faucet.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+if [ -z "$SOLANA_URL" ]; then
+  echo "SOLANA_URL is not set"
+  exit 1
+fi
+
+echo "Extracting NEON-EVM's ELF parameters"
+export EVM_LOADER=$(solana address -k /spl/bin/evm_loader-keypair.json)
+export $(/spl/bin/neon-cli --commitment confirmed --url $SOLANA_URL --evm_loader="$EVM_LOADER" neon-elf-params)
+
+BALANCE=$(solana balance | tr '.' '\t'| tr '[:space:]' '\t' | cut -f1)
+if [ "$BALANCE" -eq 0 ]; then
+    echo "SOL balance is 0"
+    exit 1
+fi
+
+if [ "$(spl-token balance "$NEON_TOKEN_MINT" || echo 0)" -eq 0 ]; then
+    echo "NEON balance is 0"
+    exit 1
+fi
+
+faucet run --workers 1

run-test-faucet.sh

@@ -1,7 +1,44 @@
 #!/bin/bash
 
+if [ -z "$SOLANA_URL" ]; then
+  echo "SOLANA_URL is not set"
+  exit 1
+fi
+
+if [ -z "$TEST_FAUCET_INIT_NEON_BALANCE"]; then
+    echo "TEST_FAUCET_INIT_NEON_BALANCE is not set"
+    exit 1
+fi
+
+solana config set -u "$SOLANA_URL"
+
 echo "Extracting NEON-EVM's ELF parameters"
 export EVM_LOADER=$(solana address -k /spl/bin/evm_loader-keypair.json)
 export $(/spl/bin/neon-cli --commitment confirmed --url $SOLANA_URL --evm_loader="$EVM_LOADER" neon-elf-params)
 
-faucet run --workers 1
+echo "Generating new account for operate with faucet service"
+rm /$HOME/.config/solana/id.json
+solana-keygen new --no-passphrase -o "$HOME/.config/solana/id.json"
+
+ACCOUNT=$(solana address -k "/$HOME/.config/solana/id.json")
+echo "New account $ACCOUNT"
+if ! solana account "$ACCOUNT"; then
+    echo "airdropping..."
+    solana airdrop 5000 "$ACCOUNT"
+    # check that balance >= 10 otherwise airdroping by 1 SOL up to 10
+    BALANCE=$(solana balance "$ACCOUNT" | tr '.' '\t'| tr '[:space:]' '\t' | cut -f1)
+    while [ "$BALANCE" -lt 10 ]; do
+      solana airdrop 1 "$ACCOUNT"
+      sleep 1
+      BALANCE=$(solana balance "$ACCOUNT" | tr '.' '\t'| tr '[:space:]' '\t' | cut -f1)
+    done
+fi
+
+if [ "$(spl-token balance "$NEON_TOKEN_MINT" || echo 0)" -eq 0 ]; then
+    echo 'Create balance and mint token'
+	TOKEN_ACCOUNT=$( (spl-token create-account "$NEON_TOKEN_MINT" || true) | grep -Po 'Creating account \K[^\n]*')
+	echo "TOKEN_ACCOUNT=$TOKEN_ACCOUNT"
+	spl-token mint "$NEON_TOKEN_MINT" $TEST_FAUCET_INIT_NEON_BALANCE --owner /spl/bin/evm_loader-keypair.json -- "$TOKEN_ACCOUNT"
+fi
+
+./run-faucet.sh