Skip to content

CCIP Home changeset : merge USDCTokenPoolProxy address from datastore#21567

Merged
0xsuryansh merged 6 commits intodevelopfrom
0xsuryansh/merge-datastore-state-valid-usdc
Mar 20, 2026
Merged

CCIP Home changeset : merge USDCTokenPoolProxy address from datastore#21567
0xsuryansh merged 6 commits intodevelopfrom
0xsuryansh/merge-datastore-state-valid-usdc

Conversation

@0xsuryansh
Copy link
Copy Markdown
Member

@0xsuryansh 0xsuryansh commented Mar 17, 2026 •
edited
Loading

Changes to cs_ccip_home

  • Since USDCTokenPoolProxy will only be present in DataStore we need to merge it into the chain state for this changeset
  • Earlier the changeset used to prioritise finding a USDCTokenPool v1.6.2 first and then USDCTokenPool v1.5.0 but with a phased rollout different pool types can be valid, so we are validating that the given pool is valid

@0xsuryansh 0xsuryansh requested review from a team as code owners March 17, 2026 20:07
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 17, 2026

👋 0xsuryansh, 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
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 17, 2026 •
edited
Loading

✅ No conflicts with other open PRs targeting develop

Copilot AI reviewed Mar 17, 2026
View reviewed changes
Copy link
Copy Markdown
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

Risk Rating: HIGH

This PR updates CCIP v1.6 deployment changesets to load on-chain state differently for candidate-related operations (optionally incorporating DataStore addresses), and relaxes USDC SourcePoolAddress validation to accept any deployed pool among a small set of supported versions.

Changes:

  • Extend validateUSDCConfig to accept SourcePoolAddress matching any deployed USDC pool across v1.5.1 / v1.6.2 / v1.7.0 (instead of only the “latest”).
  • Add loadOnchainStateForCandidateChangesets, which reloads EVM chain state using merged AddressBook+DataStore addresses when Env.DataStore is present.
  • Switch Promote/Set/AddDon candidate changesets (and config validation) to use the new loader.

Comment thread deployment/ccip/changeset/v1_6/cs_ccip_home.go Outdated
Comment thread deployment/ccip/changeset/v1_6/cs_ccip_home.go
@trunk-io
Copy link
Copy Markdown

trunk-io Bot commented Mar 17, 2026 •
edited
Loading

Static Badge   Static Badge   Static Badge   Static Badge

View Full Report ↗︎ ⋅ Docs

@0xsuryansh 0xsuryansh changed the title loadOnchainStateForCandidateChangesets CCIP Home changeset : merge USDCTokenPoolProxy address from datastore Mar 18, 2026
kylesmartin
kylesmartin previously approved these changes Mar 18, 2026
View reviewed changes
carte7000
carte7000 previously approved these changes Mar 18, 2026
View reviewed changes
@0xsuryansh 0xsuryansh added this pull request to the merge queue Mar 18, 2026
winder
winder reviewed Mar 18, 2026
View reviewed changes
Comment thread deployment/ccip/changeset/v1_6/cs_ccip_home.go Outdated
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Mar 18, 2026
simsonraj
simsonraj reviewed Mar 19, 2026
View reviewed changes
Comment thread deployment/ccip/changeset/v1_6/cs_ccip_home.go
return nil
}

func loadOnchainStateForCandidateChangesets(e cldf.Environment) (stateview.CCIPOnChainState, error) {
Copy link
Copy Markdown
Contributor

@simsonraj simsonraj Mar 19, 2026

Choose a reason for hiding this comment

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

there are methods which can already load both DS & Addressbook state merged, but for this purpose its okay

Copy link
Copy Markdown
Member Author

@0xsuryansh 0xsuryansh Mar 20, 2026

Choose a reason for hiding this comment

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

#21567 (comment)
GitHub made this suggestion which made sense, so I wrote my own

simsonraj
simsonraj previously approved these changes Mar 19, 2026
View reviewed changes
@0xsuryansh 0xsuryansh dismissed stale reviews from simsonraj, carte7000, and kylesmartin via c4eba39 March 20, 2026 16:08
@0xsuryansh 0xsuryansh enabled auto-merge March 20, 2026 16:23
@cl-sonarqube-production
Copy link
Copy Markdown

cl-sonarqube-production Bot commented Mar 20, 2026

Quality Gate passed Quality Gate passed

Issues
1 New issue
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

@0xsuryansh 0xsuryansh added this pull request to the merge queue Mar 20, 2026
github-merge-queue Bot pushed a commit that referenced this pull request Mar 20, 2026
@0xsuryansh
CCIP Home changeset : merge USDCTokenPoolProxy address from datastore (…
a5256bc 
…#21567)

* loadOnchainStateForCandidateChangesets

* fix for dup entries

* lint fix

* move test

* use slices.Contains
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Mar 20, 2026
@0xsuryansh 0xsuryansh added this pull request to the merge queue Mar 20, 2026
Merged via the queue into develop with commit fcffbb8 Mar 20, 2026
218 of 225 checks passed
@0xsuryansh 0xsuryansh deleted the 0xsuryansh/merge-datastore-state-valid-usdc branch March 20, 2026 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@winder winder winder approved these changes

@carte7000 carte7000 carte7000 approved these changes

@simsonraj simsonraj simsonraj approved these changes

@makramkd makramkd Awaiting requested review from makramkd makramkd is a code owner automatically assigned from smartcontractkit/ccip-offchain

@AmrMohamedRezk AmrMohamedRezk Awaiting requested review from AmrMohamedRezk AmrMohamedRezk is a code owner automatically assigned from smartcontractkit/ccip-offchain

@agusaldasoro agusaldasoro Awaiting requested review from agusaldasoro agusaldasoro is a code owner automatically assigned from smartcontractkit/ccip-offchain

@ogtownsend ogtownsend Awaiting requested review from ogtownsend ogtownsend is a code owner automatically assigned from smartcontractkit/ccip-offchain

@tt-cll tt-cll Awaiting requested review from tt-cll tt-cll is a code owner automatically assigned from smartcontractkit/ccip-offchain

@b-gopalswami b-gopalswami Awaiting requested review from b-gopalswami b-gopalswami is a code owner automatically assigned from smartcontractkit/ccip-offchain

@ecPablo ecPablo Awaiting requested review from ecPablo

+1 more reviewer

@kylesmartin kylesmartin kylesmartin left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@0xsuryansh @winder @carte7000 @simsonraj @kylesmartin