fix: cctp transfer validation (#8621)

Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>

Author: troykessler

.changeset/little-boxes-yawn.md

@@ -0,0 +1,6 @@
+---
+"@hyperlane-xyz/cli": patch
+"@hyperlane-xyz/sdk": patch
+---
+
+Fixed cctp transfer validation

typescript/cli/src/deploy/warp.ts

@@ -50,9 +50,7 @@ import {
   getRouterAddressesFromWarpCoreConfig,
   getSubmitterBuilder,
   getTokenConnectionId,
-  isCollateralTokenConfig,
   isCrossCollateralTokenConfig,
-  isXERC20TokenConfig,
   normalizeScale,
   splitWarpCoreAndExtendedConfigs,
   tokenTypeToStandard,
@@ -370,10 +368,8 @@ function generateTokenConfigs(
   for (const chainName of Object.keys(contracts)) {
     const config = warpDeployConfig[chainName];
     const collateralAddressOrDenom =
-      isCollateralTokenConfig(config) ||
-      isXERC20TokenConfig(config) ||
-      isCrossCollateralTokenConfig(config)
-        ? (config as { token: string }).token // gets set in the above deriveTokenMetadata()
+      'token' in config && typeof config.token === 'string'
+        ? config.token
         : undefined;
 
     const protocol = multiProvider.getProtocol(chainName);

typescript/sdk/src/index.ts

@@ -850,6 +850,7 @@ export {
   HypTokenRouterConfigSchema,
   HypTokenRouterVirtualConfig,
   isCollateralRebaseTokenConfig,
+  isCctpTokenConfig,
   isCollateralTokenConfig,
   isMovableCollateralTokenConfig,
   isNativeTokenConfig,

typescript/sdk/src/token/TokenMetadata.ts

@@ -45,8 +45,11 @@ function matchesUnderlyingAsset(
       return true;
     }
 
+    // Only HypNative collateral legitimately lacks collateralAddressOrDenom;
+    // any other collateralized token missing it is a config bug, not a native match.
     if (
       !source.collateralAddressOrDenom &&
+      source.isHypNative() &&
       (target.isNative() || target.isHypNative())
     ) {
       return true;