Merge pull request #297 from peaqnetwork/feat/1208500128481486_evm_fe…

…e_unreachable WIP: Feat/1208500128481486 evm fee unreachable
peaqnetwork · Oct 14, 2024 · e8b1509 · e8b1509
2 parents cdabce8 + 7a9cfae
commit e8b1509
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 132 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -118,7 +118,6 @@ fp-evm = { git = "https://github.com/peaqnetwork/frontier", branch = "peaq-polka
 fp-rpc = { git = "https://github.com/peaqnetwork/frontier", branch = "peaq-polkadot-v1.7.2", default-features = false }
 fp-self-contained = { git = "https://github.com/peaqnetwork/frontier", branch = "peaq-polkadot-v1.7.2", default-features = false, features = ["serde"] }
 pallet-base-fee = { git = "https://github.com/peaqnetwork/frontier", branch = "peaq-polkadot-v1.7.2", default-features = false }
-pallet-dynamic-fee = { git = "https://github.com/peaqnetwork/frontier", branch = "peaq-polkadot-v1.7.2", default-features = false }
 pallet-ethereum = { git = "https://github.com/peaqnetwork/frontier", branch = "peaq-polkadot-v1.7.2", default-features = false }
 pallet-evm = { git = "https://github.com/peaqnetwork/frontier", branch = "peaq-polkadot-v1.7.2", default-features = false }
 pallet-evm-precompile-blake2 = { git = "https://github.com/peaqnetwork/frontier", branch = "peaq-polkadot-v1.7.2", default-features = false }

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -76,7 +76,6 @@ fp-consensus = { workspace = true, default-features = true }
 fp-storage = { workspace = true, default-features = true }
 fp-rpc = { workspace = true, default-features = true }
 pallet-base-fee = { workspace = true, default-features = true }
-pallet-dynamic-fee = { workspace = true, default-features = true }
 pallet-ethereum = { workspace = true, default-features = true }
 pallet-evm = { workspace = true, default-features = true }
 tokio = { workspace = true, default-features = true, features = [ "macros", "sync" ] }

diff --git a/node/src/parachain/dev_chain_spec.rs b/node/src/parachain/dev_chain_spec.rs
@@ -171,7 +171,6 @@ fn configure_genesis(
 			..Default::default()
 		},
 		ethereum: EthereumConfig { ..Default::default() },
-		dynamic_fee: Default::default(),
 		base_fee: Default::default(),
 		polkadot_xcm: peaq_dev_runtime::PolkadotXcmConfig {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),

diff --git a/node/src/parachain/krest_chain_spec.rs b/node/src/parachain/krest_chain_spec.rs
@@ -156,7 +156,6 @@ fn configure_genesis(
 			..Default::default()
 		},
 		ethereum: EthereumConfig { ..Default::default() },
-		dynamic_fee: Default::default(),
 		base_fee: Default::default(),
 		polkadot_xcm: peaq_krest_runtime::PolkadotXcmConfig {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),

diff --git a/node/src/parachain/peaq_chain_spec.rs b/node/src/parachain/peaq_chain_spec.rs
@@ -160,8 +160,6 @@ fn configure_genesis(
 			..Default::default()
 		},
 		ethereum: EthereumConfig { ..Default::default() },
-		dynamic_fee: Default::default(),
-		base_fee: Default::default(),
 		polkadot_xcm: peaq_runtime::PolkadotXcmConfig {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),
 			..Default::default()

diff --git a/runtime/krest/Cargo.toml b/runtime/krest/Cargo.toml
@@ -65,7 +65,6 @@ fp-evm = { workspace = true, default-features = false }
 fp-rpc = { workspace = true, default-features = false }
 fp-self-contained = { workspace = true, default-features = false }
 pallet-base-fee = { workspace = true, default-features = false }
-pallet-dynamic-fee = { workspace = true, default-features = false }
 pallet-ethereum = { workspace = true, default-features = false, features = ["forbid-evm-reentrancy"] }
 pallet-evm = { workspace = true, default-features = false, features = ["forbid-evm-reentrancy"] }
 pallet-evm-precompile-blake2 = { workspace = true, default-features = false }
@@ -227,7 +226,6 @@ std = [
 	"fp-evm/std",
 	"fp-self-contained/std",
 	"pallet-base-fee/std",
-	"pallet-dynamic-fee/std",
 	"pallet-ethereum/std",
 	"pallet-evm/std",
 	"pallet-evm-precompile-simple/std",
@@ -328,7 +326,6 @@ try-runtime = [
 	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-evm/try-runtime",
-	"pallet-dynamic-fee/try-runtime",
 	"pallet-base-fee/try-runtime",
 	"pallet-transaction-payment/try-runtime",
 	"pallet-contracts/try-runtime",

diff --git a/runtime/krest/src/lib.rs b/runtime/krest/src/lib.rs
@@ -640,18 +640,6 @@ pub const GAS_PER_SECOND: u64 = 40_000_000;
 /// u64 works for approximations because Weight is a very small unit compared to gas.
 pub const WEIGHT_PER_GAS: u64 = WEIGHT_REF_TIME_PER_SECOND.saturating_div(GAS_PER_SECOND);
 
-pub struct PeaqGasWeightMapping;
-impl pallet_evm::GasWeightMapping for PeaqGasWeightMapping {
-	fn gas_to_weight(gas: u64, _without_base_weight: bool) -> Weight {
-		let weight = gas.saturating_mul(WEIGHT_PER_GAS);
-		Weight::from_parts(weight, 0)
-	}
-
-	fn weight_to_gas(weight: Weight) -> u64 {
-		weight.ref_time().wrapping_div(WEIGHT_PER_GAS)
-	}
-}
-
 parameter_types! {
 	pub const EvmChainId: u64 = 2241;
 	pub BlockGasLimit: U256 = U256::from(
@@ -680,7 +668,7 @@ parameter_types! {
 impl pallet_evm::Config for Runtime {
 	type FeeCalculator = BaseFee;
 	type WeightPerGas = WeightPerGas;
-	type GasWeightMapping = PeaqGasWeightMapping;
+	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;
 	type CallOrigin = EnsureAddressTruncated;
 	type WithdrawOrigin = EnsureAddressTruncated;
@@ -713,14 +701,6 @@ impl pallet_ethereum::Config for Runtime {
 	type ExtraDataLength = ConstU32<30>;
 }
 
-frame_support::parameter_types! {
-	pub BoundDivision: U256 = U256::from(1024);
-}
-
-impl pallet_dynamic_fee::Config for Runtime {
-	type MinGasPriceBoundDivisor = BoundDivision;
-}
-
 frame_support::parameter_types! {
 	pub DefaultBaseFeePerGas: U256 = U256::from(1024);
 	pub DefaultElasticity: Permill = Permill::zero();
@@ -1072,7 +1052,7 @@ construct_runtime!(
 		// EVM
 		Ethereum: pallet_ethereum = 11,
 		EVM: pallet_evm = 12,
-		DynamicFee: pallet_dynamic_fee = 13,
+		// DynamicFee: pallet_dynamic_fee = 13,
 		BaseFee: pallet_base_fee::{Pallet, Call, Storage, Config<T>, Event} = 14,
 
 		// Parachain

diff --git a/runtime/peaq-dev/Cargo.toml b/runtime/peaq-dev/Cargo.toml
@@ -65,7 +65,6 @@ fp-evm = { workspace = true, default-features = false }
 fp-rpc = { workspace = true, default-features = false }
 fp-self-contained = { workspace = true, default-features = false }
 pallet-base-fee = { workspace = true, default-features = false }
-pallet-dynamic-fee = { workspace = true, default-features = false }
 pallet-ethereum = { workspace = true, default-features = false, features = ["forbid-evm-reentrancy"] }
 pallet-evm = { workspace = true, default-features = false, features = ["forbid-evm-reentrancy"] }
 pallet-evm-precompile-blake2 = { workspace = true, default-features = false }
@@ -229,7 +228,6 @@ std = [
 	"fp-evm/std",
 	"fp-self-contained/std",
 	"pallet-base-fee/std",
-	"pallet-dynamic-fee/std",
 	"pallet-ethereum/std",
 	"pallet-evm/std",
 	"pallet-evm-precompile-simple/std",
@@ -330,7 +328,6 @@ try-runtime = [
 	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-evm/try-runtime",
-	"pallet-dynamic-fee/try-runtime",
 	"pallet-base-fee/try-runtime",
 	"pallet-transaction-payment/try-runtime",
 	"pallet-contracts/try-runtime",

diff --git a/runtime/peaq-dev/src/lib.rs b/runtime/peaq-dev/src/lib.rs
@@ -646,18 +646,6 @@ pub const GAS_PER_SECOND: u64 = 40_000_000;
 /// u64 works for approximations because Weight is a very small unit compared to gas.
 pub const WEIGHT_PER_GAS: u64 = WEIGHT_REF_TIME_PER_SECOND.saturating_div(GAS_PER_SECOND);
 
-pub struct PeaqGasWeightMapping;
-impl pallet_evm::GasWeightMapping for PeaqGasWeightMapping {
-	fn gas_to_weight(gas: u64, _without_base_weight: bool) -> Weight {
-		let weight = gas.saturating_mul(WEIGHT_PER_GAS);
-		Weight::from_parts(weight, 0)
-	}
-
-	fn weight_to_gas(weight: Weight) -> u64 {
-		weight.ref_time().wrapping_div(WEIGHT_PER_GAS)
-	}
-}
-
 parameter_types! {
 	pub const EvmChainId: u64 = 9990;
 	pub BlockGasLimit: U256 = U256::from(
@@ -686,7 +674,7 @@ parameter_types! {
 impl pallet_evm::Config for Runtime {
 	type FeeCalculator = BaseFee;
 	type WeightPerGas = WeightPerGas;
-	type GasWeightMapping = PeaqGasWeightMapping;
+	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;
 	type CallOrigin = EnsureAddressTruncated;
 	type WithdrawOrigin = EnsureAddressTruncated;
@@ -719,14 +707,6 @@ impl pallet_ethereum::Config for Runtime {
 	type ExtraDataLength = ConstU32<30>;
 }
 
-frame_support::parameter_types! {
-	pub BoundDivision: U256 = U256::from(1024);
-}
-
-impl pallet_dynamic_fee::Config for Runtime {
-	type MinGasPriceBoundDivisor = BoundDivision;
-}
-
 frame_support::parameter_types! {
 	pub DefaultBaseFeePerGas: U256 = U256::from(1024);
 	pub DefaultElasticity: Permill = Permill::zero();
@@ -1086,7 +1066,7 @@ construct_runtime!(
 		// EVM
 		Ethereum: pallet_ethereum = 11,
 		EVM: pallet_evm = 12,
-		DynamicFee: pallet_dynamic_fee = 13,
+		// DynamicFee: pallet_dynamic_fee = 13,
 		BaseFee: pallet_base_fee::{Pallet, Call, Storage, Config<T>, Event} = 14,
 
 		// Parachain

diff --git a/runtime/peaq/Cargo.toml b/runtime/peaq/Cargo.toml
@@ -64,8 +64,6 @@ sp-io = { workspace = true, default-features = false }
 fp-evm = { workspace = true, default-features = false }
 fp-rpc = { workspace = true, default-features = false }
 fp-self-contained = { workspace = true, default-features = false }
-pallet-base-fee = { workspace = true, default-features = false }
-pallet-dynamic-fee = { workspace = true, default-features = false }
 pallet-ethereum = { workspace = true, default-features = false, features = ["forbid-evm-reentrancy"] }
 pallet-evm = { workspace = true, default-features = false, features = ["forbid-evm-reentrancy"] }
 pallet-evm-precompile-blake2 = { workspace = true, default-features = false }
@@ -226,8 +224,6 @@ std = [
 	"sp-io/std",
 	"fp-evm/std",
 	"fp-self-contained/std",
-	"pallet-base-fee/std",
-	"pallet-dynamic-fee/std",
 	"pallet-ethereum/std",
 	"pallet-evm/std",
 	"pallet-evm-precompile-simple/std",
@@ -328,8 +324,6 @@ try-runtime = [
 	"pallet-sudo/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-evm/try-runtime",
-	"pallet-dynamic-fee/try-runtime",
-	"pallet-base-fee/try-runtime",
 	"pallet-transaction-payment/try-runtime",
 	"pallet-contracts/try-runtime",
 	"pallet-utility/try-runtime",

diff --git a/runtime/peaq/src/lib.rs b/runtime/peaq/src/lib.rs
@@ -666,18 +666,6 @@ pub const GAS_PER_SECOND: u64 = 40_000_000;
 /// u64 works for approximations because Weight is a very small unit compared to gas.
 pub const WEIGHT_PER_GAS: u64 = WEIGHT_REF_TIME_PER_SECOND.saturating_div(GAS_PER_SECOND);
 
-pub struct PeaqGasWeightMapping;
-impl pallet_evm::GasWeightMapping for PeaqGasWeightMapping {
-	fn gas_to_weight(gas: u64, _without_base_weight: bool) -> Weight {
-		let weight = gas.saturating_mul(WEIGHT_PER_GAS);
-		Weight::from_parts(weight, 0)
-	}
-
-	fn weight_to_gas(weight: Weight) -> u64 {
-		weight.ref_time().wrapping_div(WEIGHT_PER_GAS)
-	}
-}
-
 parameter_types! {
 	pub const EvmChainId: u64 = 3338;
 	pub BlockGasLimit: U256 = U256::from(
@@ -728,7 +716,7 @@ impl FeeCalculator for TransactionPaymentAsGasPrice {
 impl pallet_evm::Config for Runtime {
 	type FeeCalculator = TransactionPaymentAsGasPrice;
 	type WeightPerGas = WeightPerGas;
-	type GasWeightMapping = PeaqGasWeightMapping;
+	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;
 	type CallOrigin = EnsureAddressTruncated;
 	type WithdrawOrigin = EnsureAddressTruncated;
@@ -761,39 +749,6 @@ impl pallet_ethereum::Config for Runtime {
 	type ExtraDataLength = ConstU32<30>;
 }
 
-frame_support::parameter_types! {
-	pub BoundDivision: U256 = U256::from(1024);
-}
-
-impl pallet_dynamic_fee::Config for Runtime {
-	type MinGasPriceBoundDivisor = BoundDivision;
-}
-
-frame_support::parameter_types! {
-	pub DefaultBaseFeePerGas: U256 = U256::from(1024);
-	pub DefaultElasticity: Permill = Permill::zero();
-}
-
-pub struct BaseFeeThreshold;
-impl pallet_base_fee::BaseFeeThreshold for BaseFeeThreshold {
-	fn lower() -> Permill {
-		Permill::zero()
-	}
-	fn ideal() -> Permill {
-		Permill::from_parts(500_000)
-	}
-	fn upper() -> Permill {
-		Permill::from_parts(1_000_000)
-	}
-}
-
-impl pallet_base_fee::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Threshold = BaseFeeThreshold;
-	type DefaultBaseFeePerGas = DefaultBaseFeePerGas;
-	type DefaultElasticity = DefaultElasticity;
-}
-
 impl pallet_insecure_randomness_collective_flip::Config for Runtime {}
 
 // Parachain
@@ -1119,8 +1074,8 @@ construct_runtime!(
 		// EVM
 		Ethereum: pallet_ethereum = 11,
 		EVM: pallet_evm = 12,
-		DynamicFee: pallet_dynamic_fee = 13,
-		BaseFee: pallet_base_fee::{Pallet, Call, Storage, Config<T>, Event} = 14,
+		// DynamicFee: pallet_dynamic_fee = 13,
+		// BaseFee: pallet_base_fee::{Pallet, Call, Storage, Config<T>, Event} = 14,
 
 		// Parachain
 		InflationManager: inflation_manager::{Pallet, Call, Storage, Config<T>, Event<T>} = 15,
@@ -1762,7 +1717,7 @@ impl_runtime_apis! {
 		}
 
 		fn elasticity() -> Option<Permill> {
-			Some(pallet_base_fee::Elasticity::<Runtime>::get())
+			None
 		}
 
 		fn gas_limit_multiplier_support() {}