From 7241829aecb644a44bbf868e3368080032b9d688 Mon Sep 17 00:00:00 2001 From: Mateusz Sekara Date: Wed, 10 Jul 2024 16:39:22 +0200 Subject: [PATCH] Passing finality status within TxMeta --- core/services/ocr2/plugins/ccip/ccipexec/ocr2.go | 2 +- .../ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/services/ocr2/plugins/ccip/ccipexec/ocr2.go b/core/services/ocr2/plugins/ccip/ccipexec/ocr2.go index c2c1c54693a..3f594a423b8 100644 --- a/core/services/ocr2/plugins/ccip/ccipexec/ocr2.go +++ b/core/services/ocr2/plugins/ccip/ccipexec/ocr2.go @@ -247,7 +247,7 @@ func (r *ExecutionReportingPlugin) getExecutedSeqNrsInRange(ctx context.Context, } executedMp := make(map[uint64]bool, len(stateChanges)) for _, stateChange := range stateChanges { - executedMp[stateChange.SequenceNumber] = stateChange.Finalized + executedMp[stateChange.SequenceNumber] = stateChange.TxMeta.IsFinalized() } return executedMp, nil } diff --git a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp.go b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp.go index f8ec447cf5e..53a1a46cae9 100644 --- a/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp.go +++ b/core/services/ocr2/plugins/ccip/internal/ccipdata/v1_0_0/offramp.go @@ -466,7 +466,6 @@ func (o *OffRamp) GetExecutionStateChangesBetweenSeqNums(ctx context.Context, se return &cciptypes.ExecutionStateChanged{ SequenceNumber: sc.SequenceNumber, - Finalized: sc.Raw.BlockNumber <= uint64(latestBlock.FinalizedBlockNumber), }, nil }, ) @@ -477,7 +476,7 @@ func (o *OffRamp) GetExecutionStateChangesBetweenSeqNums(ctx context.Context, se res := make([]cciptypes.ExecutionStateChangedWithTxMeta, 0, len(parsedLogs)) for _, log := range parsedLogs { res = append(res, cciptypes.ExecutionStateChangedWithTxMeta{ - TxMeta: log.TxMeta, + TxMeta: log.TxMeta.UpdateFinalityStatus(uint64(latestBlock.FinalizedBlockNumber)), ExecutionStateChanged: log.Data, }) }