diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs index d0a1c91c7e..cbc2e4a1c1 100644 --- a/frame/evm/src/lib.rs +++ b/frame/evm/src/lib.rs @@ -185,7 +185,7 @@ pub mod pallet { /// EVM config used in the module. fn config() -> &'static EvmConfig { - &SHANGHAI_CONFIG + &CANCUN_CONFIG } } @@ -792,7 +792,7 @@ impl GasWeightMapping for FixedGasWeightMapping { } } -static SHANGHAI_CONFIG: EvmConfig = EvmConfig::shanghai(); +static CANCUN_CONFIG: EvmConfig = EvmConfig::cancun(); impl Pallet { /// Check whether an account is empty. diff --git a/precompiles/src/testing/handle.rs b/precompiles/src/testing/handle.rs index 0e869700f2..a984a0d6b4 100644 --- a/precompiles/src/testing/handle.rs +++ b/precompiles/src/testing/handle.rs @@ -118,7 +118,7 @@ impl PrecompileHandle for MockHandle { if self .record_cost(crate::evm::costs::call_cost( context.apparent_value, - &evm::Config::london(), + &evm::Config::cancun(), )) .is_err() { diff --git a/primitives/evm/src/validation.rs b/primitives/evm/src/validation.rs index 4ad7bd2cbe..5f98d3629a 100644 --- a/primitives/evm/src/validation.rs +++ b/primitives/evm/src/validation.rs @@ -271,7 +271,7 @@ mod tests { UnknownError, } - static SHANGHAI_CONFIG: evm::Config = evm::Config::shanghai(); + static CANCUN_CONFIG: evm::Config = evm::Config::cancun(); impl From for TestError { fn from(e: TransactionValidationError) -> Self { @@ -345,7 +345,7 @@ mod tests { } = input; CheckEvmTransaction::::new( CheckEvmTransactionConfig { - evm_config: &SHANGHAI_CONFIG, + evm_config: &CANCUN_CONFIG, block_gas_limit: blockchain_gas_limit, base_fee: blockchain_base_fee, chain_id: blockchain_chain_id,