Merge pull request ethereum#32 from OffchainLabs/hostio-code

Add code load parameter to WasmAccountTouchCost
streamingfast · Jan 30, 2024 · 2e1774e · 2e1774e
2 parents 991e082 + 098f174
commit 2e1774e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/core/types/arbitrum_signer.go b/core/types/arbitrum_signer.go
@@ -11,6 +11,7 @@ var ArbSysAddress = common.HexToAddress("0x64")
 var ArbGasInfoAddress = common.HexToAddress("0x6c")
 var ArbRetryableTxAddress = common.HexToAddress("0x6e")
 var ArbosTestAddress = common.HexToAddress("0x69")
+var ArbOwnerPublicAddress = common.HexToAddress("0x6b")
 var ArbOwnerAddress = common.HexToAddress("0x70")
 var ArbWasmAddress = common.HexToAddress("0x71")
 var NodeInterfaceAddress = common.HexToAddress("0xc8")

diff --git a/core/vm/interpreter_arbitrum.go b/core/vm/interpreter_arbitrum.go
@@ -16,10 +16,6 @@
 
 package vm
 
-import (
-	"github.com/ethereum/go-ethereum/common"
-)
-
 func (in *EVMInterpreter) Config() *Config {
 	return &in.evm.Config
 }
@@ -36,13 +32,8 @@ func (in *EVMInterpreter) ReadOnly() bool {
 	return in.readOnly
 }
 
-func (in *EVMInterpreter) GetReturnData(offset int, size int) []byte {
-	if offset >= len(in.returnData) {
-		return []byte{}
-	}
-	data := in.returnData[offset:]
-
-	return data[:common.MinInt(size, len(data))]
+func (in *EVMInterpreter) GetReturnData() []byte {
+	return in.returnData
 }
 
 func (in *EVMInterpreter) SetReturnData(data []byte) {

diff --git a/core/vm/operations_acl_arbitrum.go b/core/vm/operations_acl_arbitrum.go
@@ -144,10 +144,15 @@ func WasmCallCost(db StateDB, contract common.Address, value *big.Int, budget ui
 
 // Computes the cost of touching an account in wasm
 // Note: the code here is adapted from gasEip2929AccountCheck with the most recent parameters as of The Merge
-func WasmAccountTouchCost(db StateDB, addr common.Address) uint64 {
+func WasmAccountTouchCost(db StateDB, addr common.Address, withCode bool) uint64 {
+	cost := uint64(0)
+	if withCode {
+		cost = params.MaxCodeSize / 24576 * params.ExtcodeSizeGasEIP150
+	}
+
 	if !db.AddressInAccessList(addr) {
 		db.AddAddressToAccessList(addr)
-		return params.ColdAccountAccessCostEIP2929
+		return cost + params.ColdAccountAccessCostEIP2929
 	}
-	return params.WarmStorageReadCostEIP2929
+	return cost + params.WarmStorageReadCostEIP2929
 }