Check bounds

noble-assets · May 1, 2024 · ea7a7d4 · ea7a7d4
1 parent ff1375f
commit ea7a7d4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ethereum/listener.go b/ethereum/listener.go
@@ -291,7 +291,11 @@ func (e *Ethereum) flushMechanism(
 
 			// initialize first lastFlushedBlock if not set
 			if e.lastFlushedBlock == 0 {
-				e.lastFlushedBlock = latestBlock - (2 * e.lookbackPeriod)
+				e.lastFlushedBlock = latestBlock - 2*e.lookbackPeriod
+
+				if latestBlock < e.lookbackPeriod {
+					e.lastFlushedBlock = 0
+				}
 			}
 
 			// start from the last block it flushed
@@ -307,7 +311,7 @@ func (e *Ethereum) flushMechanism(
 
 			logger.Info(fmt.Sprintf("Flush started from %d to %d (current height: %d, lookback period: %d)", startBlock, finishBlock, latestBlock, e.lookbackPeriod))
 
-			// consume from lastFlushedBlock to the latestBlock
+			// consume from lastFlushedBlock to the finishBlock
 			e.getAndConsumeHistory(ctx, logger, processingQueue, messageSent, messageTransmitterAddress, messageTransmitterABI, startBlock, finishBlock)
 
 			// update lastFlushedBlock to the last block it flushed

diff --git a/noble/listener.go b/noble/listener.go
@@ -158,6 +158,10 @@ func (n *Noble) flushMechanism(
 			// initialize first lastFlushedBlock if not set
 			if n.lastFlushedBlock == 0 {
 				n.lastFlushedBlock = latestBlock - (2 * n.lookbackPeriod)
+
+				if latestBlock < n.lookbackPeriod {
+					n.lastFlushedBlock = 0
+				}
 			}
 
 			// start from the last block it flushed