Implement general resource metering

Author: TorstenStueber

substrate/frame/revive/proc-macro/src/lib.rs

@@ -443,8 +443,7 @@ fn expand_functions(def: &EnvDef) -> TokenStream2 {
 
 	quote! {
 		// Write gas from  polkavm into pallet-revive before entering the host function.
-		let __gas_left_before__ = self
-			.ext
+		self.ext
 			.gas_meter_mut()
 			.sync_from_executor(memory.gas())
 			.map_err(TrapReason::from)?;
@@ -462,7 +461,7 @@ fn expand_functions(def: &EnvDef) -> TokenStream2 {
 		})();
 
 		// Write gas from pallet-revive into polkavm after leaving the host function.
-		let gas = self.ext.gas_meter_mut().sync_to_executor(__gas_left_before__).map_err(TrapReason::from)?;
+		let gas = self.ext.gas_meter_mut().sync_to_executor();
 		memory.set_gas(gas.into());
 		result
 	}

substrate/frame/revive/src/call_builder.rs

@@ -258,8 +258,10 @@ where
 		let outcome = Contracts::<T>::bare_instantiate(
 			origin,
 			U256::zero(),
-			Weight::MAX,
-			default_deposit_limit::<T>(),
+			TransactionLimits::WeightAndDeposit {
+				weight_limit: Weight::MAX,
+				deposit_limit: default_deposit_limit::<T>(),
+			},
 			Code::Upload(module.code),
 			data,
 			salt,

substrate/frame/revive/src/evm/call.rs

@@ -24,7 +24,7 @@ use crate::{
 };
 use codec::DecodeLimit;
 use frame_support::MAX_EXTRINSIC_DEPTH;
-use sp_core::Get;
+use sp_core::{Get, U256};
 use sp_runtime::{transaction_validity::InvalidTransaction, FixedPointNumber, SaturatedConversion};
 
 /// Result of decoding an eth transaction into a dispatchable call.
@@ -41,6 +41,8 @@ pub struct CallInfo<T: Config> {
 	pub tx_fee: BalanceOf<T>,
 	/// The additional storage deposit to be deposited into the txhold.
 	pub storage_deposit: BalanceOf<T>,
+	/// The ethereum gas limit of the transaction.
+	pub eth_gas_limit: U256,
 }
 
 /// Decode `tx` into a dispatchable call.
@@ -114,6 +116,7 @@ where
 				dest,
 				value,
 				weight_limit: Zero::zero(),
+				eth_gas_limit: gas,
 				data,
 				effective_gas_price,
 				encoded_len,
@@ -135,6 +138,7 @@ where
 		let call = crate::Call::eth_instantiate_with_code::<T> {
 			value,
 			weight_limit: Zero::zero(),
+			eth_gas_limit: gas,
 			code,
 			data,
 			effective_gas_price,
@@ -186,5 +190,5 @@ where
 		InvalidTransaction::Payment
 	})?.saturated_into();
 
-	Ok(CallInfo { call, weight_limit, encoded_len, tx_fee, storage_deposit })
+	Ok(CallInfo { call, weight_limit, encoded_len, tx_fee, storage_deposit, eth_gas_limit: gas })
 }

substrate/frame/revive/src/evm/runtime.rs

@@ -514,6 +514,7 @@ mod test {
 				value,
 				data,
 				weight_limit,
+				eth_gas_limit,
 				effective_gas_price,
 				encoded_len,
 			}) if dest == tx.to.unwrap() &&
@@ -549,6 +550,7 @@ mod test {
 				code,
 				data,
 				weight_limit,
+				eth_gas_limit,
 				effective_gas_price,
 				encoded_len,
 			}) if value == expected_value &&