op-chain-ops,op-wheel: handle missing account in storage-trie lookup

op-chain-ops/genesis/check.go

@@ -5,6 +5,7 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
+	"github.com/ethereum/go-ethereum/core/types"
 	"math/big"
 
 	"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
@@ -181,16 +182,25 @@ func PostCheckUntouchables(udb state.Database, currDB *state.StateDB, prevRoot c
 		log.Info("checked code hash", "address", addr, "hash", hash)
 
 		// Ensure that the current/previous roots match
+		var prevRoot, currRoot common.Hash
 		prevStorage, err := prevDB.StorageTrie(addr)
 		if err != nil {
 			return fmt.Errorf("failed to open previous-db storage trie of %s: %w", addr, err)
 		}
+		if prevStorage == nil {
+			prevRoot = types.EmptyRootHash
+		} else {
+			prevRoot = prevStorage.Hash()
+		}
 		currStorage, err := currDB.StorageTrie(addr)
 		if err != nil {
 			return fmt.Errorf("failed to open current-db storage trie of %s: %w", addr, err)
 		}
-		prevRoot := prevStorage.Hash()
-		currRoot := currStorage.Hash()
+		if currStorage == nil {
+			currRoot = types.EmptyRootHash
+		} else {
+			currRoot = currStorage.Hash()
+		}
 		if prevRoot != currRoot {
 			return fmt.Errorf("expected storage root for %s to be %s, but got %s", addr, prevRoot, currRoot)
 		}

op-chain-ops/genesis/layer_one.go

@@ -220,6 +220,9 @@ func BuildL1DeveloperGenesis(config *DeployConfig) (*core.Genesis, error) {
 		if err != nil {
 			return nil, fmt.Errorf("failed to open storage trie of %s: %w", dep.Address, err)
 		}
+		if st == nil {
+			return nil, fmt.Errorf("missing account %s in state, address: %s", dep.Name, dep.Address)
+		}
 		iter := trie.NewIterator(st.NodeIterator(nil))
 
 		depAddr := dep.Address

op-wheel/cheat/cheat.go

@@ -190,6 +190,9 @@ func StorageReadAll(address common.Address, w io.Writer) HeadFn {
 		if err != nil {
 			return fmt.Errorf("failed to open storage trie of addr %s: %w", address, err)
 		}
+		if storage == nil {
+			return fmt.Errorf("no storage trie in state for account %s", address)
+		}
 		iter := trie.NewIterator(storage.NodeIterator(nil))
 		for iter.Next() {
 			if _, err := fmt.Fprintf(w, "+ %x = %x\n", iter.Key, dbValueToHash(iter.Value)); err != nil {
@@ -220,10 +223,16 @@ func StorageDiff(out io.Writer, addressA, addressB common.Address) HeadFn {
 		if err != nil {
 			return fmt.Errorf("failed to open storage trie of addr A %s: %w", addressA, err)
 		}
+		if aStorage == nil {
+			return fmt.Errorf("no storage trie in state for account A %s", addressA)
+		}
 		bStorage, err := headState.StorageTrie(addressB)
 		if err != nil {
 			return fmt.Errorf("failed to open storage trie of addr B %s: %w", addressB, err)
 		}
+		if bStorage == nil {
+			return fmt.Errorf("no storage trie in state for account B %s", addressB)
+		}
 		aIter := trie.NewIterator(aStorage.NodeIterator(nil))
 		bIter := trie.NewIterator(bStorage.NodeIterator(nil))
 		hasA := aIter.Next()