Skip to content

bump ccv and fix deployment adapters #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tt-cll merged 4 commits into from
Jul 9, 2026
Merged

bump ccv and fix deployment adapters #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f7feec
fix adapter
tt-cll Jul 8, 2026
1404033
bump ccv
tt-cll Jul 8, 2026
72955ec
bump evm
tt-cll Jul 9, 2026
38e1df7
lint
tt-cll Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions deployment/adapters/executor_config_adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,22 @@ 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 }

Expand All @@ -69,13 +85,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{
Expand Down
11 changes: 0 additions & 11 deletions deployment/adapters/verifier_config_adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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,
Expand All @@ -76,7 +66,6 @@ func (a *CantonVerifierJobConfigAdapter) ResolveVerifierContractAddresses(
return &ccvadapters.VerifierContractAddresses{
CommitteeVerifierAddress: committeeVerifierAddr,
OnRampAddress: onRampAddr,
ExecutorProxyAddress: executorAddr,
RMNRemoteAddress: rmnRemoteAddr,
}, nil
}
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,10 +1165,10 @@ 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/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/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-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=
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
Loading