Merge branch 'develop' into ci-test-block-develop

proxy/common_neon/transaction_sender.py

@@ -27,8 +27,10 @@
 from .solana_interactor import check_if_big_transaction, check_if_program_exceeded_instructions
 from ..common_neon.eth_proto import Trx as EthTx
 from ..common_neon.utils import NeonTxResultInfo, NeonTxInfo
+
 from ..environment import RETRY_ON_FAIL, EVM_LOADER_ID, PERM_ACCOUNT_LIMIT, ACCOUNT_PERMISSION_UPDATE_INT
 from ..environment import MIN_OPERATOR_BALANCE_TO_WARN, MIN_OPERATOR_BALANCE_TO_ERR
+from ..environment import ACCOUNT_MAX_SIZE, SPL_TOKEN_ACCOUNT_SIZE, HOLDER_MSG_SIZE, ACCOUNT_STORAGE_OVERHEAD
 from ..memdb.memdb import MemDB, NeonPendingTxInfo
 from ..environment import get_solana_accounts
 from ..common_neon.account_whitelist import AccountWhitelist

proxy/plugin/solana_rest_api.py

@@ -362,7 +362,7 @@ def eth_sendRawTransaction(self, rawTrx):
         eth_signature = '0x' + trx.hash_signed().hex()
 
         try:
-            tx_sender = NeonTxSender(self._db, self._solana, trx, steps=500)
+            tx_sender = NeonTxSender(self._db, self._solana, trx, steps=evm_step_count)
             tx_sender.execute()
             return eth_signature
 

proxy/plugin/solana_rest_api_tools.py

@@ -3,12 +3,10 @@
 from logged_groups import logged_group
 
 from ..common_neon.address import ether2program, getTokenAddr, EthereumAddress
-from ..common_neon.errors import SolanaAccountNotFoundError, SolanaErrors
-from ..common_neon.emulator_interactor import call_emulated
 from ..common_neon.solana_interactor import SolanaInteractor
-from ..common_neon.utils import get_from_dict
 from ..environment import  read_elf_params, TIMEOUT_TO_RELOAD_NEON_CONFIG
 
+
 @logged_group("neon.Proxy")
 def neon_config_load(ethereum_model, *, logger):
     try:
@@ -30,6 +28,8 @@ def neon_config_load(ethereum_model, *, logger):
                                                             '-' \
                                                             + ethereum_model.neon_config_dict['NEON_REVISION']
     logger.debug(ethereum_model.neon_config_dict)
+
+
 @logged_group("neon.Proxy")
 def get_token_balance_gwei(solana: SolanaInteractor, pda_account: str, *, logger) -> int:
     neon_token_account = getTokenAddr(PublicKey(pda_account))