Update EthBlockGasLimit (#306)

* Update pangolin's max gas limit * Update other runtimes * Move evm tests * Self review
darwinia-network · Mar 1, 2023 · 9253372 · 9253372
1 parent 8ddcaa4
commit 9253372
Show file tree

Hide file tree

Showing 24 changed files with 88 additions and 114 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/runtime/common/src/test.rs b/runtime/common/src/test.rs
@@ -376,3 +376,23 @@ macro_rules! impl_account_migration_tests {
 		}
 	};
 }
+
+#[macro_export]
+macro_rules! impl_evm_tests {
+	() => {
+		mod evm {
+			// darwinia
+			use crate::mock::{Runtime, WeightPerGas};
+
+			#[test]
+			fn configured_base_extrinsic_weight_is_evm_compatible() {
+				let min_ethereum_transaction_weight = WeightPerGas::get() * 21_000;
+				let base_extrinsic = <Runtime as frame_system::Config>::BlockWeights::get()
+					.get(frame_support::dispatch::DispatchClass::Normal)
+					.base_extrinsic;
+
+				assert!(base_extrinsic.ref_time() <= min_ethereum_transaction_weight.ref_time());
+			}
+		}
+	};
+}
diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml
@@ -58,6 +58,7 @@ pallet-bridge-parachains = { workspace = true }
 pallet-fee-market        = { workspace = true }
 
 # frontier
+fp-evm                         = { workspace = true }
 fp-rpc                         = { workspace = true }
 fp-self-contained              = { workspace = true }
 pallet-ethereum                = { workspace = true, features = ["forbid-evm-reentrancy"] }
@@ -177,6 +178,7 @@ std = [
 	"pallet-fee-market/std",
 
 	# frontier
+	"fp-evm/std",
 	"fp-rpc/std",
 	"fp-self-contained/std",
 	"pallet-ethereum/std",

diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
@@ -615,19 +615,3 @@ cumulus_pallet_parachain_system::register_validate_block! {
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
 	CheckInherents = CheckInherents,
 }
-
-#[cfg(test)]
-mod tests {
-	// darwinia
-	use super::*;
-
-	#[test]
-	fn configured_base_extrinsic_weight_is_evm_compatible() {
-		let min_ethereum_transaction_weight = WeightPerGas::get() * 21_000;
-		let base_extrinsic = <Runtime as frame_system::Config>::BlockWeights::get()
-			.get(frame_support::dispatch::DispatchClass::Normal)
-			.base_extrinsic;
-
-		assert!(base_extrinsic.ref_time() <= min_ethereum_transaction_weight.ref_time());
-	}
-}
diff --git a/runtime/crab/src/pallets/evm.rs b/runtime/crab/src/pallets/evm.rs
@@ -21,12 +21,11 @@ use crate::*;
 // frontier
 use pallet_evm::Precompile;
 
-const WEIGHT_PER_GAS: u64 = 40_000;
-
+const BLOCK_GAS_LIMIT: u64 = 10_000_000;
 frame_support::parameter_types! {
-	pub BlockGasLimit: sp_core::U256 = sp_core::U256::from(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT.ref_time() / WEIGHT_PER_GAS);
+	pub BlockGasLimit: sp_core::U256 = sp_core::U256::from(BLOCK_GAS_LIMIT);
 	pub PrecompilesValue: CrabPrecompiles<Runtime> = CrabPrecompiles::<_>::new();
-	pub WeightPerGas: frame_support::weights::Weight = frame_support::weights::Weight::from_ref_time(WEIGHT_PER_GAS);
+	pub WeightPerGas: frame_support::weights::Weight = frame_support::weights::Weight::from_ref_time(fp_evm::weight_per_gas(BLOCK_GAS_LIMIT, NORMAL_DISPATCH_RATIO, WEIGHT_MILLISECS_PER_BLOCK));
 }
 
 // TODO: Integrate to the upstream repo

diff --git a/runtime/crab/src/pallets/system.rs b/runtime/crab/src/pallets/system.rs
@@ -28,9 +28,10 @@ const AVERAGE_ON_INITIALIZE_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::fr
 pub const NORMAL_DISPATCH_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::from_percent(75);
 
 /// We allow for 0.5 of a second of compute with a 12 second average block time.
+pub const WEIGHT_MILLISECS_PER_BLOCK: u64 = 500;
 pub const MAXIMUM_BLOCK_WEIGHT: frame_support::weights::Weight =
 	frame_support::weights::Weight::from_parts(
-		frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND.saturating_div(2),
+		frame_support::weights::constants::WEIGHT_REF_TIME_PER_MILLIS * WEIGHT_MILLISECS_PER_BLOCK,
 		cumulus_primitives_core::relay_chain::v2::MAX_POV_SIZE as u64,
 	);
 

diff --git a/runtime/crab/tests/tests.rs b/runtime/crab/tests/tests.rs
@@ -1,3 +1,5 @@
 pub mod mock;
 
 darwinia_common_runtime::impl_account_migration_tests! {}
+
+darwinia_common_runtime::impl_evm_tests! {}
diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml
@@ -58,6 +58,7 @@ pallet-bridge-parachains = { workspace = true }
 pallet-fee-market        = { workspace = true }
 
 # frontier
+fp-evm                         = { workspace = true }
 fp-rpc                         = { workspace = true }
 fp-self-contained              = { workspace = true }
 pallet-ethereum                = { features = ["forbid-evm-reentrancy"], workspace = true }
@@ -177,6 +178,7 @@ std = [
 	"pallet-fee-market/std",
 
 	# frontier
+	"fp-evm/std",
 	"fp-rpc/std",
 	"fp-self-contained/std",
 	"pallet-ethereum/std",

diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
@@ -616,19 +616,3 @@ cumulus_pallet_parachain_system::register_validate_block! {
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
 	CheckInherents = CheckInherents,
 }
-
-#[cfg(test)]
-mod tests {
-	// darwinia
-	use super::*;
-
-	#[test]
-	fn configured_base_extrinsic_weight_is_evm_compatible() {
-		let min_ethereum_transaction_weight = WeightPerGas::get() * 21_000;
-		let base_extrinsic = <Runtime as frame_system::Config>::BlockWeights::get()
-			.get(frame_support::dispatch::DispatchClass::Normal)
-			.base_extrinsic;
-
-		assert!(base_extrinsic.ref_time() <= min_ethereum_transaction_weight.ref_time());
-	}
-}
diff --git a/runtime/darwinia/src/pallets/evm.rs b/runtime/darwinia/src/pallets/evm.rs
@@ -21,12 +21,11 @@ use crate::*;
 // frontier
 use pallet_evm::Precompile;
 
-const WEIGHT_PER_GAS: u64 = 40_000;
-
+const BLOCK_GAS_LIMIT: u64 = 10_000_000;
 frame_support::parameter_types! {
-	pub BlockGasLimit: sp_core::U256 = sp_core::U256::from(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT.ref_time() / WEIGHT_PER_GAS);
+	pub BlockGasLimit: sp_core::U256 = sp_core::U256::from(BLOCK_GAS_LIMIT);
 	pub PrecompilesValue: DarwiniaPrecompiles<Runtime> = DarwiniaPrecompiles::<_>::new();
-	pub WeightPerGas: frame_support::weights::Weight = frame_support::weights::Weight::from_ref_time(WEIGHT_PER_GAS);
+	pub WeightPerGas: frame_support::weights::Weight = frame_support::weights::Weight::from_ref_time(fp_evm::weight_per_gas(BLOCK_GAS_LIMIT, NORMAL_DISPATCH_RATIO, WEIGHT_MILLISECS_PER_BLOCK));
 }
 
 // TODO: Integrate to the upstream repo

diff --git a/runtime/darwinia/src/pallets/system.rs b/runtime/darwinia/src/pallets/system.rs
@@ -28,9 +28,10 @@ const AVERAGE_ON_INITIALIZE_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::fr
 pub const NORMAL_DISPATCH_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::from_percent(75);
 
 /// We allow for 0.5 of a second of compute with a 12 second average block time.
+pub const WEIGHT_MILLISECS_PER_BLOCK: u64 = 500;
 pub const MAXIMUM_BLOCK_WEIGHT: frame_support::weights::Weight =
 	frame_support::weights::Weight::from_parts(
-		frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND.saturating_div(2),
+		frame_support::weights::constants::WEIGHT_REF_TIME_PER_MILLIS * WEIGHT_MILLISECS_PER_BLOCK,
 		cumulus_primitives_core::relay_chain::v2::MAX_POV_SIZE as u64,
 	);
 

diff --git a/runtime/darwinia/tests/tests.rs b/runtime/darwinia/tests/tests.rs
@@ -1,3 +1,5 @@
 pub mod mock;
 
 darwinia_common_runtime::impl_account_migration_tests! {}
+
+darwinia_common_runtime::impl_evm_tests! {}
diff --git a/runtime/pangolin/Cargo.toml b/runtime/pangolin/Cargo.toml
@@ -58,6 +58,7 @@ pallet-bridge-parachains = { workspace = true }
 pallet-fee-market        = { workspace = true }
 
 # frontier
+fp-evm                         = { workspace = true }
 fp-rpc                         = { workspace = true }
 fp-self-contained              = { workspace = true }
 pallet-ethereum                = { features = ["forbid-evm-reentrancy"], workspace = true }
@@ -177,6 +178,7 @@ std = [
 	"pallet-fee-market/std",
 
 	# frontier
+	"fp-evm/std",
 	"fp-rpc/std",
 	"fp-self-contained/std",
 	"pallet-ethereum/std",