Remove eth call on miner pipeline (#2541)

Co-authored-by: Prasanna Loganathar <pvl@prasannavl.com>

Author: sieniven

lib/ain-rs-exports/src/evm.rs

@@ -3,9 +3,8 @@ use ain_contracts::{
     get_transferdomain_native_transfer_function, FixedContract,
 };
 use ain_evm::{
-    core::{EthCallArgs, TransferDomainTxInfo, XHash},
+    core::{TransferDomainTxInfo, XHash},
     evm::FinalizedBlockInfo,
-    executor::TxResponse,
     fee::calculate_max_tip_gas_fee,
     services::SERVICES,
     storage::traits::{BlockStorage, Rollback, TransactionStorage},
@@ -868,36 +867,14 @@ fn get_tx_info_from_raw_tx(raw_tx: &str) -> Result<TxInfo> {
         .try_get_or_create(raw_tx)?;
 
     let nonce = u64::try_from(signed_tx.nonce())?;
-
-    let (parent_hash, parent_number) = SERVICES
-        .evm
-        .block
-        .get_latest_block_hash_and_number()?
-        .unwrap_or_default();
-
     let initial_base_fee = SERVICES.evm.block.calculate_base_fee(H256::zero())?;
     let tip_fee = calculate_max_tip_gas_fee(&signed_tx, initial_base_fee)?;
     let tip_fee = u64::try_from(tip_fee)?;
 
-    let base_fee = SERVICES.evm.block.calculate_base_fee(parent_hash)?;
-    let TxResponse { used_gas, .. } = SERVICES.evm.core.call(EthCallArgs {
-        caller: Some(signed_tx.sender),
-        to: signed_tx.to(),
-        value: signed_tx.value(),
-        data: signed_tx.data(),
-        gas_limit: u64::try_from(signed_tx.gas_limit()).unwrap_or(u64::MAX),
-        gas_price: Some(signed_tx.effective_gas_price(base_fee)),
-        max_fee_per_gas: signed_tx.max_fee_per_gas(),
-        access_list: signed_tx.access_list(),
-        block_number: parent_number,
-        transaction_type: Some(signed_tx.get_tx_type()),
-    })?;
-
     Ok(TxInfo {
         nonce,
         address: format!("{:?}", signed_tx.sender),
         tip_fee,
-        used_gas,
     })
 }
 

lib/ain-rs-exports/src/lib.rs

@@ -46,7 +46,6 @@ pub mod ffi {
         pub address: String,
         pub nonce: u64,
         pub tip_fee: u64,
-        pub used_gas: u64,
     }
 
     // ========== Governance Variable ==========

src/miner.cpp

@@ -47,9 +47,6 @@ struct EvmTxPreApplyContext {
     std::multimap<uint64_t, CTxMemPool::txiter>& failedNonces;
     std::map<uint256, CTxMemPool::FailedNonceIterator>& failedNoncesLookup;
     CTxMemPool::setEntries& failedTxEntries;
-    arith_uint256& sortedGasUsed;
-    arith_uint256& blockGasUsed;
-    arith_uint256& blockGasLimit;
 };
 
 int64_t UpdateTime(CBlockHeader* pblock, const Consensus::Params& consensusParams, const CBlockIndex* pindexPrev)
@@ -627,9 +624,6 @@ bool BlockAssembler::EvmTxPreapply(EvmTxPreApplyContext& ctx)
     auto& failedNonces = ctx.failedNonces;
     auto& failedNoncesLookup = ctx.failedNoncesLookup;
     auto& [txNonce, txSender] = txIter->GetEVMAddrAndNonce();
-    const auto& sortedGasUsed = ctx.sortedGasUsed;
-    const auto& blockGasUsed = ctx.blockGasUsed;
-    const auto& blockGasLimit = ctx.blockGasLimit;
 
     CrossBoundaryResult result;
     const auto expectedNonce = evm_try_unsafe_get_next_valid_nonce_in_q(result, evmQueueId, txSender);
@@ -647,10 +641,6 @@ bool BlockAssembler::EvmTxPreapply(EvmTxPreApplyContext& ctx)
         return false;
     }
 
-    if (blockGasUsed + sortedGasUsed + txIter->GetEVMGasUsed() > blockGasLimit) {
-        return false;
-    }
-
     return true;
 }
 
@@ -699,16 +689,6 @@ void BlockAssembler::addPackageTxs(int& nPackagesSelected, int& nDescendantsUpda
     std::map<uint256, CTxMemPool::FailedNonceIterator> failedNoncesLookup;
 
     // Block gas limit
-    CrossBoundaryResult result;
-    auto blockGasLimitInt = evm_try_get_block_limit(result);
-    if (!result.ok) {
-        blockGasLimitInt = DEFAULT_EVM_BLOCK_GAS_LIMIT;
-    }
-    arith_uint256 blockGasLimit{blockGasLimitInt};
-
-    // Gas used in the block
-    arith_uint256 blockGasUsed{};
-
     while (mi != mempool.mapTx.get<T>().end() || !mapModifiedTxSet.empty() || !failedNonces.empty()) {
         // First try to find a new transaction in mapTx to evaluate.
         if (mi != mempool.mapTx.get<T>().end() &&
@@ -819,9 +799,6 @@ void BlockAssembler::addPackageTxs(int& nPackagesSelected, int& nDescendantsUpda
         // Track failed custom TX. Used for removing EVM TXs from the queue.
         uint256 failedCustomTx;
 
-        // Gas used for the sorted entries
-        arith_uint256 sortedGasUsed{};
-
         // Apply and check custom TXs in order
         for (const auto& entry : sortedEntries) {
             const CTransaction& tx = entry->GetTx();
@@ -855,9 +832,6 @@ void BlockAssembler::addPackageTxs(int& nPackagesSelected, int& nDescendantsUpda
                         failedNonces,
                         failedNoncesLookup,
                         failedTxSet,
-                        sortedGasUsed,
-                        blockGasUsed,
-                        blockGasLimit,
                     };
                     auto res = EvmTxPreapply(evmTxCtx);
                     if (res) {
@@ -880,15 +854,6 @@ void BlockAssembler::addPackageTxs(int& nPackagesSelected, int& nDescendantsUpda
                     break;
                 }
 
-                if (evmType) {
-                    const auto totalGas = evm_try_unsafe_get_total_gas_used(result, evmQueueId);
-                    if (!result.ok) {
-                        LogPrintf("Failed to get total gas used in queue %d\n", evmQueueId);
-                    } else {
-                        sortedGasUsed = UintToArith256(uint256S({totalGas.begin(), totalGas.end()}));
-                    }
-                }
-
                 // Track checked TXs to avoid double applying
                 checkedDfTxHashSet.insert(tx.GetHash());
             }
@@ -919,6 +884,7 @@ void BlockAssembler::addPackageTxs(int& nPackagesSelected, int& nDescendantsUpda
                     // If the first TX in a failed set is not the failed TX
                     // then remove from queue, otherwise it has not been added.
                     if (entryHash != failedCustomTx) {
+                        CrossBoundaryResult result;
                         evm_try_unsafe_remove_txs_above_hash_in_q(result, evmQueueId, entryHash.ToString());
                         if (!result.ok) {
                             LogPrintf("%s: Unable to remove %s from queue. Will result in a block hash mismatch.\n", __func__, entryHash.ToString());
@@ -938,9 +904,6 @@ void BlockAssembler::addPackageTxs(int& nPackagesSelected, int& nDescendantsUpda
         cache.Flush();
         coinsCache.Flush();
 
-        // Set block gas used to sorted gas used
-        blockGasUsed = sortedGasUsed;
-
         for (const auto& entry : sortedEntries) {
             auto& hash = entry->GetTx().GetHash();
             if (failedNoncesLookup.count(hash)) {

src/txmempool.h

@@ -108,7 +108,6 @@ class CTxMemPoolEntry
 
     // EVM related data
     uint64_t evmMaxPromisedTipFee{};
-    arith_uint256 evmGasUsed{};
     EvmAddressWithNonce evmAddressAndNonce;
     CustomTxType customTxType{CustomTxType::None};
 
@@ -135,8 +134,6 @@ class CTxMemPoolEntry
     [[nodiscard]] CustomTxType GetCustomTxType() const { return customTxType; }
     void SetEVMPomisedTipFee(const uint64_t maxPromisedTipFee) { evmMaxPromisedTipFee = maxPromisedTipFee; }
     [[nodiscard]] uint64_t GetEVMPromisedTipFee() const { return evmMaxPromisedTipFee; }
-    void SetEVMGasUsed(const arith_uint256 gasUsed) { evmGasUsed = gasUsed; }
-    [[nodiscard]] arith_uint256 GetEVMGasUsed() const { return evmGasUsed; }
     void SetEVMAddrAndNonce(const EvmAddressWithNonce addrAndNonce) { evmAddressAndNonce = addrAndNonce; }
     [[nodiscard]] const EvmAddressWithNonce& GetEVMAddrAndNonce() const { return evmAddressAndNonce; }
 

src/validation.cpp

@@ -946,12 +946,10 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool
             EvmAddressWithNonce evmAddrAndNonce{txResult.nonce, txResult.address.c_str()};
 
             const auto tipFee = isEVMTx ? txResult.tip_fee : std::numeric_limits<uint64_t>::max();
-            const auto usedGas = isEVMTx ? txResult.used_gas : std::numeric_limits<uint64_t>::min();
             const auto txResultSender = std::string(txResult.address.data(), txResult.address.length());
 
             entry.SetEVMAddrAndNonce(evmAddrAndNonce);
             entry.SetEVMPomisedTipFee(tipFee);
-            entry.SetEVMGasUsed(usedGas);
 
             auto senderLimitFlag{false};
             if (!pool.checkAddressNonceAndFee(entry, txResultSender, senderLimitFlag)) {