link token changeset update#22687
Conversation
CORA - Pending ReviewersAll codeowners have approved! ✅ Legend: ✅ Approved | ❌ Changes Requested | 💬 Commented | 🚫 Dismissed | ⏳ Pending | ❓ Unknown For more details, see the full review summary. |
|
✅ No conflicts with other open PRs targeting |
ChrisAmora
requested review from
AmrMohamedRezk,
KodeyThomas,
agusaldasoro,
asoliman92,
carte7000,
matYang and
winder
product-security-plaid-production
Bot
requested review from
bolekk,
ecPablo and
ettec
There was a problem hiding this comment.
Pull request overview
Updates the LINK token deployment changesets used throughout CCIP deployment code to the new unified DeployLinkTokenChangeset API from cld-changesets v0.5.0, and adds a DataStore fallback for resolving LINK token addresses when loading on-chain state.
Changes:
- Bumps
cld-changesetsfrom v0.4.0 to v0.5.0 and updates import paths fromlink/changesetstotokens/link/changesets. - Replaces all uses of legacy
DeployLinkToken/DeploySolanaLinkToken/DeployStaticLinkTokenwith the unifiedDeployLinkTokenChangeset{}+DeployLinkTokenInput{EVM, Solana}shape. - Adds DataStore-based LINK/StaticLink address merging (with address-book precedence) in
stateview/state.go(EVM and Solana paths) and incs_grant_and_mint_link_token.go.
Reviewed changes
Copilot reviewed 13 out of 14 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| deployment/go.mod | Bumps cld-changesets to v0.5.0. |
| deployment/go.sum | Updates checksums for v0.5.0. |
| deployment/environment/crib/ccip_deployer.go | Migrates EVM + Solana LINK deploys to new changeset/input shape. |
| deployment/ccip/shared/stateview/state.go | Merges DataStore LINK/StaticLink into address map for both EVM and Solana loaders. |
| deployment/ccip/shared/stateview/evm/validate_feequoter_test.go | Updates import path and migrates EVM deploy to new input shape. |
| deployment/ccip/changeset/v1_6/cs_translate_onramp_to_feequoter_test.go | Same migration in test helper. |
| deployment/ccip/changeset/v1_6/cs_deploy_registry_module_test.go | Updates all DeployLinkToken call sites to the new shape. |
| deployment/ccip/changeset/v1_6/cs_deploy_chain_test.go | Same migration. |
| deployment/ccip/changeset/v1_6/cs_add_registry_module_test.go | Same migration across multiple cases. |
| deployment/ccip/changeset/testhelpers/test_environment.go | Migrates EVM (incl. static-link variant) and Solana deploys. |
| deployment/ccip/changeset/solana_v0_1_1/transfer_ccip_to_mcms_with_timelock_test.go | Migrates Solana LINK deploy. |
| deployment/ccip/changeset/solana_v0_1_1/cs_solana_token_test.go | Migrates Solana LINK deploy. |
| deployment/ccip/changeset/solana_v0_1_1/cs_deploy_chain_test.go | Migrates Solana LINK deploy. |
| deployment/ccip/changeset/cs_grant_and_mint_link_token.go | Adds DataStore LINK fallback when loading addresses. |
|
I see you updated files related to
|
ChrisAmora
force-pushed
the
feat/link-token-changeset-update
branch
from
3902ab6 to
fc7c918
Compare
|
|
|
||
| // DeployLinkTokenChangeset wraps the upstream DeployLinkTokenChangeset and | ||
| // additionally writes deployed addresses to AddressBook for backward compatibility. | ||
| type DeployLinkTokenChangeset struct{} //nolint:revive // intentional name match with upstream |
There was a problem hiding this comment.
nit: consider adding an alias to linkchangesets.DeployLinkTokenInput in this package. It should simplify the client code a little as changeset and type will come from the same place.
| solSelectors := e.BlockChains.ListChainSelectors(cldf_chain.WithFamily(chainselectors.FamilySolana)) | ||
| // need to have extra definition here for golint | ||
| var allSelectors = make([]uint64, 0) | ||
| allSelectors := make([]uint64, 0) |
There was a problem hiding this comment.
We should probably avoid mixing unrelated style changes with this PR. There's quite a few.
gustavogama-cll
left a comment
gustavogama-cll
left a comment
There was a problem hiding this comment.
Left a couple of suggestions but looks good overall. Please get an approval from CCIP as well.
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
This pull request refactors how LINK token deployment changesets are referenced and configured throughout the CCIP deployment codebase. The main focus is to standardize the usage of the new
DeployLinkTokenChangesetand its input configuration, replacing the olderDeploySolanaLinkTokenandDeployLinkTokenpatterns, and to update import paths accordingly. Additionally, there is an enhancement to the way LINK token addresses are merged from the DataStore.