prepare USDC gobindings for official release. (#1375)

* prepare USDC gobindings for official release.

* attempt CI fixes

* remove unnec. CI requirements.

* metadata wrapper regen

* update zksync gobindings

Author: jhweintraub

.github/workflows/solidity-build-and-publish.yml

@@ -87,16 +87,6 @@ jobs:
         working-directory: chains/evm
         run: make wrappers
 
-      - name: Run native compile and generate wrappers including metadata
-        if: ${{ needs.tag-check.outputs.is-release-ccip == 'true' || needs.tag-check.outputs.is-pre-release-ccip == 'true' }}
-        working-directory: chains/evm
-        run: make wrappers-release
-
-      - name: Install and run forge --zksync, and generate wrappers
-        if: ${{ needs.tag-check.outputs.is-release-ccip == 'true' || needs.tag-check.outputs.is-pre-release-ccip == 'true' }}
-        working-directory: chains/evm
-        run: make wrappers-zksync
-
       - name: Check if Go solidity wrappers are updated
         working-directory: chains/evm
         run: |

chains/evm/.gas-snapshot

@@ -59,7 +59,7 @@ ERC20LockBox_configureAllowedCallers:test_ConfigureAllowedCallers_RemoveNonExist
 ERC20LockBox_configureAllowedCallers:test_ConfigureAllowedCallers_RemoveSingleCaller() (gas: 49971)
 ERC20LockBox_configureAllowedCallers:test_ConfigureAllowedCallers_ZeroAddress() (gas: 53228)
 ERC20LockBox_configureAllowedCallers:test_ConfigureAllowedCallers_ZeroTokenAddress() (gas: 11266)
-ERC20LockBox_constructor:test_Constructor_Success() (gas: 670901)
+ERC20LockBox_constructor:test_Constructor_Success() (gas: 670101)
 ERC20LockBox_deposit:test_Deposit_FromDifferentCallers() (gas: 487682)
 ERC20LockBox_deposit:test_Deposit_MultipleDeposits() (gas: 90486)
 ERC20LockBox_withdraw:test_Withdraw_EventEmission() (gas: 99543)
@@ -550,12 +550,12 @@ TokenPool_validateReleaseOrMint:test_validateReleaseOrMint_Success() (gas: 39621
 USDCSourcePoolDataCodec__calculateDepositHash:test__calculateDepositHash() (gas: 9917)
 USDCSourcePoolDataCodec__decodeSourceTokenDataPayloadV2:test__decodeSourceTokenDataPayloadV2_CCTPV2() (gas: 5161)
 USDCSourcePoolDataCodec__decodeSourceTokenDataPayloadV2:test__decodeSourceTokenDataPayloadV2_CCTPV2CCV() (gas: 4916)
-USDCTokenPoolCCTPV2_constructor:test_constructor() (gas: 3470365)
+USDCTokenPoolCCTPV2_constructor:test_constructor() (gas: 3469557)
 USDCTokenPoolCCTPV2_lockOrBurn:test_lockOrBurn() (gas: 129947)
 USDCTokenPoolCCTPV2_lockOrBurn:test_lockOrBurn_MinFeeNotSupported() (gas: 114123)
 USDCTokenPoolCCTPV2_lockOrBurn:test_lockOrBurn_MintRecipientOverride() (gas: 157604)
 USDCTokenPoolCCTPV2_releaseOrMint:test_releaseOrMint_RealTx() (gas: 265533)
-USDCTokenPoolProxy_constructor:test_constructor() (gas: 1823082)
+USDCTokenPoolProxy_constructor:test_constructor() (gas: 1822282)
 USDCTokenPoolProxy_generateNewReleaseOrMintIn:test_generateNewReleaseOrMintIn() (gas: 35218)
 USDCTokenPoolProxy_lockOrBurn:test_lockOrBurn_CCTPV1() (gas: 104790)
 USDCTokenPoolProxy_lockOrBurn:test_lockOrBurn_CCTPV2() (gas: 94306)
@@ -572,7 +572,7 @@ USDCTokenPoolProxy_updateLockReleasePoolAddresses:test_updateLockReleasePoolAddr
 USDCTokenPoolProxy_updateLockReleasePoolAddresses:test_updateLockReleasePoolAddresses_Single() (gas: 52529)
 USDCTokenPoolProxy_updateLockReleasePoolAddresses:test_updateLockReleasePoolAddresses_ZeroAddress() (gas: 25431)
 USDCTokenPoolProxy_updatePoolAddresses:test_updatePoolAddresses() (gas: 55499)
-USDCTokenPool_constructor:test_constructor() (gas: 3377453)
+USDCTokenPool_constructor:test_constructor() (gas: 3376653)
 USDCTokenPool_lockOrBurn:test_LockOrBurn() (gas: 130897)
 USDCTokenPool_lockOrBurn:test_LockOrBurn_LegacySourcePoolDataFormat() (gas: 143822)
 USDCTokenPool_lockOrBurn:test_LockOrBurn_MintRecipientOverride() (gas: 159364)

chains/evm/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 1.6.4
+
+CCIP 1.6.4 is a minor release that overhauls the USDC Token Pool to add support for CCTP V2 and enable easier future
+upgradability of USDC and Lock/Release Token Pools.
+
+### New Features
+
+Key Improvements include:
+
+- [#1115](https://github.com/smartcontractkit/chainlink-ccip/pull/1115) - **ERC20Lockbox** - To better support token pools 
+which hold tokens, a new contract has been created which will hold the tokens for the token pool instead. This allows users 
+which utilize Lock/Release pools to upgrade their token pool without having to engage in liquidity migrations. Instead only a 
+simple configuration call is needed. The SiloedLockReleaseTokenPool has also been modified to support the lockbox.
+
+- [#1133](https://github.com/smartcontractkit/chainlink-ccip/pull/1133) - **USDCTokenPoolCCTPV2** - A modified version of
+the USDC Token Pool which is capable of supporting Circle's CCTP V2. As CCTP V1 is being phased out, all existing USDC 
+Token Pools will be migrated to this in the near future.
+
+- [#1134](https://github.com/smartcontractkit/chainlink-ccip/pull/1134) - **USDCTokenPoolProxy** - A versatile new dispatcher
+contract which allows USDC to be sent using different mechanisms based on the destination chain including CCTP V1, CCTP V2, and Lock/Mint.
 
 ## 1.6.3
 

chains/evm/contracts/pools/ERC20LockBox.sol

@@ -53,7 +53,7 @@ contract ERC20LockBox is ITypeAndVersion {
   /// without requiring the token pool owner's approval.
   mapping(address token => mapping(address caller => bool isAllowed)) internal s_allowedCallers;
 
-  string public constant typeAndVersion = "ERC20LockBox 1.6.2-dev";
+  string public constant typeAndVersion = "ERC20LockBox 1.6.4";
 
   constructor(
     address tokenAdminRegistry

chains/evm/contracts/pools/SiloedLockReleaseTokenPool.sol

@@ -67,7 +67,7 @@ contract SiloedLockReleaseTokenPool is TokenPool, ITypeAndVersion {
 
   /// @notice Using a function because constant state variables cannot be overridden by child contracts.
   function typeAndVersion() external pure virtual override returns (string memory) {
-    return "SiloedLockReleaseTokenPool 1.6.x-dev";
+    return "SiloedLockReleaseTokenPool 1.6.4";
   }
 
   /// @notice Locks the token in the pool

chains/evm/contracts/pools/USDC/SiloedUSDCTokenPool.sol

@@ -71,7 +71,7 @@ contract SiloedUSDCTokenPool is SiloedLockReleaseTokenPool, AuthorizedCallers {
 
   /// @notice Using a function because constant state variables cannot be overridden by child contracts.
   function typeAndVersion() external pure virtual override returns (string memory) {
-    return "SiloedUSDCTokenPool 1.6.x-dev";
+    return "SiloedUSDCTokenPool 1.6.4";
   }
 
   /// @inheritdoc SiloedLockReleaseTokenPool

chains/evm/contracts/pools/USDC/USDCTokenPool.sol

@@ -155,7 +155,7 @@ contract USDCTokenPool is TokenPool, ITypeAndVersion, AuthorizedCallers {
 
   /// @notice Using a function because constant state variables cannot be overridden by child contracts.
   function typeAndVersion() external pure virtual override returns (string memory) {
-    return "USDCTokenPool 1.6.x-dev";
+    return "USDCTokenPool 1.6.4";
   }
 
   /// @notice Burn tokens from the pool to initiate cross-chain transfer.

chains/evm/contracts/pools/USDC/USDCTokenPoolCCTPV2.sol

@@ -34,7 +34,7 @@ contract USDCTokenPoolCCTPV2 is USDCTokenPool {
   uint256 public constant MIN_USDC_MESSAGE_LENGTH = 280;
 
   function typeAndVersion() external pure virtual override returns (string memory) {
-    return "USDCTokenPoolCCTPV2 1.6.x-dev";
+    return "USDCTokenPoolCCTPV2 1.6.4";
   }
 
   /// @dev This contract is only used for CCTP V2, which is why the supportedUSDCVersion field of the parent

chains/evm/contracts/pools/USDC/USDCTokenPoolProxy.sol

@@ -70,7 +70,7 @@ contract USDCTokenPoolProxy is Ownable2StepMsgSender, IPoolV1, ITypeAndVersion {
   /// @dev The legacy CCTP V1, CCTP V1, and CCTP V2 pools which interact with CCTP contracts.
   PoolAddresses internal s_pools;
 
-  string public constant override typeAndVersion = "USDCTokenPoolProxy 1.6.x-dev";
+  string public constant override typeAndVersion = "USDCTokenPoolProxy 1.6.4";
 
   constructor(IERC20 token, PoolAddresses memory pools, address router) {
     // Note: It is not required that every pool address be set, as this proxy may be deployed on a chain which does not