[wip] E35

commitment/commitment.go

@@ -24,6 +24,7 @@ type Trie interface {
 	// Reset Drops everything from the trie
 	Reset()
 
+	// Reads updates from storage
 	ReviewKeys(pk, hk [][]byte) (rootHash []byte, branchNodeUpdates map[string]BranchData, err error)
 
 	ProcessUpdates(pk, hk [][]byte, updates []Update) (rootHash []byte, branchNodeUpdates map[string]BranchData, err error)

common/bytes.go

@@ -17,6 +17,7 @@
 package common
 
 import (
+	"bytes"
 	"fmt"
 )
 
@@ -53,6 +54,21 @@ func Copy(b []byte) []byte {
 	return c
 }
 
+func AppendInto(dst []byte, src ...[]byte) {
+	d := bytes.NewBuffer(dst)
+	for _, s := range src {
+		d.Write(s)
+	}
+}
+
+func Append(data ...[]byte) []byte {
+	s := new(bytes.Buffer)
+	for _, d := range data {
+		s.Write(d)
+	}
+	return s.Bytes()
+}
+
 func EnsureEnoughSize(in []byte, size int) []byte {
 	if cap(in) < size {
 		newBuf := make([]byte, size)

state/aggregator.go

@@ -30,6 +30,7 @@ import (
 	"github.com/VictoriaMetrics/metrics"
 	"github.com/holiman/uint256"
 	"github.com/ledgerwatch/log/v3"
+	atomic2 "go.uber.org/atomic"
 
 	"github.com/ledgerwatch/erigon-lib/kv/iter"
 	"github.com/ledgerwatch/erigon-lib/kv/order"
@@ -211,7 +212,7 @@ func (a *Aggregator) ReopenList(fNames []string) error {
 }
 
 func (a *Aggregator) GetAndResetStats() DomainStats {
-	stats := DomainStats{HistoryQueries: &atomic.Uint64{}, TotalQueries: &atomic.Uint64{}}
+	stats := DomainStats{HistoryQueries: &atomic2.Uint64{}, TotalQueries: &atomic2.Uint64{}}
 	stats.Accumulate(a.accounts.GetAndResetStats())
 	stats.Accumulate(a.storage.GetAndResetStats())
 	stats.Accumulate(a.code.GetAndResetStats())
@@ -629,6 +630,15 @@ type SelectedStaticFiles struct {
 	commitmentI    int
 }
 
+func (sf SelectedStaticFiles) FillV3(s *SelectedStaticFilesV3) SelectedStaticFiles {
+	sf.accounts, sf.accountsIdx, sf.accountsHist = s.accounts, s.accountsIdx, s.accountsHist
+	sf.storage, sf.storageIdx, sf.storageHist = s.storage, s.storageIdx, s.storageHist
+	sf.code, sf.codeIdx, sf.codeHist = s.code, s.codeIdx, s.codeHist
+	sf.commitment, sf.commitmentIdx, sf.commitmentHist = s.commitment, s.commitmentIdx, s.commitmentHist
+	sf.codeI, sf.accountsI, sf.storageI, sf.commitmentI = s.codeI, s.accountsI, s.storageI, s.commitmentI
+	return sf
+}
+
 func (sf SelectedStaticFiles) Close() {
 	for _, group := range [][]*filesItem{
 		sf.accounts, sf.accountsIdx, sf.accountsHist,
@@ -680,6 +690,14 @@ type MergedFiles struct {
 	commitmentIdx, commitmentHist *filesItem
 }
 
+func (mf MergedFiles) FillV3(m *MergedFilesV3) MergedFiles {
+	mf.accounts, mf.accountsIdx, mf.accountsHist = m.accounts, m.accountsIdx, m.accountsHist
+	mf.storage, mf.storageIdx, mf.storageHist = m.storage, m.storageIdx, m.storageHist
+	mf.code, mf.codeIdx, mf.codeHist = m.code, m.codeIdx, m.codeHist
+	mf.commitment, mf.commitmentIdx, mf.commitmentHist = m.commitment, m.commitmentIdx, m.commitmentHist
+	return mf
+}
+
 func (mf MergedFiles) Close() {
 	for _, item := range []*filesItem{
 		mf.accounts, mf.accountsIdx, mf.accountsHist,