swap version & hash, polish

Author: rachel-bousfield

core/rawdb/accessors_state_arbitrum.go

@@ -23,14 +23,14 @@ import (
 )
 
 // ReadCompiledWasmCode retrieves the compiled wasm contract code of the provided code hash.
-func ReadCompiledWasmCode(db ethdb.KeyValueReader, hash common.Hash, version uint32) []byte {
-	data, _ := db.Get(compiledWasmCodeKey(hash, version))
+func ReadCompiledWasmCode(db ethdb.KeyValueReader, version uint32, hash common.Hash) []byte {
+	data, _ := db.Get(compiledWasmCodeKey(version, hash))
 	return data
 }
 
 // WriteCompiledWasmCode writes the provided contract compiled wasm code database.
-func WriteCompiledWasmCode(db ethdb.KeyValueWriter, hash common.Hash, version uint32, code []byte) {
-	if err := db.Put(compiledWasmCodeKey(hash, version), code); err != nil {
+func WriteCompiledWasmCode(db ethdb.KeyValueWriter, version uint32, hash common.Hash, code []byte) {
+	if err := db.Put(compiledWasmCodeKey(version, hash), code); err != nil {
 		log.Crit("Failed to store compiled wasm contract code", "err", err)
 	}
 }

core/rawdb/schema_arbitrum.go

@@ -21,28 +21,32 @@ package rawdb
 import (
 	"bytes"
 	"encoding/binary"
+
 	"github.com/ethereum/go-ethereum/common"
 )
 
 var (
-	CompiledWasmCodePrefix = []byte("w") // CompiledWasmCodePrefix + code hash -> account compiled wasm code
+	CompiledWasmCodePrefix = []byte{0x00, 'w'} // (prefix, version, code_hash) -> account compiled wasm code
 )
 
-// compiledWasmCodeKey = CompiledWasmCodePrefix + hash
-func compiledWasmCodeKey(hash common.Hash, version uint32) []byte {
+// compiledWasmCodeKey = CompiledWasmCodePrefix + version + hash
+func compiledWasmCodeKey(version uint32, hash common.Hash) []byte {
 	var versionBytes [4]byte
 	binary.BigEndian.PutUint32(versionBytes[:], version)
-	return append(append(CompiledWasmCodePrefix, hash.Bytes()...), versionBytes[:]...)
+	return append(append(CompiledWasmCodePrefix, versionBytes[:]...), hash.Bytes()...)
 }
 
 // IsCompiledWasmCodeKey reports whether the given byte slice is the key of compiled wasm contract code,
 // if so return the raw code hash and version as well.
-func IsCompiledWasmCodeKey(key []byte) (bool, []byte, uint32) {
-	if bytes.HasPrefix(key, CompiledWasmCodePrefix) && len(key) == common.HashLength+4+len(CompiledWasmCodePrefix) {
-		endOfHashOffset := len(CompiledWasmCodePrefix) + common.HashLength
-		codeHash := key[len(CompiledWasmCodePrefix):endOfHashOffset]
-		version := binary.BigEndian.Uint32(key[endOfHashOffset:])
+func IsCompiledWasmCodeKey(key []byte) (bool, common.Hash, uint32) {
+
+	wasmKeyLen := len(CompiledWasmCodePrefix) + 4 + common.HashLength
+	start := len(CompiledWasmCodePrefix)
+
+	if bytes.HasPrefix(key, CompiledWasmCodePrefix) && len(key) == wasmKeyLen {
+		version := binary.BigEndian.Uint32(key[start : start+4])
+		codeHash := common.BytesToHash(key[start+4:])
 		return true, codeHash, version
 	}
-	return false, nil, 0
+	return false, common.Hash{}, 0
 }

core/state/database_arbitrum.go

@@ -2,6 +2,7 @@ package state
 
 import (
 	"errors"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/rawdb"
 )
@@ -11,7 +12,7 @@ func (db *cachingDB) CompiledWasmContractCode(codeHash common.Hash, version uint
 	if code := db.compiledWasmCache.Get(nil, codeHash.Bytes()); len(code) > 0 {
 		return code, nil
 	}
-	code := rawdb.ReadCompiledWasmCode(db.db.DiskDB(), codeHash, version)
+	code := rawdb.ReadCompiledWasmCode(db.db.DiskDB(), version, codeHash)
 	if len(code) > 0 {
 		db.compiledWasmCache.Set(codeHash.Bytes(), code)
 		return code, nil

core/state/state_object_arbitrum.go

@@ -1,7 +1,24 @@
+// Copyright 2014 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
 package state
 
 import (
 	"fmt"
+
 	"github.com/ethereum/go-ethereum/common"
 )
 

core/state/statedb.go

@@ -962,7 +962,8 @@ func (s *StateDB) Commit(deleteEmptyObjects bool) (common.Hash, error) {
 			// Arbitrum Only
 			for version, wasm := range obj.compiledWasmCode {
 				if wasm.dirty {
-					rawdb.WriteCompiledWasmCode(codeWriter, common.BytesToHash(obj.CodeHash()), version, wasm.code)
+					codeHash := common.BytesToHash(obj.CodeHash())
+					rawdb.WriteCompiledWasmCode(codeWriter, version, codeHash, wasm.code)
 					wasm.dirty = false
 				}
 			}

core/vm/evm_arbitrum.go

@@ -21,6 +21,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/log"
 )
 
 // Depth returns the current depth
@@ -96,5 +97,6 @@ func (p DefaultTxProcessor) GasPriceOp(evm *EVM) *big.Int {
 func (p DefaultTxProcessor) FillReceiptInfo(*types.Receipt) {}
 
 func (p DefaultTxProcessor) ExecuteWASM(contract *Contract, input []byte, readOnly bool, txContext TxContext, blockContext BlockContext) ([]byte, error) {
+	log.Crit("tried to execute WASM with default processing hook")
 	return nil, nil
 }