Rename neon_tx_exec_cfg

proxy/common_neon/data.py

@@ -4,7 +4,7 @@
 
 
 @dataclass
-class NeonTxCfg:
+class NeonTxExecCfg:
     is_underpriced_tx_without_chainid: bool
     steps_executed: int
 

proxy/mempool/mempool_api.py

@@ -1,11 +1,11 @@
 from dataclasses import dataclass
 
 from ..common_neon.eth_proto import Trx as NeonTx
-from ..common_neon.data import NeonTxCfg, NeonEmulatingResult
+from ..common_neon.data import NeonTxExecCfg, NeonEmulatingResult
 
 
 @dataclass
 class MemPoolTxRequest:
     neon_tx: NeonTx
-    neon_tx_cfg: NeonTxCfg
+    neon_tx_exec_cfg: NeonTxExecCfg
     emulating_result: NeonEmulatingResult

proxy/mempool/mempool_tx_executor.py

@@ -21,7 +21,7 @@ def __init__(self, config: IConfig):
 
     def execute_neon_tx(self, mempool_tx_request: MemPoolTxRequest):
         neon_tx = mempool_tx_request.neon_tx
-        neon_tx_cfg = mempool_tx_request.neon_tx_cfg
+        neon_tx_cfg = mempool_tx_request.neon_tx_exec_cfg
         emulating_result = mempool_tx_request.emulating_result
         emv_step_count = self._config.get_evm_count()
         tx_sender = NeonTxSender(self._db, self._solana, neon_tx, steps=emv_step_count)

proxy/mempool/transaction_sender.py

@@ -21,7 +21,7 @@
 from ..common_neon.eth_proto import Trx as EthTx
 from ..common_neon.utils import NeonTxResultInfo, NeonTxInfo
 from ..common_neon.errors import EthereumError
-from ..common_neon.data import NeonTxCfg, NeonEmulatingResult
+from ..common_neon.data import NeonTxExecCfg, NeonEmulatingResult
 from ..environment import RETRY_ON_FAIL
 from ..environment import HOLDER_MSG_SIZE
 from ..memdb.memdb import MemDB, NeonPendingTxInfo
@@ -62,7 +62,7 @@ def __init__(self, db: MemDB, solana: SolanaInteractor, eth_tx: EthTx, steps: in
         self._create_account_list = []
         self._eth_meta_dict: Dict[str, AccountMeta] = dict()
 
-    def execute(self, exec_cfg: NeonTxCfg, emulating_result: NeonEmulatingResult) -> NeonTxResultInfo:
+    def execute(self, exec_cfg: NeonTxExecCfg, emulating_result: NeonEmulatingResult) -> NeonTxResultInfo:
         self._validate_pend_tx()
         self._prepare_execution(emulating_result)
         return self._execute(exec_cfg)
@@ -83,7 +83,7 @@ def _validate_pend_tx(self):
         self._pending_tx = NeonPendingTxInfo(neon_sign=self.neon_sign, operator=operator, slot=0)
         self._pend_tx_into_db(self.solana.get_recent_blockslot())
 
-    def _execute(self, exec_cfg: NeonTxCfg):
+    def _execute(self, exec_cfg: NeonTxExecCfg):
 
         for Strategy in [SimpleNeonTxStrategy, IterativeNeonTxStrategy, HolderNeonTxStrategy, NoChainIdNeonTxStrategy]:
             try:
@@ -209,7 +209,7 @@ def done_account_tx_list(self, skip_create_accounts=False):
 class BaseNeonTxStrategy(metaclass=abc.ABCMeta):
     NAME = 'UNKNOWN STRATEGY'
 
-    def __init__(self, exec_cfg: NeonTxCfg, neon_tx_sender: NeonTxSender):
+    def __init__(self, exec_cfg: NeonTxExecCfg, neon_tx_sender: NeonTxSender):
         self._neon_tx_exec_cfg = exec_cfg
         self.is_valid = False
         self.error = None

proxy/neon_rpc_api_model/neon_rpc_api_model.py

@@ -15,7 +15,7 @@
 from ..common_neon.keys_storage import KeyStorage
 from ..common_neon.solana_interactor import SolanaInteractor
 from ..common_neon.utils import SolanaBlockInfo
-from ..common_neon.data import NeonTxCfg, NeonEmulatingResult
+from ..common_neon.data import NeonTxExecCfg, NeonEmulatingResult
 from ..common_neon.gas_price_calculator import GasPriceCalculator
 
 from ..environment import SOLANA_URL, PP_SOLANA_URL, PYTH_MAPPING_ACCOUNT, NEON_EVM_VERSION, NEON_EVM_REVISION, \
@@ -452,7 +452,7 @@ def eth_sendRawTransaction(self, rawTrx: str) -> str:
 
             self._stat_tx_success()
             mempool_tx_request = MemPoolTxRequest(neon_tx=trx,
-                                                  neon_tx_cfg=neon_tx_cfg,
+                                                  neon_tx_exec_cfg=neon_tx_cfg,
                                                   emulating_result=emulating_result)
 
             if not self._mempool_client.send_raw_transaction(mempool_tx_request):
@@ -471,7 +471,7 @@ def eth_sendRawTransaction(self, rawTrx: str) -> str:
             self._stat_tx_failed()
             raise
 
-    def precheck(self, neon_trx: EthTrx) -> Tuple[NeonTxCfg, NeonEmulatingResult]:
+    def precheck(self, neon_trx: EthTrx) -> Tuple[NeonTxExecCfg, NeonEmulatingResult]:
         min_gas_price = self.gas_price_calculator.get_min_gas_price()
         neon_validator = NeonTxValidator(self._solana, neon_trx, min_gas_price)
         return neon_validator.precheck()

proxy/neon_rpc_api_model/transaction_validator.py

@@ -14,7 +14,7 @@
 from ..environment import ACCOUNT_PERMISSION_UPDATE_INT, CHAIN_ID, NEON_GAS_LIMIT_MULTIPLIER_NO_CHAINID,\
                           ALLOW_UNDERPRICED_TX_WITHOUT_CHAINID
 
-from ..common_neon.data import NeonTxCfg, NeonEmulatingResult
+from ..common_neon.data import NeonTxExecCfg, NeonEmulatingResult
 
 
 @logged_group("neon.Proxy")
@@ -58,16 +58,16 @@ def is_underpriced_tx_without_chainid(self) -> bool:
             return False
         return (self._tx.gasPrice < self._min_gas_price) or (self._tx.gasLimit < self._estimated_gas)
 
-    def precheck(self) -> Tuple[NeonTxCfg, NeonEmulatingResult]:
+    def precheck(self) -> Tuple[NeonTxExecCfg, NeonEmulatingResult]:
         try:
             self._prevalidate_tx()
             emulating_result: NeonEmulatingResult = call_trx_emulated(self._tx)
             self._prevalidate_emulator(emulating_result)
 
             is_underpriced_tx_without_chainid = self.is_underpriced_tx_without_chainid()
-            neon_tx_cfg = NeonTxCfg(steps_executed=emulating_result["steps_executed"],
-                                    is_underpriced_tx_without_chainid=is_underpriced_tx_without_chainid)
-            return neon_tx_cfg, emulating_result
+            neon_tx_exec_cfg = NeonTxExecCfg(steps_executed=emulating_result["steps_executed"],
+                                             is_underpriced_tx_without_chainid=is_underpriced_tx_without_chainid)
+            return neon_tx_exec_cfg, emulating_result
 
         except Exception as e:
             self.extract_ethereum_error(e)