evm: Remove pallet-dynamic-fee

Phala-Network · Jan 4, 2024 · 1038129 · 1038129
1 parent 31e9786
commit 1038129
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 29 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/standalone/node/src/chain_spec.rs b/standalone/node/src/chain_spec.rs
@@ -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, ElectionsConfig, ImOnlineConfig, IndicesConfig,
-    NominationPoolsConfig, PhalaRegistryConfig, SessionConfig, SessionKeys, SocietyConfig,
-    StakerStatus, StakingConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig,
+    DemocracyConfig, 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};
@@ -523,7 +523,6 @@ pub fn testnet_genesis(
             ..Default::default()
         },
         base_fee: BaseFeeConfig::new(100_000_000_000_u64.into(), Permill::zero()),
-        dynamic_fee: DynamicFeeConfig::default(),
         ethereum: Default::default(),
         evm: Default::default(),
     }

diff --git a/standalone/runtime/Cargo.toml b/standalone/runtime/Cargo.toml
@@ -119,7 +119,6 @@ fp-rpc = { workspace = true }
 fp-self-contained = { workspace = true, features = ["serde"] }
 # Frontier FRAME
 pallet-base-fee = { workspace = true }
-pallet-dynamic-fee = { workspace = true }
 pallet-ethereum = { workspace = true }
 pallet-evm = { workspace = true }
 pallet-evm-precompile-modexp = { workspace = true }
@@ -217,7 +216,6 @@ std = [
 	"fp-self-contained/std",
 	# Frontier FRAME
 	"pallet-base-fee/std",
-	"pallet-dynamic-fee/std",
 	"pallet-ethereum/std",
 	"pallet-evm/std",
 	"pallet-evm-precompile-modexp/std",

diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs
@@ -1693,10 +1693,6 @@ parameter_types! {
     pub BoundDivision: U256 = U256::from(1024);
 }
 
-impl pallet_dynamic_fee::Config for Runtime {
-    type MinGasPriceBoundDivisor = BoundDivision;
-}
-
 parameter_types! {
     pub DefaultBaseFeePerGas: U256 = 100_000_000_000_u64.into();
     pub DefaultElasticity: Permill = Permill::zero();
@@ -1798,7 +1794,6 @@ construct_runtime!(
         // Frontier
         Ethereum: pallet_ethereum,
         EVM: pallet_evm,
-        DynamicFee: pallet_dynamic_fee,
         BaseFee: pallet_base_fee,
         HotfixSufficients: pallet_hotfix_sufficients,
     }