XLabs · yuli-ferna · Apr 14, 2025
diff --git a/apps/connect/package-lock.json b/apps/connect/package-lock.json
diff --git a/apps/connect/package.json b/apps/connect/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@xlabs/portal-bridge-ui",
   "private": true,
-  "version": "0.2.23",
+  "version": "0.2.26",
   "type": "module",
   "scripts": {
     "dev:usdc-bridge": "vite --config ./vite.usdc-bridge.config.ts",
@@ -34,8 +34,7 @@
     "@mui/material": "^5.12.1",
     "@tanstack/react-query": "^5.14.2",
     "@wormhole-foundation/sdk": "^1.13.1",
-    "@wormhole-foundation/wormhole-connect": "^2.3.0",
-    "@xlabs/wormhole-connect": "^1.0.0-cctpv2.7-development",
+    "@wormhole-foundation/wormhole-connect": "^2.4.0",
     "bech32": "^2.0.0",
     "dompurify": "^3.0.6",
     "ethers": "^6.4.2",

diff --git a/apps/connect/src/components/atoms/Connect.tsx b/apps/connect/src/components/atoms/Connect.tsx
@@ -1,11 +1,11 @@
 import { memo, useEffect, useState } from "react";
-import WormholeConnect, { nttRoutes } from "@xlabs/wormhole-connect";
+import WormholeConnect, { nttRoutes } from "@wormhole-foundation/wormhole-connect";
 import { useConnectConfig } from "../../hooks/useConnectConfig";
 import { styled, CircularProgress } from "@mui/material";
 import { NAVBAR_WIDTH } from "./NavBar";
 import { theme } from "../../theme/connect";
 import { Banner } from "./Banner";
-import { WormholeConnectConfig } from "@xlabs/wormhole-connect";
+import { WormholeConnectConfig } from "@wormhole-foundation/wormhole-connect";
 import { fetchTokensConfig } from "../../utils/fetchTokens";
 import { envVars } from "../../env/env-vars";
 

diff --git a/apps/connect/src/env/common.ts b/apps/connect/src/env/common.ts
@@ -1,4 +1,4 @@
-import type { WormholeConnectConfig } from "@xlabs/wormhole-connect";
+import type { WormholeConnectConfig } from "@wormhole-foundation/wormhole-connect";
 import { envVars } from "./env-vars";
 
 const rpcs = (chains: string[], template: (chain: string) => string) =>

diff --git a/apps/connect/src/env/token-bridge.mainnet.ts b/apps/connect/src/env/token-bridge.mainnet.ts
@@ -7,8 +7,8 @@ import {
   MayanRouteSWIFT,
   MayanRouteSHUTTLE,
   type WormholeConnectConfig,
-  CircleV2ManualRoute,
-} from "@xlabs/wormhole-connect";
+  //CircleV2ManualRoute,
+} from "@wormhole-foundation/wormhole-connect";
 import { Env, MAINNET_RPCS } from "./common";
 import { M0AutomaticRoute } from "@m0-foundation/ntt-sdk-route";
 
@@ -22,7 +22,7 @@ export const ENV: Env = {
       // } as WormholeConnectConfig["ui"],
       rpcs: MAINNET_RPCS,
       routes: [
-        CircleV2ManualRoute,
+        //CircleV2ManualRoute,
         ...DEFAULT_ROUTES,
         MayanRouteWH as any, // FIXME: Remove this any and fix wh connect type issues
         MayanRouteMCTP,

diff --git a/apps/connect/src/env/token-bridge.testnet.ts b/apps/connect/src/env/token-bridge.testnet.ts
@@ -1,7 +1,7 @@
 import { ENV as ENV_BASE } from "./token-bridge";
 import { mergeDeep } from "../utils/mergeDeep";
-import { CircleV2ManualRoute, DEFAULT_ROUTES } from "@xlabs/wormhole-connect";
-import type { WormholeConnectConfig } from "@xlabs/wormhole-connect";
+import { DEFAULT_ROUTES } from "@wormhole-foundation/wormhole-connect";
+import type { WormholeConnectConfig } from "@wormhole-foundation/wormhole-connect";
 import { Env } from "./common";
 
 export const ENV: Env = {
@@ -34,7 +34,8 @@ export const ENV: Env = {
         "Mantle",
         "Worldchain",
       ],
-      routes: [...DEFAULT_ROUTES, CircleV2ManualRoute],
+      routes: [...DEFAULT_ROUTES, //CircleV2ManualRoute
+      ],
     }
   ),
 };
diff --git a/apps/connect/src/env/token-bridge.ts b/apps/connect/src/env/token-bridge.ts
@@ -1,4 +1,4 @@
-import type { WormholeConnectConfig } from "@xlabs/wormhole-connect";
+import type { WormholeConnectConfig } from "@wormhole-foundation/wormhole-connect";
 import { chains, Env, PUBLIC_URL, wormholeConnectConfigCommon } from "./common";
 import { mergeDeep } from "../utils/mergeDeep";
 

diff --git a/apps/connect/src/env/usdc-bridge.mainnet.ts b/apps/connect/src/env/usdc-bridge.mainnet.ts
@@ -1,11 +1,11 @@
 import { ENV as ENV_BASE } from "./usdc-bridge";
 import { mergeDeep } from "../utils/mergeDeep";
 import {
-  CircleV2ManualRoute,
+  //CircleV2ManualRoute,
   DEFAULT_ROUTES,
   MayanRouteSHUTTLE,
   type WormholeConnectConfig,
-} from "@xlabs/wormhole-connect";
+} from "@wormhole-foundation/wormhole-connect";
 import { Env, MAINNET_RPCS } from "./common";
 
 export const ENV: Env = {
@@ -15,7 +15,7 @@ export const ENV: Env = {
     {
       rpcs: MAINNET_RPCS,
       routes: [
-        CircleV2ManualRoute,
+        //CircleV2ManualRoute,
         ...DEFAULT_ROUTES,
         MayanRouteSHUTTLE as any,
       ],

diff --git a/apps/connect/src/env/usdc-bridge.testnet.ts b/apps/connect/src/env/usdc-bridge.testnet.ts
@@ -1,10 +1,10 @@
 import { ENV as ENV_BASE } from "./usdc-bridge";
 import { mergeDeep } from "../utils/mergeDeep";
 import {
-  CircleV2ManualRoute,
+  //CircleV2ManualRoute,
   DEFAULT_ROUTES,
   type WormholeConnectConfig,
-} from "@xlabs/wormhole-connect";
+} from "@wormhole-foundation/wormhole-connect";
 import { Env } from "./common";
 
 export const ENV: Env = {
@@ -15,7 +15,7 @@ export const ENV: Env = {
       routes: [
         ...DEFAULT_ROUTES,
         //MayanRouteSHUTTLE as any,
-        CircleV2ManualRoute,
+        //CircleV2ManualRoute,
       ],
       chains: [
         "Sepolia",

diff --git a/apps/connect/src/env/usdc-bridge.ts b/apps/connect/src/env/usdc-bridge.ts
@@ -1,7 +1,7 @@
 import {
   DEFAULT_ROUTES,
   type WormholeConnectConfig,
-} from "@xlabs/wormhole-connect";
+} from "@wormhole-foundation/wormhole-connect";
 import { Env, PUBLIC_URL, wormholeConnectConfigCommon } from "./common";
 import { mergeDeep } from "../utils/mergeDeep";
 

diff --git a/apps/connect/src/hooks/useConnectConfig.ts b/apps/connect/src/hooks/useConnectConfig.ts
@@ -1,4 +1,4 @@
-import type { WormholeConnectConfig } from "@xlabs/wormhole-connect";
+import type { WormholeConnectConfig } from "@wormhole-foundation/wormhole-connect";
 import { useEffect, useMemo, useState } from "react";
 
 import { useQueryParams } from "./useQueryParams";

diff --git a/apps/connect/src/hooks/useFormatAssetParam.test.ts b/apps/connect/src/hooks/useFormatAssetParam.test.ts
@@ -2,7 +2,7 @@ import { renderHook } from "@testing-library/react";
 import { useFormatAssetParam } from "./useFormatAssetParam";
 
 // Mock the wormhole-connect package
-jest.mock("@xlabs/wormhole-connect", () => ({
+jest.mock("@wormhole-foundation/wormhole-connect", () => ({
   MAINNET: {
     tokens: [
       {

diff --git a/apps/connect/src/hooks/useFormatAssetParam.ts b/apps/connect/src/hooks/useFormatAssetParam.ts
@@ -1,5 +1,5 @@
 import { ENV } from "@env";
-import { MAINNET, TESTNET } from "@xlabs/wormhole-connect";
+import { MAINNET, TESTNET } from "@wormhole-foundation/wormhole-connect";
 import { useMemo } from "react";
 
 const tokensList =
@@ -28,4 +28,4 @@ function getFormatedAsset(asset: string | null): string | null {
 export function useFormatAssetParam(asset: string | null) {
   const formatedAsset = useMemo(() => getFormatedAsset(asset), [asset]);
   return formatedAsset;
-}
+}
diff --git a/apps/connect/src/providers/sanctions.test.ts b/apps/connect/src/providers/sanctions.test.ts
@@ -42,7 +42,7 @@ describe("sanctions", () => {
         body: JSON.stringify([
           {
             address: transferDetails.fromWalletAddress,
-            chain: getTrmChainName(transferDetails.fromChain),
+            chain: getTrmChainName(transferDetails.fromChain as any),
             accountExternalId: ACCOUNT_ID,
           },
         ]),
@@ -55,7 +55,7 @@ describe("sanctions", () => {
         body: JSON.stringify([
           {
             address: transferDetails.toWalletAddress,
-            chain: getTrmChainName(transferDetails.toChain),
+            chain: getTrmChainName(transferDetails.toChain as any),
             accountExternalId: ACCOUNT_ID,
           },
         ]),

diff --git a/apps/connect/src/providers/sanctions.ts b/apps/connect/src/providers/sanctions.ts
@@ -1,6 +1,6 @@
 import { Chain, toChainId } from "@wormhole-foundation/sdk";
 import { isCosmWasmChain, isEVMChain } from "../utils/constants";
-import { WormholeConnectConfig } from "@xlabs/wormhole-connect";
+import { WormholeConnectConfig } from "@wormhole-foundation/wormhole-connect";
 
 export type ExtendedTransferDetails = Parameters<
   NonNullable<WormholeConnectConfig["validateTransferHandler"]>
@@ -76,15 +76,15 @@ export const isSanctionedAddress = async (
   const [isOriginSanctioned, isTargetSanctioned, isTargetSanctionedEth] =
     await Promise.all([
       isSanctioned({
-        chain: getTrmChainName(transferDetails.fromChain),
+        chain: getTrmChainName(transferDetails.fromChain as any),
         address: transferDetails.fromWalletAddress,
       }),
       isSanctioned({
-        chain: getTrmChainName(transferDetails.toChain),
+        chain: getTrmChainName(transferDetails.toChain as any),
         address: transferDetails.toWalletAddress,
       }),
       ...(transferDetails.toChain !== "Ethereum" &&
-      (isEVMChain(transferDetails.toChain) ||
+      (isEVMChain(transferDetails.toChain as any) ||
         transferDetails.toChain === "Worldchain")
         ? [
             isSanctioned({
@@ -96,4 +96,4 @@ export const isSanctionedAddress = async (
     ]);
 
   return isOriginSanctioned || isTargetSanctioned || isTargetSanctionedEth;
-};
+};
diff --git a/apps/connect/src/providers/telemetry.ts b/apps/connect/src/providers/telemetry.ts
@@ -1,6 +1,6 @@
 import mixpanel from "mixpanel-browser";
 import { isPreview, isProduction } from "../utils/constants";
-import type { WormholeConnectConfig } from "@xlabs/wormhole-connect";
+import type { WormholeConnectConfig } from "@wormhole-foundation/wormhole-connect";
 import { amount as sdkAmount } from "@wormhole-foundation/sdk";
 
 export type WormholeConnectEvent = Parameters<
@@ -48,7 +48,7 @@ export const eventHandler = (e: WormholeConnectEvent) => {
   if (e.type === "load") return;
 
   // Start the trace when the event is load
-  const span = { event: e.type, properties: e.details as unknown };
+  const span = { event: e.type, properties: "details" in e ? e.details : {} };
   // Wallet connect information
   if (e.type === "wallet.connect") {
     const side = e.details.side;
@@ -67,55 +67,57 @@ export const eventHandler = (e: WormholeConnectEvent) => {
     lastChain = chain;
     return;
   }
+  if ("details" in e){ 
   const getTokenAddress = (token: typeof e.details.fromToken): string =>
     typeof token?.tokenId === "object" ? token.tokenId.address : "native";
 
-  // Convert WormholeConnectEvent to Attributes
-  const isTransferError =
-    e.type === "transfer.error" || e.type === "transfer.redeem.error";
-  const amount =
-    typeof e.details.amount === "number"
-      ? e.details.amount
-      : sdkAmount.whole(e.details.amount as sdkAmount.Amount);
-  const attributes: { [key: string]: string | number | undefined } = {
-    fromChain: e.details.fromChain.toString(),
-    toChain: e.details.toChain.toString(),
-    fromTokenSymbol: e.details.fromToken?.symbol,
-    fromTokenAddress: getTokenAddress(e.details.fromToken),
-    toTokenSymbol: e.details.toToken?.symbol,
-    toTokenAddress: getTokenAddress(e.details.toToken),
-    txId: e.details.txId,
-    USDAmount: e.details.USDAmount,
-    amount: amount,
-    connectVersion: e.meta.version,
-    connectHash: e.meta.hash,
-    route:
-      {
-        ManualTokenBridge: "Manual Bridge",
-        AutomaticTokenBridge: "Relayer",
-        ManualCCTP: "CCTP Manual",
-        AutomaticCCTP: "CCTP Relayer",
-        ManualNtt: "NTT Manual",
-        AutomaticNtt: "NTT Relayer",
-        MayanSwap: "Mayan Swap",
-        MayanSwapWH: "Mayan Swap",
-        MayanSwapMCTP: "Mayan Swap MCTP",
-        MayanSwapSWIFT: "Mayan Swap Swift",
-        MayanSwapSHUTTLE: "Mayan Swap Shuttle",
-        cosmosGateway: "Cosmos Gateway",
-        ethBridge: "Eth Bridge",
-        wstETHBridge: "wstETH Bridge",
-        tbtc: "TBTC",
-        usdtBridge: "USDT Bridge",
-      }[e.details.route] || "Manual Bridge",
-    ...(isTransferError
-      ? {
-          "error-type": e.error.type || "unknown",
-          "error-message": getErrorMessage(e.error?.original),
-        }
-      : {}),
-  };
+    // Convert WormholeConnectEvent to Attributes
+    const isTransferError =
+      e.type === "transfer.error" || e.type === "transfer.redeem.error";
+    const amount =
+      typeof e.details.amount === "number"
+        ? e.details.amount
+        : sdkAmount.whole(e.details.amount as sdkAmount.Amount);
+    const attributes: { [key: string]: string | number | undefined } = {
+      fromChain: e.details.fromChain.toString(),
+      toChain: e.details.toChain.toString(),
+      fromTokenSymbol: e.details.fromToken?.symbol,
+      fromTokenAddress: getTokenAddress(e.details.fromToken),
+      toTokenSymbol: e.details.toToken?.symbol,
+      toTokenAddress: getTokenAddress(e.details.toToken),
+      txId: e.details.txId,
+      USDAmount: e.details.USDAmount,
+      amount: amount,
+      connectVersion: e.meta.version,
+      connectHash: e.meta.hash,
+      route:
+        {
+          ManualTokenBridge: "Manual Bridge",
+          AutomaticTokenBridge: "Relayer",
+          ManualCCTP: "CCTP Manual",
+          AutomaticCCTP: "CCTP Relayer",
+          ManualNtt: "NTT Manual",
+          AutomaticNtt: "NTT Relayer",
+          MayanSwap: "Mayan Swap",
+          MayanSwapWH: "Mayan Swap",
+          MayanSwapMCTP: "Mayan Swap MCTP",
+          MayanSwapSWIFT: "Mayan Swap Swift",
+          MayanSwapSHUTTLE: "Mayan Swap Shuttle",
+          cosmosGateway: "Cosmos Gateway",
+          ethBridge: "Eth Bridge",
+          wstETHBridge: "wstETH Bridge",
+          tbtc: "TBTC",
+          usdtBridge: "USDT Bridge",
+        }[e.details.route] || "Manual Bridge",
+      ...(isTransferError
+        ? {
+            "error-type": e.error.type || "unknown",
+            "error-message": getErrorMessage(e.error?.original),
+          }
+        : {}),
+    };
 
-  // Transfer event information
-  sendEvent({ ...span, properties: { ...attributes } });
+    // Transfer event information
+    sendEvent({ ...span, properties: { ...attributes } });
+  }
 };
diff --git a/apps/connect/src/theme/connect.ts b/apps/connect/src/theme/connect.ts
@@ -1,4 +1,4 @@
-import type { WormholeConnectTheme } from "@xlabs/wormhole-connect";
+import type { WormholeConnectTheme } from "@wormhole-foundation/wormhole-connect";
 
 export const theme: WormholeConnectTheme = {
   mode: "dark",

diff --git a/apps/connect/src/utils/transferVerification.ts b/apps/connect/src/utils/transferVerification.ts
@@ -1,7 +1,7 @@
 import { isValidAddress } from "./isValidAddress";
 import { isSanctionedAddress } from "../../src/providers/sanctions";
 import { Chain } from "@wormhole-foundation/sdk";
-import { WormholeConnectConfig } from "@xlabs/wormhole-connect";
+import { WormholeConnectConfig } from "@wormhole-foundation/wormhole-connect";
 
 export type ExtendedTransferDetails = Parameters<
   NonNullable<WormholeConnectConfig["validateTransferHandler"]>
@@ -24,7 +24,7 @@ export const validateTransfer = async (
   }
 
   // Correct Address Validation (based on chain selected)
-  const isValid = await isValidAddress(tx.toWalletAddress, tx.toChain);
+  const isValid = await isValidAddress(tx.toWalletAddress, tx.toChain as Chain);
   if (!isValid) {
     return { isValid: false, error: "Not valid target address" };
   }

diff --git a/apps/connect/vite.token-bridge.config.ts b/apps/connect/vite.token-bridge.config.ts
@@ -39,7 +39,7 @@ export default defineConfig({
             tag: "meta",
             attrs: {
               name: "Wormhole connect",
-              content: `v${packageJson.dependencies["@xlabs/wormhole-connect"]}`,
+              content: `v${packageJson.dependencies["@wormhole-foundation/wormhole-connect"]}`,
             },
           },
           {

diff --git a/apps/connect/vite.usdc-bridge.config.ts b/apps/connect/vite.usdc-bridge.config.ts
@@ -42,7 +42,7 @@ export default defineConfig({
             tag: "meta",
             attrs: {
               name: "Wormhole connect",
-              content: `v${packageJson.dependencies["@xlabs/wormhole-connect"]}`,
+              content: `v${packageJson.dependencies["@wormhole-foundation/wormhole-connect"]}`,
             },
           },
           {