From 2ad069cdf7f4948fe10c35cea1f6ccc5a9c7ca9e Mon Sep 17 00:00:00 2001 From: Terry Tata Date: Thu, 9 Jul 2026 11:46:16 -0700 Subject: [PATCH 1/2] bump ccv --- deployment/adapters/init.go | 18 +++++++++--------- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- integration-tests/go.mod | 6 +++--- integration-tests/go.sum | 12 ++++++------ 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/deployment/adapters/init.go b/deployment/adapters/init.go index fb77dcb6d..f3d63e273 100644 --- a/deployment/adapters/init.go +++ b/deployment/adapters/init.go @@ -38,15 +38,15 @@ func init() { ccipadapters.GetChainFamilyRegistry().RegisterChainFamily(chainsel.FamilyCanton, &cantonChainFamilyWithDataStoreCache{}) ccipdeploy.GetTransferOwnershipRegistry().RegisterAdapter(chainsel.FamilyCanton, ccipdeploy.MCMSVersion, &CantonTransferOwnershipAdapter{}) - // Register the offchain adapters - ccvadapters.GetRegistry().Register(chainsel.FamilyCanton, ccvadapters.ChainAdapters{ - Aggregator: &CantonAggregatorConfigAdapter{}, - Executor: &CantonExecutorConfigAdapter{}, - Verifier: &CantonVerifierJobConfigAdapter{}, - Indexer: &CantonIndexerConfigAdapter{}, - CommitteeVerifierOnchain: &CantonCommitteeVerifierOnchain{}, - TokenVerifier: nil, // not implemented yet - }) + // Register the offchain adapters into the ccv per-type singleton registries. + // The legacy GetRegistry().Register(ChainAdapters{}) shim was removed in the + // ccv adapter-registration cleanup, so each adapter type registers on its own. + // TokenVerifier is not implemented for canton yet. + ccvadapters.GetAggregatorRegistry().Register(chainsel.FamilyCanton, &CantonAggregatorConfigAdapter{}) + ccvadapters.GetExecutorRegistry().Register(chainsel.FamilyCanton, &CantonExecutorConfigAdapter{}) + ccvadapters.GetVerifierRegistry().Register(chainsel.FamilyCanton, &CantonVerifierJobConfigAdapter{}) + ccvadapters.GetIndexerRegistry().Register(chainsel.FamilyCanton, &CantonIndexerConfigAdapter{}) + ccvadapters.GetCommitteeVerifierOnchainRegistry().Register(chainsel.FamilyCanton, &CantonCommitteeVerifierOnchain{}) lanes.GetLaneAdapterRegistry().RegisterLaneAdapter(chainsel.FamilyCanton, semver.MustParse("2.0.0"), CantonLaneAdapter{}) mcmsreaderapi.GetRegistry().RegisterMCMSReader(chainsel.FamilyCanton, &CantonMCMSReader{}) diff --git a/go.mod b/go.mod index b51f82703..a22826174 100644 --- a/go.mod +++ b/go.mod @@ -35,9 +35,9 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.104 github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260702144426-865f1e5fe90d 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.20260708170746-8c3b42e257ba + github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260709174019-f20ea93af300 + github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260709174019-f20ea93af300 + github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260709174019-f20ea93af300 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 @@ -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-20260708170746-8c3b42e257ba // indirect + github.com/smartcontractkit/chainlink-ccv/integration/evm v0.0.2-0.20260709174019-f20ea93af300 // 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 422cf5d32..82d178476 100644 --- a/go.sum +++ b/go.sum @@ -1161,14 +1161,14 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260129103204-4c8453dd8139/go.mod h1:1WcontO9PeuKdUf5HXfs3nuICtzUvFNnyCmrHkTCF9Y= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260702144426-865f1e5fe90d h1:ur6iz6AwuK6iBoAAAM8KMlEJb5Y7ihlJ4fk0acw2mJw= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260702144426-865f1e5fe90d/go.mod h1:7VW7TwL0yIOQIoe39YwUfwYkt9P79tDR4Pb0h/Q7P3E= -github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260708170746-8c3b42e257ba h1:vhzL6VxlQ+QjIYw4ULJBgDgYdJ8m9fskDD/nWESQARI= -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.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-ccv v0.0.2-0.20260709174019-f20ea93af300 h1:UEZdHYGIQ7jsg630iPNuXJroU/AtQjm6RyAdFzVMHBQ= +github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260709174019-f20ea93af300/go.mod h1:Y9XY8iqp8k8zzg7fMPJr7P5ch46lR5Kaf1gnMADY0u8= +github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260709174019-f20ea93af300 h1:OJqNR4i/cj5aix92PbpXzBPQfjMtwaKxDW87EEbghbM= +github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260709174019-f20ea93af300/go.mod h1:Cn8TqXyI1ERb7V9JJxPQaeWGfPYpfbixV5ur4LvLYZU= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260709174019-f20ea93af300 h1:Im1fLyxtwXKf5cDrNVDCMo1c7LKJUNclrj43sIDAJOY= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260709174019-f20ea93af300/go.mod h1:MUp3G8xL8EDpQOo5Me+HabfOMRgFqRYDGliAmW0nVx0= +github.com/smartcontractkit/chainlink-ccv/integration/evm v0.0.2-0.20260709174019-f20ea93af300 h1:Pfkaxl3jWBT+3Czp5ueVwBbzHcD+IrdtVLAxkuOrerE= +github.com/smartcontractkit/chainlink-ccv/integration/evm v0.0.2-0.20260709174019-f20ea93af300/go.mod h1:m8+AldVoHR1f2OvRiSNZj6RROhwQAmlqIv/VOUhHnPo= 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= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 07bd16697..a79b32f12 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -27,8 +27,8 @@ require ( github.com/smartcontractkit/chainlink-canton/party-ceremony v0.0.0-00010101000000-000000000000 github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260702144426-865f1e5fe90d 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 v0.0.2-0.20260709174019-f20ea93af300 + github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260709174019-f20ea93af300 github.com/smartcontractkit/chainlink-common v0.11.2-0.20260506120607-7f10be016c89 github.com/smartcontractkit/chainlink-deployments-framework v0.114.2 github.com/smartcontractkit/freeport v0.1.3-0.20250828155247-add56fa28aad @@ -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.20260708170746-8c3b42e257ba // indirect + github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260709174019-f20ea93af300 // 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 d10becdd7..826b67516 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -717,12 +717,12 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260129103204-4c8453dd8139/go.mod h1:1WcontO9PeuKdUf5HXfs3nuICtzUvFNnyCmrHkTCF9Y= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260702144426-865f1e5fe90d h1:ur6iz6AwuK6iBoAAAM8KMlEJb5Y7ihlJ4fk0acw2mJw= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260702144426-865f1e5fe90d/go.mod h1:7VW7TwL0yIOQIoe39YwUfwYkt9P79tDR4Pb0h/Q7P3E= -github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260708170746-8c3b42e257ba h1:vhzL6VxlQ+QjIYw4ULJBgDgYdJ8m9fskDD/nWESQARI= -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.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 v0.0.2-0.20260709174019-f20ea93af300 h1:UEZdHYGIQ7jsg630iPNuXJroU/AtQjm6RyAdFzVMHBQ= +github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260709174019-f20ea93af300/go.mod h1:Y9XY8iqp8k8zzg7fMPJr7P5ch46lR5Kaf1gnMADY0u8= +github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260709174019-f20ea93af300 h1:OJqNR4i/cj5aix92PbpXzBPQfjMtwaKxDW87EEbghbM= +github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260709174019-f20ea93af300/go.mod h1:Cn8TqXyI1ERb7V9JJxPQaeWGfPYpfbixV5ur4LvLYZU= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260709174019-f20ea93af300 h1:Im1fLyxtwXKf5cDrNVDCMo1c7LKJUNclrj43sIDAJOY= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260709174019-f20ea93af300/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 68a4a348012c0dd80d18eb603977ba5e158b7ed3 Mon Sep 17 00:00:00 2001 From: Terry Tata Date: Thu, 9 Jul 2026 12:07:58 -0700 Subject: [PATCH 2/2] bump ref --- .github/actions/setup-ccip-devenv/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-ccip-devenv/action.yml b/.github/actions/setup-ccip-devenv/action.yml index c83e1df41..4ad9f2a15 100644 --- a/.github/actions/setup-ccip-devenv/action.yml +++ b/.github/actions/setup-ccip-devenv/action.yml @@ -11,7 +11,7 @@ inputs: # builds the verifier/devenv Docker images, while go.mod pins the `ccv up` tooling # that generates their configs. A mismatch across config-format changes (e.g. #1193 # bootstrap monitoring.Config) makes the verifier container exit on startup. - default: 8c3b42e257ba81dbb2d45f8a8a987e1a33eaefff + default: f20ea93af3005f17859ca1d7e6529e0121a0430c canton-ref: description: >- chainlink-canton git ref. Leave empty to use the ref that triggered the workflow.