1.6 UpdateLanes Changeset to include FQ2.0 Updates by simsonraj · Pull Request #21499 · smartcontractkit/chainlink

simsonraj · 2026-03-11T16:39:05Z

This updates FQ updates to include 2.0 Updates. when 1.5 - > 1.6 migration already has 2.0 FQ deployed

github-actions · 2026-03-11T16:39:34Z

👋 simsonraj, 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!

github-actions · 2026-03-11T16:40:27Z

✅ No conflicts with other open PRs targeting develop

Copilot

Pull request overview

Risk Rating: HIGH (changeset logic now conditionally routes FeeQuoter updates across major versions and affects MCMS proposal composition)

This PR updates the CCIP v1.6 lane update changeset to support FeeQuoter v2.0 (FQ2.0) chains by resolving the correct FeeQuoter target per chain, splitting v1 vs v2 update execution, and aggregating resulting MCMS operations into a single proposal.

Changes:

Resolve FeeQuoter address+version per chain from the address book/datastore and route updates to v1 or v2 sequences accordingly.
Convert v1.6 FeeQuoter dest/price updates into v2.0 update inputs and execute the v2 FeeQuoter update sequence per chain.
Aggregate v1 and v2 batch operations into a single MCMS timelock proposal (when MCMS is enabled).

deployment/ccip/changeset/v1_6/cs_update_bidirectional_lanes.go

Copilot · 2026-03-11T16:46:08Z

deployment/ccip/changeset/v1_6/cs_update_bidirectional_lanes.go

+				DefaultTokenDestGasOverhead: cfg.DestChainConfig.DefaultTokenDestGasOverhead,
+				DefaultTxGasLimit:           cfg.DestChainConfig.DefaultTxGasLimit,
+				NetworkFeeUSDCents:          uint16(cfg.DestChainConfig.NetworkFeeUSDCents),
+				LinkFeeMultiplierPercent:    fqv2seq.LinkFeeMultiplierPercent,
+			},


NetworkFeeUSDCents is being narrowed to uint16. If the source value exceeds math.MaxUint16, this will overflow and produce an incorrect fee in the v2 FeeQuoter update. Add an explicit range check (and fail fast) before converting, or adjust the v2 struct field/type if it should support larger values.

deployment/ccip/changeset/v1_6/cs_update_bidirectional_lanes.go

trunk-io · 2026-03-11T18:25:34Z

_{View Full Report ↗︎ ⋅ Docs}

github-actions · 2026-03-12T10:35:03Z

CORA - Pending Reviewers

Codeowners Entry	Overall	Num Files	Owners
`go.md`	💬	1	@smartcontractkit/core, @smartcontractkit/foundations
`go.mod`	💬	5	@smartcontractkit/core, @smartcontractkit/foundations
`go.sum`	💬	5	@smartcontractkit/core, @smartcontractkit/foundations

For more details, see the full review summary.

github-actions · 2026-03-12T16:09:20Z

I see you updated files related to core. Please run make gocs in the root directory to add a changeset as well as in the text include at least one of the following tags:

#added For any new functionality added.
#breaking_change For any functionality that requires manual action for the node to boot.
#bugfix For bug fixes.
#changed For any change to the existing functionality.
#db_update For any feature that introduces updates to database schema.
#deprecation_notice For any upcoming deprecation functionality.
#internal For changesets that need to be excluded from the final changelog.
#nops For any feature that is NOP facing and needs to be in the official Release Notes for the release.
#removed For any functionality/config that is removed.
#updated For any functionality that is updated.
#wip For any change that is not ready yet and external communication about it should be held off till it is feature complete.

RensR · 2026-03-12T18:00:26Z

deployment/ccip/changeset/v1_6/cs_update_bidirectional_lanes.go

+			e.BlockChains,
+			fqUpdate,
+		)
+		output.Reports = append(output.Reports, v2Report.ExecutionReports...)


v2Report is used before checking the err

RensR · 2026-03-12T18:04:51Z

deployment/ccip/changeset/v1_6/cs_update_bidirectional_lanes.go

+
+	// Execute v2 FeeQuoter update sequences and append their batch ops
+	var v2BatchOps []mcmstypes.BatchOperation
+	for chainSel := range v2FeeQuoterChains {


Maps are not ordered so this yields different outcomes every time you run it, should the outcome not be deterministic?

reports/batches are generated perchain & added to the proposal batch independently per chain, I don't think the ordering is checked in the proposal execution or the tests

cl-sonarqube-production · 2026-03-12T18:59:01Z

Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

Update Lanes Changeset to include FQ2.0 Updates

52172ac

simsonraj requested review from a team as code owners March 11, 2026 16:39

simsonraj requested review from 0xAustinWang, KodeyThomas, asoliman92, Copilot, matYang, mateusz-sekara, tt-cll and winder March 11, 2026 16:39

product-security-plaid-production bot requested a review from ajaskolski March 11, 2026 16:39

Copilot started reviewing on behalf of simsonraj March 11, 2026 16:40 View session

Copilot AI reviewed Mar 11, 2026

View reviewed changes

simsonraj added 2 commits March 12, 2026 15:37

Merge remote-tracking branch 'origin' into update-lanes-fq-v2

6ac9bb4

Update go.mod

8a346db

simsonraj requested a review from a team as a code owner March 12, 2026 10:34

product-security-plaid-production bot requested a review from chudilka1 March 12, 2026 10:34

tests & fixes

bba57ca

simsonraj requested a review from a team as a code owner March 12, 2026 16:03

product-security-plaid-production bot requested a review from ChrisAmora March 12, 2026 16:03

simsonraj added 2 commits March 12, 2026 21:36

Merge remote-tracking branch 'origin' into update-lanes-fq-v2

60ed425

go mod tidy

74b9cee

simsonraj added 2 commits March 12, 2026 22:23

update Modgraph

877553e

fix go.md

f8f61e2

tt-cll previously approved these changes Mar 12, 2026

View reviewed changes

simsonraj changed the title ~~Update Lanes Changeset to include FQ2.0 Updates~~ 1.6 UpdateLanes Changeset to include FQ2.0 Updates Mar 12, 2026

athegaul previously approved these changes Mar 12, 2026

View reviewed changes

RensR reviewed Mar 12, 2026

View reviewed changes

fix for review comment

690e675

simsonraj dismissed stale reviews from athegaul and tt-cll via 690e675 March 12, 2026 18:41

tt-cll approved these changes Mar 12, 2026

View reviewed changes

ecPablo approved these changes Mar 12, 2026

View reviewed changes

simsonraj enabled auto-merge March 12, 2026 18:45

kylesmartin approved these changes Mar 12, 2026

View reviewed changes

athegaul approved these changes Mar 12, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

1.6 UpdateLanes Changeset to include FQ2.0 Updates#21499

1.6 UpdateLanes Changeset to include FQ2.0 Updates#21499
simsonraj wants to merge 9 commits intodevelopfrom
update-lanes-fq-v2

simsonraj commented Mar 11, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Mar 11, 2026

Uh oh!

github-actions bot commented Mar 11, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI Mar 11, 2026

Uh oh!

Uh oh!

Uh oh!

trunk-io bot commented Mar 11, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Mar 12, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Mar 12, 2026

Uh oh!

RensR Mar 12, 2026

Uh oh!

RensR Mar 12, 2026

Uh oh!

simsonraj Mar 12, 2026

Uh oh!

cl-sonarqube-production bot commented Mar 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

simsonraj commented Mar 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Mar 11, 2026

Uh oh!

github-actions bot commented Mar 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

trunk-io bot commented Mar 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CORA - Pending Reviewers

Uh oh!

github-actions bot commented Mar 12, 2026

Uh oh!

RensR Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

RensR Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

simsonraj Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

cl-sonarqube-production bot commented Mar 12, 2026

Quality Gate passed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

simsonraj commented Mar 11, 2026 •

edited

Loading

github-actions bot commented Mar 11, 2026 •

edited

Loading

trunk-io bot commented Mar 11, 2026 •

edited

Loading

github-actions bot commented Mar 12, 2026 •

edited

Loading