evm: Config chain id via const parameter

Author: kvinwang

Cargo.lock

@@ -121,7 +121,6 @@ pallet-base-fee = { git = "https://github.com/kvinwang/frontier", branch = "polk
 pallet-dynamic-fee = { git = "https://github.com/kvinwang/frontier", branch = "polkadot-v1.5.0", default-features = false }
 pallet-ethereum = { git = "https://github.com/kvinwang/frontier", branch = "polkadot-v1.5.0", default-features = false }
 pallet-evm = { git = "https://github.com/kvinwang/frontier", branch = "polkadot-v1.5.0", default-features = false }
-pallet-evm-chain-id = { git = "https://github.com/kvinwang/frontier", branch = "polkadot-v1.5.0", default-features = false }
 pallet-evm-precompile-modexp = { git = "https://github.com/kvinwang/frontier", branch = "polkadot-v1.5.0", default-features = false }
 pallet-evm-precompile-sha3fips = { git = "https://github.com/kvinwang/frontier", branch = "polkadot-v1.5.0", default-features = false }
 pallet-evm-precompile-simple = { git = "https://github.com/kvinwang/frontier", branch = "polkadot-v1.5.0", default-features = false }

Cargo.toml

@@ -24,9 +24,9 @@ use node_runtime::constants::{currency::*, time::*};
 use node_runtime::Block;
 use node_runtime::{
     wasm_binary_unwrap, AssetsConfig, BabeConfig, BalancesConfig, BaseFeeConfig, CouncilConfig,
-    DemocracyConfig, DynamicFeeConfig, EVMChainIdConfig, ElectionsConfig, ImOnlineConfig,
-    IndicesConfig, NominationPoolsConfig, PhalaRegistryConfig, SessionConfig, SessionKeys,
-    SocietyConfig, StakerStatus, StakingConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig,
+    DemocracyConfig, DynamicFeeConfig, ElectionsConfig, ImOnlineConfig, IndicesConfig,
+    NominationPoolsConfig, PhalaRegistryConfig, SessionConfig, SessionKeys, SocietyConfig,
+    StakerStatus, StakingConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig,
 };
 use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
 use sc_chain_spec::{ChainSpecExtension, Properties};
@@ -526,10 +526,6 @@ pub fn testnet_genesis(
         dynamic_fee: DynamicFeeConfig::default(),
         ethereum: Default::default(),
         evm: Default::default(),
-        evm_chain_id: EVMChainIdConfig {
-            chain_id: 1234567, // TODO: We need to register a chain id
-            ..Default::default()
-        },
     }
 }
 

standalone/node/src/chain_spec.rs

@@ -122,7 +122,6 @@ pallet-base-fee = { workspace = true }
 pallet-dynamic-fee = { workspace = true }
 pallet-ethereum = { workspace = true }
 pallet-evm = { workspace = true }
-pallet-evm-chain-id = { workspace = true }
 pallet-evm-precompile-modexp = { workspace = true }
 pallet-evm-precompile-sha3fips = { workspace = true }
 pallet-evm-precompile-simple = { workspace = true }
@@ -221,7 +220,6 @@ std = [
 	"pallet-dynamic-fee/std",
 	"pallet-ethereum/std",
 	"pallet-evm/std",
-	"pallet-evm-chain-id/std",
 	"pallet-evm-precompile-modexp/std",
 	"pallet-evm-precompile-sha3fips/std",
 	"pallet-evm-precompile-simple/std",

standalone/runtime/Cargo.toml

@@ -1593,8 +1593,6 @@ impl pallet_evm_account_mapping::Config for Runtime {
     type WeightInfo = pallet_evm_account_mapping::weights::SubstrateWeight<Runtime>;
 }
 
-impl pallet_evm_chain_id::Config for Runtime {}
-
 pub struct FindAuthorTruncated;
 impl FindAuthor<H160> for FindAuthorTruncated {
     fn find_author<'a, I>(_digests: I) -> Option<H160>
@@ -1652,6 +1650,10 @@ impl pallet_evm::AddressMapping<AccountId> for PostfixAddressMapping {
     }
 }
 
+parameter_types! {
+    pub const EVMChainId: u64 = 2035;
+}
+
 impl pallet_evm::Config for Runtime {
     type FeeCalculator = BaseFee;
     type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
@@ -1796,7 +1798,6 @@ construct_runtime!(
         // Frontier
         Ethereum: pallet_ethereum,
         EVM: pallet_evm,
-        EVMChainId: pallet_evm_chain_id,
         DynamicFee: pallet_dynamic_fee,
         BaseFee: pallet_base_fee,
         HotfixSufficients: pallet_hotfix_sufficients,