use Cancun config

moonbeam-foundation · May 2, 2024 · 5af51ee · 5af51ee
1 parent 920046c
commit 5af51ee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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<T: Config> GasWeightMapping for FixedGasWeightMapping<T> {
 	}
 }
 
-static SHANGHAI_CONFIG: EvmConfig = EvmConfig::shanghai();
+static CANCUN_CONFIG: EvmConfig = EvmConfig::cancun();
 
 impl<T: Config> Pallet<T> {
 	/// Check whether an account is empty.

diff --git 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
@@ -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<TransactionValidationError> for TestError {
 		fn from(e: TransactionValidationError) -> Self {
@@ -345,7 +345,7 @@ mod tests {
 		} = input;
 		CheckEvmTransaction::<TestError>::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,