From 8859862515eb2eb71739734d669e325df0fb67c8 Mon Sep 17 00:00:00 2001 From: Sam Davies Date: Wed, 21 Jun 2023 12:34:36 -0400 Subject: [PATCH] Properly scope logpoller to feedID for mercury --- core/services/relay/evm/evm.go | 2 +- core/services/relay/evm/mercury/config_poller.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/services/relay/evm/evm.go b/core/services/relay/evm/evm.go index 8337809bac5..8eb21f85a46 100644 --- a/core/services/relay/evm/evm.go +++ b/core/services/relay/evm/evm.go @@ -151,7 +151,7 @@ func FilterNamesFromRelayArgs(args relaytypes.RelayArgs) (filterNames []string, } if relayConfig.FeedID != nil { - filterNames = []string{mercury.FilterName(addr.Address())} + filterNames = []string{mercury.FilterName(addr.Address(), *relayConfig.FeedID)} } else { filterNames = []string{configPollerFilterName(addr.Address()), transmitterFilterName(addr.Address())} } diff --git a/core/services/relay/evm/mercury/config_poller.go b/core/services/relay/evm/mercury/config_poller.go index 589b3b27eee..59399070266 100644 --- a/core/services/relay/evm/mercury/config_poller.go +++ b/core/services/relay/evm/mercury/config_poller.go @@ -94,13 +94,13 @@ type ConfigPoller struct { subscription pg.Subscription } -func FilterName(addr common.Address) string { - return logpoller.FilterName("OCR2 Mercury ConfigPoller", addr.String()) +func FilterName(addr common.Address, feedID common.Hash) string { + return logpoller.FilterName("OCR3 Mercury ConfigPoller", addr.String(), feedID.Hex()) } // NewConfigPoller creates a new Mercury ConfigPoller func NewConfigPoller(lggr logger.Logger, destChainPoller logpoller.LogPoller, addr common.Address, feedId common.Hash, eventBroadcaster pg.EventBroadcaster) (*ConfigPoller, error) { - err := destChainPoller.RegisterFilter(logpoller.Filter{Name: FilterName(addr), EventSigs: []common.Hash{FeedScopedConfigSet}, Addresses: []common.Address{addr}}) + err := destChainPoller.RegisterFilter(logpoller.Filter{Name: FilterName(addr, feedId), EventSigs: []common.Hash{FeedScopedConfigSet}, Addresses: []common.Address{addr}}) if err != nil { return nil, err }