fix: use EVM-configured tx gas limit cap (#343)

Author: klkvr

crates/evm/src/either.rs

@@ -1,6 +1,6 @@
 use crate::{Evm, EvmEnv};
 use alloy_primitives::{Address, Bytes};
-use revm::context::either;
+use revm::context::{either, CfgEnv};
 
 impl<L, R> Evm for either::Either<L, R>
 where
@@ -29,6 +29,10 @@ where
         either::for_both!(self, evm => evm.block())
     }
 
+    fn cfg_env(&self) -> &CfgEnv<Self::Spec> {
+        either::for_both!(self, evm => evm.cfg_env())
+    }
+
     fn chain_id(&self) -> u64 {
         either::for_both!(self, evm => evm.chain_id())
     }

crates/evm/src/eth/block.rs

@@ -24,7 +24,7 @@ use alloy_hardforks::EthereumHardfork;
 use alloy_primitives::{Bytes, Log, B256};
 use revm::{
     context::Block, context_interface::result::ResultAndState, database::DatabaseCommitExt,
-    primitives::eip7825::TX_GAS_LIMIT_CAP, DatabaseCommit, Inspector,
+    DatabaseCommit, Inspector,
 };
 
 /// Context for Ethereum block execution.
@@ -177,9 +177,12 @@ where
 
         // Use regular part of transaction gas limit to check if it fits inside available block
         // space.
-        let tx_min_gas_limit = min(tx.tx().gas_limit(), TX_GAS_LIMIT_CAP);
+        let mut max_tx_gas_usage = tx.tx().gas_limit();
+        if let Some(tx_gas_limit_cap) = self.evm.cfg_env().tx_gas_limit_cap {
+            max_tx_gas_usage = min(max_tx_gas_usage, tx_gas_limit_cap);
+        }
 
-        if tx_min_gas_limit > block_available_gas {
+        if max_tx_gas_usage > block_available_gas {
             return Err(BlockValidationError::TransactionGasLimitMoreThanAvailableBlockGas {
                 transaction_gas_limit: tx.tx().gas_limit(),
                 block_available_gas,

crates/evm/src/eth/mod.rs

@@ -211,6 +211,10 @@ where
         &self.block
     }
 
+    fn cfg_env(&self) -> &CfgEnv<Self::Spec> {
+        &self.cfg
+    }
+
     fn chain_id(&self) -> u64 {
         self.cfg.chain_id
     }

crates/evm/src/evm.rs

@@ -5,7 +5,7 @@ use alloy_consensus::transaction::TxHashRef;
 use alloy_primitives::{Address, Bytes, B256};
 use core::{error::Error, fmt::Debug, hash::Hash};
 use revm::{
-    context::result::ExecutionResult,
+    context::{result::ExecutionResult, CfgEnv},
     context_interface::{
         result::{HaltReasonTr, ResultAndState},
         ContextTr,
@@ -64,6 +64,9 @@ pub trait Evm {
     /// Reference to [`Evm::BlockEnv`].
     fn block(&self) -> &Self::BlockEnv;
 
+    /// Reference to [`CfgEnv`].
+    fn cfg_env(&self) -> &CfgEnv<Self::Spec>;
+
     /// Returns the chain ID of the environment.
     fn chain_id(&self) -> u64;