fix(relayer): retroactively fix old relayer messages (#15691) (#15735)

Co-authored-by: xiaodino <[email protected]>

packages/relayer/indexer/handle_event.go

@@ -3,6 +3,7 @@ package indexer
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"math/big"
 	"time"
 
@@ -78,13 +79,6 @@ func (i *Indexer) handleEvent(
 		return errors.Wrap(err, "svc.eventStatusFromMsgHash")
 	}
 
-	// if the message is not status new, and we are iterating crawling past blocks,
-	// we also dont want to handle this event. it has already been handled.
-	if i.watchMode == CrawlPastBlocks && eventStatus != relayer.EventStatusNew {
-		// we can return early, this message has been processed as expected.
-		return nil
-	}
-
 	marshaled, err := json.Marshal(event)
 	if err != nil {
 		return errors.Wrap(err, "json.Marshal(event)")
@@ -139,6 +133,21 @@ func (i *Indexer) handleEvent(
 	} else {
 		// otherwise, we can use the existing event ID for the body.
 		id = existingEvent.ID
+
+		if i.watchMode == CrawlPastBlocks && eventStatus == existingEvent.Status {
+			// If the status from contract matches the existing event status,
+			// we can return early as this message has been processed as expected.
+			return nil
+		}
+
+		// If the status from contract is done, update the database
+		if i.watchMode == CrawlPastBlocks && eventStatus == relayer.EventStatusDone {
+			if err := i.eventRepo.UpdateStatus(ctx, id, relayer.EventStatusDone); err != nil {
+				return errors.Wrap(err, fmt.Sprintf("i.eventRepo.UpdateStatus, id: %v", id))
+			}
+
+			return nil
+		}
 	}
 
 	msg := queue.QueueMessageBody{