bor blocks retire: infinity loop fix (erigontech#10596)

Problem: `+1` was added to maxBlockNum instead of minBlockNum for: erigontech#10554
anshalshukla · Jun 3, 2024 · 5456bf8 · 5456bf8
1 parent 3de2f4b
commit 5456bf8
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/turbo/snapshotsync/freezeblocks/bor_snapshots.go b/turbo/snapshotsync/freezeblocks/bor_snapshots.go
@@ -33,19 +33,13 @@ func (br *BlockRetire) retireBorBlocks(ctx context.Context, minBlockNum uint64,
 
 	blocksRetired := false
 
+	minBlockNum = max(blockReader.FrozenBorBlocks(), minBlockNum)
 	for _, snaptype := range blockReader.BorSnapshots().Types() {
-		minSnapNum := minBlockNum
-
-		if available := blockReader.BorSnapshots().SegmentsMax(); available < minBlockNum {
-			minSnapNum = available
-		}
-
-		if maxBlockNum <= minSnapNum {
+		if maxBlockNum <= minBlockNum {
 			continue
 		}
 
-		blockFrom, blockTo, ok := canRetire(minSnapNum, maxBlockNum+1, snaptype.Enum(), br.chainConfig)
-
+		blockFrom, blockTo, ok := CanRetire(maxBlockNum, minBlockNum, snaptype.Enum(), br.chainConfig)
 		if ok {
 			blocksRetired = true