From ffb6b83c0929c473164c53080441458947c43aa3 Mon Sep 17 00:00:00 2001
From: Andrew Ashikhmin <34320705+yperbasis@users.noreply.github.com>
Date: Mon, 29 Jan 2024 13:49:47 +0100
Subject: [PATCH] (release) RpcDaemon doesn't see recently retired blocks
 (#9336)

Cherry pick PR #9318

---------

Co-authored-by: Alex Sharov <AskAlexSharov@gmail.com>
---
 .../kv/remotedbserver/remotedbserver.go       | 16 +++++--
 eth/integrity/snap_blocks_read.go             | 46 +++++++++++++++++++
 params/version.go                             |  2 +-
 turbo/app/snapshots_cmd.go                    |  7 ++-
 4 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 eth/integrity/snap_blocks_read.go

diff --git a/erigon-lib/kv/remotedbserver/remotedbserver.go b/erigon-lib/kv/remotedbserver/remotedbserver.go
index f276674cb..8537cef26 100644
--- a/erigon-lib/kv/remotedbserver/remotedbserver.go
+++ b/erigon-lib/kv/remotedbserver/remotedbserver.go
@@ -458,17 +458,27 @@ func (s *KvServer) SendStateChanges(_ context.Context, sc *remote.StateChangeBat
 	s.stateChangeStreams.Pub(sc)
 }
 
-func (s *KvServer) Snapshots(_ context.Context, _ *remote.SnapshotsRequest) (*remote.SnapshotsReply, error) {
+func (s *KvServer) Snapshots(_ context.Context, _ *remote.SnapshotsRequest) (reply *remote.SnapshotsReply, err error) {
+	defer func() {
+		if rec := recover(); rec != nil {
+			err = fmt.Errorf("%v, %s", rec, dbg.Stack())
+		}
+	}()
 	if s.blockSnapshots == nil || reflect.ValueOf(s.blockSnapshots).IsNil() { // nolint
 		return &remote.SnapshotsReply{BlocksFiles: []string{}, HistoryFiles: []string{}}, nil
 	}
 
 	blockFiles := s.blockSnapshots.Files()
-	if s.borSnapshots != nil {
+	if s.borSnapshots != nil && !reflect.ValueOf(s.borSnapshots).IsNil() { // nolint
 		blockFiles = append(blockFiles, s.borSnapshots.Files()...)
 	}
 
-	return &remote.SnapshotsReply{BlocksFiles: blockFiles, HistoryFiles: s.historySnapshots.Files()}, nil
+	reply = &remote.SnapshotsReply{BlocksFiles: blockFiles}
+	if s.historySnapshots != nil && !reflect.ValueOf(s.historySnapshots).IsNil() { // nolint
+		reply.HistoryFiles = s.historySnapshots.Files()
+	}
+
+	return reply, nil
 }
 
 type StateChangePubSub struct {
diff --git a/eth/integrity/snap_blocks_read.go b/eth/integrity/snap_blocks_read.go
new file mode 100644
index 000000000..c7fcf356f
--- /dev/null
+++ b/eth/integrity/snap_blocks_read.go
@@ -0,0 +1,46 @@
+package integrity
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/ledgerwatch/erigon-lib/kv"
+	"github.com/ledgerwatch/erigon/turbo/services"
+	"github.com/ledgerwatch/log/v3"
+)
+
+func SnapBlocksRead(db kv.RoDB, blockReader services.FullBlockReader, ctx context.Context, failFast bool) error {
+	defer log.Info("[integrity] SnapBlocksRead: done")
+	logEvery := time.NewTicker(10 * time.Second)
+	defer logEvery.Stop()
+
+	maxBlockNum := blockReader.Snapshots().SegmentsMax()
+	for i := uint64(0); i < maxBlockNum; i += 10_000 {
+		if err := db.View(ctx, func(tx kv.Tx) error {
+			b, err := blockReader.BlockByNumber(ctx, tx, i)
+			if err != nil {
+				return err
+			}
+			if b == nil {
+				err := fmt.Errorf("block not found in snapshots: %d\n", i)
+				if failFast {
+					return err
+				}
+				log.Error("[integrity] SnapBlocksRead", "err", err)
+			}
+			return nil
+		}); err != nil {
+			return err
+		}
+
+		select {
+		case <-ctx.Done():
+			return nil
+		case <-logEvery.C:
+			log.Info("[integrity] SnapBlocksRead", "blockNum", fmt.Sprintf("%dK/%dK", i/1000, maxBlockNum/1000))
+		default:
+		}
+	}
+	return nil
+}
diff --git a/params/version.go b/params/version.go
index ce8420074..6d1ca420d 100644
--- a/params/version.go
+++ b/params/version.go
@@ -33,7 +33,7 @@ var (
 const (
 	VersionMajor       = 2  // Major version component of the current release
 	VersionMinor       = 57 // Minor version component of the current release
-	VersionMicro       = 1  // Patch version component of the current release
+	VersionMicro       = 2  // Patch version component of the current release
 	VersionModifier    = "" // Modifier component of the current release
 	VersionKeyCreated  = "ErigonVersionCreated"
 	VersionKeyFinished = "ErigonVersionFinished"
diff --git a/turbo/app/snapshots_cmd.go b/turbo/app/snapshots_cmd.go
index c4419b114..88912a6fb 100644
--- a/turbo/app/snapshots_cmd.go
+++ b/turbo/app/snapshots_cmd.go
@@ -19,6 +19,7 @@ import (
 	"github.com/ledgerwatch/erigon-lib/common/dbg"
 	"github.com/ledgerwatch/erigon-lib/common/dir"
 	"github.com/ledgerwatch/erigon-lib/metrics"
+	"github.com/ledgerwatch/erigon/eth/integrity"
 	"github.com/ledgerwatch/log/v3"
 	"github.com/urfave/cli/v2"
 	"golang.org/x/sync/semaphore"
@@ -223,10 +224,14 @@ func doIntegrity(cliCtx *cli.Context) error {
 	defer agg.Close()
 
 	blockReader, _ := blockRetire.IO()
-	if err := blockReader.(*freezeblocks.BlockReader).IntegrityTxnID(false); err != nil {
+	if err := integrity.SnapBlocksRead(chainDB, blockReader, ctx, false); err != nil {
 		return err
 	}
 
+	//if err := blockReader.(*freezeblocks.BlockReader).IntegrityTxnID(false); err != nil {
+	//	return err
+	//}
+
 	//if err := integrity.E3HistoryNoSystemTxs(ctx, chainDB, agg); err != nil {
 	//	return err
 	//}