save on key hashing: lump code size update with first code chunk group (

ethereum#159)
jsign · Feb 7, 2023 · 8e29b6c · 8e29b6c
1 parent 4dc00e6
commit 8e29b6c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/core/state/statedb.go b/core/state/statedb.go
@@ -34,7 +34,7 @@ import (
 	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/trie"
-	trieUtils "github.com/ethereum/go-ethereum/trie/utils"
+	"github.com/ethereum/go-ethereum/trie/utils"
 	"github.com/gballet/go-verkle"
 	"github.com/holiman/uint256"
 )
@@ -523,26 +523,30 @@ func (s *StateDB) updateStateObject(obj *stateObject) {
 		s.setError(fmt.Errorf("updateStateObject (%x) error: %w", addr[:], err))
 	}
 	if s.trie.IsVerkle() {
-		cs := make([]byte, 32)
-		binary.LittleEndian.PutUint64(cs, uint64(len(obj.code)))
-		key := trieUtils.GetTreeKeyCodeSize(addr[:])
-		if err := s.trie.TryUpdate(key, cs); err != nil {
-			s.setError(fmt.Errorf("updateStateObject (%x) error: %w", addr[:], err))
-		}
 		var (
 			chunks = trie.ChunkifyCode(obj.code)
 			values [][]byte
+			key    []byte
 		)
 		for i, chunknr := 0, uint64(0); i < len(chunks); i, chunknr = i+32, chunknr+1 {
 			groupOffset := (chunknr + 128) % 256
 			if groupOffset == 128 {
 				values = make([][]byte, verkle.NodeWidth)
-				key = trieUtils.GetTreeKeyCodeChunkWithEvaluatedAddress(obj.pointEval, uint256.NewInt(chunknr))
+				key = utils.GetTreeKeyCodeChunkWithEvaluatedAddress(obj.pointEval, uint256.NewInt(chunknr))
 			}
 			values[groupOffset] = chunks[i : i+32]
 
+			// Reuse the calculated key to also update the code size.
+			if i == 0 {
+				cs := make([]byte, 32)
+				binary.LittleEndian.PutUint64(cs, uint64(len(obj.code)))
+				values[utils.CodeSizeLeafKey] = cs
+			}
+
 			if groupOffset == 255 || len(chunks)-i <= 32 {
-				s.trie.(*trie.VerkleTrie).TryUpdateStem(key[:31], values)
+				if err := s.trie.(*trie.VerkleTrie).TryUpdateStem(key[:31], values); err != nil {
+					s.setError(fmt.Errorf("updateStateObject (%x) error: %w", addr[:], err))
+				}
 			}
 		}
 	}

diff --git a/trie/verkle.go b/trie/verkle.go
@@ -155,16 +155,16 @@ func (t *VerkleTrie) TryUpdateAccount(key []byte, acc *types.StateAccount) error
 	return nil
 }
 
-func (trie *VerkleTrie) TryUpdateStem(key []byte, values [][]byte) {
+func (trie *VerkleTrie) TryUpdateStem(key []byte, values [][]byte) error {
 	resolver :=
 		func(h []byte) ([]byte, error) {
 			return trie.db.diskdb.Get(h)
 		}
 	switch root := trie.root.(type) {
 	case *verkle.InternalNode:
-		root.InsertStem(key, values, resolver)
+		return root.InsertStem(key, values, resolver)
 	case *verkle.StatelessNode:
-		root.InsertAtStem(key, values, resolver, true)
+		return root.InsertAtStem(key, values, resolver, true)
 	default:
 		panic("invalid root type")
 	}