From 242ecbaef101d0fe8387a1954c587c59247bea27 Mon Sep 17 00:00:00 2001 From: Augustus Chang Date: Mon, 5 Aug 2024 11:36:11 -0400 Subject: [PATCH 1/3] update the cache used for LatestRoundRequested --- relayer/pkg/chainlink/ocr2/contract_reader.go | 1 + relayer/pkg/chainlink/ocr2/transmissions_cache.go | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/relayer/pkg/chainlink/ocr2/contract_reader.go b/relayer/pkg/chainlink/ocr2/contract_reader.go index 2ce41622..0f01a0ed 100644 --- a/relayer/pkg/chainlink/ocr2/contract_reader.go +++ b/relayer/pkg/chainlink/ocr2/contract_reader.go @@ -101,6 +101,7 @@ func (c *contractReader) LatestTransmissionDetails( return } +// round will never be requested on Starknet func (c *contractReader) LatestRoundRequested( ctx context.Context, lookback time.Duration, diff --git a/relayer/pkg/chainlink/ocr2/transmissions_cache.go b/relayer/pkg/chainlink/ocr2/transmissions_cache.go index 851de28b..be3a14d9 100644 --- a/relayer/pkg/chainlink/ocr2/transmissions_cache.go +++ b/relayer/pkg/chainlink/ocr2/transmissions_cache.go @@ -121,6 +121,7 @@ func (c *transmissionsCache) LatestTransmissionDetails( return } +// round will never be requested on Starknet func (c *transmissionsCache) LatestRoundRequested( ctx context.Context, lookback time.Duration, @@ -133,9 +134,8 @@ func (c *transmissionsCache) LatestRoundRequested( c.tdLock.RLock() defer c.tdLock.RUnlock() configDigest = c.transmissionDetails.Digest - epoch = c.transmissionDetails.Epoch - round = c.transmissionDetails.Round - err = c.assertTransmissionsNotStale() + epoch = 0 + round = 0 return } From abcb8f3a0894ad06f8c7cf7c666cfa8fee555de3 Mon Sep 17 00:00:00 2001 From: Augustus Chang Date: Mon, 5 Aug 2024 13:26:42 -0400 Subject: [PATCH 2/3] remove need to query chain --- relayer/pkg/chainlink/ocr2/contract_reader.go | 8 +------- relayer/pkg/chainlink/ocr2/transmissions_cache.go | 4 +--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/relayer/pkg/chainlink/ocr2/contract_reader.go b/relayer/pkg/chainlink/ocr2/contract_reader.go index 0f01a0ed..10ba9304 100644 --- a/relayer/pkg/chainlink/ocr2/contract_reader.go +++ b/relayer/pkg/chainlink/ocr2/contract_reader.go @@ -111,15 +111,9 @@ func (c *contractReader) LatestRoundRequested( round uint8, err error, ) { - transmissionDetails, err := c.reader.LatestTransmissionDetails(ctx, c.address) - if err != nil { - err = fmt.Errorf("couldn't get transmission details: %w", err) - } - - configDigest = transmissionDetails.Digest + configDigest = types.ConfigDigest{} epoch = 0 round = 0 - return } diff --git a/relayer/pkg/chainlink/ocr2/transmissions_cache.go b/relayer/pkg/chainlink/ocr2/transmissions_cache.go index be3a14d9..3a5e4bec 100644 --- a/relayer/pkg/chainlink/ocr2/transmissions_cache.go +++ b/relayer/pkg/chainlink/ocr2/transmissions_cache.go @@ -131,9 +131,7 @@ func (c *transmissionsCache) LatestRoundRequested( round uint8, err error, ) { - c.tdLock.RLock() - defer c.tdLock.RUnlock() - configDigest = c.transmissionDetails.Digest + configDigest = types.ConfigDigest{} epoch = 0 round = 0 return From 1e7c9e925a2ef02dee6dd622a2f43eb2fec3449c Mon Sep 17 00:00:00 2001 From: Augustus Chang Date: Mon, 5 Aug 2024 13:57:46 -0400 Subject: [PATCH 3/3] call reader in cache directly --- relayer/pkg/chainlink/ocr2/contract_reader.go | 2 +- relayer/pkg/chainlink/ocr2/transmissions_cache.go | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/relayer/pkg/chainlink/ocr2/contract_reader.go b/relayer/pkg/chainlink/ocr2/contract_reader.go index 10ba9304..91d09486 100644 --- a/relayer/pkg/chainlink/ocr2/contract_reader.go +++ b/relayer/pkg/chainlink/ocr2/contract_reader.go @@ -101,7 +101,7 @@ func (c *contractReader) LatestTransmissionDetails( return } -// round will never be requested on Starknet +// round will never be requested on Starknet so we return 0 values func (c *contractReader) LatestRoundRequested( ctx context.Context, lookback time.Duration, diff --git a/relayer/pkg/chainlink/ocr2/transmissions_cache.go b/relayer/pkg/chainlink/ocr2/transmissions_cache.go index 3a5e4bec..7928738c 100644 --- a/relayer/pkg/chainlink/ocr2/transmissions_cache.go +++ b/relayer/pkg/chainlink/ocr2/transmissions_cache.go @@ -121,7 +121,6 @@ func (c *transmissionsCache) LatestTransmissionDetails( return } -// round will never be requested on Starknet func (c *transmissionsCache) LatestRoundRequested( ctx context.Context, lookback time.Duration, @@ -131,10 +130,7 @@ func (c *transmissionsCache) LatestRoundRequested( round uint8, err error, ) { - configDigest = types.ConfigDigest{} - epoch = 0 - round = 0 - return + return c.reader.LatestRoundRequested(ctx, lookback) } func (c *transmissionsCache) assertTransmissionsNotStale() error {