Update v1.7 ref to v2.0

deployment/ccip/changeset/v1_6/cs_ccip_home.go

@@ -197,13 +197,13 @@ func validateUSDCConfig(usdcConfig *pluginconfig.USDCCCTPObserverConfig, state s
 			if pool, ok := onchainState.USDCTokenPoolsV1_6[deployment.Version1_6_2]; ok {
 				validSourcePools = append(validSourcePools, pool.Address())
 			}
-			if proxy, ok := onchainState.USDCTokenPoolProxies[deployment.Version1_7_0]; ok {
+			if proxy, ok := onchainState.USDCTokenPoolProxies[deployment.Version2_0_0]; ok {
 				validSourcePools = append(validSourcePools, proxy)
 			}
 			if len(validSourcePools) == 0 {
 				return fmt.Errorf(
 					"chain %d does not have USDC token pool deployed with version %s, %s, or %s",
-					sel, deployment.Version1_5_1, deployment.Version1_6_2, deployment.Version1_7_0,
+					sel, deployment.Version1_5_1, deployment.Version1_6_2, deployment.Version2_0_0,
 				)
 			}
 
@@ -274,15 +274,15 @@ func loadOnchainStateForCandidateChangesets(e cldf.Environment) (stateview.CCIPO
 		refs := e.DataStore.Addresses().Filter(
 			datastore.AddressRefByChainSelector(chainSelector),
 			datastore.AddressRefByType(datastore.ContractType(shared.USDCTokenPoolProxy)),
-			datastore.AddressRefByVersion(&deployment.Version1_7_0),
+			datastore.AddressRefByVersion(&deployment.Version2_0_0),
 		)
 		if len(refs) == 0 {
 			continue
 		}
 		if len(refs) > 1 {
 			return stateview.CCIPOnChainState{}, fmt.Errorf(
 				"multiple datastore entries found for %s %s on chain %d; qualifiers=%v",
-				shared.USDCTokenPoolProxy, deployment.Version1_7_0, chainSelector, maps.Keys(refsByQualifier(refs)),
+				shared.USDCTokenPoolProxy, deployment.Version2_0_0, chainSelector, maps.Keys(refsByQualifier(refs)),
 			)
 		}
 
@@ -293,7 +293,7 @@ func loadOnchainStateForCandidateChangesets(e cldf.Environment) (stateview.CCIPO
 		if chainState.USDCTokenPoolProxies == nil {
 			chainState.USDCTokenPoolProxies = make(map[semver.Version]common.Address)
 		}
-		chainState.USDCTokenPoolProxies[deployment.Version1_7_0] = common.HexToAddress(refs[0].Address)
+		chainState.USDCTokenPoolProxies[deployment.Version2_0_0] = common.HexToAddress(refs[0].Address)
 		state.WriteEVMChainState(chainSelector, chainState)
 	}
 

deployment/ccip/changeset/v1_6/cs_ccip_home_test.go

@@ -571,7 +571,7 @@ func Test_SetCandidateAcceptsUSDCTokenPoolProxyFromDataStore(t *testing.T) {
 		ChainSelector: dest,
 		Address:       proxyAddress.Hex(),
 		Type:          datastore.ContractType(shared.USDCTokenPoolProxy),
-		Version:       &deployment.Version1_7_0,
+		Version:       &deployment.Version2_0_0,
 		Qualifier:     "proxy-only-in-datastore",
 	}))
 	tenv.Env.DataStore = ds.Seal()
@@ -608,7 +608,7 @@ func Test_SetCandidateErrorsOnDuplicateUSDCTokenPoolProxyInDataStore(t *testing.
 			ChainSelector: dest,
 			Address:       common.HexToAddress(ref.address).Hex(),
 			Type:          datastore.ContractType(shared.USDCTokenPoolProxy),
-			Version:       &deployment.Version1_7_0,
+			Version:       &deployment.Version2_0_0,
 			Qualifier:     ref.qualifier,
 		}), "add datastore ref %d", i)
 	}
@@ -621,7 +621,7 @@ func Test_SetCandidateErrorsOnDuplicateUSDCTokenPoolProxyInDataStore(t *testing.
 		),
 	)
 	require.Error(t, err)
-	require.ErrorContains(t, err, "multiple datastore entries found for USDCTokenPoolProxy 1.7.0")
+	require.ErrorContains(t, err, "multiple datastore entries found for USDCTokenPoolProxy 2.0.0")
 }
 
 func setCandidateExecConfig(homeChainSel, feedChainSel, dest uint64, sourcePoolAddress string) v1_6.SetCandidateChangesetConfig {

deployment/ccip/shared/stateview/state.go

@@ -1273,11 +1273,11 @@ func LoadChainState(ctx context.Context, chain cldf_evm.Chain, addresses map[str
 			}
 			state.USDCTokenPoolsV1_6[deployment.Version1_6_2] = utp
 			state.ABIByAddress[address] = usdc_token_pool_v1_6_2.USDCTokenPoolABI
-		case cldf.NewTypeAndVersion(ccipshared.USDCTokenPoolProxy, deployment.Version1_7_0).String():
+		case cldf.NewTypeAndVersion(ccipshared.USDCTokenPoolProxy, deployment.Version2_0_0).String():
 			if state.USDCTokenPoolProxies == nil {
 				state.USDCTokenPoolProxies = make(map[semver.Version]common.Address)
 			}
-			state.USDCTokenPoolProxies[deployment.Version1_7_0] = common.HexToAddress(address)
+			state.USDCTokenPoolProxies[deployment.Version2_0_0] = common.HexToAddress(address)
 		case cldf.NewTypeAndVersion(ccipshared.USDCMockTransmitter, deployment.Version1_0_0).String():
 			umt, err := mock_usdc_token_transmitter.NewMockE2EUSDCTransmitter(common.HexToAddress(address), chain.Client)
 			if err != nil {

deployment/ccip/shared/token_pools.go

@@ -56,7 +56,7 @@ var TokenPoolVersions = map[semver.Version]struct{}{
 	deployment.Version1_6_0:      {},
 	deployment.Version1_6_1:      {},
 	deployment.Version1_6_2:      {},
-	deployment.Version1_7_0:      {},
+	deployment.Version2_0_0:      {},
 }
 
 // tokenPool defines behavior common to all token pools.

deployment/version.go

@@ -17,5 +17,5 @@ var (
 	Version1_6_2    = *semver.MustParse("1.6.2")
 	Version1_6_3Dev = *semver.MustParse("1.6.3-dev")
 	Version1_6_3    = *semver.MustParse("1.6.3")
-	Version1_7_0    = *semver.MustParse("1.7.0")
+	Version2_0_0    = *semver.MustParse("2.0.0")
 )