save

direct/execution_client.go

@@ -88,3 +88,7 @@ func (s *ExecutionClientDirect) GetHeaderHashNumber(ctx context.Context, in *typ
 func (s *ExecutionClientDirect) GetForkChoice(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*execution.ForkChoice, error) {
 	return s.server.GetForkChoice(ctx, in)
 }
+
+func (s *ExecutionClientDirect) Ready(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*execution.ReadyResponse, error) {
+	return s.server.Ready(ctx, in)
+}

go.mod

@@ -3,7 +3,7 @@ module github.com/ledgerwatch/erigon-lib
 go 1.19
 
 require (
-	github.com/ledgerwatch/interfaces v0.0.0-20230731192530-801b5852e33e
+	github.com/ledgerwatch/interfaces v0.0.0-20230804204553-2578723af0cf
 	github.com/ledgerwatch/log/v3 v3.8.0
 	github.com/ledgerwatch/secp256k1 v1.0.0
 	github.com/ledgerwatch/trackerslist v1.1.0

go.sum

@@ -233,8 +233,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
-github.com/ledgerwatch/interfaces v0.0.0-20230731192530-801b5852e33e h1:a++pG0zOOAOpF/2yRwTwbh7urXLUfO7YZQfb182vjqA=
-github.com/ledgerwatch/interfaces v0.0.0-20230731192530-801b5852e33e/go.mod h1:ugQv1QllJzBny3cKZKxUrSnykkjkBgm27eQM6dnGAcc=
+github.com/ledgerwatch/interfaces v0.0.0-20230804204553-2578723af0cf h1:8M4mGiIRrH7LXErJ63pVkS/F9npjYExbaa0TD3PmOek=
+github.com/ledgerwatch/interfaces v0.0.0-20230804204553-2578723af0cf/go.mod h1:ugQv1QllJzBny3cKZKxUrSnykkjkBgm27eQM6dnGAcc=
 github.com/ledgerwatch/log/v3 v3.8.0 h1:gCpp7uGtIerEz1jKVPeDnbIopFPud9ZnCpBLlLBGqPU=
 github.com/ledgerwatch/log/v3 v3.8.0/go.mod h1:J2Jl6zV/58LeA6LTaVVnCGyf1/cYYSEOOLHY4ZN8S2A=
 github.com/ledgerwatch/secp256k1 v1.0.0 h1:Usvz87YoTG0uePIV8woOof5cQnLXGYa162rFf3YnwaQ=

kv/memdb/memory_mutation.go

@@ -17,6 +17,7 @@ import (
 	"bytes"
 	"context"
 
+	"github.com/ledgerwatch/erigon-lib/common"
 	"github.com/ledgerwatch/erigon-lib/kv/iter"
 	"github.com/ledgerwatch/erigon-lib/kv/order"
 	"github.com/ledgerwatch/log/v3"
@@ -378,6 +379,72 @@ func (m *MemoryMutation) Flush(tx kv.RwTx) error {
 	return nil
 }
 
+func (m *MemoryMutation) Diff() (*MemoryDiff, error) {
+	memDiff := &MemoryDiff{
+		diff:           make(map[table][]entry),
+		deletedEntries: make(map[string][]string),
+	}
+	// Obtain buckets touched.
+	buckets, err := m.memTx.ListBuckets()
+	if err != nil {
+		return nil, err
+	}
+	// Obliterate buckets who are to be deleted
+	for bucket := range m.clearedTables {
+		memDiff.clearedTableNames = append(memDiff.clearedTableNames, bucket)
+	}
+	// Obliterate entries who are to be deleted
+	for bucket, keys := range m.deletedEntries {
+		for key := range keys {
+			memDiff.deletedEntries[bucket] = append(memDiff.deletedEntries[bucket], key)
+		}
+	}
+	// Iterate over each bucket and apply changes accordingly.
+	for _, bucket := range buckets {
+		if isTablePurelyDupsort(bucket) {
+			cbucket, err := m.memTx.CursorDupSort(bucket)
+			if err != nil {
+				return nil, err
+			}
+			defer cbucket.Close()
+
+			t := table{
+				name:    bucket,
+				dupsort: true,
+			}
+			for k, v, err := cbucket.First(); k != nil; k, v, err = cbucket.Next() {
+				if err != nil {
+					return nil, err
+				}
+				memDiff.diff[t] = append(memDiff.diff[t], entry{
+					k: common.Copy(k),
+					v: common.Copy(v),
+				})
+			}
+		} else {
+			cbucket, err := m.memTx.Cursor(bucket)
+			if err != nil {
+				return nil, err
+			}
+			defer cbucket.Close()
+			t := table{
+				name:    bucket,
+				dupsort: false,
+			}
+			for k, v, err := cbucket.First(); k != nil; k, v, err = cbucket.Next() {
+				if err != nil {
+					return nil, err
+				}
+				memDiff.diff[t] = append(memDiff.diff[t], entry{
+					k: common.Copy(k),
+					v: common.Copy(v),
+				})
+			}
+		}
+	}
+	return memDiff, nil
+}
+
 // Check if a bucket is dupsorted and has dupsort conversion off
 func isTablePurelyDupsort(bucket string) bool {
 	config, ok := kv.ChaindataTablesCfg[bucket]

kv/memdb/memory_mutation_diff.go

@@ -0,0 +1,58 @@
+package memdb
+
+import "github.com/ledgerwatch/erigon-lib/kv"
+
+type entry struct {
+	k []byte
+	v []byte
+}
+
+type MemoryDiff struct {
+	diff              map[table][]entry // god.
+	deletedEntries    map[string][]string
+	clearedTableNames []string
+}
+
+type table struct {
+	name    string
+	dupsort bool
+}
+
+func (m *MemoryDiff) Flush(tx kv.RwTx) error {
+	// Obliterate buckets who are to be deleted
+	for _, bucket := range m.clearedTableNames {
+		if err := tx.ClearBucket(bucket); err != nil {
+			return err
+		}
+	}
+	// Obliterate entries who are to be deleted
+	for bucket, keys := range m.deletedEntries {
+		for _, key := range keys {
+			if err := tx.Delete(bucket, []byte(key)); err != nil {
+				return err
+			}
+		}
+	}
+	// Iterate over each bucket and apply changes accordingly.
+	for bucketInfo, bucketDiff := range m.diff {
+		if bucketInfo.dupsort {
+			dbCursor, err := tx.RwCursorDupSort(bucketInfo.name)
+			if err != nil {
+				return err
+			}
+			defer dbCursor.Close()
+			for _, entry := range bucketDiff {
+				if err := dbCursor.Put(entry.k, entry.v); err != nil {
+					return err
+				}
+			}
+		} else {
+			for _, entry := range bucketDiff {
+				if err := tx.Put(bucketInfo.name, entry.k, entry.v); err != nil {
+					return err
+				}
+			}
+		}
+	}
+	return nil
+}