merge from develop

Author: sinev-valentine

proxy/common_neon/elf_params.py

@@ -17,10 +17,6 @@ class ElfParams:
     def __init__(self):
         self._elf_param_dict: Dict[str, any] = {}
 
-    @property
-    def treasury_pool_base(self) -> Optional[str]:
-        return self._elf_param_dict.get("NEON_POOL_BASE")
-
     @property
     def treasury_pool_max(self) -> int:
         return int(self._elf_param_dict.get("NEON_POOL_COUNT"))

proxy/common_neon/neon_instruction.py

@@ -73,7 +73,10 @@ def init_neon_tx(self, neon_tx: NeonTx) -> NeonIxBuilder:
         keccak_result = self._neon_tx.hash_signed()
         treasury_pool_index = int().from_bytes(keccak_result[:4], "little") % ElfParams().treasury_pool_max
         self._treasury_pool_index_buf = treasury_pool_index.to_bytes(4, 'little')
-        self._treasury_pool_address = self._create_treasury_pool_address(treasury_pool_index)
+        self._treasury_pool_address = SolPubKey.find_program_address(
+            [b'treasury_pool', self._treasury_pool_index_buf],
+            self._evm_program_id
+        )[0]
 
         return self
 
@@ -85,13 +88,6 @@ def init_iterative(self, holder: SolPubKey):
         self._holder = holder
         return self
 
-    @staticmethod
-    def _create_treasury_pool_address(treasury_pool_index):
-        treasury_seed_prefix = "collateral_seed_"
-        seed = treasury_seed_prefix + str(treasury_pool_index)
-        treasury_pool_base = SolPubKey(ElfParams().treasury_pool_base)
-        return account_with_seed(treasury_pool_base, str.encode(seed))
-
     def make_create_account_with_seed_ix(self, account: SolPubKey, seed: bytes, lamports: int, space: int) -> SolTxIx:
         seed_str = str(seed, 'utf8')
         self.debug(f"createAccountWithSeedIx {self._operator_account} account({account} seed({seed_str})")

proxy/prepare-deploy-test.sh

@@ -10,7 +10,7 @@ solana address || solana-keygen new --no-passphrase
 solana airdrop 1000
 solana balance
 
-/spl/bin/neon-cli --commitment confirmed --url "${SOLANA_URL}" --evm_loader "${EVM_LOADER}" neon-elf-params > .test-env
+neon-cli --commitment confirmed --url "${SOLANA_URL}" --evm_loader "${EVM_LOADER}" neon-elf-params > .test-env
 echo "TEST_PROGRAM=$(solana address -k /spl/bin/neon-test-invoke-program-keypair.json)" >> .test-env
 
 export $(cat .test-env | xargs)

proxy/testing/solana_utils.py

@@ -31,7 +31,6 @@
 keccakprog = "KeccakSecp256k11111111111111111111111111111"
 rentid = "SysvarRent111111111111111111111111111111111"
 incinerator = "1nc1nerator11111111111111111111111111111111"
-collateral_pool_base = "4sW3SZDJB7qXUyCYKA7pFL8eCTfm3REr8oSiKkww7MaT"
 COMPUTE_BUDGET_ID: PublicKey = PublicKey("ComputeBudget111111111111111111111111111111")
 
 solana_url = os.environ.get("SOLANA_URL", "http://localhost:8899")

proxy/testing/test_environment.py

@@ -23,10 +23,6 @@ def test_read_elf_params(self):
         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 = os.environ.get('NEON_CHAIN_ID', None)