update changesets to use stored addressRef #1412

jhweintraub · 2025-11-24T18:13:23Z

This PR modifies the previous v1_6_4 changesets to use the addressRef to acquire necessary deployed contract addresses rather than have them be supplied by the user. This reduces the amount of potential errors in the durable pipeline creation process as there are fewer possible fields for the creator to fill out incorrectly.

Copilot

Pull request overview

This PR refactors v1_6_4 changesets to retrieve deployed contract addresses from the datastore using addressRef lookups rather than requiring users to supply them as input parameters. This simplification reduces the potential for configuration errors during the durable pipeline creation process.

Key Changes:

Modified changeset input structs to remove address fields that can be retrieved from the datastore
Updated changeset implementations to use FindAndFormatRef utility for address resolution
Refactored tests to populate the datastore with required addresses before executing changesets

Reviewed changes

Copilot reviewed 23 out of 23 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
usdc_token_pool_deploy.go	Removed CCTPMessageTransmitterProxy deployment logic; now expects it to be pre-deployed and stored in datastore
usdc_token_pool_proxy_deploy.go	Retrieves Router, USDCToken, and pool addresses from datastore instead of input parameters
usdc_token_pool_cctp_v2_deploy.go	Added datastore lookups for Router, RMN, and Token addresses with fallback to input parameter for Token
siloed_usdc_token_pool_deploy.go	Removed Token, RMNProxy, Router, and LockBox from input struct; retrieves from datastore
erc20_lockbox_deploy.go	Removed TokenAdminRegistry from input; retrieves from datastore
set_domains.go	Removed single Address field; now uses per-chain address lookups from datastore
configure_allowed_callers.go	Renamed Address to AddressesByChain map; retrieves ERC20LockBox addresses from datastore
update_lock_or_burn_mechanism.go	Removed Address from input; retrieves USDCTokenPoolProxy address from datastore
update_lock_release_pool_addresses.go	Removed Address from input; retrieves USDCTokenPoolProxy address from datastore
*_test.go files	Updated tests to pre-populate datastore with required addresses and removed address fields from changeset inputs

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

chains/evm/deployment/v1_6_4/sequences/usdc_token_pool_deploy.go

chains/evm/deployment/v1_6_4/changesets/usdc_token_pool_cctp_v2_deploy.go

chains/evm/deployment/v1_6_4/changesets/set_domains.go

chains/evm/deployment/v1_6_4/changesets/usdc_token_pool_proxy_deploy.go

…and throw an error

chains/evm/deployment/v1_6_4/changesets/configure_allowed_callers.go

kylesmartin · 2025-11-25T02:44:56Z

chains/evm/deployment/v1_6_4/changesets/configure_allowed_callers.go

 		for _, perChainInput := range input.ChainInputs {
-			addressByChain[perChainInput.ChainSelector] = perChainInput.Address
+
+			erc20_lock_box_address, err := datastore_utils.FindAndFormatRef(e.DataStore, datastore.AddressRef{


For this one, you need to allow for the ability to pass in a full ref. Or at least a qualifier string (qualifier is another address ref field). Only because there will be multiple lock boxes for different tokens in the datastore. Qualifier would typically be the token symbol, ultimately depends on what you save to the datastore post-deployment.

Qualifier is a good idea. I think the better way would be to use "IOwnable" as the qualifier since the main identifying feature of the lockbox is that it uses Ownable token pools. That way in the future if we build a lockbox which works on RBAC-based token pools we can make the qualifier "IAccessControl". Good Call out. In terms of 1.6.4 there is only one version but forward thinking is also useful.

chains/evm/deployment/v1_6_4/changesets/erc20_lockbox_deploy.go

kylesmartin · 2025-11-25T02:48:59Z

chains/evm/deployment/v1_6_4/changesets/erc20_lockbox_deploy.go

-				TokenAdminRegistry: perChainInput.TokenAdminRegistry,
+				TokenAdminRegistry: tokenAdminRegistryAddress,
 			}
 			report, err := cldf_ops.ExecuteSequence(e.OperationsBundle, sequences.ERC20LockboxDeploySequence, e.BlockChains, sequenceInput)


Also, make sure that when you deploy something like a lock box or a token pool, you add the entry to the datastore with the qualifier field populated (i.e. set to the token symbol). Ensures that you can differentiate between different token pools / lock boxes in the datastore and what their purposes are.

so the lockbox is not one-token-one-lockbox, but multiple tokens to one lockbox so I don't think using the token in the qualifier is the best solution, but I do agree with better labeling practices. Also the token pools being deployed here do have "USDC" in the type which should solve the issue.

chains/evm/deployment/v1_6_4/changesets/siloed_usdc_token_pool_deploy.go

…oolAddresses changeset

b-gopalswami

LGTM! Just left one question.

b-gopalswami · 2025-12-01T18:27:06Z

chains/evm/deployment/v1_6_4/changesets/configure_allowed_callers.go

+			erc20LockBoxAddress, err := datastore_utils.FindAndFormatRef(e.DataStore, datastore.AddressRef{
+				Type:    datastore.ContractType(erc20_lock_box.ContractType),
+				Version: erc20_lock_box.Version,
+			}, perChainInput.ChainSelector, evm_datastore_utils.ToEVMAddress)
+			if err != nil {
+				return cldf.ChangesetOutput{}, err
+			}


How do we ensure this is the right address to act on? Like, do we expect only one such contract to be available for the entire network?

I've added a qualifier to the lookup to ensure there are no conflicts. Currently we don't expect there to be more than one LockBox per chain but that may change in the future so adding this qualifier helps with that. It is also possible that we could just do it based on versioning, as any future version of the lockbox will have a version >1.6.4 but the qualifier is a fine solution as well.

e13bde4#diff-e5ca08ab4642f513279363eb93ed645ab89ab91a2f85b047c3eaac5220fe78f4R52

…hangeset to prevent dataStore conflicts.

AnieeG

Approved with 1 observation -
For all changesets I see only mcms input is verified and no other input is considered for verify function. If you want to come back to it later please add a ticket. Otherwise we are opening up ways for contract reverts and unintended input set-up through operations.

AnieeG · 2025-12-01T19:39:27Z

chains/evm/deployment/v1_6_4/changesets/erc20_lockbox_deploy.go

+				Type:    "TokenAdminRegistry",
+				Version: semver.MustParse("1.5.0"),


nit : better to refer it from constants - https://github.com/smartcontractkit/chainlink-ccip/blob/main/chains/evm/deployment/v1_5_0/operations/token_admin_registry/token_admin_registry.go#L15-L16 - Applicable to all contract types and version usages

7d5cbea#diff-8541bdf34dea5406289172d86718994202ad4e9a5bb2bf2fb1c2e3aeee9d0e6cR39

AnieeG · 2025-12-01T19:43:02Z

chains/evm/deployment/v1_6_4/changesets/siloed_usdc_token_pool_deploy.go

+				Type:      "RBACTimelock",
+				Version:   semver.MustParse("1.0.0"),


https://github.com/smartcontractkit/chainlink-ccip/blob/main/deployment/utils/common.go#L19

7d5cbea#diff-24dbd2cf6c70c06b070bd83fba6eb1eaf87787bb629d791e3cbdba3cc217c83dR54

AnieeG · 2025-12-01T19:43:26Z

chains/evm/deployment/v1_6_4/changesets/siloed_usdc_token_pool_deploy.go

+			erc20LockboxAddress, err := datastore_utils.FindAndFormatRef(e.DataStore, datastore.AddressRef{
+				Type:      datastore.ContractType(erc20_lock_box.ContractType),
+				Version:   erc20_lock_box.Version,
+				Qualifier: "IOwnable",


let's have it as constant

7d5cbea#diff-24dbd2cf6c70c06b070bd83fba6eb1eaf87787bb629d791e3cbdba3cc217c83dR26

github-actions · 2025-12-01T20:38:38Z

Metric	`v1_6_4/changeset_addressRefs`	`main`
Coverage	70.3%	70.0%

update changesets to use stored addressRef

2c20f6e

Copilot AI review requested due to automatic review settings November 24, 2025 18:13

jhweintraub requested review from a team as code owners November 24, 2025 18:13

jhweintraub assigned kylesmartin Nov 24, 2025

Copilot AI reviewed Nov 24, 2025

View reviewed changes

Merge branch 'main' into v1_6_4/changeset_addressRefs

0be2eec

github-code-quality bot found potential problems Nov 24, 2025

View reviewed changes

chains/evm/deployment/v1_6_4/changesets/usdc_token_pool_proxy_deploy.go Fixed Show fixed Hide fixed

fix code duplication errors and some linting

c35760b

jhweintraub assigned jhweintraub and unassigned kylesmartin Nov 24, 2025

jhweintraub requested a review from kylesmartin November 24, 2025 18:27

add address to commit store when provided as changeset input

2f985fd

jhweintraub requested review from AnieeG and b-gopalswami November 24, 2025 21:09

jhweintraub added 2 commits November 24, 2025 17:53

fix timelockReference bug in deployment sequences

c01f4fa

fix bug where RBAC Timelock search would return multiple addressRefs …

0c3d37a

…and throw an error

kylesmartin reviewed Nov 25, 2025

View reviewed changes

jhweintraub and others added 3 commits December 1, 2025 09:39

remove unnec. addressRef parameters and added ERC20LockBox qualifiers.

7dd6be5

Merge branch 'main' into v1_6_4/changeset_addressRefs

799a076

re-add nec. chainSelector parameter

fa093b4

jhweintraub requested a review from kylesmartin December 1, 2025 17:11

jhweintraub added 2 commits December 1, 2025 11:56

remove address check from token_pool_proxy_deployment and add updateP…

6f47fc6

…oolAddresses changeset

comment fixes

b9e2c66

b-gopalswami reviewed Dec 1, 2025

View reviewed changes

add qualifier to ERC20Lockbox lookup in the configureAllowedCallers c…

e13bde4

…hangeset to prevent dataStore conflicts.

b-gopalswami previously approved these changes Dec 1, 2025

View reviewed changes

AnieeG previously approved these changes Dec 1, 2025

View reviewed changes

hard code contract types and qualifiers

7d5cbea

jhweintraub dismissed AnieeG’s stale review via 7d5cbea December 1, 2025 19:59

jhweintraub dismissed b-gopalswami’s stale review via 7d5cbea December 1, 2025 19:59

jhweintraub added 4 commits December 1, 2025 14:11

remove all string literals and replace with constants

ba744b4

fix broken import

3d15e8c

fix more broken versioning

8a79267

fix message transmitter proxy broken versioning scheme.

1512a0d

AnieeG approved these changes Dec 1, 2025

View reviewed changes

tt-cll approved these changes Dec 1, 2025

View reviewed changes

jhweintraub added this pull request to the merge queue Dec 1, 2025

Merged via the queue into main with commit e200e93 Dec 1, 2025
40 checks passed

jhweintraub deleted the v1_6_4/changeset_addressRefs branch December 1, 2025 21:30

		Type: "TokenAdminRegistry",
		Version: semver.MustParse("1.5.0"),

update changesets to use stored addressRef #1412

update changesets to use stored addressRef #1412

Uh oh!

Conversation

jhweintraub commented Nov 24, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jhweintraub Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jhweintraub Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

b-gopalswami left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jhweintraub Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AnieeG left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Dec 1, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

jhweintraub Dec 1, 2025 •

edited

Loading

jhweintraub Dec 1, 2025 •

edited

Loading

jhweintraub Dec 1, 2025 •

edited

Loading