Merge branch 'hex-patricia-reader' into hex-patricia-reader-proof

erigon-lib/commitment/commitment.go

@@ -22,12 +22,13 @@ import (
 	"encoding/binary"
 	"errors"
 	"fmt"
-	"github.com/erigontech/erigon-lib/types/accounts"
 	"math/bits"
 	"sort"
 	"strings"
 	"unsafe"
 
+	"github.com/erigontech/erigon-lib/types/accounts"
+
 	"github.com/holiman/uint256"
 
 	"github.com/google/btree"
@@ -120,6 +121,8 @@ type TrieVariant string
 const (
 	// VariantHexPatriciaTrie used as default commitment approach
 	VariantHexPatriciaTrie TrieVariant = "hex-patricia-hashed"
+	// VariantHexPatriciaTrieReader used as read only commitment trie
+	VariantHexPatriciaTrieReader TrieVariant = "hex-patricia-hashed-reader"
 	// VariantBinPatriciaTrie - Experimental mode with binary key representation
 	VariantBinPatriciaTrie TrieVariant = "bin-patricia-hashed"
 )
@@ -922,6 +925,13 @@ func DecodeBranchAndCollectStat(key, branch []byte, tv TrieVariant) *BranchStat
 	return stat
 }
 
+type ReadOrUpdate int
+
+const (
+	ReadTouch   ReadOrUpdate = 0
+	UpdateTouch ReadOrUpdate = 1
+)
+
 // Defines how to evaluate commitments
 type Mode uint
 
@@ -967,6 +977,9 @@ type Updates struct {
 	tmpdir string
 }
 
+type Reads = Updates
+type ReadsOrUpdates = Updates
+
 type keyHasher func(key []byte) []byte
 
 func keyHasherNoop(key []byte) []byte { return key }
@@ -986,6 +999,9 @@ func NewUpdates(m Mode, tmpdir string, hasher keyHasher) *Updates {
 	}
 	return t
 }
+
+var NewReads = NewUpdates
+
 func (t *Updates) SetMode(m Mode) {
 	t.mode = m
 	if t.mode == ModeDirect && t.keys == nil {

erigon-lib/commitment/commitment_test.go

@@ -302,11 +302,11 @@ func TestBranchData_ReplacePlainKeys_WithEmpty(t *testing.T) {
 	})
 }
 
-func TestNewUpdates(t *testing.T) {
+func TestNewReadsOrUpdates(t *testing.T) {
 	t.Parallel()
 
 	t.Run("ModeUpdate", func(t *testing.T) {
-		ut := NewUpdates(ModeUpdate, t.TempDir(), keyHasherNoop)
+		ut := NewReadsOrUpdates(ModeUpdate, t.TempDir(), keyHasherNoop)
 
 		require.NotNil(t, ut.tree)
 		require.NotNil(t, ut.keccak)
@@ -315,7 +315,7 @@ func TestNewUpdates(t *testing.T) {
 	})
 
 	t.Run("ModeDirect", func(t *testing.T) {
-		ut := NewUpdates(ModeDirect, t.TempDir(), keyHasherNoop)
+		ut := NewReadsOrUpdates(ModeDirect, t.TempDir(), keyHasherNoop)
 
 		require.NotNil(t, ut.keccak)
 		require.NotNil(t, ut.keys)
@@ -327,8 +327,8 @@ func TestNewUpdates(t *testing.T) {
 func TestUpdates_TouchPlainKey(t *testing.T) {
 	t.Parallel()
 
-	utUpdate := NewUpdates(ModeUpdate, t.TempDir(), keyHasherNoop)
-	utDirect := NewUpdates(ModeDirect, t.TempDir(), keyHasherNoop)
+	utUpdate := NewReadsOrUpdates(ModeUpdate, t.TempDir(), keyHasherNoop)
+	utDirect := NewReadsOrUpdates(ModeDirect, t.TempDir(), keyHasherNoop)
 
 	type tc struct {
 		key []byte