fix code chunk key calculation and storage key calculation

core/state/statedb.go

@@ -530,7 +530,7 @@ func (s *StateDB) updateStateObject(obj *stateObject) {
 		)
 		for i, chunknr := 0, uint64(0); i < len(chunks); i, chunknr = i+32, chunknr+1 {
 			groupOffset := (chunknr + 128) % 256
-			if groupOffset == 128 {
+			if groupOffset == 0 /* start of new group */ || chunknr == 0 /* first chunk in header group */ {
 				values = make([][]byte, verkle.NodeWidth)
 				key = utils.GetTreeKeyCodeChunkWithEvaluatedAddress(obj.pointEval, uint256.NewInt(chunknr))
 			}

core/state/statedb_test.go

@@ -32,6 +32,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/rawdb"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/trie"
 )
 
 // Tests that updating a state trie does not leak any database writes prior to
@@ -957,3 +958,34 @@ func TestFlushOrderDataLoss(t *testing.T) {
 		}
 	}
 }
+
+// Test that an account with more than 128 pieces of code overflows
+// correctly into the next group.
+func TestCodeChunkOverflow(t *testing.T) {
+	// Create an empty state database
+	db := rawdb.NewMemoryDatabase()
+	state, _ := New(common.Hash{}, NewDatabaseWithConfig(db, &trie.Config{UseVerkle: true}), nil)
+
+	// Update it with some accounts
+	addr := common.BytesToAddress([]byte{1})
+	state.AddBalance(addr, big.NewInt(int64(11)))
+	state.SetNonce(addr, uint64(42))
+	state.SetState(addr, common.BytesToHash([]byte{1, 1, 1}), common.BytesToHash([]byte{1, 1, 1, 1}))
+	code := make([]byte, 31*256)
+	for i := range code {
+		code[i] = 1
+	}
+	state.SetCode(addr, code)
+
+	root := state.IntermediateRoot(false)
+	if err := state.Database().TrieDB().Commit(root, false, nil); err != nil {
+		t.Errorf("can not commit trie %v to persistent database", root.Hex())
+	}
+
+	// Ensure that no data was leaked into the database
+	it := db.NewIterator(nil, nil)
+	for it.Next() {
+		t.Errorf("State leaked into database: %x -> %x", it.Key(), it.Value())
+	}
+	it.Release()
+}

trie/utils/verkle.go

@@ -31,13 +31,12 @@ const (
 )
 
 var (
-	zero                               = uint256.NewInt(0)
-	HeaderStorageOffset                = uint256.NewInt(64)
-	CodeOffset                         = uint256.NewInt(128)
-	MainStorageOffset                  = new(uint256.Int).Lsh(uint256.NewInt(256), 31)
-	VerkleNodeWidth                    = uint256.NewInt(256)
-	codeStorageDelta                   = uint256.NewInt(0).Sub(CodeOffset, HeaderStorageOffset)
-	MainStorageMinusStorageDeltaOffset = new(uint256.Int).Sub(MainStorageOffset, codeStorageDelta)
+	zero                = uint256.NewInt(0)
+	HeaderStorageOffset = uint256.NewInt(64)
+	CodeOffset          = uint256.NewInt(128)
+	MainStorageOffset   = new(uint256.Int).Lsh(uint256.NewInt(256), 31)
+	VerkleNodeWidth     = uint256.NewInt(256)
+	codeStorageDelta    = uint256.NewInt(0).Sub(CodeOffset, HeaderStorageOffset)
 
 	getTreePolyIndex0Point *verkle.Point
 )
@@ -146,7 +145,7 @@ func GetTreeKeyStorageSlot(address []byte, storageKey *uint256.Int) []byte {
 	if storageKey.Cmp(codeStorageDelta) < 0 {
 		pos.Add(HeaderStorageOffset, storageKey)
 	} else {
-		pos.Add(MainStorageMinusStorageDeltaOffset, storageKey)
+		pos.Add(MainStorageOffset, storageKey)
 	}
 	treeIndex := new(uint256.Int).Div(pos, VerkleNodeWidth)
 
@@ -229,7 +228,7 @@ func GetTreeKeyStorageSlotWithEvaluatedAddress(evaluated *verkle.Point, storageK
 	if storageKey.Cmp(codeStorageDelta) < 0 {
 		pos.Add(HeaderStorageOffset, storageKey)
 	} else {
-		pos.Add(MainStorageMinusStorageDeltaOffset, storageKey)
+		pos.Add(MainStorageOffset, storageKey)
 	}
 	treeIndex := new(uint256.Int).Div(pos, VerkleNodeWidth)
 	// calculate the sub_index, i.e. the index in the stem tree.