diff --git a/Cargo.lock b/Cargo.lock index babcfffc0..fe5d6edba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1659,7 +1659,6 @@ dependencies = [ "pallet-balances", "pallet-base-fee", "pallet-cc-authorities-noting", - "pallet-dynamic-fee", "pallet-ethereum", "pallet-evm", "pallet-evm-chain-id", @@ -4140,16 +4139,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "fp-dynamic-fee" -version = "1.0.0" -source = "git+https://github.com/moondance-labs/frontier?branch=tanssi-polkadot-v1.3.0#17b64ada67c9b52eeb32cea33565e456a0f39fbb" -dependencies = [ - "async-trait", - "sp-core", - "sp-inherents", -] - [[package]] name = "fp-ethereum" version = "1.0.0-dev" @@ -7762,22 +7751,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-dynamic-fee" -version = "4.0.0-dev" -source = "git+https://github.com/moondance-labs/frontier?branch=tanssi-polkadot-v1.3.0#17b64ada67c9b52eeb32cea33565e456a0f39fbb" -dependencies = [ - "fp-dynamic-fee", - "fp-evm", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-core", - "sp-inherents", - "sp-std", -] - [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" diff --git a/Cargo.toml b/Cargo.toml index ae29a0d0c..59060db29 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -219,7 +219,6 @@ fp-evm = { git = "https://github.com/moondance-labs/frontier", branch = "tanssi- fp-rpc = { git = "https://github.com/moondance-labs/frontier", branch = "tanssi-polkadot-v1.3.0", default-features = false } fp-self-contained = { git = "https://github.com/moondance-labs/frontier", branch = "tanssi-polkadot-v1.3.0", default-features = false } pallet-base-fee = { git = "https://github.com/moondance-labs/frontier", branch = "tanssi-polkadot-v1.3.0", default-features = false } -pallet-dynamic-fee = { git = "https://github.com/moondance-labs/frontier", branch = "tanssi-polkadot-v1.3.0", default-features = false } pallet-ethereum = { git = "https://github.com/moondance-labs/frontier", branch = "tanssi-polkadot-v1.3.0", default-features = false } pallet-evm = { git = "https://github.com/moondance-labs/frontier", branch = "tanssi-polkadot-v1.3.0", default-features = false } pallet-evm-chain-id = { git = "https://github.com/moondance-labs/frontier", branch = "tanssi-polkadot-v1.3.0", default-features = false } diff --git a/container-chains/templates/frontier/node/src/chain_spec.rs b/container-chains/templates/frontier/node/src/chain_spec.rs index de132ee76..8caed7b99 100644 --- a/container-chains/templates/frontier/node/src/chain_spec.rs +++ b/container-chains/templates/frontier/node/src/chain_spec.rs @@ -205,7 +205,6 @@ fn testnet_genesis( ..Default::default() }, ethereum: Default::default(), - dynamic_fee: Default::default(), base_fee: Default::default(), transaction_payment: Default::default(), sudo: container_chain_template_frontier_runtime::SudoConfig { diff --git a/container-chains/templates/frontier/runtime/Cargo.toml b/container-chains/templates/frontier/runtime/Cargo.toml index 5dea1e5ba..f1b84b90f 100644 --- a/container-chains/templates/frontier/runtime/Cargo.toml +++ b/container-chains/templates/frontier/runtime/Cargo.toml @@ -92,7 +92,6 @@ fp-evm = { workspace = true, features = [ "serde" ] } fp-rpc = { workspace = true } fp-self-contained = { workspace = true, features = [ "serde" ] } pallet-base-fee = { workspace = true } -pallet-dynamic-fee = { workspace = true } pallet-ethereum = { workspace = true } pallet-evm = { workspace = true } pallet-evm-chain-id = { workspace = true } @@ -140,7 +139,6 @@ std = [ "pallet-balances/std", "pallet-base-fee/std", "pallet-cc-authorities-noting/std", - "pallet-dynamic-fee/std", "pallet-ethereum/std", "pallet-ethereum/std", "pallet-evm-chain-id/std", @@ -247,7 +245,6 @@ try-runtime = [ "pallet-balances/try-runtime", "pallet-base-fee/try-runtime", "pallet-cc-authorities-noting/try-runtime", - "pallet-dynamic-fee/try-runtime", "pallet-ethereum/try-runtime", "pallet-evm-chain-id/try-runtime", "pallet-evm/try-runtime", diff --git a/container-chains/templates/frontier/runtime/src/lib.rs b/container-chains/templates/frontier/runtime/src/lib.rs index 7e02b497e..3944e73df 100644 --- a/container-chains/templates/frontier/runtime/src/lib.rs +++ b/container-chains/templates/frontier/runtime/src/lib.rs @@ -867,10 +867,6 @@ 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(2_000_000_000); pub DefaultElasticity: Permill = Permill::from_parts(125_000); @@ -948,7 +944,6 @@ construct_runtime!( Ethereum: pallet_ethereum = 60, EVM: pallet_evm = 61, EVMChainId: pallet_evm_chain_id = 62, - DynamicFee: pallet_dynamic_fee = 63, BaseFee: pallet_base_fee = 64, HotfixSufficients: pallet_hotfix_sufficients = 65, TransactionPayment: pallet_transaction_payment = 66,