[BCFR-1441] Subtract 2 from configured rpcBatchSize to account for ref blocks (#49)

reductionista · web-flow · commit 31e95dfafc00 · 2025-05-07T08:40:53.000-07:00
* Subtract 2 from configured rpcBatchSize to account for ref blocks

* Avoid allowing less than 1 block request per batch
diff --git a/pkg/logpoller/log_poller.go b/pkg/logpoller/log_poller.go
@@ -1420,7 +1420,12 @@ func (lp *logPoller) fillRemainingBlocksFromRPC(
 			"remainingBlocks", remainingBlocks)
 	}
 
-	return lp.batchFetchBlocks(ctx, remainingBlocks, lp.rpcBatchSize)
+	batchSize := lp.rpcBatchSize - 2 // subtract 2 to leave room for 2 reference requests added in lp.fetchBlocks()
+	if batchSize < 1 {
+		batchSize = 1
+	}
+
+	return lp.batchFetchBlocks(ctx, remainingBlocks, batchSize)
 }
 
 // newBlockReq constructs an eth_getBlockByNumber request for particular block number

Original file line number	Diff line number	Diff line change
`@@ -1420,7 +1420,12 @@ func (lp *logPoller) fillRemainingBlocksFromRPC(`
`1420`	`1420`	`"remainingBlocks", remainingBlocks)`
`1421`	`1421`	`}`
`1422`	`1422`
`1423`		`- return lp.batchFetchBlocks(ctx, remainingBlocks, lp.rpcBatchSize)`
	`1423`	`+ batchSize := lp.rpcBatchSize - 2 // subtract 2 to leave room for 2 reference requests added in lp.fetchBlocks()`
	`1424`	`+ if batchSize < 1 {`
	`1425`	`+ batchSize = 1`
	`1426`	`+ }`
	`1427`	`+`
	`1428`	`+ return lp.batchFetchBlocks(ctx, remainingBlocks, batchSize)`
`1424`	`1429`	`}`
`1425`	`1430`
`1426`	`1431`	`// newBlockReq constructs an eth_getBlockByNumber request for particular block number`