[CCIP-Merge] OCR2 plugins merge fixes [CCIP-2942]

.mockery.yaml

@@ -457,4 +457,95 @@ packages:
       filename: optimism_dispute_game_factory_interface.go
       outpkg: mock_optimism_dispute_game_factory
     interfaces:
-      OptimismDisputeGameFactoryInterface: 
+      OptimismDisputeGameFactoryInterface:
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/cache:
+    config:
+      filename: chain_health_mock.go
+    interfaces:
+      ChainHealthcheck:
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata:
+    interfaces:
+      CommitStoreReader:
+        config:
+          filename: commit_store_reader_mock.go
+      OffRampReader:
+        config:
+          filename: offramp_reader_mock.go
+      OnRampReader:
+        config:
+          filename: onramp_reader_mock.go
+      PriceRegistryReader:
+        config:
+          filename: price_registry_reader_mock.go
+      TokenPoolReader:
+        config:
+          filename: token_pool_reader_mock.go
+      USDCReader:
+        config:
+          filename: usdc_reader_mock.go
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/batchreader:
+    config:
+      filename: token_pool_batched_reader_mock.go
+    interfaces:
+      TokenPoolBatchedReader:
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdata/ccipdataprovider:
+    config:
+      filename: price_registry_mock.go
+    interfaces:
+      PriceRegistry:
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/ccipdb:
+    config:
+      filename: price_service_mock.go
+    interfaces:
+      PriceService:
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/pricegetter:
+    config:
+      filename: mock.go
+      dir: "{{ .InterfaceDir }}/"
+      outpkg: pricegetter
+    interfaces:
+      PriceGetter:
+        config:
+          mockname: "Mock{{ .InterfaceName }}"
+  github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/statuschecker:
+    interfaces:
+      CCIPTransactionStatusChecker:
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/internal/rpclib:
+    config:
+      outpkg: rpclibmocks
+    interfaces:
+      BatchCaller:
+        config:
+          filename: batch_caller.go
+          dir: core/services/relay/evm/rpclibmocks
+      EvmBatchCaller:
+        config:
+          filename: evm_mock.go
+          dir: "{{ .InterfaceDir }}/rpclibmocks"
+
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/prices:
+    config:
+      dir: "{{ .InterfaceDir }}/"
+      outpkg: prices
+    interfaces:
+      GasPriceEstimatorCommit:
+        config:
+          mockname: "Mock{{ .InterfaceName }}"
+          filename: gas_price_estimator_commit_mock.go
+      GasPriceEstimatorExec:
+        config:
+          mockname: "Mock{{ .InterfaceName }}"
+          filename: gas_price_estimator_exec_mock.go
+      GasPriceEstimator:
+        config:
+          mockname: "Mock{{ .InterfaceName }}"
+          filename: gas_price_estimator_mock.go
+  github.com/smartcontractkit/chainlink/v2/core/services/ocr2/plugins/ccip/tokendata:
+    config:
+      filename: reader_mock.go
+      dir: "{{ .InterfaceDir }}/"
+      outpkg: tokendata
+    interfaces:
+      Reader:
+        config:
+          mockname: "Mock{{ .InterfaceName }}"

core/config/docs/core.toml

@@ -13,6 +13,8 @@ FeedsManager = true # Default
 LogPoller = false # Default
 # UICSAKeys enables CSA Keys in the UI.
 UICSAKeys = false # Default
+# CCIP enables the CCIP service.
+CCIP = true # Default
 
 [Database]
 # DefaultIdleInTxSessionTimeout is the maximum time allowed for a transaction to be open and idle before timing out. See Postgres `idle_in_transaction_session_timeout` for more details.

core/config/toml/types.go

@@ -303,6 +303,7 @@ type Feature struct {
 	FeedsManager *bool
 	LogPoller    *bool
 	UICSAKeys    *bool
+	CCIP         *bool
 }
 
 func (f *Feature) setFrom(f2 *Feature) {
@@ -315,6 +316,9 @@ func (f *Feature) setFrom(f2 *Feature) {
 	if v := f2.UICSAKeys; v != nil {
 		f.UICSAKeys = v
 	}
+	if v := f2.CCIP; v != nil {
+		f.CCIP = v
+	}
 }
 
 type Database struct {

core/scripts/go.mod

@@ -60,7 +60,7 @@ require (
 	github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
 	github.com/XSAM/otelsql v0.27.0 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
-	github.com/avast/retry-go/v4 v4.5.1 // indirect
+	github.com/avast/retry-go/v4 v4.6.0 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect

core/scripts/go.sum

@@ -147,8 +147,8 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV
 github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
 github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o=
-github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
+github.com/avast/retry-go/v4 v4.6.0 h1:K9xNA+KeB8HHc2aWFuLb25Offp+0iVRXEvFx8IinRJA=
+github.com/avast/retry-go/v4 v4.6.0/go.mod h1:gvWlPhBVsvBbLkVGDg/KwvBv0bEkCOLRRSHKIr2PyOE=
 github.com/aws/aws-sdk-go v1.22.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.45.25 h1:c4fLlh5sLdK2DCRTY1z0hyuJZU4ygxX8m1FswL6/nF4=

core/services/chainlink/config_test.go

@@ -261,6 +261,7 @@ func TestConfig_Marshal(t *testing.T) {
 		FeedsManager: ptr(true),
 		LogPoller:    ptr(true),
 		UICSAKeys:    ptr(true),
+		CCIP:         ptr(true),
 	}
 	full.Database = toml.Database{
 		DefaultIdleInTxSessionTimeout: commoncfg.MustNewDuration(time.Minute),
@@ -771,6 +772,7 @@ Headers = ['Authorization: token', 'X-SomeOther-Header: value with spaces | and
 FeedsManager = true
 LogPoller = true
 UICSAKeys = true
+CCIP = true
 `},
 		{"Database", Config{Core: toml.Core{Database: full.Database}}, `[Database]
 DefaultIdleInTxSessionTimeout = '1m0s'

core/services/chainlink/testdata/config-empty-effective.toml

@@ -6,6 +6,7 @@ ShutdownGracePeriod = '5s'
 FeedsManager = true
 LogPoller = false
 UICSAKeys = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1h0m0s'

core/services/chainlink/testdata/config-full.toml

@@ -6,6 +6,7 @@ ShutdownGracePeriod = '10s'
 FeedsManager = true
 LogPoller = true
 UICSAKeys = true
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1m0s'

core/services/chainlink/testdata/config-multi-chain-effective.toml

@@ -6,6 +6,7 @@ ShutdownGracePeriod = '5s'
 FeedsManager = true
 LogPoller = false
 UICSAKeys = false
+CCIP = true
 
 [Database]
 DefaultIdleInTxSessionTimeout = '1h0m0s'

core/services/feeds/service.go

@@ -107,6 +107,9 @@ type Service interface {
 	ListSpecsByJobProposalIDs(ctx context.Context, ids []int64) ([]JobProposalSpec, error)
 	RejectSpec(ctx context.Context, id int64) error
 	UpdateSpecDefinition(ctx context.Context, id int64, spec string) error
+
+	// UnsafeSetConnectionsManager Only for testing
+	UnsafeSetConnectionsManager(ConnectionsManager)
 }
 
 type service struct {
@@ -1105,6 +1108,16 @@ func (s *service) observeJobProposalCounts(ctx context.Context) error {
 	return nil
 }
 
+// Unsafe_SetConnectionsManager sets the ConnectionsManager on the service.
+//
+// We need to be able to inject a mock for the client to facilitate integration
+// tests.
+//
+// ONLY TO BE USED FOR TESTING.
+func (s *service) UnsafeSetConnectionsManager(connMgr ConnectionsManager) {
+	s.connMgr = connMgr
+}
+
 // findExistingJobForOCR2 looks for existing job for OCR2
 func findExistingJobForOCR2(ctx context.Context, j *job.Job, tx job.ORM) (int32, error) {
 	var contractID string
@@ -1501,5 +1514,6 @@ func (ns NullService) IsJobManaged(ctx context.Context, jobID int64) (bool, erro
 func (ns NullService) UpdateSpecDefinition(ctx context.Context, id int64, spec string) error {
 	return ErrFeedsManagerDisabled
 }
+func (ns NullService) UnsafeSetConnectionsManager(_ ConnectionsManager) {}
 
 //revive:enable