Skip to content

Commit

Permalink
e3: bor blocks retire: infinity loop fix (#10598)
Browse files Browse the repository at this point in the history
cherry-pick of #10596

Problem: `+1` was added to maxBlockNum instead of minBlockNum
for: #10554
  • Loading branch information
AskAlexSharov committed Jun 3, 2024
1 parent d98d330 commit aed04b2
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions turbo/snapshotsync/freezeblocks/bor_snapshots.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit aed04b2

Please sign in to comment.