From b0357f2c96d46de1992614b0162c2118a38c9c47 Mon Sep 17 00:00:00 2001 From: Jeffery Walsh Date: Mon, 18 Sep 2023 11:59:38 -0700 Subject: [PATCH 1/4] only index and add to queue if the message has the same intended dest chainID --- packages/relayer/indexer/handle_event.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/relayer/indexer/handle_event.go b/packages/relayer/indexer/handle_event.go index d5f580ac47..5178f1ca89 100644 --- a/packages/relayer/indexer/handle_event.go +++ b/packages/relayer/indexer/handle_event.go @@ -23,6 +23,15 @@ func (i *Indexer) handleEvent( ) error { slog.Info("event found for msgHash", "msgHash", common.Hash(event.MsgHash).Hex(), "txHash", event.Raw.TxHash.Hex()) + if event.Message.DestChainId.Cmp(i.destChainId) != 0 { + slog.Info("skipping event, wrong chainID", + "messageDestChainID", + event.Message.DestChainId.Uint64(), + "indexerDestChainID", + i.destChainId.Uint64(), + ) + } + if err := i.detectAndHandleReorg(ctx, relayer.EventNameMessageSent, common.Hash(event.MsgHash).Hex()); err != nil { return errors.Wrap(err, "svc.detectAndHandleReorg") } @@ -71,7 +80,6 @@ func (i *Indexer) handleEvent( return errors.Wrap(err, "svc.eventRepo.Save") } - // TODO: add to queue msg := queue.QueueMessageBody{ ID: e.ID, Event: event, From a5512a50fd3a8ccfcea00643efca4d5d47029f1a Mon Sep 17 00:00:00 2001 From: Jeffery Walsh Date: Mon, 18 Sep 2023 12:10:35 -0700 Subject: [PATCH 2/4] return nil --- packages/relayer/indexer/handle_event.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/relayer/indexer/handle_event.go b/packages/relayer/indexer/handle_event.go index 5178f1ca89..8052cce0d3 100644 --- a/packages/relayer/indexer/handle_event.go +++ b/packages/relayer/indexer/handle_event.go @@ -30,6 +30,8 @@ func (i *Indexer) handleEvent( "indexerDestChainID", i.destChainId.Uint64(), ) + + return nil } if err := i.detectAndHandleReorg(ctx, relayer.EventNameMessageSent, common.Hash(event.MsgHash).Hex()); err != nil { From 432a9828ae187e8d8547c5643b0e1cf044f7cb54 Mon Sep 17 00:00:00 2001 From: Jeffery Walsh Date: Mon, 18 Sep 2023 12:47:49 -0700 Subject: [PATCH 3/4] test --- packages/relayer/mock/bridge.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/relayer/mock/bridge.go b/packages/relayer/mock/bridge.go index 245536be57..47cab12920 100644 --- a/packages/relayer/mock/bridge.go +++ b/packages/relayer/mock/bridge.go @@ -60,7 +60,8 @@ func (b *Bridge) WatchMessageSent( sink <- &bridge.BridgeMessageSent{ Message: bridge.IBridgeMessage{ - SrcChainId: big.NewInt(1), + SrcChainId: big.NewInt(1), + DestChainId: big.NewInt(1), }, } b.MessagesSent++ From 47e41aa963d6d50cf4ad349e701f1ffed9ae4e5d Mon Sep 17 00:00:00 2001 From: Jeffery Walsh Date: Mon, 18 Sep 2023 12:48:34 -0700 Subject: [PATCH 4/4] mock chain id --- packages/relayer/mock/bridge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/relayer/mock/bridge.go b/packages/relayer/mock/bridge.go index 47cab12920..5b198241db 100644 --- a/packages/relayer/mock/bridge.go +++ b/packages/relayer/mock/bridge.go @@ -61,7 +61,7 @@ func (b *Bridge) WatchMessageSent( sink <- &bridge.BridgeMessageSent{ Message: bridge.IBridgeMessage{ SrcChainId: big.NewInt(1), - DestChainId: big.NewInt(1), + DestChainId: MockChainID, }, } b.MessagesSent++