CCIP Home changeset : merge USDCTokenPoolProxy address from datastore#21567
CCIP Home changeset : merge USDCTokenPoolProxy address from datastore#215670xsuryansh wants to merge 4 commits intodevelopfrom
Conversation
0xsuryansh
requested review from
AmrMohamedRezk,
agusaldasoro,
b-gopalswami,
Copilot,
makramkd,
ogtownsend,
tt-cll and
winder
|
👋 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! |
|
✅ No conflicts with other open PRs targeting |
There was a problem hiding this comment.
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
validateUSDCConfigto 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 whenEnv.DataStoreis present. - Switch Promote/Set/AddDon candidate changesets (and config validation) to use the new loader.
0xsuryansh
changed the title
|
| for _, sourcePoolAddress := range validSourcePools { | ||
| if configuredSourcePool == sourcePoolAddress { | ||
| matchesDeployedPool = true | ||
| break | ||
| } | ||
| } | ||
| if matchesDeployedPool { | ||
| break | ||
| } |
There was a problem hiding this comment.
| for _, sourcePoolAddress := range validSourcePools { | |
| if configuredSourcePool == sourcePoolAddress { | |
| matchesDeployedPool = true | |
| break | |
| } | |
| } | |
| if matchesDeployedPool { | |
| break | |
| } | |
| if slices.Contains(validSourcePools, configuredSourcePool) { | |
| break | |
| } |
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
| return nil | ||
| } | ||
|
|
||
| func loadOnchainStateForCandidateChangesets(e cldf.Environment) (stateview.CCIPOnChainState, error) { |
There was a problem hiding this comment.
there are methods which can already load both DS & Addressbook state merged, but for this purpose its okay
Changes to cs_ccip_home