Post cherry-pick fixes

core/chains/evm/logpoller/orm_test.go

@@ -1313,7 +1313,7 @@ func TestInsertLogsWithBlock(t *testing.T) {
 	// We need full db here, because we want to test transaction rollbacks.
 	// Using pgtest.NewSqlxDB(t) will run all tests in TXs which is not desired for this type of test
 	// (inner tx rollback will rollback outer tx, blocking rest of execution)
-	_, db := heavyweight.FullTestDBV2(t, nil)
+	_, db := heavyweight.FullTestDBV2(t, "insert_test", nil)
 	o := logpoller.NewORM(chainID, db, logger.TestLogger(t), pgtest.NewQConfig(true))
 
 	correctLog := GenLog(chainID, 1, 1, utils.RandomAddress().String(), event[:], address)
@@ -1389,7 +1389,7 @@ func TestInsertLogsInTx(t *testing.T) {
 	maxLogsSize := 9000
 
 	// We need full db here, because we want to test transaction rollbacks.
-	_, db := heavyweight.FullTestDBV2(t, nil)
+	_, db := heavyweight.FullTestDBV2(t, "insert_logs_tx", nil)
 	o := logpoller.NewORM(chainID, db, logger.TestLogger(t), pgtest.NewQConfig(true))
 
 	logs := make([]logpoller.Log, maxLogsSize, maxLogsSize+1)

core/services/ocr2/plugins/ccip/execution_reporting_plugin.go

@@ -790,7 +790,7 @@ func (r *ExecutionReportingPlugin) getReportsWithSendRequests(
 		}
 
 		// get executable sequence numbers
-		executedMp, err := r.getExecutedSeqNrsInRange(ctx, intervalMin, intervalMax, latestBlock)
+		executedMp, err := r.getExecutedSeqNrsInRange(ctx, intervalMin, intervalMax, latestBlock.BlockNumber)
 		if err != nil {
 			return err
 		}

core/services/ocr2/plugins/ccip/execution_reporting_plugin_test.go

@@ -21,6 +21,7 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	lpMocks "github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal"
@@ -108,7 +109,7 @@ func TestExecutionReportingPlugin_Observation(t *testing.T) {
 			p.config.commitStoreReader = commitStoreReader
 
 			destReader := ccipdatamocks.NewReader(t)
-			destReader.On("LatestBlock", ctx).Return(int64(1234), nil).Maybe()
+			destReader.On("LatestBlock", ctx).Return(logpoller.LogPollerBlock{BlockNumber: 1234}, nil).Maybe()
 			p.config.destReader = destReader
 
 			var executionEvents []ccipdata.Event[ccipdata.ExecutionStateChanged]
@@ -1014,7 +1015,7 @@ func TestExecutionReportingPlugin_getReportsWithSendRequests(t *testing.T) {
 			p.config.onRampReader = sourceReader
 
 			destReader := ccipdatamocks.NewReader(t)
-			destReader.On("LatestBlock", ctx).Return(tc.destLatestBlock, nil).Maybe()
+			destReader.On("LatestBlock", ctx).Return(logpoller.LogPollerBlock{BlockNumber: tc.destLatestBlock}, nil).Maybe()
 			var executedEvents []ccipdata.Event[ccipdata.ExecutionStateChanged]
 			for _, executedSeqNum := range tc.destExecutedSeqNums {
 				executedEvents = append(executedEvents, ccipdata.Event[ccipdata.ExecutionStateChanged]{

core/services/ocr2/plugins/ccip/internal/cache/cache.go

@@ -91,7 +91,7 @@ func (c *CachedChain[T]) initializeCache(ctx context.Context) (T, error) {
 		return empty, err
 	}
 
-	c.updateCache(value, latestBlock-c.optimisticConfirmations)
+	c.updateCache(value, latestBlock.BlockNumber-c.optimisticConfirmations)
 	return c.copyCachedValue(), nil
 
 }

core/services/ocr2/plugins/ccip/internal/cache/cache_test.go

@@ -22,7 +22,7 @@ const (
 
 func TestGet_InitDataForTheFirstTime(t *testing.T) {
 	lp := lpMocks.NewLogPoller(t)
-	lp.On("LatestBlock", mock.Anything).Maybe().Return(int64(100), nil)
+	lp.On("LatestBlock", mock.Anything).Maybe().Return(logpoller.LogPollerBlock{BlockNumber: 100}, nil)
 
 	contract := newCachedContract(lp, "", []string{"value1"}, 0)
 

core/services/ocr2/plugins/ccip/internal/cache/tokenpool_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -74,7 +75,7 @@ func TestNewTokenPools(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			mockLp := mocks.NewLogPoller(t)
-			mockLp.On("LatestBlock", mock.Anything).Return(int64(100), nil)
+			mockLp.On("LatestBlock", mock.Anything).Return(logpoller.LogPollerBlock{BlockNumber: 100}, nil)
 
 			offRamp := ccipdatamocks.NewOffRampReader(t)
 			offRamp.On("TokenEvents").Return([]common.Hash{})

core/services/ocr2/plugins/ccip/internal/ccipdata/logpoller.go

@@ -36,7 +36,7 @@ func NewLogPollerReader(lp logpoller.LogPoller, lggr logger.Logger, client evmcl
 	}
 }
 
-func (c *LogPollerReader) LatestBlock(ctx context.Context) (int64, error) {
+func (c *LogPollerReader) LatestBlock(ctx context.Context) (logpoller.LogPollerBlock, error) {
 	return c.lp.LatestBlock(pg.WithParentCtx(ctx))
 }
 

core/services/ocr2/plugins/ccip/internal/ccipdata/offramp_reader_v1_0_0_unit_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/rpclib"
@@ -79,7 +80,7 @@ func TestOffRampGetDestinationTokensFromSourceTokens(t *testing.T) {
 	}
 
 	lp := mocks.NewLogPoller(t)
-	lp.On("LatestBlock", mock.Anything).Return(int64(rand.Uint64()), nil)
+	lp.On("LatestBlock", mock.Anything).Return(logpoller.LogPollerBlock{BlockNumber: rand.Int63()}, nil)
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {

core/services/ocr2/plugins/ccip/internal/ccipdata/offramp_v1_0_0.go

@@ -164,7 +164,7 @@ func (o *OffRampV1_0_0) GetDestinationTokensFromSourceTokens(ctx context.Context
 		return nil, fmt.Errorf("get latest block: %w", err)
 	}
 
-	results, err := o.evmBatchCaller.BatchCall(ctx, uint64(latestBlock), evmCalls)
+	results, err := o.evmBatchCaller.BatchCall(ctx, uint64(latestBlock.BlockNumber), evmCalls)
 	if err != nil {
 		return nil, fmt.Errorf("batch call limit: %w", err)
 	}
@@ -207,7 +207,7 @@ func (o *OffRampV1_0_0) GetTokenPoolsRateLimits(ctx context.Context, poolAddress
 		return nil, fmt.Errorf("get latest block: %w", err)
 	}
 
-	results, err := o.evmBatchCaller.BatchCall(ctx, uint64(latestBlock), evmCalls)
+	results, err := o.evmBatchCaller.BatchCall(ctx, uint64(latestBlock.BlockNumber), evmCalls)
 	if err != nil {
 		return nil, fmt.Errorf("batch call limit: %w", err)
 	}

core/services/ocr2/plugins/ccip/internal/ccipdata/price_registry_v1_0_0.go

@@ -156,7 +156,7 @@ func (p *PriceRegistryV1_0_0) GetTokensDecimals(ctx context.Context, tokenAddres
 		return nil, fmt.Errorf("get latest block: %w", err)
 	}
 
-	results, err := p.evmBatchCaller.BatchCall(ctx, uint64(latestBlock), evmCalls)
+	results, err := p.evmBatchCaller.BatchCall(ctx, uint64(latestBlock.BlockNumber), evmCalls)
 	if err != nil {
 		return nil, fmt.Errorf("batch call limit: %w", err)
 	}

core/services/ocr2/plugins/ccip/internal/ccipdata/reader.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/logpoller"
 	"github.com/smartcontractkit/chainlink/v2/core/services/pg"
 )
 
@@ -36,5 +37,5 @@ type Closer interface {
 //go:generate mockery --quiet --name Reader --filename reader_mock.go --case=underscore
 type Reader interface {
 	// LatestBlock returns the latest known/parsed block of the underlying implementation.
-	LatestBlock(ctx context.Context) (int64, error)
+	LatestBlock(ctx context.Context) (logpoller.LogPollerBlock, error)
 }