From 7f7feec814de9fd7fd8c949340e911e0db1d2a90 Mon Sep 17 00:00:00 2001 From: Terry Tata Date: Wed, 8 Jul 2026 16:52:26 -0700 Subject: [PATCH 1/4] fix adapter --- .../adapters/executor_config_adapter.go | 25 +++++++++++++------ .../adapters/verifier_config_adapter.go | 13 +--------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/deployment/adapters/executor_config_adapter.go b/deployment/adapters/executor_config_adapter.go index fe57fcc67..73ecc84ff 100644 --- a/deployment/adapters/executor_config_adapter.go +++ b/deployment/adapters/executor_config_adapter.go @@ -50,6 +50,21 @@ func (a *CantonExecutorConfigAdapter) RequiresNodeChainSupportInJD() bool { return false } +// ResolveExecutorAddress resolves the Canton executor address for the given chain and +// qualifier from the datastore. +func (a *CantonExecutorConfigAdapter) ResolveExecutorAddress(ds datastore.DataStore, chainSelector uint64, qualifier string) (string, error) { + toAddress := func(ref datastore.AddressRef) (string, error) { return ref.Address, nil } + executorAddr, err := dsutils.FindAndFormatRef(ds, datastore.AddressRef{ + Type: datastore.ContractType(executor.ContractType), + Qualifier: qualifier, + Version: executor.Version, + }, chainSelector, toAddress) + if err != nil { + return "", fmt.Errorf("failed to get executor address for chain %d: %w", chainSelector, err) + } + return executorAddr, nil +} + func (a *CantonExecutorConfigAdapter) BuildChainConfig(ds datastore.DataStore, chainSelector uint64, qualifier string) (ccvexecutor.ChainConfiguration, error) { toAddress := func(ref datastore.AddressRef) (string, error) { return ref.Address, nil } @@ -69,13 +84,9 @@ func (a *CantonExecutorConfigAdapter) BuildChainConfig(ds datastore.DataStore, c return ccvexecutor.ChainConfiguration{}, fmt.Errorf("failed to get rmn remote address for chain %d: %w", chainSelector, err) } - executorAddr, err := dsutils.FindAndFormatRef(ds, datastore.AddressRef{ - Type: datastore.ContractType(executor.ContractType), - Qualifier: qualifier, - Version: executor.Version, - }, chainSelector, toAddress) + executorAddr, err := a.ResolveExecutorAddress(ds, chainSelector, qualifier) if err != nil { - return ccvexecutor.ChainConfiguration{}, fmt.Errorf("failed to get executor address for chain %d: %w", chainSelector, err) + return ccvexecutor.ChainConfiguration{}, err } return ccvexecutor.ChainConfiguration{ @@ -85,4 +96,4 @@ func (a *CantonExecutorConfigAdapter) BuildChainConfig(ds datastore.DataStore, c }, DefaultExecutorAddress: executorAddr, }, nil -} +} \ No newline at end of file diff --git a/deployment/adapters/verifier_config_adapter.go b/deployment/adapters/verifier_config_adapter.go index 3c72c7cfa..21b0726f2 100644 --- a/deployment/adapters/verifier_config_adapter.go +++ b/deployment/adapters/verifier_config_adapter.go @@ -10,7 +10,6 @@ import ( "github.com/smartcontractkit/chainlink-deployments-framework/datastore" "github.com/smartcontractkit/chainlink-canton/deployment/operations/ccip/committee_verifier" - "github.com/smartcontractkit/chainlink-canton/deployment/operations/ccip/executor" "github.com/smartcontractkit/chainlink-canton/deployment/operations/ccip/onramp" "github.com/smartcontractkit/chainlink-canton/deployment/operations/ccip/rmn_remote" ) @@ -56,15 +55,6 @@ func (a *CantonVerifierJobConfigAdapter) ResolveVerifierContractAddresses( return nil, fmt.Errorf("failed to get on ramp address for chain %d: %w", chainSelector, err) } - executorAddr, err := dsutils.FindAndFormatRef(ds, datastore.AddressRef{ - Type: datastore.ContractType(executor.ContractType), - Qualifier: executorQualifier, - Version: executor.Version, - }, chainSelector, toAddress) - if err != nil { - return nil, fmt.Errorf("failed to get executor address for chain %d: %w", chainSelector, err) - } - rmnRemoteAddr, err := dsutils.FindAndFormatRef(ds, datastore.AddressRef{ Type: datastore.ContractType(rmn_remote.ContractType), Version: rmn_remote.Version, @@ -76,7 +66,6 @@ func (a *CantonVerifierJobConfigAdapter) ResolveVerifierContractAddresses( return &ccvadapters.VerifierContractAddresses{ CommitteeVerifierAddress: committeeVerifierAddr, OnRampAddress: onRampAddr, - ExecutorProxyAddress: executorAddr, RMNRemoteAddress: rmnRemoteAddr, }, nil -} +} \ No newline at end of file From 140403332b2f4fc07b18344dfc57e264c47b703f Mon Sep 17 00:00:00 2001 From: Terry Tata Date: Wed, 8 Jul 2026 16:55:38 -0700 Subject: [PATCH 2/4] bump ccv --- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 58fa82e0e..0681ce931 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260702144426-865f1e5fe90d github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260708170746-8c3b42e257ba github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260708170746-8c3b42e257ba - github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703162011-f56568515e8a + github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260708170746-8c3b42e257ba github.com/smartcontractkit/chainlink-common v0.11.2-0.20260506120607-7f10be016c89 github.com/smartcontractkit/chainlink-deployments-framework v0.114.2 github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.6-0.20260708113039-95f97b2d25e9 diff --git a/go.sum b/go.sum index a1e5983bb..4eb522c13 100644 --- a/go.sum +++ b/go.sum @@ -1165,8 +1165,8 @@ github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260708170746-8c3b42e257ba h github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260708170746-8c3b42e257ba/go.mod h1:/PzCVgBhiTN7vWDgBDYgQYh1Ya0TQFhivC2hHZZUp4U= github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260708170746-8c3b42e257ba h1:Nt37kPJFCV0AYJQyQsV0J+mXGLTVHa3MyGuH7jV1jKI= github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260708170746-8c3b42e257ba/go.mod h1:Cn8TqXyI1ERb7V9JJxPQaeWGfPYpfbixV5ur4LvLYZU= -github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703162011-f56568515e8a h1:FAaAqMOqX4H/g2OXdQj01gNlKajeBF8SDZO2WhHbSPc= -github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703162011-f56568515e8a/go.mod h1:MUp3G8xL8EDpQOo5Me+HabfOMRgFqRYDGliAmW0nVx0= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260708170746-8c3b42e257ba h1:oYSGHkoM7rLrCTCfQ+1EnXOdlUnEU8ZGBGkeaU/WdZA= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260708170746-8c3b42e257ba/go.mod h1:MUp3G8xL8EDpQOo5Me+HabfOMRgFqRYDGliAmW0nVx0= github.com/smartcontractkit/chainlink-ccv/integration/evm v0.0.0-20260702145243-1bc05d9d7d3a h1:NFRZ6oiM7aTJ5Kz1G8t7izxB4on9qoTPCI5PTHeVP+8= github.com/smartcontractkit/chainlink-ccv/integration/evm v0.0.0-20260702145243-1bc05d9d7d3a/go.mod h1:3PUKLvizVRdanwr5NkLeTWnQIYsT3VmGKZPUqAcLfus= github.com/smartcontractkit/chainlink-common v0.11.2-0.20260506120607-7f10be016c89 h1:5z3LQ27MJmhiaeqp9S2TzbF5Wm4GGvUKAYOtE9AauR8= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 3d497e739..07bd16697 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -266,7 +266,7 @@ require ( github.com/smartcontractkit/chainlink-aptos v0.0.0-20260428085939-5c70de12dbfc // indirect github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260129103204-4c8453dd8139 // indirect github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260129103204-4c8453dd8139 // indirect - github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703162011-f56568515e8a // indirect + github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260708170746-8c3b42e257ba // indirect github.com/smartcontractkit/chainlink-common/keystore v1.0.2 // indirect github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260427132147-1ef18876ae9b // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 07a8c9f2d..d10becdd7 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -721,8 +721,8 @@ github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260708170746-8c3b42e257ba h github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260708170746-8c3b42e257ba/go.mod h1:/PzCVgBhiTN7vWDgBDYgQYh1Ya0TQFhivC2hHZZUp4U= github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260708170746-8c3b42e257ba h1:Nt37kPJFCV0AYJQyQsV0J+mXGLTVHa3MyGuH7jV1jKI= github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260708170746-8c3b42e257ba/go.mod h1:Cn8TqXyI1ERb7V9JJxPQaeWGfPYpfbixV5ur4LvLYZU= -github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703162011-f56568515e8a h1:FAaAqMOqX4H/g2OXdQj01gNlKajeBF8SDZO2WhHbSPc= -github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703162011-f56568515e8a/go.mod h1:MUp3G8xL8EDpQOo5Me+HabfOMRgFqRYDGliAmW0nVx0= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260708170746-8c3b42e257ba h1:oYSGHkoM7rLrCTCfQ+1EnXOdlUnEU8ZGBGkeaU/WdZA= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260708170746-8c3b42e257ba/go.mod h1:MUp3G8xL8EDpQOo5Me+HabfOMRgFqRYDGliAmW0nVx0= github.com/smartcontractkit/chainlink-common v0.11.2-0.20260506120607-7f10be016c89 h1:5z3LQ27MJmhiaeqp9S2TzbF5Wm4GGvUKAYOtE9AauR8= github.com/smartcontractkit/chainlink-common v0.11.2-0.20260506120607-7f10be016c89/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh6J5NCrex+wAgTYpWyHsyNPSXzsQ= From 72955ec5f9fb35b373ac5110d55002723e978526 Mon Sep 17 00:00:00 2001 From: Terry Tata Date: Wed, 8 Jul 2026 17:07:13 -0700 Subject: [PATCH 3/4] bump evm --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0681ce931..b51f82703 100644 --- a/go.mod +++ b/go.mod @@ -158,7 +158,7 @@ require ( github.com/segmentio/ksuid v1.0.4 // indirect github.com/sercand/kuberesolver/v6 v6.0.0 // indirect github.com/smartcontractkit/ccip-owner-contracts v0.1.0 // indirect - github.com/smartcontractkit/chainlink-ccv/integration/evm v0.0.0-20260702145243-1bc05d9d7d3a // indirect + github.com/smartcontractkit/chainlink-ccv/integration/evm v0.0.0-20260708170746-8c3b42e257ba // indirect github.com/smartcontractkit/chainlink-framework/chains v0.0.0-20260423135514-5b1a7565a99c // indirect github.com/smartcontractkit/chainlink-framework/metrics v0.0.0-20260423135514-5b1a7565a99c // indirect github.com/smartcontractkit/chainlink-framework/multinode v0.0.0-20260423135514-5b1a7565a99c // indirect diff --git a/go.sum b/go.sum index 4eb522c13..422cf5d32 100644 --- a/go.sum +++ b/go.sum @@ -1167,8 +1167,8 @@ github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260708170746-8 github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260708170746-8c3b42e257ba/go.mod h1:Cn8TqXyI1ERb7V9JJxPQaeWGfPYpfbixV5ur4LvLYZU= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260708170746-8c3b42e257ba h1:oYSGHkoM7rLrCTCfQ+1EnXOdlUnEU8ZGBGkeaU/WdZA= github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260708170746-8c3b42e257ba/go.mod h1:MUp3G8xL8EDpQOo5Me+HabfOMRgFqRYDGliAmW0nVx0= -github.com/smartcontractkit/chainlink-ccv/integration/evm v0.0.0-20260702145243-1bc05d9d7d3a h1:NFRZ6oiM7aTJ5Kz1G8t7izxB4on9qoTPCI5PTHeVP+8= -github.com/smartcontractkit/chainlink-ccv/integration/evm v0.0.0-20260702145243-1bc05d9d7d3a/go.mod h1:3PUKLvizVRdanwr5NkLeTWnQIYsT3VmGKZPUqAcLfus= +github.com/smartcontractkit/chainlink-ccv/integration/evm v0.0.0-20260708170746-8c3b42e257ba h1:7pUx6WRA7aVZvtFA2b6h6XGrSvGMZh0Fuz5H6uZqoLE= +github.com/smartcontractkit/chainlink-ccv/integration/evm v0.0.0-20260708170746-8c3b42e257ba/go.mod h1:eXon5VZbU+JJFv71BAKgL+HqJY/0l8ej4c4DJs/PC18= github.com/smartcontractkit/chainlink-common v0.11.2-0.20260506120607-7f10be016c89 h1:5z3LQ27MJmhiaeqp9S2TzbF5Wm4GGvUKAYOtE9AauR8= github.com/smartcontractkit/chainlink-common v0.11.2-0.20260506120607-7f10be016c89/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh6J5NCrex+wAgTYpWyHsyNPSXzsQ= From 38e1df77179cdf98dea511533abbf5d299047a89 Mon Sep 17 00:00:00 2001 From: Terry Tata Date: Wed, 8 Jul 2026 17:38:38 -0700 Subject: [PATCH 4/4] lint --- deployment/adapters/executor_config_adapter.go | 3 ++- deployment/adapters/verifier_config_adapter.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deployment/adapters/executor_config_adapter.go b/deployment/adapters/executor_config_adapter.go index 73ecc84ff..9419c319d 100644 --- a/deployment/adapters/executor_config_adapter.go +++ b/deployment/adapters/executor_config_adapter.go @@ -62,6 +62,7 @@ func (a *CantonExecutorConfigAdapter) ResolveExecutorAddress(ds datastore.DataSt if err != nil { return "", fmt.Errorf("failed to get executor address for chain %d: %w", chainSelector, err) } + return executorAddr, nil } @@ -96,4 +97,4 @@ func (a *CantonExecutorConfigAdapter) BuildChainConfig(ds datastore.DataStore, c }, DefaultExecutorAddress: executorAddr, }, nil -} \ No newline at end of file +} diff --git a/deployment/adapters/verifier_config_adapter.go b/deployment/adapters/verifier_config_adapter.go index 21b0726f2..902bf0863 100644 --- a/deployment/adapters/verifier_config_adapter.go +++ b/deployment/adapters/verifier_config_adapter.go @@ -68,4 +68,4 @@ func (a *CantonVerifierJobConfigAdapter) ResolveVerifierContractAddresses( OnRampAddress: onRampAddr, RMNRemoteAddress: rmnRemoteAddr, }, nil -} \ No newline at end of file +}