@aptos-labs/cross-chain-core 5.5.0 → 5.6.0-alpha.1

package/src/config/mainnet/chains.ts

@@ -78,19 +78,15 @@ export const mainnetChains: ChainsConfig = {
     symbol: "MATIC",
     defaultRpc: "https://polygon-bor-rpc.publicnode.com",
   },
-  // Sui: {
-  //   key: "Sui",
-  //   id: 21,
-  //   context: Context.SUI,
-  //   finalityThreshold: 0,
-  //   displayName: "Sui",
-  //   sdkName: "Sui",
-  //   explorerUrl: "https://suiscan.xyz/",
-  //   explorerName: "Suiscan",
-  //   gasToken: "SUI",
-  //   chainId: 0,
-  //   icon: "Sui",
-  //   maxBlockSearch: 0,
-  //   symbol: "SUI",
-  // },
+  Sui: {
+    key: "Sui",
+    context: Context.SUI,
+    displayName: "Sui",
+    explorerUrl: "https://suiscan.xyz/",
+    explorerName: "Suiscan",
+    chainId: 0,
+    icon: "Sui",
+    symbol: "SUI",
+    defaultRpc: "https://fullnode.mainnet.sui.io:443",
+  },
 };

package/src/config/mainnet/tokens.ts

@@ -65,14 +65,14 @@ export const mainnetTokens: Record<string, TokenConfig> = {
       address: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
     },
   },
-  // Sui: {
-  //   symbol: "USDC",
-  //   decimals: 6,
-  //   tokenId: {
-  //     chain: "Sui",
-  //     address:
-  //       "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC",
-  //   },
-  //   icon: "USDC",
-  // },
+  Sui: {
+    symbol: "USDC",
+    decimals: 6,
+    tokenId: {
+      chain: "Sui",
+      address:
+        "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC",
+    },
+    icon: "USDC",
+  },
 };

package/src/config/testnet/chains.ts

@@ -79,19 +79,15 @@ export const testnetChains: ChainsConfig = {
     symbol: "APT",
     defaultRpc: "https://fullnode.testnet.aptos.dev",
   },
-  // Sui: {
-  //   key: "Sui",
-  //   id: 21,
-  //   context: Context.SUI,
-  //   finalityThreshold: 0,
-  //   displayName: "Sui",
-  //   explorerUrl: "https://suiscan.xyz/testnet/",
-  //   explorerName: "Suiscan",
-  //   gasToken: "SUI",
-  //   chainId: 0,
-  //   icon: "Sui",
-  //   maxBlockSearch: 0,
-  //   symbol: "SUI",
-  //   sdkName: "Sui",
-  // },
+  Sui: {
+    key: "Sui",
+    context: Context.SUI,
+    displayName: "Sui",
+    explorerUrl: "https://suiscan.xyz/testnet",
+    explorerName: "Suiscan",
+    chainId: 0,
+    icon: "Sui",
+    symbol: "SUI",
+    defaultRpc: "https://fullnode.testnet.sui.io:443",
+  },
 };

package/src/config/testnet/tokens.ts

@@ -65,14 +65,14 @@ export const testnetTokens: Record<string, TokenConfig> = {
       address: "0x41E94Eb019C0762f9Bfcf9Fb1E58725BfB0e7582",
     },
   },
-  // Sui: {
-  //   symbol: "USDC",
-  //   tokenId: {
-  //     chain: "Sui",
-  //     address:
-  //       "0xa1ec7fc00a6f40db9693ad1415d0c193ad3906494428cf252621037bd7117e29::usdc::USDC",
-  //   },
-  //   icon: "USDC",
-  //   decimals: 6,
-  // },
+  Sui: {
+    symbol: "USDC",
+    tokenId: {
+      chain: "Sui",
+      address:
+        "0xa1ec7fc00a6f40db9693ad1415d0c193ad3906494428cf252621037bd7117e29::usdc::USDC",
+    },
+    icon: "USDC",
+    decimals: 6,
+  },
 };

package/src/config/types.ts

@@ -4,6 +4,7 @@ export enum Context {
   ETH = "Ethereum",
   SOLANA = "Solana",
   APTOS = "Aptos",
+  SUI = "Sui",
 }
 
 export type BaseChainConfig = {

package/src/providers/wormhole/signers/AptosLocalSigner.ts

@@ -20,9 +20,10 @@ import {
 } from "@wormhole-foundation/sdk-aptos";
 import { GasStationApiKey } from "../types";
 
-export class AptosLocalSigner<N extends Network, C extends Chain>
-  implements SignAndSendSigner<N, C>
-{
+export class AptosLocalSigner<
+  N extends Network,
+  C extends Chain,
+> implements SignAndSendSigner<N, C> {
   _chain: C;
   _options: any;
   _wallet: Account;

package/src/providers/wormhole/signers/Signer.ts

@@ -11,15 +11,15 @@ import {
   EvmUnsignedTransaction,
   EvmChains,
 } from "@wormhole-foundation/sdk-evm";
+import {
+  SuiChains,
+  SuiUnsignedTransaction,
+} from "@wormhole-foundation/sdk-sui";
 
 import * as solanaSigner from "./SolanaSigner";
 import * as ethereumSigner from "./EthereumSigner";
 import * as aptosSigner from "./AptosSigner";
-// import {
-//   SuiChains,
-//   SuiUnsignedTransaction,
-// } from "@wormhole-foundation/sdk-sui";
-// import * as suiSigner from "./SuiSigner";
+import * as suiSigner from "./SuiSigner";
 
 import { ChainConfig } from "../../../config";
 import { CrossChainCore } from "../../../CrossChainCore";
@@ -27,9 +27,10 @@ import { AptosChains } from "@wormhole-foundation/sdk-aptos/dist/cjs/types";
 import { AptosUnsignedTransaction } from "@wormhole-foundation/sdk-aptos/dist/cjs/unsignedTransaction";
 import { GasStationApiKey } from "../types";
 import { Account } from "@aptos-labs/ts-sdk";
-export class Signer<N extends Network, C extends Chain>
-  implements SignAndSendSigner<N, C>
-{
+export class Signer<
+  N extends Network,
+  C extends Chain,
+> implements SignAndSendSigner<N, C> {
   _chain: ChainConfig;
   _address: string;
   _options: any;
@@ -113,6 +114,12 @@ export const signAndSendTransaction = async (
       options,
     );
     return tx;
+  } else if (chain.context === "Sui") {
+    const tx = await suiSigner.signAndSendTransaction(
+      request as SuiUnsignedTransaction<Network, SuiChains>,
+      wallet,
+    );
+    return tx;
   } else if (chain.context === "Aptos") {
     const tx = await aptosSigner.signAndSendTransaction(
       request as AptosUnsignedTransaction<Network, AptosChains>,

package/src/providers/wormhole/signers/SuiSigner.ts

@@ -0,0 +1,42 @@
+import { AdapterWallet } from "@aptos-labs/wallet-adapter-core";
+import { Network } from "@wormhole-foundation/sdk";
+import {
+  SuiChains,
+  SuiUnsignedTransaction,
+} from "@wormhole-foundation/sdk-sui";
+import { SuiDerivedWallet } from "@aptos-labs/derived-wallet-sui";
+import {
+  SuiSignAndExecuteTransactionInput,
+  SuiSignAndExecuteTransactionOutput,
+} from "@mysten/wallet-standard";
+
+export async function signAndSendTransaction(
+  request: SuiUnsignedTransaction<Network, SuiChains>,
+  wallet: AdapterWallet,
+): Promise<string> {
+  if (!wallet) {
+    throw new Error("wallet is undefined");
+  }
+  const suiDerivedWallet = wallet as SuiDerivedWallet;
+
+  const signAndExecuteTransactionFeature = suiDerivedWallet.suiWallet.features[
+    "sui:signAndExecuteTransaction"
+  ] as {
+    signAndExecuteTransaction: (
+      input: SuiSignAndExecuteTransactionInput,
+    ) => Promise<SuiSignAndExecuteTransactionOutput>;
+  };
+
+  if (!signAndExecuteTransactionFeature) {
+    throw new Error("wallet does not support signAndExecuteTransaction");
+  }
+
+  const { digest } =
+    await signAndExecuteTransactionFeature.signAndExecuteTransaction({
+      transaction: request.transaction,
+      account: suiDerivedWallet.suiWallet.accounts[0],
+      chain: `sui:${request.network.toLocaleLowerCase()}`,
+    });
+
+  return digest;
+}

package/src/providers/wormhole/wormhole.ts

@@ -11,6 +11,7 @@ import { Network, sleep } from "@aptos-labs/ts-sdk";
 import aptos from "@wormhole-foundation/sdk/aptos";
 import solana from "@wormhole-foundation/sdk/solana";
 import evm from "@wormhole-foundation/sdk/evm";
+import sui from "@wormhole-foundation/sdk/sui";
 
 import {
   Chain,
@@ -36,18 +37,16 @@ import {
 } from "./types";
 import { SolanaDerivedWallet } from "@aptos-labs/derived-wallet-solana";
 import { EIP1193DerivedWallet } from "@aptos-labs/derived-wallet-ethereum";
+import { SuiDerivedWallet } from "@aptos-labs/derived-wallet-sui";
 
-export class WormholeProvider
-  implements
-    CrossChainProvider<
-      WormholeQuoteRequest,
-      WormholeQuoteResponse,
-      WormholeTransferRequest,
-      WormholeTransferResponse,
-      WormholeWithdrawRequest,
-      WormholeWithdrawResponse
-    >
-{
+export class WormholeProvider implements CrossChainProvider<
+  WormholeQuoteRequest,
+  WormholeQuoteResponse,
+  WormholeTransferRequest,
+  WormholeTransferResponse,
+  WormholeWithdrawRequest,
+  WormholeWithdrawResponse
+> {
   private crossChainCore: CrossChainCore;
 
   private _wormholeContext: Wormhole<"Mainnet" | "Testnet"> | undefined;
@@ -73,7 +72,7 @@ export class WormholeProvider
       throw new Error("Origin chain not selected");
     }
     const isMainnet = dappNetwork === Network.MAINNET;
-    const platforms: PlatformLoader<any>[] = [aptos, solana, evm];
+    const platforms: PlatformLoader<any>[] = [aptos, solana, evm, sui];
     const wh = await wormhole(isMainnet ? "Mainnet" : "Testnet", platforms);
     this._wormholeContext = wh;
   }
@@ -190,13 +189,18 @@ export class WormholeProvider
       signerAddress =
         (wallet as SolanaDerivedWallet).solanaWallet.publicKey?.toBase58() ||
         "";
-    } else {
+    } else if (chainContext === "Ethereum") {
       // is Ethereum
       [signerAddress] = await (
         wallet as EIP1193DerivedWallet
       ).eip1193Provider.request({
         method: "eth_requestAccounts",
       });
+    } else if (chainContext === "Sui") {
+      signerAddress =
+        (wallet as SuiDerivedWallet).suiWallet.accounts[0].address || "";
+    } else {
+      throw new Error("Unsupported chain context: " + chainContext);
     }
     logger.log("signerAddress", signerAddress);
 

package/src/utils/getUsdcBalance.ts

@@ -3,6 +3,7 @@ import { Connection, PublicKey } from "@solana/web3.js";
 import { mainnetTokens, testnetTokens } from "../config";
 import { ethers, JsonRpcProvider } from "ethers";
 import { Chain } from "../CrossChainCore";
+import { SuiClient } from "@mysten/sui/client";
 
 export const getSolanaWalletUSDCBalance = async (
   walletAddress: string,
@@ -29,7 +30,7 @@ export const getSolanaWalletUSDCBalance = async (
 
   return (
     balance.value.uiAmountString ??
-    (Number(balance.value.amount) / 10 ** balance.value.decimals).toString()
+    ethers.formatUnits(BigInt(balance.value.amount), balance.value.decimals)
   );
 };
 
@@ -74,9 +75,26 @@ export const getAptosWalletUSDCBalance = async (
   if (response.length === 0) {
     return "0";
   }
-  const balance = (
-    Number(response[0].amount) /
-    10 ** token.decimals
-  ).toString();
-  return balance;
+  return ethers.formatUnits(BigInt(response[0].amount), token.decimals);
+};
+
+export const getSuiWalletUSDCBalance = async (
+  walletAddress: string,
+  aptosNetwork: Network,
+  rpc: string,
+): Promise<string> => {
+  const token =
+    aptosNetwork === Network.MAINNET
+      ? mainnetTokens["Sui"]
+      : testnetTokens["Sui"];
+
+  const client = new SuiClient({
+    url: rpc,
+  });
+  const balance = await client.getBalance({
+    owner: walletAddress,
+    coinType: token.tokenId.address,
+  });
+  // Reuse ethers' formatter for precise decimal formatting of large integers.
+  return ethers.formatUnits(BigInt(balance.totalBalance), token.decimals);
 };

package/src/version.ts

@@ -1 +1 @@
-export const CROSS_CHAIN_CORE_VERSION = "5.5.0";
+export const CROSS_CHAIN_CORE_VERSION = "5.6.0-alpha.1";