From b3c93a7f259a279060f555098efb4d683ab7e838 Mon Sep 17 00:00:00 2001 From: Domino Valdano Date: Wed, 17 Jul 2024 10:01:52 -0700 Subject: [PATCH] Fix LatestFinalizedBlock=0 bug (#BCI-3618) (#13861) --- .changeset/twenty-rings-kneel.md | 5 +++++ core/chains/evm/logpoller/log_poller.go | 11 ++++++----- core/chains/evm/logpoller/log_poller_test.go | 5 +++++ 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 .changeset/twenty-rings-kneel.md diff --git a/.changeset/twenty-rings-kneel.md b/.changeset/twenty-rings-kneel.md new file mode 100644 index 00000000000..160881c7faf --- /dev/null +++ b/.changeset/twenty-rings-kneel.md @@ -0,0 +1,5 @@ +--- +"chainlink": minor +--- + +#bugfix Set LatestFinalizedBlock for finalized blocks saved by logpoller diff --git a/core/chains/evm/logpoller/log_poller.go b/core/chains/evm/logpoller/log_poller.go index eef6c97cde6..dee5d1d1a5d 100644 --- a/core/chains/evm/logpoller/log_poller.go +++ b/core/chains/evm/logpoller/log_poller.go @@ -1276,11 +1276,12 @@ func (lp *logPoller) fillRemainingBlocksFromRPC( logPollerBlocks := make(map[uint64]LogPollerBlock) for _, head := range evmBlocks { logPollerBlocks[uint64(head.Number)] = LogPollerBlock{ - EvmChainId: head.EVMChainID, - BlockHash: head.Hash, - BlockNumber: head.Number, - BlockTimestamp: head.Timestamp, - CreatedAt: head.Timestamp, + EvmChainId: head.EVMChainID, + BlockHash: head.Hash, + BlockNumber: head.Number, + BlockTimestamp: head.Timestamp, + FinalizedBlockNumber: head.Number, // always finalized; only matters if this block is returned by LatestBlock() + CreatedAt: head.Timestamp, } } return logPollerBlocks, nil diff --git a/core/chains/evm/logpoller/log_poller_test.go b/core/chains/evm/logpoller/log_poller_test.go index c83efc83b39..860b588c771 100644 --- a/core/chains/evm/logpoller/log_poller_test.go +++ b/core/chains/evm/logpoller/log_poller_test.go @@ -1342,6 +1342,7 @@ func TestLogPoller_GetBlocks_Range(t *testing.T) { require.NoError(t, err) assert.Equal(t, 1, len(blocks)) assert.Equal(t, 1, int(blocks[0].BlockNumber)) + assert.Equal(t, 1, int(blocks[0].FinalizedBlockNumber)) // LP fails to return block 2 because it hasn't been finalized yet blockNums = []uint64{2} @@ -1360,6 +1361,7 @@ func TestLogPoller_GetBlocks_Range(t *testing.T) { require.NoError(t, err) assert.Equal(t, 1, len(rpcBlocks)) assert.Equal(t, 2, int(rpcBlocks[0].BlockNumber)) + assert.Equal(t, 2, int(rpcBlocks[0].FinalizedBlockNumber)) th.Client.Commit() // commit block #5 so that #3 becomes finalized @@ -1374,6 +1376,7 @@ func TestLogPoller_GetBlocks_Range(t *testing.T) { assert.Equal(t, 2, len(rpcBlocks2)) assert.Equal(t, 1, int(rpcBlocks2[0].BlockNumber)) assert.Equal(t, 3, int(rpcBlocks2[1].BlockNumber)) + assert.Equal(t, 3, int(rpcBlocks2[1].FinalizedBlockNumber)) // after calling PollAndSaveLogs, block 3 (latest finalized block) is persisted in DB th.LogPoller.PollAndSaveLogs(testutils.Context(t), 1) @@ -1387,6 +1390,7 @@ func TestLogPoller_GetBlocks_Range(t *testing.T) { assert.Equal(t, 1, len(lpBlocks)) assert.Equal(t, rpcBlocks[0].BlockNumber, lpBlocks[0].BlockNumber) assert.Equal(t, rpcBlocks[0].BlockHash, lpBlocks[0].BlockHash) + assert.Equal(t, rpcBlocks[0].FinalizedBlockNumber, lpBlocks[0].FinalizedBlockNumber) // getBlocksRange return multiple blocks blockNums = []uint64{1, 2} @@ -1396,6 +1400,7 @@ func TestLogPoller_GetBlocks_Range(t *testing.T) { assert.NotEmpty(t, blocks[0].BlockHash) assert.Equal(t, 2, int(blocks[1].BlockNumber)) assert.NotEmpty(t, blocks[1].BlockHash) + assert.Equal(t, 2, int(blocks[1].FinalizedBlockNumber)) // getBlocksRange return blocks in requested order blockNums = []uint64{2, 1}