From c8da85bea96ad9038e88c5f080b56d3f426d1ad6 Mon Sep 17 00:00:00 2001
From: xiaodino <ruby@taiko.xyz>
Date: Sat, 16 Mar 2024 22:58:54 -0700
Subject: [PATCH] Update

---
 packages/relayer/indexer/indexer.go                          | 3 +++
 .../relayer/indexer/set_initial_processing_block_by_mode.go  | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/packages/relayer/indexer/indexer.go b/packages/relayer/indexer/indexer.go
index d41c937773..fa254eb675 100644
--- a/packages/relayer/indexer/indexer.go
+++ b/packages/relayer/indexer/indexer.go
@@ -393,6 +393,9 @@ func (i *Indexer) filter(ctx context.Context) error {
 
 	if i.watchMode == CrawlPastBlocks {
 		slog.Info("restarting filtering from genesis")
+
+		i.processingBlockHeight = 0
+
 		return i.filter(ctx)
 	}
 
diff --git a/packages/relayer/indexer/set_initial_processing_block_by_mode.go b/packages/relayer/indexer/set_initial_processing_block_by_mode.go
index 2df25e038a..bb980711e6 100644
--- a/packages/relayer/indexer/set_initial_processing_block_by_mode.go
+++ b/packages/relayer/indexer/set_initial_processing_block_by_mode.go
@@ -43,7 +43,12 @@ func (i *Indexer) setInitialProcessingBlockByMode(
 
 		return nil
 	case Resync:
+		if i.watchMode == CrawlPastBlocks && i.processingBlockHeight > startingBlock {
+			return nil
+		}
+
 		i.processingBlockHeight = startingBlock
+
 		return nil
 	default:
 		return relayer.ErrInvalidMode