Add test, remove NEON_CHAIN_ID where it is not needed

proxy/deploy-test.sh

@@ -3,8 +3,10 @@ set -xeuo pipefail
 
 echo "Deploy test..."
 
+solana config set -u $SOLANA_URL
 solana address || solana-keygen new --no-passphrase
-export $(/spl/bin/neon-cli --evm_loader JxujFZpNBPADbfw2MnPPgnnFGruzp2ELSFWPQgrjz5D neon-elf-params /spl/bin/evm_loader.so | grep NEON_REVISION | xargs)
+solana program dump "$EVM_LOADER" ./evm_loader.dump
+export $(/spl/bin/neon-cli --evm_loader "$EVM_LOADER" neon-elf-params ./evm_loader.dump)
 
 curl -v --header "Content-Type: application/json" --data '{"method":"eth_blockNumber","id":1,"jsonrpc":"2.0","params":[]}' $PROXY_URL
 

proxy/run-proxy.sh

@@ -10,7 +10,6 @@ if [ "$CONFIG" == "ci" ]; then
   [[ -z "$ETH_TOKEN_MINT"               ]] && export ETH_TOKEN_MINT=deploy
   [[ -z "$COLLATERAL_POOL_BASE"         ]] && export COLLATERAL_POOL_BASE=deploy
   [[ -z "$NEW_USER_AIRDROP_AMOUNT"      ]] && export NEW_USER_AIRDROP_AMOUNT=100
-  [[ -z "$NEON_CHAIN_ID"                ]] && export NEON_CHAIN_ID=0x6f
   [[ -z "$EXTRA_GAS"                    ]] && export EXTRA_GAS=100000
   [[ -z "$NEON_CLI_TIMEOUT"             ]] && export NEON_CLI_TIMEOUT="0.5"
   [[ -z "$USE_COMBINED_START_CONTINUE"  ]] && export USE_COMBINED_START_CONTINUE="YES"
@@ -22,7 +21,6 @@ elif [ "$CONFIG" == "local" ]; then
   [[ -z "$ETH_TOKEN_MINT"               ]] && export ETH_TOKEN_MINT=deploy
   [[ -z "$COLLATERAL_POOL_BASE"         ]] && export COLLATERAL_POOL_BASE=deploy
   [[ -z "$NEW_USER_AIRDROP_AMOUNT"      ]] && export NEW_USER_AIRDROP_AMOUNT=10
-  [[ -z "$NEON_CHAIN_ID"                ]] && export NEON_CHAIN_ID=0x6f
   [[ -z "$EXTRA_GAS"                    ]] && export EXTRA_GAS=0
   [[ -z "$NEON_CLI_TIMEOUT"             ]] && export NEON_CLI_TIMEOUT="0.9"
   [[ -z "$MINIMAL_GAS_PRICE"            ]] && export MINIMAL_GAS_PRICE=0
@@ -32,7 +30,6 @@ elif [ "$CONFIG" == "devnet" ]; then
   [[ -z "$ETH_TOKEN_MINT"               ]] && export ETH_TOKEN_MINT=89dre8rZjLNft7HoupGiyxu3MNftR577ZYu8bHe2kK7g
   [[ -z "$COLLATERAL_POOL_BASE"         ]] && export COLLATERAL_POOL_BASE=7SBdHNeF9FFYySEoszpjZXXQsAiwa5Lzpsz6nUJWusEx
   [[ -z "$NEW_USER_AIRDROP_AMOUNT"      ]] && export NEW_USER_AIRDROP_AMOUNT=0
-  [[ -z "$NEON_CHAIN_ID"                ]] && export NEON_CHAIN_ID=0x6e
   [[ -z "$EXTRA_GAS"                    ]] && export EXTRA_GAS=90000
   [[ -z "$NEON_CLI_TIMEOUT"             ]] && export NEON_CLI_TIMEOUT="10"
   [[ -z "$MINIMAL_GAS_PRICE"            ]] && export MINIMAL_GAS_PRICE=1
@@ -42,7 +39,6 @@ elif [ "$CONFIG" == "testnet" ]; then
   [[ -z "$ETH_TOKEN_MINT"               ]] && export ETH_TOKEN_MINT=89dre8rZjLNft7HoupGiyxu3MNftR577ZYu8bHe2kK7g
   [[ -z "$COLLATERAL_POOL_BASE"         ]] && export COLLATERAL_POOL_BASE=7SBdHNeF9FFYySEoszpjZXXQsAiwa5Lzpsz6nUJWusEx
   [[ -z "$NEW_USER_AIRDROP_AMOUNT"      ]] && export NEW_USER_AIRDROP_AMOUNT=0
-  [[ -z "$NEON_CHAIN_ID"                ]] && export NEON_CHAIN_ID=0x6f
   [[ -z "$EXTRA_GAS"                    ]] && export EXTRA_GAS=90000
   [[ -z "$NEON_CLI_TIMEOUT"             ]] && export NEON_CLI_TIMEOUT="15"
   [[ -z "$MINIMAL_GAS_PRICE"            ]] && export MINIMAL_GAS_PRICE="1"
@@ -54,7 +50,6 @@ fi
 [[ -z "$EVM_LOADER"               ]] && echo "EVM_LOADER is not set" && exit 1
 [[ -z "$ETH_TOKEN_MINT"           ]] && echo "ETH_TOKEN_MINT is not set" && exit 1
 [[ -z "$COLLATERAL_POOL_BASE"     ]] && echo "COLLATERAL_POOL_BASE is not set" && exit 1
-[[ -z "$NEON_CHAIN_ID"            ]] && echo "NEON_CHAIN_ID is not set" && exit 1
 
 echo SOLANA_URL=$SOLANA_URL
 

proxy/test_cancel_hanged.py

@@ -8,7 +8,6 @@
 os.environ['EVM_LOADER'] = "53DfF883gyixYNXnM7s5xhdeyV8mVk9T4i2hGV9vG9io"
 os.environ['ETH_TOKEN_MINT'] = "HPsV9Deocecw3GeZv1FkAPNCBRfuVyfw9MMwjwRe1xaU"
 os.environ['COLLATERAL_POOL_BASE'] = "4sW3SZDJB7qXUyCYKA7pFL8eCTfm3REr8oSiKkww7MaT"
-os.environ['NEON_CHAIN_ID'] = "0x6f"
 
 import base64
 import unittest

proxy/test_environment.py

@@ -12,17 +12,34 @@ def setUpClass(cls):
         cls.elf_params = {}
         read_elf_params(cls.elf_params)
 
+    def test_read_elf_params(self):
+        print("\n\nhttps://github.com/neonlabsorg/neon-evm/issues/347")
+        elf_params = {}
+        read_elf_params(elf_params)
+
+        neon_chain_id = elf_params.get('NEON_CHAIN_ID', None)
+        self.assertTrue(neon_chain_id is not None)
+        self.assertEqual(neon_chain_id, os.environ.get('NEON_CHAIN_ID', None))
+
+        neon_token_mint = elf_params.get('NEON_TOKEN_MINT', None)
+        self.assertTrue(neon_token_mint is not None)
+        self.assertEqual(neon_token_mint, os.environ.get('NEON_TOKEN_MINT', None))
+
+        neon_pool_base = elf_params.get('NEON_POOL_BASE', None)
+        self.assertTrue(neon_pool_base is not None)
+        self.assertEqual(neon_pool_base, os.environ.get('NEON_POOL_BASE', None))
+
     def test_neon_chain_id(self):
         print("\n\nhttps://github.com/neonlabsorg/neon-evm/issues/347")
-        neon_chain_id = self.elf_params.get('NEON_CHAIN_ID', None)
+        neon_chain_id = os.environ.get('NEON_CHAIN_ID', None)
         print(f"NEON_CHAIN_ID = {neon_chain_id}")
-        assert (neon_chain_id is not None)
+        self.assertTrue(neon_chain_id is not None)
 
         eth_chainId: int = proxy.eth.chain_id
         print(f"eth_chainId = {eth_chainId}")
-        assert(eth_chainId == int(neon_chain_id))
+        self.assertEqual(eth_chainId, int(neon_chain_id))
 
         net_version: str = proxy.net.version
         print(f"net_version = {net_version}")
-        assert (net_version == neon_chain_id)
+        self.assertEqual(net_version, neon_chain_id)