Skip to content

combine 1.6 and 2.0 connect lanes#1794

Merged
tt-cll merged 36 commits intodevelopfrom
tt/combine
Mar 13, 2026
Merged

combine 1.6 and 2.0 connect lanes#1794
tt-cll merged 36 commits intodevelopfrom
tt/combine

Conversation

@tt-cll
Copy link
Collaborator

@tt-cll tt-cll commented Mar 4, 2026

No description provided.

@tt-cll tt-cll marked this pull request as ready for review March 6, 2026 22:44
@tt-cll tt-cll requested review from a team as code owners March 6, 2026 22:44
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR consolidates lane-connection logic across CCIP 1.6 and 2.0 by moving configuration onto the deployment/lanes ConnectChains flow, wiring EVM lane adapters into the shared registry, and removing the prior v1_7_0 “ConfigureChainsForLanes” changeset/adapter plumbing.

Changes:

  • Introduces v2-oriented lane config fields in deployment/lanes and updates ConnectChains to populate/resolve them.
  • Refactors EVM lane configuration sequences to ConfigureLaneLegAsSource / ConfigureLaneLegAsDest and updates related tests to use the new lanes types.
  • Updates module wiring (replace directives / go.sum) to use local CCIP + CCV EVM modules consistently.

Reviewed changes

Copilot reviewed 21 out of 25 changed files in this pull request and generated 10 comments.

Show a summary per file
File Description
integration-tests/go.mod Adds local replace for ccv/chains/evm module.
integration-tests/go.sum Removes now-unneeded module checksum entries after replace changes.
devenv/go.mod Enables local replace for root + CCV EVM modules (and deployment paths).
devenv/go.sum Removes no-longer-referenced module checksum entries.
deployment/v1_7_0/changesets/configure_chains_for_lanes.go Deletes legacy v1_7_0 lanes changeset implementation.
deployment/v1_7_0/changesets/configure_chains_for_lanes_test.go Deletes legacy tests for the removed changeset.
deployment/v1_7_0/adapters/chain_family.go Deletes legacy chain-family registry/types used by removed changeset.
deployment/utils/common.go Adds Version_2_0_0 semver constant for version gating.
deployment/lanes/lane_update.go Expands ChainDefinition and related types to include 2.0 lane config fields.
deployment/lanes/connect_chains.go Updates ConnectChains flow to populate v2 fields and persist sequence metadata.
chains/evm/deployment/go.mod Adds local replace for root module to keep builds consistent.
chains/evm/deployment/go.sum Removes no-longer-needed module checksum entries after replace changes.
ccv/chains/evm/deployment/go.mod Adds local replaces for CCV EVM module and root module, plus deployment paths.
ccv/chains/evm/deployment/go.sum Removes module checksum entries no longer needed with local replaces.
ccv/chains/evm/deployment/v1_7_0/testsetup/testsetup.go Switches config builders to deployment/lanes types and derives family selector.
ccv/chains/evm/deployment/v1_7_0/sequences/configure_committee_verifier_for_lanes.go Swaps config types from v1_7_0 adapters to deployment/lanes.
ccv/chains/evm/deployment/v1_7_0/sequences/configure_committee_verifier_for_lanes_test.go Updates tests to use deployment/lanes types.
ccv/chains/evm/deployment/v1_7_0/sequences/configure_chain_for_lanes.go Replaces ConfigureChainForLanes with leg-based source/dest sequences and new config conversions.
ccv/chains/evm/deployment/v1_7_0/sequences/configure_chain_for_lanes_test.go Updates test to exercise new leg-based sequences.
ccv/chains/evm/deployment/v1_7_0/operations/executor/executor.go Switches executor config type dependency to deployment/lanes.
ccv/chains/evm/deployment/v1_7_0/adapters/lanemigrator_test.go Uses lanes.ConnectChains rather than removed ConfigureChainsForLanes changeset.
ccv/chains/evm/deployment/v1_7_0/adapters/lanemigrator.go Updates comment to reference ConnectChains.
ccv/chains/evm/deployment/v1_7_0/adapters/init.go Registers EVM lane adapter into lanes.GetLaneAdapterRegistry().
ccv/chains/evm/deployment/v1_7_0/adapters/chain_family_test.go Migrates adapter test to lanes.ConnectChains + new ChainDefinition builder.
ccv/chains/evm/deployment/v1_7_0/adapters/chain_family.go Implements the lanes.LaneAdapter interface and adds Get*Address helpers.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@tt-cll tt-cll requested a review from a team as a code owner March 10, 2026 12:07
@tt-cll tt-cll enabled auto-merge (squash) March 12, 2026 18:01
kylesmartin
kylesmartin previously approved these changes Mar 13, 2026
agusaldasoro
agusaldasoro previously approved these changes Mar 13, 2026
@@ -1,182 +0,0 @@
package adapters
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we remove the entire deployment/v1_7_0 folder?

@tt-cll tt-cll dismissed stale reviews from agusaldasoro and kylesmartin via 349ce9b March 13, 2026 15:23
@github-actions
Copy link

Metric tt/combine develop
Coverage 70.1% 69.8%

@tt-cll tt-cll merged commit 73fcb20 into develop Mar 13, 2026
26 of 27 checks passed
@tt-cll tt-cll deleted the tt/combine branch March 13, 2026 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants