fix: fq2.0 changes updated for lane expansion#1866
Merged
chris-de-leon-cll merged 13 commits intomainfrom Mar 21, 2026
Merged
Conversation
sowgandhi11
requested review from
0xAustinWang,
KodeyThomas,
b-gopalswami,
chris-de-leon-cll,
Copilot,
matYang,
mateusz-sekara and
winder
|
👋 sowgandhi11, thanks for creating this pull request! To help reviewers, please consider creating future PRs as drafts first. This allows you to self-review and make any final changes before notifying the team. Once you're ready, you can mark it as "Ready for review" to request feedback. Thanks! |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds FeeQuoter contract version awareness to lane configuration so lane updates can apply the correct FeeQuoter operations when chains have upgraded from CCIP FeeQuoter v1.6.x to v2.0.x (lane expansion / mixed-version environments).
Changes:
- Introduces an optional
FeeQuoterVersionProviderinterface and plumbsFeeQuoterVersionintoChainDefinitionduring address population. - Updates EVM v1.6 lane update sequencing to conditionally use FeeQuoter v2.0 operations and adds translation/helpers for v2 inputs.
- Implements FeeQuoter version lookup in the EVM v1.6 adapter using datastore
AddressRef.Version.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| deployment/lanes/product.go | Adds optional adapter interface to report FeeQuoter contract version. |
| deployment/lanes/lane_update.go | Adds FeeQuoterVersion to ChainDefinition for downstream sequencing decisions. |
| deployment/lanes/connect_chains.go | Populates FeeQuoterVersion during chain address discovery when supported by the adapter. |
| chains/evm/deployment/v2_0_0/sequences/fee_quoter.go | Adds a v2 fee-quoter dest-chain-config update input type (supporting v2 operations usage). |
| chains/evm/deployment/v1_6_0/sequences/update_lanes.go | Switches FeeQuoter update path based on deployed FeeQuoter version; adds v2 translation + execution helper. |
| chains/evm/deployment/v1_6_0/sequences/adapter.go | Implements GetFQVersion for EVM adapter to expose deployed FeeQuoter version. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
sowgandhi11
force-pushed
the
fix/lane-expansion-update-fq2.0
branch
from
510ccf1 to
6676d6f
Compare
…mcms function from test
|
chris-de-leon-cll
approved these changes
Mar 20, 2026
tt-cll
approved these changes
Mar 20, 2026
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.