Use observed home chain reader in CCIP (#15628)

* Switching to the observed version * Switching to the observed version
smartcontractkit · Dec 11, 2024 · 6101be7 · 6101be7
1 parent 9c36587
commit 6101be7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/.changeset/spotty-seals-give.md b/.changeset/spotty-seals-give.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Switching CCIP to observed ChainReader for HomeChainReader #internal
diff --git a/core/capabilities/ccip/ccip_integration_tests/integrationhelpers/integration_helpers.go b/core/capabilities/ccip/ccip_integration_tests/integrationhelpers/integration_helpers.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"math/big"
 	"sort"
+	"strconv"
 	"testing"
 	"time"
 
@@ -137,7 +138,7 @@ func NewTestUniverse(ctx context.Context, t *testing.T, lggr logger.Logger) Test
 	t.Cleanup(func() { require.NoError(t, lp.Close()) })
 
 	cr := NewReader(t, lp, headTracker, cl, ccAddress, configsevm.HomeChainReaderConfigRaw)
-	hcr := NewHomeChainReader(t, cr, ccAddress)
+	hcr := NewHomeChainReader(t, cr, ccAddress, strconv.Itoa(chainID))
 	return TestUniverse{
 		Transactor:         transactor,
 		Backend:            backend,
@@ -237,11 +238,22 @@ func (t *TestUniverse) AddCapability(p2pIDs [][32]byte) {
 	}
 }
 
-func NewHomeChainReader(t *testing.T, cr types.ContractReader, ccAddress common.Address) ccipreader.HomeChain {
-	hcr := ccipreader.NewHomeChainReader(cr, logger.TestLogger(t), 50*time.Millisecond, types.BoundContract{
-		Address: ccAddress.String(),
-		Name:    consts.ContractNameCCIPConfig,
-	})
+func NewHomeChainReader(
+	t *testing.T,
+	cr types.ContractReader,
+	ccAddress common.Address,
+	chainID string,
+) ccipreader.HomeChain {
+	hcr := ccipreader.NewObservedHomeChainReader(
+		cr,
+		logger.TestLogger(t),
+		50*time.Millisecond,
+		types.BoundContract{
+			Address: ccAddress.String(),
+			Name:    consts.ContractNameCCIPConfig,
+		},
+		chainID,
+	)
 	require.NoError(t, hcr.Start(testutils.Context(t)))
 	t.Cleanup(func() { require.NoError(t, hcr.Close()) })
 

diff --git a/core/capabilities/ccip/delegate.go b/core/capabilities/ccip/delegate.go
@@ -167,11 +167,12 @@ func (d *Delegate) ServicesForSpec(ctx context.Context, spec job.Job) (services
 		return nil, fmt.Errorf("failed to get home chain contract reader: %w", err)
 	}
 
-	hcr := ccipreaderpkg.NewHomeChainReader(
+	hcr := ccipreaderpkg.NewObservedHomeChainReader(
 		homeChainContractReader,
 		d.lggr.Named("HomeChainReader"),
 		100*time.Millisecond,
 		ccipConfigBinding,
+		d.capabilityConfig.ExternalRegistry().ChainID(),
 	)
 
 	// get the chain selector for the home chain