done with impact analysis

Author: weiihann

cmd/geth/dbcmd.go

@@ -202,10 +202,10 @@ func expandVerkle(ctx *cli.Context) error {
 
 	for i, key := range keylist {
 		log.Info("Reading key", "index", i, "key", keylist[0])
-		root.Get(key, chaindb.Get)
+		root.Get(key, 0, chaindb.Get)
 	}
 
-	if err := os.WriteFile("dump.dot", []byte(verkle.ToDot(root)), 0600); err != nil {
+	if err := os.WriteFile("dump.dot", []byte(verkle.ToDot(root)), 0o600); err != nil {
 		log.Error("Failed to dump file", "err", err)
 	} else {
 		log.Info("Tree was dumped to file", "file", "dump.dot")

cmd/geth/verkle.go

@@ -22,6 +22,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/syndtr/goleveldb/leveldb"
 )
 
 // ReadSnapshotDisabled retrieves if the snapshot maintenance is disabled.
@@ -93,9 +94,12 @@ func DeleteAccountSnapshot(db ethdb.KeyValueWriter, hash common.Hash) {
 }
 
 func ReadAccountSnapshotMeta(db ethdb.KeyValueReader, hash common.Hash) uint64 {
-	data, _ := db.Get(accountSnapshotMetaKey(hash))
-	if len(data) != 8 {
-		log.Crit("Failed to read account snapshot meta")
+	data, err := db.Get(accountSnapshotMetaKey(hash))
+	if err != nil {
+		if err == leveldb.ErrNotFound {
+			return 0
+		}
+		log.Crit("Failed to read account snapshot meta", "err", err)
 	}
 	return binary.BigEndian.Uint64(data)
 }
@@ -135,8 +139,10 @@ func DeleteStorageSnapshot(db ethdb.KeyValueWriter, accountHash, storageHash com
 func ReadStorageSnapshotMeta(db ethdb.KeyValueReader, accountHash, storageHash common.Hash) uint64 {
 	data, err := db.Get(storageSnapshotMetaKey(accountHash, storageHash))
 	if err != nil {
-		log.Info("Failed to read storage snapshot meta", "err", err)
-		return 0
+		if err == leveldb.ErrNotFound {
+			return 0
+		}
+		log.Crit("Failed to read storage snapshot meta", "err", err)
 	}
 	return binary.BigEndian.Uint64(data)
 }

core/rawdb/accessors_snapshot.go

@@ -1220,6 +1220,9 @@ func (s *StateDB) commit(deleteEmptyObjects bool, noStorageWiping bool) (*stateU
 	// more expensive than it should be, so let's fix that and revisit this todo.
 	for addr, op := range s.mutations {
 		if op.isDelete() {
+			addrHash := common.BytesToHash(addr.Bytes())
+			delete(accountsMeta, addrHash)
+			delete(storagesMeta, addrHash)
 			continue
 		}
 		// Write any contract code associated with the state object

core/state/statedb.go

@@ -193,11 +193,11 @@ func TestProcessVerkle(t *testing.T) {
 	})
 
 	// Check proof for both blocks
-	err := verkle.Verify(proofs[0], gspec.ToBlock().Root().Bytes(), chain[0].Root().Bytes(), statediffs[0])
+	err := verkle.Verify(proofs[0], gspec.ToBlock().Root().Bytes(), chain[0].Root().Bytes(), statediffs[0], 0)
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = verkle.Verify(proofs[1], chain[0].Root().Bytes(), chain[1].Root().Bytes(), statediffs[1])
+	err = verkle.Verify(proofs[1], chain[0].Root().Bytes(), chain[1].Root().Bytes(), statediffs[1], 0)
 	if err != nil {
 		t.Fatal(err)
 	}

core/verkle_witness_test.go

@@ -147,3 +147,5 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
+
+replace github.com/ethereum/go-verkle => github.com/weiihann/go-verkle v0.11.3-0.20250221075231-54a369960b8d

go.mod

@@ -166,8 +166,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
 github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
-github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=
-github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/ferranbt/fastssz v0.1.2 h1:Dky6dXlngF6Qjc+EfDipAkE83N5I5DE68bY6O0VLNPk=
@@ -514,6 +512,8 @@ github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+github.com/weiihann/go-verkle v0.11.3-0.20250221075231-54a369960b8d h1:YCVvFQJfSX8HAPJgns4wNLlXlnPoxrJ/cQfQhygx5/8=
+github.com/weiihann/go-verkle v0.11.3-0.20250221075231-54a369960b8d/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

go.sum

@@ -537,6 +537,7 @@ func (s *Sync) scheduleCodeRequest(req *codeRequest) {
 
 // children retrieves all the missing children of a state trie entry for future
 // retrieval scheduling.
+// TODO(weiihann): this is where it determines what trie nodes are missing!
 func (s *Sync) children(req *nodeRequest, object node) ([]*nodeRequest, error) {
 	// Gather all the children of the node, irrelevant whether known or not
 	type childNode struct {

trie/sync.go

@@ -278,6 +278,10 @@ func pointToHash(evaluated *verkle.Point, suffix byte) []byte {
 	return retb[:]
 }
 
+func EvaluateAddressPoint(address []byte) *verkle.Point {
+	return evaluateAddressPoint(address)
+}
+
 func evaluateAddressPoint(address []byte) *verkle.Point {
 	if len(address) < 32 {
 		var aligned [32]byte

trie/utils/verkle.go

@@ -32,9 +32,7 @@ import (
 	"github.com/holiman/uint256"
 )
 
-var (
-	errInvalidRootType = errors.New("invalid node type for root")
-)
+var errInvalidRootType = errors.New("invalid node type for root")
 
 // VerkleTrie is a wrapper around VerkleNode that implements the trie.Trie
 // interface so that Verkle trees can be reused verbatim.
@@ -90,7 +88,7 @@ func (t *VerkleTrie) GetAccount(addr common.Address) (*types.StateAccount, error
 	)
 	switch n := t.root.(type) {
 	case *verkle.InternalNode:
-		values, err = n.GetValuesAtStem(t.cache.GetStem(addr[:]), t.nodeResolver)
+		values, err = n.GetValuesAtStem(t.cache.GetStem(addr[:]), 0, t.nodeResolver)
 		if err != nil {
 			return nil, fmt.Errorf("GetAccount (%x) error: %v", addr, err)
 		}
@@ -114,7 +112,7 @@ func (t *VerkleTrie) GetAccount(addr common.Address) (*types.StateAccount, error
 // nil will be returned. If the tree is corrupted, an error will be returned.
 func (t *VerkleTrie) GetStorage(addr common.Address, key []byte) ([]byte, error) {
 	k := utils.StorageSlotKeyWithEvaluatedAddress(t.cache.Get(addr.Bytes()), key)
-	val, err := t.root.Get(k, t.nodeResolver)
+	val, err := t.root.Get(k, 0, t.nodeResolver)
 	if err != nil {
 		return nil, err
 	}
@@ -145,7 +143,7 @@ func (t *VerkleTrie) UpdateAccount(addr common.Address, acc *types.StateAccount,
 
 	switch root := t.root.(type) {
 	case *verkle.InternalNode:
-		err = root.InsertValuesAtStem(stem, values, t.nodeResolver)
+		err = root.InsertValuesAtStem(stem, values, 0, true, t.nodeResolver)
 	default:
 		return errInvalidRootType
 	}
@@ -167,7 +165,7 @@ func (t *VerkleTrie) UpdateStorage(address common.Address, key, value []byte) er
 		copy(v[32-len(value):], value[:])
 	}
 	k := utils.StorageSlotKeyWithEvaluatedAddress(t.cache.Get(address.Bytes()), key)
-	return t.root.Insert(k, v[:], t.nodeResolver)
+	return t.root.Insert(k, v[:], 0, t.nodeResolver)
 }
 
 // DeleteAccount leaves the account untouched, as no account deletion can happen
@@ -179,7 +177,7 @@ func (t *VerkleTrie) UpdateStorage(address common.Address, key, value []byte) er
 // the balance with 0. This will be removed once the spec has been clarified.
 func (t *VerkleTrie) DeleteAccount(addr common.Address) error {
 	k := utils.BasicDataKeyWithEvaluatedAddress(t.cache.Get(addr.Bytes()))
-	values, err := t.root.(*verkle.InternalNode).GetValuesAtStem(k, t.nodeResolver)
+	values, err := t.root.(*verkle.InternalNode).GetValuesAtStem(k, 0, t.nodeResolver)
 	if err != nil {
 		return fmt.Errorf("Error getting data at %x in delete: %w", k, err)
 	}
@@ -198,7 +196,7 @@ func (t *VerkleTrie) DeleteAccount(addr common.Address) error {
 		}
 	}
 	if prefunded {
-		t.root.Insert(k, common.Hash{}.Bytes(), t.nodeResolver)
+		t.root.Insert(k, common.Hash{}.Bytes(), 0, t.nodeResolver)
 	}
 	return nil
 }
@@ -210,7 +208,7 @@ func (t *VerkleTrie) RollBackAccount(addr common.Address) error {
 		evaluatedAddr = t.cache.Get(addr.Bytes())
 		basicDataKey  = utils.BasicDataKeyWithEvaluatedAddress(evaluatedAddr)
 	)
-	basicDataBytes, err := t.root.Get(basicDataKey, t.nodeResolver)
+	basicDataBytes, err := t.root.Get(basicDataKey, 0, t.nodeResolver)
 	if err != nil {
 		return fmt.Errorf("rollback: error finding code size: %w", err)
 	}
@@ -223,7 +221,7 @@ func (t *VerkleTrie) RollBackAccount(addr common.Address) error {
 	codeSize := binary.BigEndian.Uint32(basicDataBytes[utils.BasicDataCodeSizeOffset-1:])
 
 	// Delete the account header + first 64 slots + first 128 code chunks
-	_, err = t.root.(*verkle.InternalNode).DeleteAtStem(basicDataKey[:31], t.nodeResolver)
+	_, err = t.root.(*verkle.InternalNode).DeleteAtStem(basicDataKey[:31], 0, t.nodeResolver)
 	if err != nil {
 		return fmt.Errorf("error rolling back account header: %w", err)
 	}
@@ -234,7 +232,7 @@ func (t *VerkleTrie) RollBackAccount(addr common.Address) error {
 		offset := uint256.NewInt(chunknr)
 		key := utils.CodeChunkKeyWithEvaluatedAddress(evaluatedAddr, offset)
 
-		if _, err = t.root.(*verkle.InternalNode).DeleteAtStem(key[:], t.nodeResolver); err != nil {
+		if _, err = t.root.(*verkle.InternalNode).DeleteAtStem(key[:], 0, t.nodeResolver); err != nil {
 			return fmt.Errorf("error deleting code chunk stem (addr=%x, offset=%d) error: %w", addr[:], offset, err)
 		}
 	}
@@ -247,7 +245,7 @@ func (t *VerkleTrie) RollBackAccount(addr common.Address) error {
 func (t *VerkleTrie) DeleteStorage(addr common.Address, key []byte) error {
 	var zero [32]byte
 	k := utils.StorageSlotKeyWithEvaluatedAddress(t.cache.Get(addr.Bytes()), key)
-	return t.root.Insert(k, zero[:], t.nodeResolver)
+	return t.root.Insert(k, zero[:], 0, t.nodeResolver)
 }
 
 // Hash returns the root hash of the tree. It does not write to the database and
@@ -317,7 +315,7 @@ func (t *VerkleTrie) Proof(posttrie *VerkleTrie, keys [][]byte) (*verkle.VerkleP
 	if posttrie != nil {
 		postroot = posttrie.root
 	}
-	proof, _, _, _, err := verkle.MakeVerkleMultiProof(t.root, postroot, keys, t.FlatdbNodeResolver)
+	proof, _, _, _, err := verkle.MakeVerkleMultiProof(t.root, postroot, keys, 0, t.FlatdbNodeResolver)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -404,7 +402,7 @@ func (t *VerkleTrie) UpdateContractCode(addr common.Address, codeHash common.Has
 		if groupOffset == 255 || len(chunks)-i <= 32 {
 			switch root := t.root.(type) {
 			case *verkle.InternalNode:
-				err = root.InsertValuesAtStem(key[:31], values, t.nodeResolver)
+				err = root.InsertValuesAtStem(key[:31], values, 0, true, t.nodeResolver)
 				if err != nil {
 					return fmt.Errorf("UpdateContractCode (addr=%x) error: %w", addr[:], err)
 				}

trie/verkle.go

@@ -138,7 +138,7 @@ func TestVerkleRollBack(t *testing.T) {
 
 	// ensure there is some code in the 2nd group of the 1st account
 	keyOf2ndGroup := utils.CodeChunkKeyWithEvaluatedAddress(tr.cache.Get(common.Address{1}.Bytes()), uint256.NewInt(128))
-	chunk, err := tr.root.Get(keyOf2ndGroup, nil)
+	chunk, err := tr.root.Get(keyOf2ndGroup, 0, nil)
 	if err != nil {
 		t.Fatalf("Failed to get account, %v", err)
 	}
@@ -163,7 +163,7 @@ func TestVerkleRollBack(t *testing.T) {
 	}
 
 	// ensure that the last code chunk is also gone from the tree
-	chunk, err = tr.root.Get(keyOf2ndGroup, nil)
+	chunk, err = tr.root.Get(keyOf2ndGroup, 0, nil)
 	if err != nil {
 		t.Fatalf("Failed to get account, %v", err)
 	}