USDC token pool changesets (+ token pool patches)

deployment/ccip/changeset/cs_accept_admin_role_test.go

@@ -61,7 +61,7 @@ func TestAcceptAdminRoleChangeset_Validations(t *testing.T) {
 					selectorA: map[changeset.TokenSymbol]changeset.TokenPoolInfo{
 						testhelpers.TestTokenSymbol: {
 							Type:    "InvalidType",
-							Version: deployment.Version1_5_1,
+							Version: changeset.CurrentTokenPoolVersion,
 						},
 					},
 				},
@@ -91,7 +91,7 @@ func TestAcceptAdminRoleChangeset_Validations(t *testing.T) {
 					selectorA: map[changeset.TokenSymbol]changeset.TokenPoolInfo{
 						testhelpers.TestTokenSymbol: {
 							Type:    changeset.BurnMintTokenPool,
-							Version: deployment.Version1_5_1,
+							Version: changeset.CurrentTokenPoolVersion,
 						},
 					},
 				},
@@ -152,13 +152,13 @@ func TestAcceptAdminRoleChangeset_Execution(t *testing.T) {
 							selectorA: map[changeset.TokenSymbol]changeset.TokenPoolInfo{
 								testhelpers.TestTokenSymbol: {
 									Type:    changeset.BurnMintTokenPool,
-									Version: deployment.Version1_5_1,
+									Version: changeset.CurrentTokenPoolVersion,
 								},
 							},
 							selectorB: map[changeset.TokenSymbol]changeset.TokenPoolInfo{
 								testhelpers.TestTokenSymbol: {
 									Type:    changeset.BurnMintTokenPool,
-									Version: deployment.Version1_5_1,
+									Version: changeset.CurrentTokenPoolVersion,
 								},
 							},
 						},
@@ -172,13 +172,13 @@ func TestAcceptAdminRoleChangeset_Execution(t *testing.T) {
 							selectorA: map[changeset.TokenSymbol]changeset.TokenPoolInfo{
 								testhelpers.TestTokenSymbol: {
 									Type:    changeset.BurnMintTokenPool,
-									Version: deployment.Version1_5_1,
+									Version: changeset.CurrentTokenPoolVersion,
 								},
 							},
 							selectorB: map[changeset.TokenSymbol]changeset.TokenPoolInfo{
 								testhelpers.TestTokenSymbol: {
 									Type:    changeset.BurnMintTokenPool,
-									Version: deployment.Version1_5_1,
+									Version: changeset.CurrentTokenPoolVersion,
 								},
 							},
 						},

deployment/ccip/changeset/cs_ccip_home.go

@@ -126,13 +126,14 @@ func validateUSDCConfig(usdcConfig *pluginconfig.USDCCCTPObserverConfig, state C
 		if !ok {
 			return fmt.Errorf("chain %d does not exist in state but provided in USDCCCTPObserverConfig", sel)
 		}
-		if onchainState.USDCTokenPool == nil {
-			return fmt.Errorf("chain %d does not have USDC token pool deployed", sel)
+		if onchainState.USDCTokenPools == nil || onchainState.USDCTokenPools[CurrentTokenPoolVersion] == nil {
+			return fmt.Errorf("chain %d does not have a USDC token pool with the current version %s deployed", sel, CurrentTokenPoolVersion)
 		}
-		if common.HexToAddress(token.SourcePoolAddress) != onchainState.USDCTokenPool.Address() {
+		usdcTokenPool := onchainState.USDCTokenPools[CurrentTokenPoolVersion]
+		if common.HexToAddress(token.SourcePoolAddress) != usdcTokenPool.Address() {
 			return fmt.Errorf("chain %d has USDC token pool deployed at %s, "+
 				"but SourcePoolAddress %s is provided in USDCCCTPObserverConfig",
-				sel, onchainState.USDCTokenPool.Address().String(), token.SourcePoolAddress)
+				sel, usdcTokenPool.Address().String(), token.SourcePoolAddress)
 		}
 	}
 	return nil

deployment/ccip/changeset/cs_configure_token_pools.go

@@ -85,9 +85,13 @@ func (c TokenPoolConfig) Validate(ctx context.Context, chain deployment.Chain, s
 	if !ok {
 		return fmt.Errorf("token pool does not exist on %s with symbol %s, type %s, and version %s", chain.String(), tokenSymbol, c.Type, c.Version)
 	}
+	tokenPool, err := token_pool.NewTokenPool(tokenPoolAddress, chain.Client)
+	if err != nil {
+		return fmt.Errorf("failed to connect token pool with address %s on chain %s with token pool bindings: %w", tokenPoolAddress, chain, err)
+	}
 
 	// Validate that the token pool is owned by the address that will be actioning the transactions (i.e. Timelock or deployer key)
-	if err := commoncs.ValidateOwnership(ctx, useMcms, chain.DeployerKey.From, state.Timelock.Address(), state.TokenAdminRegistry); err != nil {
+	if err := commoncs.ValidateOwnership(ctx, useMcms, chain.DeployerKey.From, state.Timelock.Address(), tokenPool); err != nil {
 		return fmt.Errorf("token pool with address %s on %s failed ownership validation: %w", tokenPoolAddress, chain.String(), err)
 	}
 
@@ -146,13 +150,11 @@ func (c ConfigureTokenPoolContractsConfig) Validate(env deployment.Environment)
 		if tokenAdminRegistry := chainState.TokenAdminRegistry; tokenAdminRegistry == nil {
 			return fmt.Errorf("missing tokenAdminRegistry on %s", chain.String())
 		}
-		if c.MCMS != nil {
-			if timelock := chainState.Timelock; timelock == nil {
-				return fmt.Errorf("missing timelock on %s", chain.String())
-			}
-			if proposerMcm := chainState.ProposerMcm; proposerMcm == nil {
-				return fmt.Errorf("missing proposerMcm on %s", chain.String())
-			}
+		if timelock := chainState.Timelock; timelock == nil {
+			return fmt.Errorf("missing timelock on %s", chain.String())
+		}
+		if proposerMcm := chainState.ProposerMcm; proposerMcm == nil {
+			return fmt.Errorf("missing proposerMcm on %s", chain.String())
 		}
 		if err := poolUpdate.Validate(env.GetContext(), chain, chainState, c.MCMS != nil, c.TokenSymbol); err != nil {
 			return fmt.Errorf("invalid pool update on %s: %w", chain.String(), err)

deployment/ccip/changeset/cs_configure_token_pools_test.go

@@ -19,22 +19,6 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 )
 
-// createSymmetricRateLimits is a utility to quickly create a rate limiter config with equal inbound and outbound values.
-func createSymmetricRateLimits(rate int64, capacity int64) changeset.RateLimiterConfig {
-	return changeset.RateLimiterConfig{
-		Inbound: token_pool.RateLimiterConfig{
-			IsEnabled: rate != 0 || capacity != 0,
-			Rate:      big.NewInt(rate),
-			Capacity:  big.NewInt(capacity),
-		},
-		Outbound: token_pool.RateLimiterConfig{
-			IsEnabled: rate != 0 || capacity != 0,
-			Rate:      big.NewInt(rate),
-			Capacity:  big.NewInt(capacity),
-		},
-	}
-}
-
 // validateMemberOfTokenPoolPair performs checks required to validate that a token pool is fully configured for cross-chain transfer.
 func validateMemberOfTokenPoolPair(
 	t *testing.T,
@@ -177,7 +161,7 @@ func TestValidateTokenPoolConfig(t *testing.T) {
 			Msg: "Pool is not owned by required address",
 			TokenPoolConfig: changeset.TokenPoolConfig{
 				Type:    changeset.BurnMintTokenPool,
-				Version: deployment.Version1_5_1,
+				Version: changeset.CurrentTokenPoolVersion,
 			},
 			ErrStr: "failed ownership validation",
 		},
@@ -321,47 +305,47 @@ func TestValidateConfigureTokenPoolContracts(t *testing.T) {
 		{
 			Msg: "Configure new pools on registry",
 			RegistrationPass: &regPass{
-				SelectorA2B: createSymmetricRateLimits(100, 1000),
-				SelectorB2A: createSymmetricRateLimits(100, 1000),
+				SelectorA2B: testhelpers.CreateSymmetricRateLimits(100, 1000),
+				SelectorB2A: testhelpers.CreateSymmetricRateLimits(100, 1000),
 			},
 		},
 		{
 			Msg: "Configure new pools on registry, update their rate limits",
 			RegistrationPass: &regPass{
-				SelectorA2B: createSymmetricRateLimits(100, 1000),
-				SelectorB2A: createSymmetricRateLimits(100, 1000),
+				SelectorA2B: testhelpers.CreateSymmetricRateLimits(100, 1000),
+				SelectorB2A: testhelpers.CreateSymmetricRateLimits(100, 1000),
 			},
 			UpdatePass: &updatePass{
 				UpdatePoolOnA: false,
 				UpdatePoolOnB: false,
-				SelectorA2B:   createSymmetricRateLimits(200, 2000),
-				SelectorB2A:   createSymmetricRateLimits(200, 2000),
+				SelectorA2B:   testhelpers.CreateSymmetricRateLimits(200, 2000),
+				SelectorB2A:   testhelpers.CreateSymmetricRateLimits(200, 2000),
 			},
 		},
 		{
 			Msg: "Configure new pools on registry, update both pools",
 			RegistrationPass: &regPass{
-				SelectorA2B: createSymmetricRateLimits(100, 1000),
-				SelectorB2A: createSymmetricRateLimits(100, 1000),
+				SelectorA2B: testhelpers.CreateSymmetricRateLimits(100, 1000),
+				SelectorB2A: testhelpers.CreateSymmetricRateLimits(100, 1000),
 			},
 			UpdatePass: &updatePass{
 				UpdatePoolOnA: true,
 				UpdatePoolOnB: true,
-				SelectorA2B:   createSymmetricRateLimits(100, 1000),
-				SelectorB2A:   createSymmetricRateLimits(100, 1000),
+				SelectorA2B:   testhelpers.CreateSymmetricRateLimits(100, 1000),
+				SelectorB2A:   testhelpers.CreateSymmetricRateLimits(100, 1000),
 			},
 		},
 		{
 			Msg: "Configure new pools on registry, update only one pool",
 			RegistrationPass: &regPass{
-				SelectorA2B: createSymmetricRateLimits(100, 1000),
-				SelectorB2A: createSymmetricRateLimits(100, 1000),
+				SelectorA2B: testhelpers.CreateSymmetricRateLimits(100, 1000),
+				SelectorB2A: testhelpers.CreateSymmetricRateLimits(100, 1000),
 			},
 			UpdatePass: &updatePass{
 				UpdatePoolOnA: false,
 				UpdatePoolOnB: true,
-				SelectorA2B:   createSymmetricRateLimits(200, 2000),
-				SelectorB2A:   createSymmetricRateLimits(200, 2000),
+				SelectorA2B:   testhelpers.CreateSymmetricRateLimits(200, 2000),
+				SelectorB2A:   testhelpers.CreateSymmetricRateLimits(200, 2000),
 			},
 		},
 	}
@@ -402,11 +386,11 @@ func TestValidateConfigureTokenPoolContracts(t *testing.T) {
 				state, err := changeset.LoadOnchainState(e)
 				require.NoError(t, err)
 
-				lockReleaseA, _ := token_pool.NewTokenPool(state.Chains[selectorA].LockReleaseTokenPools[testhelpers.TestTokenSymbol][deployment.Version1_5_1].Address(), e.Chains[selectorA].Client)
-				burnMintA, _ := token_pool.NewTokenPool(state.Chains[selectorA].BurnMintTokenPools[testhelpers.TestTokenSymbol][deployment.Version1_5_1].Address(), e.Chains[selectorA].Client)
+				lockReleaseA, _ := token_pool.NewTokenPool(state.Chains[selectorA].LockReleaseTokenPools[testhelpers.TestTokenSymbol][changeset.CurrentTokenPoolVersion].Address(), e.Chains[selectorA].Client)
+				burnMintA, _ := token_pool.NewTokenPool(state.Chains[selectorA].BurnMintTokenPools[testhelpers.TestTokenSymbol][changeset.CurrentTokenPoolVersion].Address(), e.Chains[selectorA].Client)
 
-				lockReleaseB, _ := token_pool.NewTokenPool(state.Chains[selectorB].LockReleaseTokenPools[testhelpers.TestTokenSymbol][deployment.Version1_5_1].Address(), e.Chains[selectorB].Client)
-				burnMintB, _ := token_pool.NewTokenPool(state.Chains[selectorB].BurnMintTokenPools[testhelpers.TestTokenSymbol][deployment.Version1_5_1].Address(), e.Chains[selectorB].Client)
+				lockReleaseB, _ := token_pool.NewTokenPool(state.Chains[selectorB].LockReleaseTokenPools[testhelpers.TestTokenSymbol][changeset.CurrentTokenPoolVersion].Address(), e.Chains[selectorB].Client)
+				burnMintB, _ := token_pool.NewTokenPool(state.Chains[selectorB].BurnMintTokenPools[testhelpers.TestTokenSymbol][changeset.CurrentTokenPoolVersion].Address(), e.Chains[selectorB].Client)
 
 				pools := map[uint64]tokenPools{
 					selectorA: tokenPools{
@@ -438,14 +422,14 @@ func TestValidateConfigureTokenPoolContracts(t *testing.T) {
 								PoolUpdates: map[uint64]changeset.TokenPoolConfig{
 									selectorA: {
 										Type:    changeset.LockReleaseTokenPool,
-										Version: deployment.Version1_5_1,
+										Version: changeset.CurrentTokenPoolVersion,
 										ChainUpdates: changeset.RateLimiterPerChain{
 											selectorB: test.RegistrationPass.SelectorA2B,
 										},
 									},
 									selectorB: {
 										Type:    changeset.LockReleaseTokenPool,
-										Version: deployment.Version1_5_1,
+										Version: changeset.CurrentTokenPoolVersion,
 										ChainUpdates: changeset.RateLimiterPerChain{
 											selectorA: test.RegistrationPass.SelectorB2A,
 										},
@@ -461,13 +445,13 @@ func TestValidateConfigureTokenPoolContracts(t *testing.T) {
 									selectorA: map[changeset.TokenSymbol]changeset.TokenPoolInfo{
 										testhelpers.TestTokenSymbol: {
 											Type:    changeset.LockReleaseTokenPool,
-											Version: deployment.Version1_5_1,
+											Version: changeset.CurrentTokenPoolVersion,
 										},
 									},
 									selectorB: map[changeset.TokenSymbol]changeset.TokenPoolInfo{
 										testhelpers.TestTokenSymbol: {
 											Type:    changeset.LockReleaseTokenPool,
-											Version: deployment.Version1_5_1,
+											Version: changeset.CurrentTokenPoolVersion,
 										},
 									},
 								},
@@ -481,13 +465,13 @@ func TestValidateConfigureTokenPoolContracts(t *testing.T) {
 									selectorA: map[changeset.TokenSymbol]changeset.TokenPoolInfo{
 										testhelpers.TestTokenSymbol: {
 											Type:    changeset.LockReleaseTokenPool,
-											Version: deployment.Version1_5_1,
+											Version: changeset.CurrentTokenPoolVersion,
 										},
 									},
 									selectorB: map[changeset.TokenSymbol]changeset.TokenPoolInfo{
 										testhelpers.TestTokenSymbol: {
 											Type:    changeset.LockReleaseTokenPool,
-											Version: deployment.Version1_5_1,
+											Version: changeset.CurrentTokenPoolVersion,
 										},
 									},
 								},
@@ -501,13 +485,13 @@ func TestValidateConfigureTokenPoolContracts(t *testing.T) {
 									selectorA: map[changeset.TokenSymbol]changeset.TokenPoolInfo{
 										testhelpers.TestTokenSymbol: {
 											Type:    changeset.LockReleaseTokenPool,
-											Version: deployment.Version1_5_1,
+											Version: changeset.CurrentTokenPoolVersion,
 										},
 									},
 									selectorB: map[changeset.TokenSymbol]changeset.TokenPoolInfo{
 										testhelpers.TestTokenSymbol: {
 											Type:    changeset.LockReleaseTokenPool,
-											Version: deployment.Version1_5_1,
+											Version: changeset.CurrentTokenPoolVersion,
 										},
 									},
 								},
@@ -561,14 +545,14 @@ func TestValidateConfigureTokenPoolContracts(t *testing.T) {
 								PoolUpdates: map[uint64]changeset.TokenPoolConfig{
 									selectorA: {
 										Type:    aType,
-										Version: deployment.Version1_5_1,
+										Version: changeset.CurrentTokenPoolVersion,
 										ChainUpdates: changeset.RateLimiterPerChain{
 											selectorB: test.UpdatePass.SelectorA2B,
 										},
 									},
 									selectorB: {
 										Type:    bType,
-										Version: deployment.Version1_5_1,
+										Version: changeset.CurrentTokenPoolVersion,
 										ChainUpdates: changeset.RateLimiterPerChain{
 											selectorA: test.UpdatePass.SelectorB2A,
 										},

deployment/ccip/changeset/cs_deploy_token_pools.go

@@ -82,9 +82,9 @@ func (i DeployTokenPoolInput) Validate(ctx context.Context, chain deployment.Cha
 	}
 
 	// We should check if a token pool with this type, version, and symbol already exists
-	_, ok := getTokenPoolAddressFromSymbolTypeAndVersion(state, chain, tokenSymbol, i.Type, currentTokenPoolVersion)
+	_, ok := getTokenPoolAddressFromSymbolTypeAndVersion(state, chain, tokenSymbol, i.Type, CurrentTokenPoolVersion)
 	if ok {
-		return fmt.Errorf("token pool with type %s and version %s already exists for %s on %s", i.Type, currentTokenPoolVersion, tokenSymbol, chain)
+		return fmt.Errorf("token pool with type %s and version %s already exists for %s on %s", i.Type, CurrentTokenPoolVersion, tokenSymbol, chain)
 	}
 
 	return nil
@@ -207,7 +207,7 @@ func DeployTokenPool(
 			return deployment.ContractDeploy[*token_pool.TokenPool]{
 				Address:  tpAddr,
 				Contract: tp,
-				Tv:       deployment.NewTypeAndVersion(poolConfig.Type, currentTokenPoolVersion),
+				Tv:       deployment.NewTypeAndVersion(poolConfig.Type, CurrentTokenPoolVersion),
 				Tx:       tx,
 				Err:      err,
 			}

deployment/ccip/changeset/cs_deploy_token_pools_test.go

@@ -174,7 +174,7 @@ func TestValidateDeployTokenPoolInput(t *testing.T) {
 				TokenAddress:       tokens[selectorA].Address,
 				LocalTokenDecimals: testhelpers.LocalTokenDecimals,
 			},
-			ErrStr: fmt.Sprintf("token pool with type BurnMintTokenPool and version %s already exists", deployment.Version1_5_1),
+			ErrStr: fmt.Sprintf("token pool with type BurnMintTokenPool and version %s already exists", changeset.CurrentTokenPoolVersion),
 		},
 	}
 
@@ -306,7 +306,7 @@ func TestDeployTokenPoolContracts(t *testing.T) {
 	burnMintTokenPools, ok := state.Chains[selectorA].BurnMintTokenPools[testhelpers.TestTokenSymbol]
 	require.True(t, ok)
 	require.Len(t, burnMintTokenPools, 1)
-	owner, err := burnMintTokenPools[deployment.Version1_5_1].Owner(nil)
+	owner, err := burnMintTokenPools[changeset.CurrentTokenPoolVersion].Owner(nil)
 	require.NoError(t, err)
 	require.Equal(t, e.Chains[selectorA].DeployerKey.From, owner)
 }