minor fixes

Author: nischitpra

internal/committer/reorg.go

@@ -16,6 +16,7 @@ func InitReorg() {
 }
 
 func RunReorgValidator() {
+	lastBlockCheck := int64(0)
 	for {
 		startBlock, endBlock, err := getReorgRange()
 		if err != nil {
@@ -24,13 +25,20 @@ func RunReorgValidator() {
 			continue
 		}
 
+		if endBlock == lastBlockCheck || endBlock-startBlock < 5 {
+			log.Debug().Msg("Not enough new blocks to check. Sleeping for 1 minute.")
+			time.Sleep(1 * time.Minute)
+			continue
+		}
+
 		// Detect reorgs and handle them
 		err = detectAndHandleReorgs(startBlock, endBlock)
 		if err != nil {
 			log.Error().Err(err).Msg("Failed to detect and handle reorgs")
 			time.Sleep(2 * time.Second)
 			continue
 		}
+		lastBlockCheck = endBlock
 	}
 }
 
@@ -40,7 +48,7 @@ func getReorgRange() (int64, int64, error) {
 		return 0, 0, fmt.Errorf("failed to get last valid block: %w", err)
 	}
 
-	startBlock := min(lastValidBlock-1, 1)
+	startBlock := max(lastValidBlock-1, 1)
 	endBlock, err := libs.GetMaxBlockNumberFromClickHouseV2(libs.ChainId)
 	if err != nil {
 		return 0, 0, fmt.Errorf("failed to get max block number: %w", err)

internal/libs/libblockdata/getblockdata.go

@@ -21,7 +21,7 @@ func GetValidBlockDataInBatch(latestBlock uint64, nextCommitBlockNumber uint64)
 	maxBlocksPerFetch := rpcBatchSize * rpcNumParallelCalls
 
 	// Calculate the range of blocks to fetch
-	blocksToFetch := latestBlock - nextCommitBlockNumber
+	blocksToFetch := latestBlock - nextCommitBlockNumber + 1
 	if blocksToFetch > maxBlocksPerFetch {
 		blocksToFetch = maxBlocksPerFetch
 	}