Switch to london evm configuration (paritytech#532)

* Switch to london evm configuration * Update descriptions * Update tests
boolnetwork · Dec 3, 2021 · 6df6b1d · 6df6b1d
1 parent aa5e518
commit 6df6b1d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/docs/frame/evm.md b/docs/frame/evm.md
@@ -42,4 +42,4 @@ any Ethereum transaction into a transaction compatible with this
 module.
 
 The gas configurations are configurable. Right now, a pre-defined
-Istanbul hard fork configuration option is provided.
+London hard fork configuration option is provided.
diff --git a/frame/ethereum/src/tests/eip1559.rs b/frame/ethereum/src/tests/eip1559.rs
@@ -228,7 +228,7 @@ fn transaction_should_generate_correct_gas_used() {
 	let (pairs, mut ext) = new_test_ext(1);
 	let alice = &pairs[0];
 
-	let expected_gas = U256::from(891328);
+	let expected_gas = U256::from(893928);
 
 	ext.execute_with(|| {
 		let t = eip1559_erc20_creation_transaction(alice);

diff --git a/frame/ethereum/src/tests/eip2930.rs b/frame/ethereum/src/tests/eip2930.rs
@@ -228,7 +228,7 @@ fn transaction_should_generate_correct_gas_used() {
 	let (pairs, mut ext) = new_test_ext(1);
 	let alice = &pairs[0];
 
-	let expected_gas = U256::from(891328);
+	let expected_gas = U256::from(893928);
 
 	ext.execute_with(|| {
 		let t = eip2930_erc20_creation_transaction(alice);

diff --git a/frame/ethereum/src/tests/legacy.rs b/frame/ethereum/src/tests/legacy.rs
@@ -228,7 +228,7 @@ fn transaction_should_generate_correct_gas_used() {
 	let (pairs, mut ext) = new_test_ext(1);
 	let alice = &pairs[0];
 
-	let expected_gas = U256::from(891328);
+	let expected_gas = U256::from(893928);
 
 	ext.execute_with(|| {
 		let t = legacy_erc20_creation_transaction(alice);

diff --git a/frame/evm/README.md b/frame/evm/README.md
@@ -24,6 +24,6 @@ Observable differences include:
 
 We currently do not aim to make unobservable behaviors, such as state root, to be the same. We also don't aim to follow the exact same transaction / receipt format. However, given one Ethereum transaction and one Substrate account's private key, one should be able to convert any Ethereum transaction into a transaction compatible with this module.
 
-The gas configurations are configurable. Right now, a pre-defined Istanbul hard fork configuration option is provided.
+The gas configurations are configurable. Right now, a pre-defined London hard fork configuration option is provided.
 
 License: Apache-2.0
diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs
@@ -48,7 +48,7 @@
 //! the exact same transaction / receipt format. However, given one Ethereum transaction and one Substrate account's
 //! private key, one should be able to convert any Ethereum transaction into a transaction compatible with this pallet.
 //!
-//! The gas configurations are configurable. Right now, a pre-defined Istanbul hard fork configuration option is provided.
+//! The gas configurations are configurable. Right now, a pre-defined London hard fork configuration option is provided.
 
 // Ensure we're `no_std` when compiling for Wasm.
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -145,7 +145,7 @@ pub mod pallet {
 
 		/// EVM config used in the module.
 		fn config() -> &'static EvmConfig {
-			&ISTANBUL_CONFIG
+			&LONDON_CONFIG
 		}
 	}
 
@@ -571,7 +571,7 @@ impl GasWeightMapping for () {
 	}
 }
 
-static ISTANBUL_CONFIG: EvmConfig = EvmConfig::istanbul();
+static LONDON_CONFIG: EvmConfig = EvmConfig::london();
 
 #[cfg(feature = "std")]
 #[derive(Clone, Eq, PartialEq, Encode, Decode, Debug, Serialize, Deserialize)]