EVM + Weight v2 support

.github/workflows/rust.yml

@@ -29,6 +29,8 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Run tests
       run: cargo test --locked --verbose --all
+    - name: Run tests (evm-with-weight-limit)
+      run: cargo test --locked --verbose --all --features evm-with-weight-limit
 
   integration:
     name: 'Run integration tests'
@@ -89,4 +91,4 @@ jobs:
     - name: Rustfmt
       run: cargo fmt --all -- --check
     - name: Clippy
-      run: cargo clippy --all --features runtime-benchmarks,try-runtime -- -D warnings
+      run: cargo clippy --all --features runtime-benchmarks,try-runtime,evm-with-weight-limit -- -D warnings

Cargo.toml

@@ -41,7 +41,7 @@ bn = { package = "substrate-bn", version = "0.6", default-features = false }
 environmental = { version = "1.1.3", default-features = false }
 ethereum = { version = "0.14.0", default-features = false }
 ethereum-types = { version = "0.14.1", default-features = false }
-evm = { version = "0.37.0", default-features = false }
+evm = { git = "https://github.com/purestake/evm", branch = "tgm-record-external-cost", default-features = false }
 impl-serde = { version = "0.4.0", default-features = false }
 jsonrpsee = "0.16.2"
 kvdb-rocksdb = "0.17.0"
@@ -76,6 +76,7 @@ sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/parityt
 sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
 # Substrate Primitive
 sp-api = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+sp-arithmetic = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", branch = "master" }

frame/ethereum/Cargo.toml

@@ -81,3 +81,4 @@ try-runtime = [
 	"pallet-evm/try-runtime",
 ]
 forbid-evm-reentrancy = ["pallet-evm/forbid-evm-reentrancy"]
+evm-with-weight-limit = ["evm/with-substrate", "pallet-evm/evm-with-weight-limit"]

frame/ethereum/src/lib.rs

@@ -151,6 +151,24 @@ where
 		len: usize,
 	) -> Option<TransactionValidity> {
 		if let Call::transact { transaction } = self {
+			// Validate submitted gas limit to weight conversion
+			let gas_limit = match transaction {
+				Transaction::Legacy(t) => t.gas_limit,
+				Transaction::EIP2930(t) => t.gas_limit,
+				Transaction::EIP1559(t) => t.gas_limit,
+			};
+			let without_base_extrinsic_weight = true;
+			let computed_weight_limit = T::GasWeightMapping::gas_to_weight(
+				gas_limit.unique_saturated_into(),
+				without_base_extrinsic_weight,
+			);
+			if computed_weight_limit != dispatch_info.weight {
+				return Some(Err(TransactionValidityError::Invalid(
+					InvalidTransaction::Custom(255),
+				)));
+			}
+
+			// CheckWeight
 			if let Err(e) = CheckWeight::<T>::do_validate(dispatch_info, len) {
 				return Some(Err(e));
 			}
@@ -241,7 +259,7 @@ pub mod pallet {
 					Self::validate_transaction_in_block(source, &transaction).expect(
 						"pre-block transaction verification failed; the block cannot be built",
 					);
-					let r = Self::apply_validated_transaction(source, transaction)
+					let r = Self::apply_validated_transaction(source, transaction, None)
 						.expect("pre-block apply transaction failed; the block cannot be built");
 
 					weight = weight.saturating_add(r.actual_weight.unwrap_or_default());
@@ -290,7 +308,32 @@ pub mod pallet {
 				"pre log already exists; block is invalid",
 			);
 
-			Self::apply_validated_transaction(source, transaction)
+			let gas_limit: u64 = match transaction {
+				Transaction::Legacy(ref t) => t.gas_limit.unique_saturated_into(),
+				Transaction::EIP2930(ref t) => t.gas_limit.unique_saturated_into(),
+				Transaction::EIP1559(ref t) => t.gas_limit.unique_saturated_into(),
+			};
+
+			let weight_limit =
+				match <T as pallet_evm::Config>::GasWeightMapping::gas_to_weight(gas_limit, true) {
+					weight_limit if weight_limit.proof_size() > 0 => {
+						// Try to subtract the encoded extrinsic from the Weight proof_size limit or fail
+						// Validate the weight limit can afford recording transaction len
+						let _ = weight_limit
+							.proof_size()
+							.checked_sub(Self::transaction_len(&transaction))
+							.ok_or(DispatchErrorWithPostInfo {
+								post_info: PostDispatchInfo {
+									actual_weight: None,
+									pays_fee: Pays::No,
+								},
+								error: sp_runtime::DispatchError::Exhausted,
+							})?;
+						Some(weight_limit)
+					}
+					_ => None,
+				};
+			Self::apply_validated_transaction(source, transaction, weight_limit)
 		}
 	}
 
@@ -353,6 +396,16 @@ pub mod pallet {
 }
 
 impl<T: Config> Pallet<T> {
+	fn transaction_len(transaction: &Transaction) -> u64 {
+		transaction
+			.encode()
+			.len()
+			// pallet index
+			.saturating_add(1)
+			// call index
+			.saturating_add(1) as u64
+	}
+
 	fn recover_signer(transaction: &Transaction) -> Option<H160> {
 		let mut sig = [0u8; 65];
 		let mut msg = [0u8; 32];
@@ -535,14 +588,15 @@ impl<T: Config> Pallet<T> {
 	fn apply_validated_transaction(
 		source: H160,
 		transaction: Transaction,
+		weight_limit: Option<Weight>,
 	) -> DispatchResultWithPostInfo {
-		let (to, _, info) = Self::execute(source, &transaction, None)?;
+		let (to, _, info) = Self::execute(source, &transaction, None, weight_limit)?;
 
 		let pending = Pending::<T>::get();
 		let transaction_hash = transaction.hash();
 		let transaction_index = pending.len() as u32;
 
-		let (reason, status, used_gas, dest, extra_data) = match info {
+		let (reason, status, weight_info, used_gas, dest, extra_data) = match info {
 			CallOrCreateInfo::Call(info) => (
 				info.exit_reason.clone(),
 				TransactionStatus {
@@ -558,6 +612,7 @@ impl<T: Config> Pallet<T> {
 						bloom
 					},
 				},
+				info.weight_info,
 				info.used_gas,
 				to,
 				match info.exit_reason {
@@ -601,6 +656,7 @@ impl<T: Config> Pallet<T> {
 						bloom
 					},
 				},
+				info.weight_info,
 				info.used_gas,
 				Some(info.value),
 				Vec::new(),
@@ -656,10 +712,16 @@ impl<T: Config> Pallet<T> {
 		});
 
 		Ok(PostDispatchInfo {
-			actual_weight: Some(T::GasWeightMapping::gas_to_weight(
-				used_gas.unique_saturated_into(),
-				true,
-			)),
+			actual_weight: {
+				let mut gas_to_weight =
+					T::GasWeightMapping::gas_to_weight(used_gas.unique_saturated_into(), true);
+				if let Some(weight_info) = weight_info {
+					if let Some(proof_size_usage) = weight_info.proof_size_usage {
+						*gas_to_weight.proof_size_mut() = proof_size_usage;
+					}
+				}
+				Some(gas_to_weight)
+			},
 			pays_fee: Pays::No,
 		})
 	}
@@ -674,6 +736,7 @@ impl<T: Config> Pallet<T> {
 		from: H160,
 		transaction: &Transaction,
 		config: Option<evm::Config>,
+		weight_limit: Option<Weight>,
 	) -> Result<
 		(Option<H160>, Option<H160>, CallOrCreateInfo),
 		DispatchErrorWithPostInfo<PostDispatchInfo>,
@@ -740,6 +803,11 @@ impl<T: Config> Pallet<T> {
 
 		let is_transactional = true;
 		let validate = false;
+		let transaction_len = if weight_limit.is_some() {
+			Some(Self::transaction_len(transaction))
+		} else {
+			None
+		};
 		match action {
 			ethereum::TransactionAction::Call(target) => {
 				let res = match T::Runner::call(
@@ -754,6 +822,8 @@ impl<T: Config> Pallet<T> {
 					access_list,
 					is_transactional,
 					validate,
+					weight_limit,
+					transaction_len,
 					config.as_ref().unwrap_or_else(|| T::config()),
 				) {
 					Ok(res) => res,
@@ -782,6 +852,8 @@ impl<T: Config> Pallet<T> {
 					access_list,
 					is_transactional,
 					validate,
+					weight_limit,
+					transaction_len,
 					config.as_ref().unwrap_or_else(|| T::config()),
 				) {
 					Ok(res) => res,
@@ -900,8 +972,12 @@ impl<T: Config> Pallet<T> {
 
 pub struct ValidatedTransaction<T>(PhantomData<T>);
 impl<T: Config> ValidatedTransactionT for ValidatedTransaction<T> {
-	fn apply(source: H160, transaction: Transaction) -> DispatchResultWithPostInfo {
-		Pallet::<T>::apply_validated_transaction(source, transaction)
+	fn apply(
+		source: H160,
+		transaction: Transaction,
+		weight_limit: Option<Weight>,
+	) -> DispatchResultWithPostInfo {
+		Pallet::<T>::apply_validated_transaction(source, transaction, weight_limit)
 	}
 }
 

frame/ethereum/src/mock.rs

@@ -138,7 +138,7 @@ parameter_types! {
 	pub const TransactionByteFee: u64 = 1;
 	pub const ChainId: u64 = 42;
 	pub const EVMModuleId: PalletId = PalletId(*b"py/evmpa");
-	pub const BlockGasLimit: U256 = U256::MAX;
+	pub BlockGasLimit: U256 = U256::from(150_000_000);
 	pub const WeightPerGas: Weight = Weight::from_ref_time(20_000);
 }