EVM USDC Token Pool Changesets #18560

winder · 2025-07-09T18:01:27Z

Add changesets to deploy and configure the latest USDC Token Pool:

deploy cctp proxy - a new prerequisite for USDC token pools
deploy usdc token pool - includes new parameters for proxy and previous pool addresses.
configure usdc token pool - allow configuring the "mint recipient" for the token pools destination.

Some updates were also made to the state object to hold references to the new usdc token pool and the cctp proxy.

winder · 2025-07-11T17:12:12Z

deployment/ccip/changeset/v1_6/cs_deploy_usdc_token_pools.go

+	if i.PreviousPoolAddress == utils.ZeroAddress {
+		return errors.New("previous pool address must be defined")
+	}


I guess it's possible that there isn't a previous token pool. Maybe there should be a "NoPreviousTokenPool" flag to ensure this field isn't skipped by accident.

chris-de-leon-cll · 2025-07-14T19:03:27Z

deployment/ccip/changeset/v1_6/cs_deploy_usdc_token_pools.go

+	}
+
+	return cldf.ChangesetOutput{
+		AddressBook: newAddresses, // TODO: this is deprecated, how do I use the DataStore instead?


I don't think we used the DataStore in the solana tooling so this is fairly new to me as well. I tried looking for other changesets which have adopted this but haven't found any yet. However, I did come across an example in the docs here which seems relevant - perhaps this could get you started on the right track?

chris-de-leon-cll · 2025-07-14T19:07:47Z

deployment/ccip/changeset/v1_6/cs_deploy_usdc_token_pools.go

+						previousPoolAddress = chainState.USDCTokenPools[deployment.Version1_6_1].Address()
+					} else {
+						return cldf.ContractDeploy[*usdc_token_pool.USDCTokenPool]{
+							Err: fmt.Errorf("previous USDC pool address not found on %s", previousPoolAddress, chain),


Suggested change

Err: fmt.Errorf("previous USDC pool address not found on %s", previousPoolAddress, chain),

Err: fmt.Errorf("previous USDC pool address (%s) not found on %s", previousPoolAddress.Hex(), chain.Name()),

chris-de-leon-cll · 2025-07-14T19:09:07Z

deployment/ccip/changeset/v1_6/cs_deploy_cctp_message_transmitter_proxy.go

+func (i DeployCCTPMessageTransmitterProxyInput) Validate(ctx context.Context, chain cldf_evm.Chain, state evm.CCIPChainState) error {
+	// The message transmitter consts are defined in the chainlink-deployments project so we can't validate them here.
+	if i.TokenMessenger == utils.ZeroAddress {
+		return fmt.Errorf("token messenger must be defined for chain %s", chain.Name)


Suggested change

return fmt.Errorf("token messenger must be defined for chain %s", chain.Name)

return fmt.Errorf("token messenger must be defined for chain %s", chain.Name())

chris-de-leon-cll · 2025-07-14T19:09:51Z

deployment/ccip/changeset/v1_6/cs_configure_usdc_token_pool.go

+
+func (i ConfigUSDCTokenPoolInput) Validate(ctx context.Context, chain cldf_evm.Chain, state evm.CCIPChainState) error {
+	if _, ok := state.USDCTokenPools_v1_6[deployment.Version1_6_0]; !ok {
+		return fmt.Errorf("no USDC token pool with version %s found on %s", deployment.Version1_6_0, chain.Name)


Suggested change

return fmt.Errorf("no USDC token pool with version %s found on %s", deployment.Version1_6_0, chain.Name)

return fmt.Errorf("no USDC token pool with version %s found on %s", deployment.Version1_6_0, chain.Name())

chris-de-leon-cll · 2025-07-14T19:26:48Z

deployment/ccip/changeset/v1_6/cs_deploy_usdc_token_pools.go

+	if _, ok := state.CCTPMessageTransmitterProxies[deployment.Version1_6_0]; !ok {
+		// TODO: Could this be deployed automatically if it doesn't exist?
+		return fmt.Errorf("CCTP message transmitter proxy for version %s not found on %s", deployment.Version1_6_0, chain)
+	}


Could this be deployed automatically if it doesn't exist?

Yep this is possible - in fact the Solana tooling automatically deploys prerequisite contracts if they are missing from state:

chainlink/deployment/ccip/changeset/solana/cs_deploy_chain.go

Lines 288 to 292 in ccacda4

if chainState.FeeQuoter.IsZero() {

feeQuoterAddress, err = DeployAndMaybeSaveToAddressBook(e, chain, ab, shared.FeeQuoter, deployment.Version1_0_0, false, "")

if err != nil {

return batches, fmt.Errorf("failed to deploy program: %w", err)

}

There's a few routes that you can take here:

You can do the deployment of the token pool and transmitter from this changeset

You can create a separate changeset which deploys everything end-to-end using a sequence

You can leave this as is and write them out separately in CLD

I think the sequence approach is probably what the CLD team would recommend - this would allow you to reduce duplication and have each changeset be more focused on a single responsibility

chris-de-leon-cll · 2025-07-14T19:34:07Z

deployment/ccip/changeset/v1_6/cs_deploy_cctp_message_transmitter_proxy.go

+	}
+
+	return cldf.ChangesetOutput{
+		AddressBook: newAddresses, // TODO: this is deprecated, how do I use the DataStore instead?


https://docs.cld.cldev.sh/guides/changesets/datastore

I was having trouble figuring out how I was supposed to use it 🤷‍♂️

chris-de-leon-cll · 2025-07-14T20:28:10Z

deployment/ccip/changeset/v1_6/cs_deploy_usdc_token_pools.go

+					// If the previous pool address is not set, we try to find the latest deployed pool address
+					if _, ok := chainState.USDCTokenPools[deployment.Version1_5_0]; !ok {
+						previousPoolAddress = chainState.USDCTokenPools[deployment.Version1_5_0].Address()
+					} else if _, ok := chainState.USDCTokenPools[deployment.Version1_5_1]; !ok {
+						previousPoolAddress = chainState.USDCTokenPools[deployment.Version1_5_1].Address()
+					} else if _, ok := chainState.USDCTokenPools_v1_6[deployment.Version1_6_0]; !ok {
+						previousPoolAddress = chainState.USDCTokenPools[deployment.Version1_6_0].Address()
+					} else if _, ok := chainState.USDCTokenPools_v1_6[deployment.Version1_6_1]; !ok {
+						previousPoolAddress = chainState.USDCTokenPools[deployment.Version1_6_1].Address()


I think the ordering of this should be reversed right? At the moment, this will look for the oldest one first rather than the latest one first

chris-de-leon-cll · 2025-07-14T20:34:55Z

deployment/ccip/changeset/v1_6/cs_configure_usdc_token_pool.go

+			if update.MintRecipient == utils.ZeroAddress {
+				return fmt.Errorf("mint recipient must be defined for Solana destination chain selector %d", destSelector)
+			}


This could just be a misunderstanding from my side, but it seems like we're checking the if the chain family is Solana then doing EVM-based address comparisons - is that intentional? Did you instead mean to perform solana-based address comparisons instead? Wanted to ask just to be safe because the zero address is slightly different on Solana and this check might not work as expected

…tter proxy

winder · 2025-07-16T17:25:44Z

deployment/ccip/changeset/v1_6/cs_configure_cctp_message_transmitter_proxy.go

+	CCTPMessageTransmitterProxyConfigOp = opsutil.NewEVMCallOperation(
+		"CCTPMessageTransmitterProxyConfigOp",
+		semver.MustParse("1.0.0"),
+		"Setting CCTP message transmitter proxy config across multiple EVM chains",


This one is for a single chain only, not multiple

winder · 2025-07-16T17:26:34Z

deployment/ccip/changeset/v1_6/cs_configure_cctp_message_transmitter_proxy.go

+
+	// TODO: New token pool contract should be imported from the latest version
+
+	mtp "github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/cctp_message_transmitter_proxy"


nit: I called this cmtp in the deploy changeset

winder · 2025-07-16T17:28:58Z

deployment/ccip/changeset/v1_6/cs_configure_cctp_message_transmitter_proxy.go

+
+// ConfigureCCTPMessageTransmitterProxyContractConfig defines the configuration for configuring the CCTP message transmitter proxy contracts.
+type ConfigureCCTPMessageTransmitterProxyContractConfig struct {
+	USDCProxies map[uint64]ConfigureCCTPMessageTransmitterProxyInput


nit: CCTPProxies?

cl-sonarqube-production · 2025-07-16T17:44:24Z

Quality Gate passed

Issues
22 New issues
1 Fixed issue
0 Accepted issues

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

See analysis details on SonarQube

winder force-pushed the will/usdc-changesets branch from bb458ba to 91d3526 Compare July 9, 2025 18:03

winder commented Jul 11, 2025

View reviewed changes

winder added 9 commits July 14, 2025 11:33

Copy/paste 1.5.1 usdc changesets to 1.6

6ae5f80

WIP - convert to new interfaces

5be353e

Update to latest usdc token pool generated code.

1888a70

placeholder for cctp message transmitter proxy.

79c461e

Implement cctp proxy changeset.

e28d994

USDC token pool config changeset template.

445b4a5

Domain update migration.

4a7f63e

Use a better name.

4527763

Lookup transmitter proxy and token pool addresses from state.

6a77988

winder force-pushed the will/usdc-changesets branch from 5f87a79 to 6a77988 Compare July 14, 2025 15:35

winder added 3 commits July 14, 2025 13:38

Add a way to automatically resolve the previous token pool address.

513be78

Cleanup inputs to usdc pool config changeset.

663b5ab

Fix pool address.

dfefb62

chris-de-leon-cll reviewed Jul 14, 2025

View reviewed changes

winder and others added 6 commits July 14, 2025 17:27

Use solana addr type.

9e6d455

Updated DomainUpdateInput allowed caller to be solana address

8f0fde9

Updated token pool helper to fetch 1.6 USDC contract address

ff7811a

Updated validate chain method to support Solana chains

b41b0de

Updated USDC token observer config validation for 1.6 token pool

db90490

Added changeset to update allowed callers on the CCTP message transmi…

a724d0a

…tter proxy

winder commented Jul 16, 2025

View reviewed changes

amit-momin added 2 commits July 16, 2025 12:29

Added validation to check CCTP message transmitter proxy existence

bcd51cd

Addressed feedback

c313727

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

EVM USDC Token Pool Changesets #18560

EVM USDC Token Pool Changesets #18560

winder commented Jul 9, 2025 •

edited

Loading

Uh oh!

winder Jul 11, 2025

Uh oh!

chris-de-leon-cll Jul 14, 2025

Uh oh!

chris-de-leon-cll Jul 14, 2025

Uh oh!

chris-de-leon-cll Jul 14, 2025

Uh oh!

chris-de-leon-cll Jul 14, 2025

Uh oh!

chris-de-leon-cll Jul 14, 2025

Uh oh!

chris-de-leon-cll Jul 14, 2025

Uh oh!

winder Jul 14, 2025

Uh oh!

chris-de-leon-cll Jul 14, 2025

Uh oh!

chris-de-leon-cll Jul 14, 2025

Uh oh!

winder Jul 16, 2025

Uh oh!

winder Jul 16, 2025

Uh oh!

winder Jul 16, 2025

Uh oh!

cl-sonarqube-production bot commented Jul 16, 2025

Uh oh!

Uh oh!

	Err: fmt.Errorf("previous USDC pool address not found on %s", previousPoolAddress, chain),
	Err: fmt.Errorf("previous USDC pool address (%s) not found on %s", previousPoolAddress.Hex(), chain.Name()),

	return fmt.Errorf("token messenger must be defined for chain %s", chain.Name)
	return fmt.Errorf("token messenger must be defined for chain %s", chain.Name())

	return fmt.Errorf("no USDC token pool with version %s found on %s", deployment.Version1_6_0, chain.Name)
	return fmt.Errorf("no USDC token pool with version %s found on %s", deployment.Version1_6_0, chain.Name())

	if chainState.FeeQuoter.IsZero() {
	feeQuoterAddress, err = DeployAndMaybeSaveToAddressBook(e, chain, ab, shared.FeeQuoter, deployment.Version1_0_0, false, "")
	if err != nil {
	return batches, fmt.Errorf("failed to deploy program: %w", err)
	}


		// TODO: New token pool contract should be imported from the latest version

		mtp "github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/latest/cctp_message_transmitter_proxy"

EVM USDC Token Pool Changesets #18560

Are you sure you want to change the base?

EVM USDC Token Pool Changesets #18560

Conversation

winder commented Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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!

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!

cl-sonarqube-production bot commented Jul 16, 2025

Quality Gate passed

Uh oh!

Uh oh!

winder commented Jul 9, 2025 •

edited

Loading