Instrument WasmCallCost with multigas

Author: MishkaRogachev

core/vm/operations_acl_arbitrum.go

@@ -111,15 +111,15 @@ func WasmStateStoreCost(db StateDB, program common.Address, key, value common.Ha
 // The code here is adapted from the following functions with the most recent parameters as of The Merge
 //   - operations_acl.go makeCallVariantGasCallEIP2929()
 //   - gas_table.go      gasCall()
-func WasmCallCost(db StateDB, contract common.Address, value *uint256.Int, budget uint64) (uint64, error) {
-	total := uint64(0)
-	apply := func(amount uint64) bool {
-		total += amount
-		return total > budget
+func WasmCallCost(db StateDB, contract common.Address, value *uint256.Int, budget uint64) (multigas.MultiGas, error) {
+	total := multigas.ZeroGas()
+	apply := func(resource multigas.ResourceKind, amount uint64) bool {
+		total.SaturatingIncrementInto(resource, amount)
+		return total.SingleGas() > budget
 	}
 
 	// EIP 2929: the static cost
-	if apply(params.WarmStorageReadCostEIP2929) {
+	if apply(multigas.ResourceKindComputation, params.WarmStorageReadCostEIP2929) {
 		return total, ErrOutOfGas
 	}
 
@@ -129,7 +129,7 @@ func WasmCallCost(db StateDB, contract common.Address, value *uint256.Int, budge
 	if !warmAccess {
 		db.AddAddressToAccessList(contract)
 
-		if apply(coldCost) {
+		if apply(multigas.ResourceKindStorageAccess, coldCost) {
 			return total, ErrOutOfGas
 		}
 	}