Update Connect 1.1.10, and Aptos WA update (#1228)

.github/workflows/preview.yml

@@ -23,7 +23,7 @@ jobs:
     with:
       name: preview
       separator: P
-      advanced-tools-branch: advanced-tools
+      advanced-tools-branch: feature/include-scroll-mantle-xlayer
       environment: Cloudflare-Preview
       public-url: "/${{ needs.branch-sha.outputs.value }}"
       wac-url-template: "https://allez-xyz--usds-*.modal.run"

apps/connect/package.json

@@ -24,17 +24,17 @@
     "test:watch": "cross-env VITE_APP_CLUSTER=Mainnet jest --coverage --watchAll=true"
   },
   "dependencies": {
-    "@certusone/wormhole-sdk": "^0.10.18",
+    "@aptos-labs/ts-sdk": "^1.33.1",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@mui/icons-material": "^5.14.11",
     "@mui/material": "^5.12.1",
     "@tanstack/react-query": "^5.14.2",
-    "@wormhole-foundation/sdk": "^1.0.0",
-    "@wormhole-foundation/wormhole-connect": "^1.1.9-beta.0-development",
-    "aptos": "^1.21.0",
+    "@wormhole-foundation/sdk": "^1.4.0",
+    "@wormhole-foundation/wormhole-connect": "^1.1.10-beta.2-development",
     "bech32": "^2.0.0",
     "dompurify": "^3.0.6",
+    "ethers": "^5.6.8",
     "mixpanel-browser": "^2.53.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

apps/connect/src/env/common.ts

@@ -34,6 +34,7 @@ export const MAINNET_RPCS = {
   ...rpcs(chains, asRpcHost),
   Klaytn: "https://public-en.node.kaia.io/",
   Solana: "https://wormhole.rpcpool.com/",
+  Aptos: "https://and76cjzpa.execute-api.us-east-2.amazonaws.com/aptos/v1",
 };
 
 export const PUBLIC_URL = envVars.VITE_PUBLIC_URL || "";
@@ -44,7 +45,6 @@ export const wormholeConnectConfigCommon: Partial<WormholeConnectConfig> = {
     title: "",
     // cctpWarning: "",
     walletConnectProjectId: envVars.VITE_APP_WALLET_CONNECT_PROJECT_ID || "",
-    showHamburgerMenu: false,
     explorer: {
       href: `https://wormholescan.io/#/txs?address={:address}&network=${CLUSTER}`,
     },

apps/connect/src/env/token-bridge.mainnet.ts

@@ -725,7 +725,7 @@ export const ENV: Env = {
           Avalanche: "0x137e3b33DC1Fe64bC6FC3d3fF2A801A2fdfcB4b2",
           Sui: "0xe817f4f6f07f0da308698a4d9cd8af8a5d05b234edc55ce524916dc8d2b42fa5::coin::COIN",
           Aptos:
-            "0x863d1f83048111cb48be29cf86d2d3da6c48b64e6c60aa72ca3e3f4abe198386",
+            "0x863d1f83048111cb48be29cf86d2d3da6c48b64e6c60aa72ca3e3f4abe198386::coin::T",
           Arbitrum: "0x3Ac2EBFf77Aab7cA87FC0e4e1c1b4a5E219957C2",
           Fantom: "0xC07B1b12122e4835e7b3d3920Cd55CA1EB238D6C",
           Base: "0x75A078Ab8d977BCECAFAfAAcA4339e6EACf648d3",
@@ -739,7 +739,7 @@ export const ENV: Env = {
           Optimism: "0x5F33522034D2281667b9354D2e9A0317755146AC",
           Sui: "0x37f44326b8ffd853e74030a00ede720380d164dcc33949aaf729c675865c4da3::coin::COIN",
           Aptos:
-            "0xb628b3c69a4747cadc570ca75efaf43cff1979db3993d85db7d071a984b9e445",
+            "0xb628b3c69a4747cadc570ca75efaf43cff1979db3993d85db7d071a984b9e445::coin::T",
           Fantom: "0x3f3a9fcAdE548b59E2c335E4f2dF2ae4ed4A6B63",
           Base: "0x9e325590933809B3b79B9C892f07D5A89d322542",
           Celo: "0xfA9f0D9b7E903970e16f65BD648ddD282E2772a1",

apps/connect/src/providers/sanctions.ts

@@ -1,19 +1,5 @@
-import {
-  CHAIN_ID_ALGORAND,
-  CHAIN_ID_ARBITRUM,
-  CHAIN_ID_AVAX,
-  CHAIN_ID_BSC,
-  CHAIN_ID_BTC,
-  CHAIN_ID_CELO,
-  CHAIN_ID_OPTIMISM,
-  CHAIN_ID_POLYGON,
-  CHAIN_ID_SOLANA,
-  CHAIN_ID_KLAYTN,
-  isCosmWasmChain,
-  isEVMChain,
-} from "@certusone/wormhole-sdk";
 import { Chain, toChainId } from "@wormhole-foundation/sdk";
-import { toChainNameFormat } from "../utils/transferVerification";
+import { isCosmWasmChain, isEVMChain } from "../utils/constants";
 import { WormholeConnectConfig } from "@wormhole-foundation/wormhole-connect";
 
 export type ExtendedTransferDetails = Parameters<
@@ -35,23 +21,22 @@ export const RISK_ADDRESS_INDICATOR_TYPE = "OWNERSHIP";
 export const getTrmChainName = (chain: Chain) => {
   const id = toChainId(chain);
   const trmChainNames: any = {
-    [CHAIN_ID_ALGORAND]: "algorand",
-    [CHAIN_ID_ARBITRUM]: "arbitrum",
-    [CHAIN_ID_AVAX]: "avalanche_c_chain",
-    [CHAIN_ID_BSC]: "binance_smart_chain",
-    [CHAIN_ID_BTC]: "bitcoin",
-    [CHAIN_ID_CELO]: "celo",
-    [CHAIN_ID_KLAYTN]: "klaytn",
-    [CHAIN_ID_OPTIMISM]: "optimism",
-    [CHAIN_ID_POLYGON]: "polygon",
-    [CHAIN_ID_SOLANA]: "solana",
+    [toChainId("Algorand")]: "algorand",
+    [toChainId("Arbitrum")]: "arbitrum",
+    [toChainId("Avalanche")]: "avalanche_c_chain",
+    [toChainId("Bsc")]: "binance_smart_chain",
+    [toChainId("Btc")]: "bitcoin",
+    [toChainId("Celo")]: "celo",
+    [toChainId("Klaytn")]: "klaytn",
+    [toChainId("Optimism")]: "optimism",
+    [toChainId("Polygon")]: "polygon",
+    [toChainId("Solana")]: "solana",
   };
 
   if (trmChainNames[id]) return trmChainNames[id];
-  if (isCosmWasmChain(toChainNameFormat(chain))) return "cosmos";
+  if (isCosmWasmChain(chain)) return "cosmos";
   // TO DO: Add support for other evm chains with the new sdk
-  if (isEVMChain(toChainNameFormat(chain)) || chain === "Worldchain")
-    return "ethereum";
+  if (isEVMChain(chain) || chain === "Worldchain") return "ethereum";
 
   return "";
 };
@@ -99,7 +84,7 @@ export const isSanctionedAddress = async (
         address: transferDetails.toWalletAddress,
       }),
       ...(transferDetails.toChain !== "Ethereum" &&
-      (isEVMChain(toChainNameFormat(transferDetails.toChain)) ||
+      (isEVMChain(transferDetails.toChain) ||
         transferDetails.toChain === "Worldchain")
         ? [
             isSanctioned({

apps/connect/src/utils/constants.ts

@@ -1,7 +1,30 @@
+import { Chain, platformToChains } from "@wormhole-foundation/sdk";
+
 export const PrivacyPolicyPath = "/privacy-policy";
 
 export const isPreview =
   window.location.origin.includes("preview") ||
   window.location.origin.includes("testnet");
 
 export const isProduction = window.location.host === "portalbridge.com";
+
+export const CosmWasmChainNames: Chain[] = [
+  "Terra",
+  "Terra2",
+  "Injective",
+  "Xpla",
+  "Sei",
+  "Wormchain",
+  "Osmosis",
+  "Evmos",
+  "Kujira",
+] as const;
+
+export const isCosmWasmChain = (chain: Chain) => {
+  return CosmWasmChainNames.includes(chain);
+};
+
+const evmChains = platformToChains("Evm");
+export const isEVMChain = (chain: Chain) => {
+  return evmChains.includes(chain as any);
+};

apps/connect/src/utils/isValidAddress.test.ts

@@ -29,7 +29,12 @@ describe("isValidAddress", () => {
         "Solana"
       )
     ).toEqual(true);
-    expect(await isValidAddress("valid", "Aptos")).toEqual(true);
+    expect(
+      await isValidAddress(
+        "0xe13ca6e4f569a54e9fcd330dcf58d8962ed9ebddabaa1221e732da6e7aa212a9",
+        "Aptos"
+      )
+    ).toEqual(true);
     expect(await isValidAddress("invalid", "Aptos")).toEqual(false);
     expect(await isValidAddress("error", "Aptos")).toEqual(false);
   });

apps/connect/src/utils/isValidAddress.ts

@@ -1,23 +1,21 @@
 import base58 from "bs58";
 import * as ethers from "ethers";
-import { isCosmWasmChain, isEVMChain } from "@certusone/wormhole-sdk";
-import { AptosClient } from "aptos";
+import { AptosConfig, Aptos, Network } from "@aptos-labs/ts-sdk";
 import { bech32 } from "bech32";
 import { Chain } from "@wormhole-foundation/sdk";
-import { toChainNameFormat } from "./transferVerification";
+import { isEVMChain, isCosmWasmChain } from "./constants";
 
 export const isValidAddress = async (
   address: string,
   chain: Chain
 ): Promise<boolean> => {
   // TO DO: Add support for other evm chains with the new sdk
-  if (isEVMChain(toChainNameFormat(chain)) || chain === "Worldchain")
+  if (isEVMChain(chain) || chain === "Worldchain")
     return isValidEthereumAddress(address);
   if (chain === "Solana") return isValidSolanaAddress(address);
   if (chain === "Aptos") return isValidAptosAddress(address);
   if (chain === "Sui") return isValidSuiAddress(address);
-  if (isCosmWasmChain(toChainNameFormat(chain)))
-    return isValidCosmosAddress(address, chain);
+  if (isCosmWasmChain(chain)) return isValidCosmosAddress(address, chain);
 
   return false;
 };
@@ -49,10 +47,11 @@ const isValidSolanaAddress = (address: string): boolean => {
 };
 
 // Aptos Validation
-const aptosClient = new AptosClient("https://api.mainnet.aptoslabs.com/v1");
+const config = new AptosConfig({ network: Network.MAINNET });
+const aptos = new Aptos(config);
 const isValidAptosAddress = async (address: string) => {
   try {
-    return !!(await aptosClient.getAccount(address));
+    return !!(await aptos.getAccountInfo({ accountAddress: address }));
   } catch {
     return false;
   }

apps/connect/src/utils/transferVerification.ts

@@ -1,6 +1,5 @@
 import { isValidAddress } from "./isValidAddress";
 import { isSanctionedAddress } from "../../src/providers/sanctions";
-import { ChainName } from "@certusone/wormhole-sdk";
 import { Chain } from "@wormhole-foundation/sdk";
 import { WormholeConnectConfig } from "@wormhole-foundation/wormhole-connect";
 
@@ -34,5 +33,5 @@ export const validateTransfer = async (
 };
 
 export const toChainNameFormat = (chain: Chain) => {
-  return chain.toLowerCase() as ChainName;
+  return chain.toLowerCase();
 };