Skip to content

Commit 73fcb20

Browse files
tt-cllCopilot
tt-cll
and
Copilot
authored
combine 1.6 and 2.0 connect lanes (#1794)
* wip * compile * wip * paths * might be passing * skip populate pre 2 * add canton * comments * x-ref * x-ref * Update deployment/lanes/connect_chains.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update ccv/chains/evm/deployment/v1_7_0/sequences/configure_chain_for_lanes.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * simplify due to infer * tests * bugs * merge conflicts * fq param split * cv split * gomod * bad merge * tests * make generate --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 2975185 commit 73fcb20

29 files changed

+1477
-2197
lines changed

‎ccv/chains/evm/deployment/go.mod‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ go 1.25.5
55
// Taken from CLDF go.mod: https://github.com/smartcontractkit/chainlink-deployments-framework/blob/main/go.mod
66
replace github.com/fbsobreira/gotron-sdk => github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.4
77

8-
// TODO: remove this local replace once chainlink-ccip/deployment is published with the adapter changes
8+
replace github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm => ../.
9+
10+
replace github.com/smartcontractkit/chainlink-ccip => ../../../../.
11+
912
replace github.com/smartcontractkit/chainlink-ccip/deployment => ../../../../deployment
1013

11-
// TODO: remove this local replace once chains/evm/deployment is published with the adapter changes
1214
replace github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment => ../../../../chains/evm/deployment
1315

1416
require (

‎ccv/chains/evm/deployment/go.sum‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -729,10 +729,6 @@ github.com/smartcontractkit/chain-selectors v1.0.97 h1:ECOin+SkJv2MUrfqTUu28J0ku
729729
github.com/smartcontractkit/chain-selectors v1.0.97/go.mod h1:qy7whtgG5g+7z0jt0nRyii9bLND9m15NZTzuQPkMZ5w=
730730
github.com/smartcontractkit/chainlink-aptos v0.0.0-20251024142440-51f2ad2652a2 h1:vGdeMwHO3ow88HvxfhA4DDPYNY0X9jmdux7L83UF/W8=
731731
github.com/smartcontractkit/chainlink-aptos v0.0.0-20251024142440-51f2ad2652a2/go.mod h1:iteU0WORHkArACVh/HoY/1bipV4TcNcJdTmom9uIT0E=
732-
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260312182032-b2b38700f19b h1:bbOmh4svjpzzvXv1pXljN8zUop8L/aTO4HM4t/wgdVs=
733-
github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260312182032-b2b38700f19b/go.mod h1:hl57wj/oxsh+ieJkvTkYxyB6+Gv22QiVjjcmh7fa0AI=
734-
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260312182032-b2b38700f19b h1:xMMmdrNH/UM/pdSbvLbjG22NY0zut7sGJcU36yLzS2g=
735-
github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260312182032-b2b38700f19b/go.mod h1:Zp8erzWAVrADEhbR0EjhWFbEdr98Sdz4yb0LKKMccA8=
736732
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260121163256-85accaf3d28d h1:xdFpzbApEMz4Rojg2Y2OjFlrh0wu7eB10V2tSZGW5y8=
737733
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260121163256-85accaf3d28d/go.mod h1:bgmqE7x9xwmIVr8PqLbC0M5iPm4AV2DBl596lO6S5Sw=
738734
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250912190424-fd2e35d7deb5 h1:Z4t2ZY+ZyGWxtcXvPr11y4o3CGqhg3frJB5jXkCSvWA=

‎ccv/chains/evm/deployment/v1_7_0/adapters/chain_family.go‎

Lines changed: 63 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,80 @@
11
package adapters
22

33
import (
4-
"github.com/ethereum/go-ethereum/common"
5-
64
seq_core "github.com/smartcontractkit/chainlink-ccip/deployment/utils/sequences"
7-
"github.com/smartcontractkit/chainlink-ccip/deployment/v1_7_0/adapters"
85
"github.com/smartcontractkit/chainlink-deployments-framework/chain"
96
"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
107
"github.com/smartcontractkit/chainlink-deployments-framework/operations"
118

129
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/sequences"
10+
11+
datastore_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore"
12+
13+
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/latest/operations/offramp"
14+
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/latest/operations/onramp"
15+
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v2_0_0/operations/fee_quoter"
16+
evm_datastore_utils "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/datastore"
17+
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_2_0/operations/router"
18+
"github.com/smartcontractkit/chainlink-ccip/deployment/lanes"
1319
)
1420

1521
// ChainFamilyAdapter is the adapter for chains of the EVM family.
1622
type ChainFamilyAdapter struct{}
1723

18-
// ConfigureChainForLanesSequence returns the sequence for configuring a chain of the EVM family for CCIP lanes.
19-
func (c *ChainFamilyAdapter) ConfigureChainForLanes() *operations.Sequence[adapters.ConfigureChainForLanesInput, seq_core.OnChainOutput, chain.BlockChains] {
20-
return sequences.ConfigureChainForLanes
24+
// ConfigureLaneLegAsSource returns the sequence for configuring a chain of the EVM family as a source chain for CCIP lanes.
25+
func (c *ChainFamilyAdapter) ConfigureLaneLegAsSource() *operations.Sequence[lanes.UpdateLanesInput, seq_core.OnChainOutput, chain.BlockChains] {
26+
return sequences.ConfigureLaneLegAsSource
27+
}
28+
29+
// ConfigureLaneLegAsDest returns the sequence for configuring a chain of the EVM family as a destination chain for CCIP lanes.
30+
func (c *ChainFamilyAdapter) ConfigureLaneLegAsDest() *operations.Sequence[lanes.UpdateLanesInput, seq_core.OnChainOutput, chain.BlockChains] {
31+
return sequences.ConfigureLaneLegAsDest
32+
}
33+
34+
func (a *ChainFamilyAdapter) GetOnRampAddress(ds datastore.DataStore, chainSelector uint64) ([]byte, error) {
35+
addr, err := datastore_utils.FindAndFormatRef(ds, datastore.AddressRef{
36+
ChainSelector: chainSelector,
37+
Type: datastore.ContractType(onramp.ContractType),
38+
Version: onramp.Version,
39+
}, chainSelector, evm_datastore_utils.ToEVMAddressBytes)
40+
if err != nil {
41+
return nil, err
42+
}
43+
return addr, nil
44+
}
45+
46+
func (a *ChainFamilyAdapter) GetOffRampAddress(ds datastore.DataStore, chainSelector uint64) ([]byte, error) {
47+
addr, err := datastore_utils.FindAndFormatRef(ds, datastore.AddressRef{
48+
ChainSelector: chainSelector,
49+
Type: datastore.ContractType(offramp.ContractType),
50+
Version: offramp.Version,
51+
}, chainSelector, evm_datastore_utils.ToEVMAddressBytes)
52+
if err != nil {
53+
return nil, err
54+
}
55+
return addr, nil
56+
}
57+
58+
func (a *ChainFamilyAdapter) GetFQAddress(ds datastore.DataStore, chainSelector uint64) ([]byte, error) {
59+
addr, err := datastore_utils.FindAndFormatRef(ds, datastore.AddressRef{
60+
ChainSelector: chainSelector,
61+
Type: datastore.ContractType(fee_quoter.ContractType),
62+
Version: fee_quoter.Version,
63+
}, chainSelector, evm_datastore_utils.ToEVMAddressBytes)
64+
if err != nil {
65+
return nil, err
66+
}
67+
return addr, nil
2168
}
2269

23-
// AddressRefToBytes returns the byte representation of an address for this chain family.
24-
func (c *ChainFamilyAdapter) AddressRefToBytes(ref datastore.AddressRef) ([]byte, error) {
25-
return common.HexToAddress(ref.Address).Bytes(), nil
70+
func (a *ChainFamilyAdapter) GetRouterAddress(ds datastore.DataStore, chainSelector uint64) ([]byte, error) {
71+
addr, err := datastore_utils.FindAndFormatRef(ds, datastore.AddressRef{
72+
ChainSelector: chainSelector,
73+
Type: datastore.ContractType(router.ContractType),
74+
Version: router.Version,
75+
}, chainSelector, evm_datastore_utils.ToEVMAddressBytes)
76+
if err != nil {
77+
return nil, err
78+
}
79+
return addr, nil
2680
}

‎ccv/chains/evm/deployment/v1_7_0/adapters/chain_family_test.go‎

Lines changed: 43 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -8,99 +8,66 @@ import (
88
"github.com/stretchr/testify/require"
99

1010
contract_utils "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/operations/contract"
11-
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_2_0/operations/router"
11+
"github.com/smartcontractkit/chainlink-ccip/deployment/lanes"
12+
"github.com/smartcontractkit/chainlink-ccip/deployment/utils/changesets"
1213
"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
1314
"github.com/smartcontractkit/chainlink-deployments-framework/deployment"
1415
"github.com/smartcontractkit/chainlink-deployments-framework/engine/test/environment"
1516

16-
"github.com/smartcontractkit/chainlink-ccip/deployment/utils/changesets"
17-
"github.com/smartcontractkit/chainlink-ccip/deployment/v1_7_0/adapters"
18-
v1_7_0_changesets "github.com/smartcontractkit/chainlink-ccip/deployment/v1_7_0/changesets"
19-
2017
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/latest/operations/committee_verifier"
21-
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/latest/operations/offramp"
22-
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/latest/operations/onramp"
23-
evm_adapters "github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/adapters"
2418
v1_7_0 "github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/changesets"
2519
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/create2_factory"
2620
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/executor"
2721
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/sequences"
2822
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/testsetup"
29-
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v2_0_0/operations/fee_quoter"
3023
)
3124

32-
func makeChainConfig(chainSelector uint64, remoteChainSelector uint64) v1_7_0_changesets.ChainConfig {
33-
return v1_7_0_changesets.ChainConfig{
34-
ChainSelector: chainSelector,
35-
Router: datastore.AddressRef{
36-
Type: datastore.ContractType(router.ContractType),
37-
Version: router.Version,
38-
},
39-
OnRamp: datastore.AddressRef{
40-
Type: datastore.ContractType(onramp.ContractType),
41-
Version: onramp.Version,
42-
},
43-
CommitteeVerifiers: []adapters.CommitteeVerifierConfig[datastore.AddressRef]{
25+
func makeChainConfig(chainSelector uint64, remoteChainSelector uint64) lanes.ChainDefinition {
26+
return lanes.ChainDefinition{
27+
Selector: chainSelector,
28+
CommitteeVerifiers: []lanes.CommitteeVerifierConfig[datastore.AddressRef]{
4429
{
4530
CommitteeVerifier: []datastore.AddressRef{
4631
{
47-
Type: datastore.ContractType(committee_verifier.ContractType),
48-
Version: committee_verifier.Version,
32+
ChainSelector: chainSelector,
33+
Type: datastore.ContractType(committee_verifier.ContractType),
34+
Version: committee_verifier.Version,
4935
},
5036
{
51-
Type: datastore.ContractType(sequences.CommitteeVerifierResolverType),
52-
Version: semver.MustParse("1.7.0"),
37+
ChainSelector: chainSelector,
38+
Type: datastore.ContractType(sequences.CommitteeVerifierResolverType),
39+
Version: semver.MustParse("1.7.0"),
5340
},
5441
},
55-
RemoteChains: map[uint64]adapters.CommitteeVerifierRemoteChainConfig{
42+
RemoteChains: map[uint64]lanes.CommitteeVerifierRemoteChainConfig{
5643
remoteChainSelector: testsetup.CreateBasicCommitteeVerifierRemoteChainConfig(),
5744
},
5845
},
5946
},
60-
FeeQuoter: datastore.AddressRef{
61-
Type: datastore.ContractType(fee_quoter.ContractType),
62-
Version: fee_quoter.Version,
63-
},
64-
OffRamp: datastore.AddressRef{
65-
Type: datastore.ContractType(offramp.ContractType),
66-
Version: offramp.Version,
47+
DefaultInboundCCVs: []datastore.AddressRef{
48+
{
49+
ChainSelector: chainSelector,
50+
Type: datastore.ContractType(committee_verifier.ContractType),
51+
Version: committee_verifier.Version,
52+
},
6753
},
68-
RemoteChains: map[uint64]adapters.RemoteChainConfig[datastore.AddressRef, datastore.AddressRef]{
69-
remoteChainSelector: {
70-
AllowTrafficFrom: true,
71-
OnRamps: []datastore.AddressRef{
72-
{
73-
Type: datastore.ContractType(onramp.ContractType),
74-
Version: onramp.Version,
75-
},
76-
},
77-
OffRamp: datastore.AddressRef{
78-
Type: datastore.ContractType(offramp.ContractType),
79-
Version: offramp.Version,
80-
},
81-
DefaultInboundCCVs: []datastore.AddressRef{
82-
{
83-
Type: datastore.ContractType(committee_verifier.ContractType),
84-
Version: committee_verifier.Version,
85-
},
86-
},
87-
DefaultOutboundCCVs: []datastore.AddressRef{
88-
{
89-
Type: datastore.ContractType(committee_verifier.ContractType),
90-
Version: committee_verifier.Version,
91-
},
92-
},
93-
DefaultExecutor: datastore.AddressRef{
94-
Type: datastore.ContractType(executor.ProxyType),
95-
Version: executor.Version,
96-
Qualifier: "default",
97-
},
98-
FeeQuoterDestChainConfig: testsetup.CreateBasicFeeQuoterDestChainConfig(),
99-
ExecutorDestChainConfig: testsetup.CreateBasicExecutorDestChainConfig(),
100-
AddressBytesLength: 20,
101-
BaseExecutionGasCost: 80_000,
54+
DefaultOutboundCCVs: []datastore.AddressRef{
55+
{
56+
ChainSelector: chainSelector,
57+
Type: datastore.ContractType(committee_verifier.ContractType),
58+
Version: committee_verifier.Version,
10259
},
10360
},
61+
DefaultExecutor: datastore.AddressRef{
62+
ChainSelector: chainSelector,
63+
Type: datastore.ContractType(executor.ProxyType),
64+
Version: executor.Version,
65+
Qualifier: "default",
66+
},
67+
FeeQuoterDestChainConfig: testsetup.CreateBasicFeeQuoterDestChainConfig(),
68+
ExecutorDestChainConfig: testsetup.CreateBasicExecutorDestChainConfig(),
69+
AddressBytesLength: 20,
70+
BaseExecutionGasCost: 80_000,
10471
}
10572
}
10673

@@ -122,8 +89,7 @@ func TestChainFamilyAdapter(t *testing.T) {
12289
require.NoError(t, err, "Failed to create test environment")
12390
require.NotNil(t, e, "Environment should be created")
12491

125-
chainFamilyRegistry := adapters.NewChainFamilyRegistry()
126-
chainFamilyRegistry.RegisterChainFamily("evm", &evm_adapters.ChainFamilyAdapter{})
92+
chainFamilyRegistry := lanes.GetLaneAdapterRegistry()
12793
mcmsRegistry := changesets.GetRegistry()
12894

12995
// On each chain, deploy chain contracts
@@ -156,13 +122,16 @@ func TestChainFamilyAdapter(t *testing.T) {
156122

157123
// Configure chains for lanes
158124
e.OperationsBundle = testsetup.BundleWithFreshReporter(e.OperationsBundle)
159-
_, err = v1_7_0_changesets.ConfigureChainsForLanes(chainFamilyRegistry, mcmsRegistry).Apply(*e, v1_7_0_changesets.ConfigureChainsForLanesConfig{
160-
Chains: []v1_7_0_changesets.ChainConfig{
161-
makeChainConfig(chainA, chainB),
162-
makeChainConfig(chainB, chainA),
125+
_, err = lanes.ConnectChains(chainFamilyRegistry, mcmsRegistry).Apply(*e, lanes.ConnectChainsConfig{
126+
Lanes: []lanes.LaneConfig{
127+
{
128+
ChainA: makeChainConfig(chainA, chainB),
129+
ChainB: makeChainConfig(chainB, chainA),
130+
Version: semver.MustParse("2.0.0"),
131+
},
163132
},
164133
})
165-
require.NoError(t, err, "Failed to apply ConfigureChainsForLanes changeset")
134+
require.NoError(t, err, "Failed to apply ConnectChains changeset")
166135
})
167136
}
168137
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ import (
1010
adapters1_5 "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_5_0/adapters"
1111
adapters1_6 "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_0/adapters"
1212
"github.com/smartcontractkit/chainlink-ccip/deployment/deploy"
13+
14+
"github.com/smartcontractkit/chainlink-ccip/deployment/lanes"
1315
ccvadapters "github.com/smartcontractkit/chainlink-ccip/deployment/v1_7_0/adapters"
1416
)
1517

1618
func init() {
19+
v := semver.MustParse("2.0.0")
1720
fqReg := deploy.GetFQAndRampUpdaterRegistry()
1821
fqReg.RegisterFeeQuoterUpdater(chainsel.FamilyEVM, semver.MustParse("2.0.0"), adapters2_0.FeeQuoterUpdater[any]{})
1922
fqReg.RegisterRampUpdater(chainsel.FamilyEVM, semver.MustParse("1.6.0"), adapters1_6.RampUpdateWithFQ{})
@@ -25,6 +28,7 @@ func init() {
2528
laneMigratorReg.RegisterRampUpdater(chainsel.FamilyEVM, semver.MustParse("2.0.0"), &LaneMigrator{})
2629
laneMigratorReg.RegisterRouterUpdater(chainsel.FamilyEVM, semver.MustParse("1.2.0"), &adapters1_2.RouterUpdater{})
2730

31+
lanes.GetLaneAdapterRegistry().RegisterLaneAdapter(chainsel.FamilyEVM, v, &ChainFamilyAdapter{})
2832
ccvadapters.GetCommitteeVerifierContractRegistry().Register(chainsel.FamilyEVM, &EVMCommitteeVerifierContractAdapter{})
2933
ccvadapters.GetExecutorConfigRegistry().Register(chainsel.FamilyEVM, &EVMExecutorConfigAdapter{})
3034
ccvadapters.GetVerifierJobConfigRegistry().Register(chainsel.FamilyEVM, &EVMVerifierJobConfigAdapter{})

‎ccv/chains/evm/deployment/v1_7_0/adapters/lanemigrator.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type LaneMigrator struct{}
3636
// It fetches the existing onRamp and offRamp addresses from the provided ExistingAddresses, then calls the necessary functions to update the onRamp and offRamp to use the new Router.
3737
//
3838
// This sequence assumes that the destChainConfig on OnRamp and SourceChainConfig on OffRamp do not need to be updated, and only updates the Router address used by the Ramps.
39-
// If you need to update the destChainConfig or sourceChainConfig, please use the ConfigureChainForLanes sequence instead.
39+
// If you need to update the destChainConfig or sourceChainConfig, please use the ConnectChains sequence instead.
4040
func (r *LaneMigrator) UpdateVersionWithRouter() *cldf_ops.Sequence[deploy.RampUpdaterConfig, sequences.OnChainOutput, chain.BlockChains] {
4141
return cldf_ops.NewSequence(
4242
"ramp-updater:sequence-update-ramps-with-router",

‎ccv/chains/evm/deployment/v1_7_0/adapters/lanemigrator_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@ import (
1414
evm_datastore_utils "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/datastore"
1515
contract_utils "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/operations/contract"
1616
"github.com/smartcontractkit/chainlink-ccip/deployment/deploy"
17+
"github.com/smartcontractkit/chainlink-ccip/deployment/lanes"
1718
"github.com/smartcontractkit/chainlink-ccip/deployment/utils/changesets"
1819
datastore_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore"
19-
"github.com/smartcontractkit/chainlink-ccip/deployment/v1_7_0/adapters"
20-
v1_7_0_changesets "github.com/smartcontractkit/chainlink-ccip/deployment/v1_7_0/changesets"
2120

22-
evm_adapters "github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/adapters"
2321
v1_7_0 "github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/changesets"
2422
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/operations/create2_factory"
2523
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/testsetup"
@@ -43,8 +41,7 @@ func TestLaneMigrator(t *testing.T) {
4341
require.NoError(t, err, "Failed to create test environment")
4442
require.NotNil(t, e, "Environment should be created")
4543

46-
chainFamilyRegistry := adapters.NewChainFamilyRegistry()
47-
chainFamilyRegistry.RegisterChainFamily("evm", &evm_adapters.ChainFamilyAdapter{})
44+
chainFamilyRegistry := lanes.GetLaneAdapterRegistry()
4845
mcmsRegistry := changesets.GetRegistry()
4946

5047
// On each chain, deploy chain contracts
@@ -77,13 +74,16 @@ func TestLaneMigrator(t *testing.T) {
7774

7875
// Configure chains for lanes
7976
e.OperationsBundle = testsetup.BundleWithFreshReporter(e.OperationsBundle)
80-
_, err = v1_7_0_changesets.ConfigureChainsForLanes(chainFamilyRegistry, mcmsRegistry).Apply(*e, v1_7_0_changesets.ConfigureChainsForLanesConfig{
81-
Chains: []v1_7_0_changesets.ChainConfig{
82-
makeChainConfig(chainA, chainB),
83-
makeChainConfig(chainB, chainA),
77+
_, err = lanes.ConnectChains(chainFamilyRegistry, mcmsRegistry).Apply(*e, lanes.ConnectChainsConfig{
78+
Lanes: []lanes.LaneConfig{
79+
{
80+
ChainA: makeChainConfig(chainA, chainB),
81+
ChainB: makeChainConfig(chainB, chainA),
82+
Version: semver.MustParse("2.0.0"),
83+
},
8484
},
8585
})
86-
require.NoError(t, err, "Failed to apply ConfigureChainsForLanes changeset")
86+
require.NoError(t, err, "Failed to apply ConnectChains changeset")
8787
// now apply the lane migrator
8888
mReg := deploy.GetLaneMigratorRegistry()
8989
e.OperationsBundle = testsetup.BundleWithFreshReporter(e.OperationsBundle)

‎ccv/chains/evm/deployment/v1_7_0/operations/executor/executor.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/gobindings/generated/latest/executor"
99
"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/gobindings/generated/latest/proxy"
1010
"github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/utils/operations/contract"
11-
"github.com/smartcontractkit/chainlink-ccip/deployment/v1_7_0/adapters"
11+
"github.com/smartcontractkit/chainlink-ccip/deployment/lanes"
1212
cldf_deployment "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
1313
)
1414

@@ -35,7 +35,7 @@ type ApplyDestChainUpdatesArgs struct {
3535

3636
type RemoteChainConfigArgs struct {
3737
DestChainSelector uint64
38-
Config adapters.ExecutorDestChainConfig
38+
Config lanes.ExecutorDestChainConfig
3939
}
4040

4141
type ApplyAllowedCCVUpdatesArgs struct {

0 commit comments

Comments
 (0)