Merge branch 'develop' into 299-emulate-solidity-raise-an-exception

# Conflicts:
#	proxy/plugin/solana_rest_api_tools.py
#	proxy/testing/test_airdropping_eth_accounts.py

Author: rozhkovdmitrii

proxy/plugin/solana_rest_api_tools.py

@@ -1258,16 +1258,21 @@ def make_instruction_data_from_tx(instruction, private_key=None):
         raise Exception("function gets ")
 
 
-def is_account_exists(client: SolanaClient, pda_account: str) -> bool:
+def is_account_exists(client: SolanaClient, eth_account: EthereumAddress) -> bool:
+    pda_account, nonce = ether2program(eth_account)
     info = client.get_account_info(pda_account, commitment=Confirmed)
     value = get_from_dict(info, "result", "value")
     return value is not None
 
 
-def estimate_gas(client: SolanaClient, signer: SolanaAccount, contract_id: str, eth_caller_address: EthereumAddress,
+def estimate_gas(client: SolanaClient, signer: SolanaAccount, contract_id: str, caller_eth_account: EthereumAddress,
                  data: str = None, value: str = None):
-    pda_account, nonce = ether2program(eth_caller_address)
-    if not is_account_exists(client, pda_account):
-        create_eth_account_and_airdrop(client, signer, eth_caller_address)
-    result = call_emulated(contract_id, str(eth_caller_address), data, value)
-    return result['used_gas'] + EXTRA_GAS
+    if not is_account_exists(client, caller_eth_account):
+        create_eth_account_and_airdrop(client, signer, caller_eth_account)
+    result = call_emulated(contract_id, str(caller_eth_account), data, value)
+    used_gas = result.get("used_gas")
+    if used_gas is None:
+        logger.error(f"Failed estimate_gas, unexpected result, by contract_id: {contract_id}, caller_eth_account: "
+                     f"{caller_eth_account}, data: {data}, value: {value}, emulation result: {result}")
+        raise Exception("Bad estimate_gas result")
+    return used_gas + EXTRA_GAS

proxy/testing/test_airdropping_eth_accounts.py

@@ -11,7 +11,7 @@
 from solana.rpc.api import Client as SolanaClient
 
 from ..plugin.solana_rest_api import EthereumModel
-from ..plugin.solana_rest_api_tools import get_token_balance_gwei, EthereumAddress, ether2program
+from ..plugin.solana_rest_api_tools import get_token_balance_gwei, ether2program
 
 
 class TestAirdroppingEthAccounts(unittest.TestCase):
@@ -50,9 +50,15 @@ def test_airdrop_onto_wrapped_new_address(self):
         self.assertEqual(self._EXPECTED_BALANCE_WEI, wrapper_actual_balance)
         self.assertEqual(self._EXPECTED_BALANCE_WEI, nested_actual_balance)
 
-    def test_raise_on_constructing(self):
-        contract_owner: LocalAccount = self._web3.eth.account.create()
-        contract = self._compile_and_deploy_contract(contract_owner, self._WRAPPER_CONTRACT_STORAGE_SOURCE)
+    def test_airdrop_on_deploy_estimation(self):
+        owner_eth_account: LocalAccount = self._web3.eth.account.create()
+        compile_result = solcx.compile_source(self._CONTRACT_STORAGE_SOURCE)
+        _, contract_interface = compile_result.popitem()
+        contract_data = contract_interface.get("bin")
+        self.assertIsNotNone(contract_data)
+        self._web3.eth.estimate_gas({"from": owner_eth_account.address, "data": contract_data})
+        owner_balance = self._get_balance_wei(owner_eth_account.address)
+        self.assertEqual(self._EXPECTED_BALANCE_WEI, owner_balance)
 
     def test_eth_call_array_constructable_contract(self):
         compile_result = solcx.compile_source(self._CONTRACT_LIST_CONSTRUCTABLE)
@@ -65,8 +71,8 @@ def test_eth_call_array_constructable_contract(self):
         self.assertEqual("ListConstructable: empty list", str(cm.exception))
 
     def _compile_and_deploy_contract(self, contract_owner: LocalAccount, source: str) -> web3_eth.Contract:
-        compiled_sol = solcx.compile_source(source)
-        contract_id, contract_interface = compiled_sol.popitem()
+        compile_result = solcx.compile_source(source)
+        contract_id, contract_interface = compile_result.popitem()
         contract = self._web3.eth.contract(abi=contract_interface['abi'], bytecode=contract_interface['bin'])
         nonce = self._web3.eth.get_transaction_count(contract_owner.address)
         chain_id = self._web3.eth.chain_id
@@ -78,8 +84,8 @@ def _compile_and_deploy_contract(self, contract_owner: LocalAccount, source: str
         contract = self._web3.eth.contract(address=trx_receipt.contractAddress, abi=contract.abi)
         return contract
 
-    def _get_balance_wei(self, eth_acc: str) -> int:
-        token_owner_account, nonce = ether2program(eth_acc)
+    def _get_balance_wei(self, eth_account: str) -> int:
+        token_owner_account, nonce = ether2program(eth_account)
         balance = get_token_balance_gwei(self._solana_client, token_owner_account)
         self.assertIsNotNone(balance)
         self.assertIsInstance(balance, int)