diff --git a/Cargo.lock b/Cargo.lock index 50cf7049..1a9ae3d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2112,16 +2112,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "fp-dynamic-fee" -version = "1.0.0" -source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36#977dab0774152e0be5779b73cccb6756ce48de38" -dependencies = [ - "async-trait", - "sp-core", - "sp-inherents", -] - [[package]] name = "fp-ethereum" version = "1.0.0-dev" @@ -4646,23 +4636,6 @@ dependencies = [ "stbl-tools", ] -[[package]] -name = "pallet-dynamic-fee" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/frontier?branch=polkadot-v0.9.36#977dab0774152e0be5779b73cccb6756ce48de38" -dependencies = [ - "fp-dynamic-fee", - "fp-evm", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-inherents", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-erc20-manager" version = "0.1.0" @@ -8650,7 +8623,6 @@ dependencies = [ "fc-mapping-sync", "fc-rpc", "fc-rpc-core", - "fp-dynamic-fee", "fp-evm", "fp-rpc", "fp-storage", @@ -8772,7 +8744,6 @@ dependencies = [ "pallet-collective", "pallet-custom-balances", "pallet-dnt-fee-controller", - "pallet-dynamic-fee", "pallet-erc20-manager", "pallet-ethereum", "pallet-evm", diff --git a/Cargo.toml b/Cargo.toml index 64519f6a..178e0fe8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -164,7 +164,6 @@ fc-rpc = { version = "2.0.0-dev", git = "https://github.com/paritytech/frontier" fc-rpc-core = { version = "1.1.0-dev", git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.36" } # Frontier Primitive fp-consensus = { version = "2.0.0-dev", git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.36", default-features = false } -fp-dynamic-fee = { version = "1.0.0", git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.36", default-features = false } fp-ethereum = { version = "1.0.0-dev", git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.36", default-features = false } fp-evm = { version = "3.0.0-dev", git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.36", default-features = false } fp-rpc = { version = "3.0.0-dev", git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.36", default-features = false } @@ -172,7 +171,6 @@ fp-self-contained = { version = "1.0.0-dev", git = "https://github.com/paritytec fp-storage = { version = "2.0.0", git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.36", default-features = false } # Frontier FRAME pallet-base-fee = { version = "1.0.0", git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.36", default-features = false } -pallet-dynamic-fee = { version = "4.0.0-dev", git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.36", default-features = false } pallet-ethereum = { version = "4.0.0-dev", git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.36", default-features = false } pallet-evm = { version = "6.0.0-dev", git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.36", default-features = false } pallet-evm-chain-id = { version = "1.0.0-dev", git = "https://github.com/paritytech/frontier", branch = "polkadot-v0.9.36", default-features = false } diff --git a/node/Cargo.toml b/node/Cargo.toml index 394a8f6c..c26317cd 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -71,7 +71,6 @@ fc-db = { workspace = true } fc-mapping-sync = { workspace = true } fc-rpc = { workspace = true } fc-rpc-core = { workspace = true } -fp-dynamic-fee = { workspace = true, features = ["std"] } fp-evm = { workspace = true, features = ["std"] } fp-rpc = { workspace = true, features = ["std"] } fp-storage = { workspace = true, features = ["std"] } diff --git a/node/src/chain_spec/mod.rs b/node/src/chain_spec/mod.rs index 983f7561..20876330 100644 --- a/node/src/chain_spec/mod.rs +++ b/node/src/chain_spec/mod.rs @@ -189,7 +189,6 @@ pub fn base_genesis( }, }, ethereum: Default::default(), - dynamic_fee: Default::default(), base_fee: Default::default(), supported_tokens_manager: SupportedTokensManagerConfig { initial_default_token, diff --git a/node/src/eth.rs b/node/src/eth.rs index 17f5ea17..a24c223f 100644 --- a/node/src/eth.rs +++ b/node/src/eth.rs @@ -51,9 +51,6 @@ pub struct EthConfiguration { #[arg(long)] pub enable_dev_signer: bool, - /// The dynamic-fee pallet target gas price set by block author - #[arg(long, default_value = "1")] - pub target_gas_price: u64, /// Maximum allowed gas limit will be `block.gas_limit * execute_gas_limit_multiplier` /// when using eth_call/eth_estimateGas. diff --git a/node/src/service.rs b/node/src/service.rs index 4c826fb7..e6719d5b 100644 --- a/node/src/service.rs +++ b/node/src/service.rs @@ -11,7 +11,6 @@ use sc_executor::{NativeElseWasmExecutor, NativeExecutionDispatch}; use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker}; use sp_api::{ConstructRuntimeApi, TransactionFor}; -use sp_core::U256; use sp_runtime::traits::BlakeTwo256; use sp_trie::PrefixedMemoryDB; use stbl_primitives_zero_gas_transactions_api::ZeroGasTransactionApi; @@ -165,7 +164,7 @@ where pub fn build_aura_grandpa_import_queue( client: Arc>, config: &Configuration, - eth_config: &EthConfiguration, + _eth_config: &EthConfiguration, task_manager: &TaskManager, telemetry: Option, grandpa_block_import: GrandpaBlockImport>, @@ -191,7 +190,6 @@ where ); let slot_duration = sc_consensus_aura::slot_duration(&*client)?; - let target_gas_price = eth_config.target_gas_price; let create_inherent_data_providers = move |_, ()| async move { let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); let slot = @@ -199,8 +197,7 @@ where *timestamp, slot_duration, ); - let dynamic_fee = fp_dynamic_fee::InherentDataProvider(U256::from(target_gas_price)); - Ok((slot, timestamp, dynamic_fee)) + Ok((slot, timestamp)) }; let import_queue = @@ -425,7 +422,6 @@ where // manual-seal authorship if let Some(sealing) = sealing { run_manual_seal_authorship( - ð_config, sealing, client, transaction_pool, @@ -455,15 +451,13 @@ where ); let slot_duration = sc_consensus_aura::slot_duration(&*client)?; - let target_gas_price = eth_config.target_gas_price; let create_inherent_data_providers = move |_, ()| async move { let timestamp = sp_timestamp::InherentDataProvider::from_system_time(); let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration( *timestamp, slot_duration, ); - let dynamic_fee = fp_dynamic_fee::InherentDataProvider(U256::from(target_gas_price)); - Ok((slot, timestamp, dynamic_fee)) + Ok((slot, timestamp)) }; let aura = sc_consensus_aura::start_aura::< @@ -552,7 +546,6 @@ where } fn run_manual_seal_authorship( - eth_config: &EthConfiguration, sealing: Sealing, client: Arc>, transaction_pool: Arc>>, @@ -612,11 +605,9 @@ where } } - let target_gas_price = eth_config.target_gas_price; let create_inherent_data_providers = move |_, ()| async move { let timestamp = MockTimestampInherentDataProvider; - let dynamic_fee = fp_dynamic_fee::InherentDataProvider(U256::from(target_gas_price)); - Ok((timestamp, dynamic_fee)) + Ok(timestamp) }; let manual_seal = match sealing { diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index fd0b83f8..b7dc5a96 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -41,7 +41,6 @@ std = [ 'fp-rpc/std', 'fp-self-contained/std', 'pallet-base-fee/std', - 'pallet-dynamic-fee/std', 'pallet-ethereum/std', 'pallet-evm/std', 'pallet-evm-chain-id/std', @@ -128,7 +127,6 @@ fp-rpc = { workspace = true } fp-self-contained = { workspace = true } # Frontier FRAME pallet-base-fee = { workspace = true } -pallet-dynamic-fee = { workspace = true } pallet-ethereum = { workspace = true } pallet-evm = { workspace = true } pallet-evm-chain-id = { workspace = true } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 4d5acada..7aad01b6 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -518,13 +518,6 @@ impl pallet_validator_fee_selector::Config for Runtime { impl pallet_supported_tokens_manager::Config for Runtime {} -parameter_types! { - pub BoundDivision: U256 = U256::from(1024); -} - -impl pallet_dynamic_fee::Config for Runtime { - type MinGasPriceBoundDivisor = BoundDivision; -} parameter_types! { pub DefaultBaseFeePerGas: U256 = U256::from(GAS_BASE_FEE); @@ -779,7 +772,6 @@ construct_runtime!( Ethereum: pallet_ethereum, EVM: pallet_evm, EVMChainId: pallet_evm_chain_id, - DynamicFee: pallet_dynamic_fee, BaseFee: pallet_base_fee, HotfixSufficients: pallet_hotfix_sufficients, UserFeeSelector: pallet_user_fee_selector,