[Revive] Implement general gas tracking

.github/workflows/tests-evm.yml

@@ -71,7 +71,7 @@ jobs:
             --platform ${{ matrix.platform }} \
             --concurrency.number-of-nodes 10 \
             --concurrency.number-of-threads 10 \
-            --concurrency.number-of-concurrent-tasks 1000 \
+            --concurrency.number-of-concurrent-tasks 100 \
             --working-directory ./workdir \
             --revive-dev-node.consensus manual-seal-200 \
             --revive-dev-node.path ./target/release/revive-dev-node \

cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs

@@ -58,7 +58,7 @@ use frame_support::{
 use hex_literal::hex;
 use pallet_revive::{
 	test_utils::builder::{BareInstantiateBuilder, Contract},
-	Code,
+	Code, TransactionLimits,
 };
 use pallet_revive_fixtures::compile_module;
 use pallet_uniques::{asset_ops::Item, asset_strategies::Attribute};
@@ -1706,8 +1706,10 @@ fn withdraw_and_deposit_erc20s() {
 		let initial_amount_u256 = U256::from(1_000_000_000_000u128);
 		let constructor_data = sol_data::Uint::<256>::abi_encode(&initial_amount_u256);
 		let Contract { addr: erc20_address, .. } = bare_instantiate(&sender, code)
-			.gas_limit(Weight::from_parts(500_000_000_000, 10 * 1024 * 1024))
-			.storage_deposit_limit(Balance::MAX)
+			.transaction_limits(TransactionLimits::WeightAndDeposit {
+				weight_limit: Weight::from_parts(500_000_000_000, 10 * 1024 * 1024),
+				deposit_limit: Balance::MAX,
+			})
 			.data(constructor_data)
 			.build_and_unwrap_contract();
 
@@ -1819,8 +1821,10 @@ fn smart_contract_not_erc20_will_error() {
 		let (code, _) = compile_module("dummy").unwrap();
 
 		let Contract { addr: non_erc20_address, .. } = bare_instantiate(&sender, code)
-			.gas_limit(Weight::from_parts(500_000_000_000, 10 * 1024 * 1024))
-			.storage_deposit_limit(Balance::MAX)
+			.transaction_limits(TransactionLimits::WeightAndDeposit {
+				weight_limit: Weight::from_parts(500_000_000_000, 10 * 1024 * 1024),
+				deposit_limit: Balance::MAX,
+			})
 			.build_and_unwrap_contract();
 
 		let wnd_amount_for_fees = 1_000_000_000_000u128;
@@ -1877,8 +1881,10 @@ fn smart_contract_does_not_return_bool_fails() {
 		let constructor_data = sol_data::Uint::<256>::abi_encode(&initial_amount_u256);
 
 		let Contract { addr: non_erc20_address, .. } = bare_instantiate(&sender, code)
-			.gas_limit(Weight::from_parts(500_000_000_000, 10 * 1024 * 1024))
-			.storage_deposit_limit(Balance::MAX)
+			.transaction_limits(TransactionLimits::WeightAndDeposit {
+				weight_limit: Weight::from_parts(500_000_000_000, 10 * 1024 * 1024),
+				deposit_limit: Balance::MAX,
+			})
 			.data(constructor_data)
 			.build_and_unwrap_contract();
 
@@ -1933,8 +1939,10 @@ fn expensive_erc20_runs_out_of_gas() {
 		let initial_amount_u256 = U256::from(1_000_000_000_000u128);
 		let constructor_data = sol_data::Uint::<256>::abi_encode(&initial_amount_u256);
 		let Contract { addr: non_erc20_address, .. } = bare_instantiate(&sender, code)
-			.gas_limit(Weight::from_parts(500_000_000_000, 10 * 1024 * 1024))
-			.storage_deposit_limit(Balance::MAX)
+			.transaction_limits(TransactionLimits::WeightAndDeposit {
+				weight_limit: Weight::from_parts(500_000_000_000, 10 * 1024 * 1024),
+				deposit_limit: Balance::MAX,
+			})
 			.data(constructor_data)
 			.build_and_unwrap_contract();
 

cumulus/parachains/runtimes/assets/common/src/erc20_transactor.rs

@@ -25,7 +25,7 @@ use pallet_revive::{
 		primitives::{Address, U256 as EU256},
 		sol_types::SolCall,
 	},
-	AddressMapper, ContractResult, ExecConfig, MomentOf,
+	AddressMapper, ContractResult, ExecConfig, MomentOf, TransactionLimits,
 };
 use sp_core::{Get, H160, H256, U256};
 use sp_runtime::Weight;
@@ -44,7 +44,7 @@ pub struct ERC20Transactor<
 	T,
 	Matcher,
 	AccountIdConverter,
-	GasLimit,
+	WeightLimit,
 	StorageDepositLimit,
 	AccountId,
 	TransfersCheckingAccount,
@@ -53,7 +53,7 @@ pub struct ERC20Transactor<
 		T,
 		Matcher,
 		AccountIdConverter,
-		GasLimit,
+		WeightLimit,
 		StorageDepositLimit,
 		AccountId,
 		TransfersCheckingAccount,
@@ -65,15 +65,15 @@ impl<
 		T: pallet_revive::Config<AccountId = AccountId>,
 		AccountIdConverter: ConvertLocation<AccountId>,
 		Matcher: MatchesFungibles<H160, u128>,
-		GasLimit: Get<Weight>,
+		WeightLimit: Get<Weight>,
 		StorageDepositLimit: Get<BalanceOf<T>>,
 		TransfersCheckingAccount: Get<AccountId>,
 	> TransactAsset
 	for ERC20Transactor<
 		T,
 		Matcher,
 		AccountIdConverter,
-		GasLimit,
+		WeightLimit,
 		StorageDepositLimit,
 		AccountId,
 		TransfersCheckingAccount,
@@ -116,24 +116,26 @@ where
 		// We need to map the 32 byte checking account to a 20 byte account.
 		let checking_account_eth = T::AddressMapper::to_address(&TransfersCheckingAccount::get());
 		let checking_address = Address::from(Into::<[u8; 20]>::into(checking_account_eth));
-		let gas_limit = GasLimit::get();
+		let weight_limit = WeightLimit::get();
 		// To withdraw, we actually transfer to the checking account.
 		// We do this using the solidity ERC20 interface.
 		let data =
 			IERC20::transferCall { to: checking_address, value: EU256::from(amount) }.abi_encode();
-		let ContractResult { result, gas_consumed, storage_deposit, .. } =
+		let ContractResult { result, weight_consumed, storage_deposit, .. } =
 			pallet_revive::Pallet::<T>::bare_call(
 				OriginFor::<T>::signed(who.clone()),
 				asset_id,
 				U256::zero(),
-				gas_limit,
-				StorageDepositLimit::get(),
+				TransactionLimits::WeightAndDeposit {
+					weight_limit,
+					deposit_limit: StorageDepositLimit::get(),
+				},
 				data,
 				ExecConfig::new_substrate_tx(),
 			);
 		// We need to return this surplus for the executor to allow refunding it.
-		let surplus = gas_limit.saturating_sub(gas_consumed);
-		tracing::trace!(target: "xcm::transactor::erc20::withdraw", ?gas_consumed, ?surplus, ?storage_deposit);
+		let surplus = weight_limit.saturating_sub(weight_consumed);
+		tracing::trace!(target: "xcm::transactor::erc20::withdraw", ?weight_consumed, ?surplus, ?storage_deposit);
 		if let Ok(return_value) = result {
 			tracing::trace!(target: "xcm::transactor::erc20::withdraw", ?return_value, "Return value by withdraw_asset");
 			if return_value.did_revert() {
@@ -179,20 +181,22 @@ where
 		// To deposit, we actually transfer from the checking account to the beneficiary.
 		// We do this using the solidity ERC20 interface.
 		let data = IERC20::transferCall { to: address, value: EU256::from(amount) }.abi_encode();
-		let gas_limit = GasLimit::get();
-		let ContractResult { result, gas_consumed, storage_deposit, .. } =
+		let weight_limit = WeightLimit::get();
+		let ContractResult { result, weight_consumed, storage_deposit, .. } =
 			pallet_revive::Pallet::<T>::bare_call(
 				OriginFor::<T>::signed(TransfersCheckingAccount::get()),
 				asset_id,
 				U256::zero(),
-				gas_limit,
-				StorageDepositLimit::get(),
+				TransactionLimits::WeightAndDeposit {
+					weight_limit,
+					deposit_limit: StorageDepositLimit::get(),
+				},
 				data,
 				ExecConfig::new_substrate_tx(),
 			);
 		// We need to return this surplus for the executor to allow refunding it.
-		let surplus = gas_limit.saturating_sub(gas_consumed);
-		tracing::trace!(target: "xcm::transactor::erc20::deposit", ?gas_consumed, ?surplus, ?storage_deposit);
+		let surplus = weight_limit.saturating_sub(weight_consumed);
+		tracing::trace!(target: "xcm::transactor::erc20::deposit", ?weight_consumed, ?surplus, ?storage_deposit);
 		if let Ok(return_value) = result {
 			tracing::trace!(target: "xcm::transactor::erc20::deposit", ?return_value, "Return value");
 			if return_value.did_revert() {