merge

Author: tt-cll

ccv/chains/evm/deployment/go.mod

@@ -17,10 +17,10 @@ require (
 	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/ethereum/go-ethereum v1.17.0
 	github.com/smartcontractkit/chain-selectors v1.0.97
-	github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260312161144-d895b42081a0
-	github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260312161144-d895b42081a0
-	github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment v0.0.0-20260312161144-d895b42081a0
-	github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260312161144-d895b42081a0
+	github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260312182032-b2b38700f19b
+	github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260312182032-b2b38700f19b
+	github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment v0.0.0-20260312182032-b2b38700f19b
+	github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260312182032-b2b38700f19b
 	github.com/smartcontractkit/chainlink-common v0.9.6-0.20260114142648-bd9e1b483e96
 	github.com/smartcontractkit/chainlink-deployments-framework v0.80.2
 	github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd

ccv/chains/evm/deployment/v1_7_0/adapters/committee_verifier_contract_adapter.go

@@ -0,0 +1,42 @@
+package adapters
+
+import (
+	"fmt"
+
+	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/latest/operations/committee_verifier"
+	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/versioned_verifier_resolver"
+	ccvadapters "github.com/smartcontractkit/chainlink-ccip/deployment/v1_7_0/adapters"
+	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
+)
+
+type EVMCommitteeVerifierContractAdapter struct{}
+
+var _ ccvadapters.CommitteeVerifierContractAdapter = (*EVMCommitteeVerifierContractAdapter)(nil)
+
+func (a *EVMCommitteeVerifierContractAdapter) ResolveCommitteeVerifierContracts(
+	ds datastore.DataStore,
+	chainSelector uint64,
+	qualifier string,
+) ([]datastore.AddressRef, error) {
+	verifier, err := ds.Addresses().Get(datastore.NewAddressRefKey(
+		chainSelector,
+		datastore.ContractType(committee_verifier.ContractType),
+		committee_verifier.Version,
+		qualifier,
+	))
+	if err != nil {
+		return nil, fmt.Errorf("committee verifier not found for chain %d qualifier %q: %w", chainSelector, qualifier, err)
+	}
+
+	resolver, err := ds.Addresses().Get(datastore.NewAddressRefKey(
+		chainSelector,
+		datastore.ContractType(versioned_verifier_resolver.CommitteeVerifierResolverType),
+		versioned_verifier_resolver.Version,
+		qualifier,
+	))
+	if err != nil {
+		return nil, fmt.Errorf("committee verifier resolver not found for chain %d qualifier %q: %w", chainSelector, qualifier, err)
+	}
+
+	return []datastore.AddressRef{verifier, resolver}, nil
+}

ccv/chains/evm/deployment/v1_7_0/adapters/deploy_chain_contracts_adapter.go

@@ -304,6 +304,7 @@ func convertMockReceivers(params []ccvadapters.MockReceiverDeployParams) []seque
 			RequiredVerifiers: mr.RequiredVerifiers,
 			OptionalVerifiers: mr.OptionalVerifiers,
 			OptionalThreshold: mr.OptionalThreshold,
+			MinimumBlockDepth: mr.MinimumBlockDepth,
 			Qualifier:         mr.Qualifier,
 		})
 	}

ccv/chains/evm/deployment/v1_7_0/adapters/indexer_config_adapter.go

@@ -5,7 +5,6 @@ import (
 
 	"github.com/Masterminds/semver/v3"
 
-	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/latest/operations/committee_verifier"
 	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/cctp_verifier"
 	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/lombard_verifier"
 	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/versioned_verifier_resolver"
@@ -48,7 +47,7 @@ func (a *EVMIndexerConfigAdapter) ResolveVerifierAddresses(
 func resolveContractMeta(kind ccvadapters.VerifierKind) (deployment.ContractType, *semver.Version, error) {
 	switch kind {
 	case ccvadapters.CommitteeVerifierKind:
-		return versioned_verifier_resolver.CommitteeVerifierResolverType, committee_verifier.Version, nil
+		return versioned_verifier_resolver.CommitteeVerifierResolverType, versioned_verifier_resolver.Version, nil
 	case ccvadapters.CCTPVerifierKind:
 		return cctp_verifier.ResolverType, cctp_verifier.Version, nil
 	case ccvadapters.LombardVerifierKind:

ccv/chains/evm/deployment/v1_7_0/adapters/init.go

@@ -29,9 +29,12 @@ func init() {
 	laneMigratorReg.RegisterRouterUpdater(chainsel.FamilyEVM, semver.MustParse("1.2.0"), &adapters1_2.RouterUpdater{})
 
 	lanes.GetLaneAdapterRegistry().RegisterLaneAdapter(chainsel.FamilyEVM, v, &ChainFamilyAdapter{})
+	ccvadapters.GetCommitteeVerifierContractRegistry().Register(chainsel.FamilyEVM, &EVMCommitteeVerifierContractAdapter{})
 	ccvadapters.GetExecutorConfigRegistry().Register(chainsel.FamilyEVM, &EVMExecutorConfigAdapter{})
+	ccvadapters.GetVerifierJobConfigRegistry().Register(chainsel.FamilyEVM, &EVMVerifierJobConfigAdapter{})
 	ccvadapters.GetDeployChainContractsRegistry().Register(chainsel.FamilyEVM, &EVMDeployChainContractsAdapter{})
 	ccvadapters.GetDeployChainContractsRegistry().RegisterConfigImporter(chainsel.FamilyEVM, semver.MustParse("1.6.0"), &adapters1_6.ConfigImportAdapter{})
 	ccvadapters.GetIndexerConfigRegistry().Register(chainsel.FamilyEVM, &EVMIndexerConfigAdapter{})
 	ccvadapters.GetAggregatorConfigRegistry().Register(chainsel.FamilyEVM, &EVMAggregatorConfigAdapter{})
+	ccvadapters.GetTokenVerifierConfigRegistry().Register(chainsel.FamilyEVM, &EVMTokenVerifierConfigAdapter{})
 }

ccv/chains/evm/deployment/v1_7_0/adapters/token_verifier_config_adapter.go

@@ -0,0 +1,78 @@
+package adapters
+
+import (
+	"fmt"
+
+	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/latest/operations/onramp"
+	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/cctp_verifier"
+	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/lombard_verifier"
+	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/rmn_remote"
+	dsutil "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore"
+	ccvadapters "github.com/smartcontractkit/chainlink-ccip/deployment/v1_7_0/adapters"
+	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
+)
+
+type EVMTokenVerifierConfigAdapter struct{}
+
+var _ ccvadapters.TokenVerifierConfigAdapter = (*EVMTokenVerifierConfigAdapter)(nil)
+
+func (a *EVMTokenVerifierConfigAdapter) ResolveTokenVerifierAddresses(
+	ds datastore.DataStore,
+	chainSelector uint64,
+	cctpQualifier string,
+	lombardQualifier string,
+) (*ccvadapters.TokenVerifierChainAddresses, error) {
+	toAddress := func(ref datastore.AddressRef) (string, error) { return ref.Address, nil }
+
+	onRampAddr, err := dsutil.FindAndFormatRef(ds, datastore.AddressRef{
+		Type: datastore.ContractType(onramp.ContractType),
+	}, chainSelector, toAddress)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get on ramp address for chain %d: %w", chainSelector, err)
+	}
+
+	rmnRemoteAddr, err := dsutil.FindAndFormatRef(ds, datastore.AddressRef{
+		Type: datastore.ContractType(rmn_remote.ContractType),
+	}, chainSelector, toAddress)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get rmn remote address for chain %d: %w", chainSelector, err)
+	}
+
+	result := &ccvadapters.TokenVerifierChainAddresses{
+		OnRampAddress:    onRampAddr,
+		RMNRemoteAddress: rmnRemoteAddr,
+	}
+
+	cctpVerifierAddr, cctpVerifierErr := dsutil.FindAndFormatRef(ds, datastore.AddressRef{
+		Type:      datastore.ContractType(cctp_verifier.ContractType),
+		Qualifier: cctpQualifier,
+	}, chainSelector, toAddress)
+
+	cctpResolverAddr, cctpResolverErr := dsutil.FindAndFormatRef(ds, datastore.AddressRef{
+		Type:      datastore.ContractType(cctp_verifier.ResolverType),
+		Qualifier: cctpQualifier,
+	}, chainSelector, toAddress)
+
+	if (cctpVerifierErr == nil) != (cctpResolverErr == nil) {
+		return nil, fmt.Errorf(
+			"chain %d: cctp verifier and resolver must both exist or both be absent (verifier error: %v, resolver error: %v)",
+			chainSelector, cctpVerifierErr, cctpResolverErr,
+		)
+	}
+
+	if cctpVerifierErr == nil {
+		result.CCTPVerifierAddress = cctpVerifierAddr
+		result.CCTPVerifierResolverAddress = cctpResolverAddr
+	}
+
+	lombardResolverAddr, lombardResolverErr := dsutil.FindAndFormatRef(ds, datastore.AddressRef{
+		Type:      datastore.ContractType(lombard_verifier.ResolverType),
+		Qualifier: lombardQualifier,
+	}, chainSelector, toAddress)
+
+	if lombardResolverErr == nil {
+		result.LombardVerifierResolverAddress = lombardResolverAddr
+	}
+
+	return result, nil
+}

ccv/chains/evm/deployment/v1_7_0/adapters/verifier_config_adapter.go

@@ -0,0 +1,72 @@
+package adapters
+
+import (
+	"fmt"
+
+	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/latest/operations/onramp"
+	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/versioned_verifier_resolver"
+	execcontract "github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/executor"
+	"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/operations/rmn_remote"
+	dsutil "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore"
+	ccvadapters "github.com/smartcontractkit/chainlink-ccip/deployment/v1_7_0/adapters"
+	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
+)
+
+type EVMVerifierJobConfigAdapter struct{}
+
+var _ ccvadapters.VerifierConfigAdapter = (*EVMVerifierJobConfigAdapter)(nil)
+
+func (a *EVMVerifierJobConfigAdapter) ResolveVerifierContractAddresses(
+	ds datastore.DataStore,
+	chainSelector uint64,
+	committeeQualifier string,
+	executorQualifier string,
+) (*ccvadapters.VerifierContractAddresses, error) {
+	toAddress := func(ref datastore.AddressRef) (string, error) { return ref.Address, nil }
+
+	committeeVerifierAddr, err := dsutil.FindAndFormatFirstRef(ds, chainSelector, toAddress,
+		datastore.AddressRef{
+			Type:      datastore.ContractType(versioned_verifier_resolver.CommitteeVerifierResolverType),
+			Qualifier: committeeQualifier,
+		},
+		datastore.AddressRef{
+			Type:      datastore.ContractType(versioned_verifier_resolver.CommitteeVerifierContractType),
+			Qualifier: committeeQualifier,
+		},
+	)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get committee verifier address for chain %d: %w", chainSelector, err)
+	}
+
+	onRampAddr, err := dsutil.FindAndFormatRef(ds, datastore.AddressRef{
+		Type:    datastore.ContractType(onramp.ContractType),
+		Version: onramp.Version,
+	}, chainSelector, toAddress)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get on ramp address for chain %d: %w", chainSelector, err)
+	}
+
+	executorAddr, err := dsutil.FindAndFormatRef(ds, datastore.AddressRef{
+		Type:      datastore.ContractType(execcontract.ProxyType),
+		Qualifier: executorQualifier,
+		Version:   execcontract.Version,
+	}, chainSelector, toAddress)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get executor proxy address for chain %d: %w", chainSelector, err)
+	}
+
+	rmnRemoteAddr, err := dsutil.FindAndFormatRef(ds, datastore.AddressRef{
+		Type:    datastore.ContractType(rmn_remote.ContractType),
+		Version: rmn_remote.Version,
+	}, chainSelector, toAddress)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get rmn remote address for chain %d: %w", chainSelector, err)
+	}
+
+	return &ccvadapters.VerifierContractAddresses{
+		CommitteeVerifierAddress: committeeVerifierAddr,
+		OnRampAddress:            onRampAddr,
+		ExecutorProxyAddress:     executorAddr,
+		RMNRemoteAddress:         rmnRemoteAddr,
+	}, nil
+}

ccv/chains/evm/deployment/v1_7_0/operations/versioned_verifier_resolver/versioned_verifier_resolver.go

@@ -12,6 +12,7 @@ import (
 )
 
 var ContractType cldf_deployment.ContractType = "VersionedVerifierResolver"
+var CommitteeVerifierContractType cldf_deployment.ContractType = "CommitteeVerifier"
 var CommitteeVerifierResolverType cldf_deployment.ContractType = "CommitteeVerifierResolver"
 
 var Version = semver.MustParse("1.7.0")

deployment/.mockery.yaml

@@ -6,3 +6,10 @@ packages:
       filename: mock_jd_client.go
     interfaces:
       JDClient:
+  github.com/smartcontractkit/chainlink-deployments-framework/offchain:
+    config:
+      dir: ./v1_7_0/mocks
+      pkgname: mocks
+      filename: mock_offchain_client.go
+    interfaces:
+      Client:

deployment/v1_7_0/adapters/committee_verifier_contract.go

@@ -0,0 +1,67 @@
+package adapters
+
+import (
+	"fmt"
+	"sync"
+
+	chainsel "github.com/smartcontractkit/chain-selectors"
+	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
+)
+
+type CommitteeVerifierContractAdapter interface {
+	ResolveCommitteeVerifierContracts(
+		ds datastore.DataStore,
+		chainSelector uint64,
+		qualifier string,
+	) ([]datastore.AddressRef, error)
+}
+
+type CommitteeVerifierContractRegistry struct {
+	mu       sync.Mutex
+	adapters map[string]CommitteeVerifierContractAdapter
+}
+
+var (
+	singletonCommitteeVerifierContractRegistry *CommitteeVerifierContractRegistry
+	committeeVerifierContractRegistryOnce      sync.Once
+)
+
+func NewCommitteeVerifierContractRegistry() *CommitteeVerifierContractRegistry {
+	return &CommitteeVerifierContractRegistry{
+		adapters: make(map[string]CommitteeVerifierContractAdapter),
+	}
+}
+
+func GetCommitteeVerifierContractRegistry() *CommitteeVerifierContractRegistry {
+	committeeVerifierContractRegistryOnce.Do(func() {
+		singletonCommitteeVerifierContractRegistry = NewCommitteeVerifierContractRegistry()
+	})
+	return singletonCommitteeVerifierContractRegistry
+}
+
+func (r *CommitteeVerifierContractRegistry) Register(family string, a CommitteeVerifierContractAdapter) {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+	if _, exists := r.adapters[family]; !exists {
+		r.adapters[family] = a
+	}
+}
+
+func (r *CommitteeVerifierContractRegistry) Get(family string) (CommitteeVerifierContractAdapter, bool) {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+	a, ok := r.adapters[family]
+	return a, ok
+}
+
+func (r *CommitteeVerifierContractRegistry) GetByChain(chainSelector uint64) (CommitteeVerifierContractAdapter, error) {
+	family, err := chainsel.GetSelectorFamily(chainSelector)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get chain family for selector %d: %w", chainSelector, err)
+	}
+	adapter, ok := r.Get(family)
+	if !ok {
+		return nil, fmt.Errorf("no committee verifier contract adapter registered for chain family %q", family)
+	}
+	return adapter, nil
+}