@aptos-labs/cross-chain-core 5.0.1 → 5.1.0

package/src/config/mainnet/chains.ts

@@ -3,49 +3,81 @@ import { Context, ChainsConfig } from "../types";
 export const mainnetChains: ChainsConfig = {
   Ethereum: {
     key: "Ethereum",
-    id: 2,
     context: Context.ETH,
-    finalityThreshold: 64,
     displayName: "Ethereum",
     explorerUrl: "https://etherscan.io/",
     explorerName: "Etherscan",
-    gasToken: "ETH",
     chainId: 1,
     icon: "Ethereum",
-    maxBlockSearch: 2000,
     symbol: "ETH",
     defaultRpc: "https://rpc.ankr.com/eth",
   },
   Solana: {
     key: "Solana",
-    id: 1,
     context: Context.SOLANA,
-    finalityThreshold: 32,
     displayName: "Solana",
     explorerUrl: "https://explorer.solana.com/",
     explorerName: "Solana Explorer",
-    gasToken: "SOL",
     chainId: 0,
     icon: "Solana",
-    maxBlockSearch: 2000,
     symbol: "SOL",
     defaultRpc: "https://solana-mainnet.rpc.extrnode.com",
   },
   Aptos: {
     key: "Aptos",
-    id: 22,
     context: Context.APTOS,
-    finalityThreshold: 0,
     displayName: "Aptos",
     explorerUrl: "https://explorer.aptoslabs.com/",
     explorerName: "Aptos Explorer",
-    gasToken: "APT",
     chainId: 0,
     icon: "Aptos",
-    maxBlockSearch: 0,
     symbol: "APT",
     defaultRpc: "https://fullnode.mainnet.aptos.dev",
   },
+  Avalanche: {
+    key: "Avalanche",
+    context: Context.ETH,
+    chainId: 43114,
+    displayName: "Avalanche",
+    explorerUrl: "https://snowtrace.io",
+    explorerName: "Avascan",
+    icon: "Avalanche",
+    symbol: "AVAX",
+    defaultRpc: "https://avalanche-c-chain-rpc.publicnode.com",
+  },
+  Base: {
+    key: "Base",
+    context: Context.ETH,
+    chainId: 8453,
+    displayName: "Base",
+    explorerUrl: "https://basescan.org",
+    explorerName: "BaseScan",
+    icon: "Base",
+    symbol: "BASE",
+    defaultRpc: "https://mainnet.base.org",
+  },
+  Arbitrum: {
+    key: "Arbitrum",
+    context: Context.ETH,
+    chainId: 42161,
+    displayName: "Arbitrum",
+    explorerUrl: "https://arbiscan.io/",
+    explorerName: "Arbitrum Explorer",
+    icon: "Arbitrum",
+    symbol: "ARB",
+    defaultRpc: "https://arb1.arbitrum.io/rpc",
+  },
+  Polygon: {
+    key: "Polygon",
+    context: Context.ETH,
+    chainId: 137,
+    displayName: "Polygon",
+    explorerUrl: "https://polygonscan.com/",
+    explorerName: "PolygonScan",
+    icon: "Polygon",
+    symbol: "MATIC",
+    defaultRpc: "https://polygon-bor-rpc.publicnode.com",
+  },
   // Sui: {
   //   key: "Sui",
   //   id: 21,

package/src/config/mainnet/tokens.ts

@@ -29,6 +29,42 @@ export const mainnetTokens: Record<string, TokenConfig> = {
     },
     icon: "USDC",
   },
+  Base: {
+    symbol: "USDC",
+    decimals: 6,
+    icon: "USDC",
+    tokenId: {
+      chain: "Base",
+      address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+    },
+  },
+  Arbitrum: {
+    symbol: "USDC",
+    decimals: 6,
+    icon: "USDC",
+    tokenId: {
+      chain: "Arbitrum",
+      address: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
+    },
+  },
+  Avalanche: {
+    symbol: "USDC",
+    decimals: 6,
+    icon: "USDC",
+    tokenId: {
+      chain: "Avalanche",
+      address: "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
+    },
+  },
+  Polygon: {
+    symbol: "USDC",
+    decimals: 6,
+    icon: "USDC",
+    tokenId: {
+      chain: "Polygon",
+      address: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
+    },
+  },
   // Sui: {
   //   symbol: "USDC",
   //   decimals: 6,

package/src/config/testnet/chains.ts

@@ -1,52 +1,81 @@
-import { Context } from "../types";
-
-import { ChainsConfig } from "../types";
+import { Context, ChainsConfig } from "../types";
 
 export const testnetChains: ChainsConfig = {
   Sepolia: {
     key: "Sepolia",
-    id: 10002,
     context: Context.ETH,
-    finalityThreshold: 0,
+    chainId: 11155111,
     displayName: "Sepolia",
     explorerUrl: "https://sepolia.etherscan.io/",
     explorerName: "Etherscan",
-    gasToken: "ETHsepolia",
-    chainId: 11155111,
     icon: "Ethereum",
-    maxBlockSearch: 2000,
     symbol: "ETH",
     defaultRpc: "https://eth-sepolia.public.blastapi.io",
-    wrappedGasToken: "0xeef12A83EE5b7161D3873317c8E0E7B76e0B5D9c",
+  },
+  BaseSepolia: {
+    key: "BaseSepolia",
+    context: Context.ETH,
+    chainId: 84532,
+    displayName: "Base Sepolia",
+    explorerUrl: "https://sepolia.basescan.org",
+    explorerName: "Basescan",
+    icon: "BaseSepolia",
+    symbol: "BASE",
+    defaultRpc:
+      "https://chain-proxy.wallet.coinbase.com?targetName=base-sepolia",
+  },
+  ArbitrumSepolia: {
+    key: "ArbitrumSepolia",
+    context: Context.ETH,
+    chainId: 421614,
+    displayName: "Arbitrum Sepolia",
+    explorerUrl: "https://sepolia.arbiscan.io",
+    explorerName: "Etherscan",
+    icon: "Arbitrum",
+    symbol: "ARB",
+    defaultRpc: "https://sepolia-rollup.arbitrum.io/rpc",
+  },
+  Avalanche: {
+    key: "Avalanche",
+    context: Context.ETH,
+    chainId: 43113,
+    displayName: "Avalanche Fuji",
+    explorerUrl: "https://testnet.snowtrace.io",
+    explorerName: "Avascan",
+    icon: "Avalanche",
+    symbol: "AVAX",
+    defaultRpc: "https://api.avax-test.network/ext/bc/C/rpc",
+  },
+  PolygonSepolia: {
+    key: "PolygonSepolia",
+    context: Context.ETH,
+    chainId: 80002,
+    displayName: "Polygon",
+    explorerUrl: "https://amoy.polygonscan.com/",
+    explorerName: "PolygonScan",
+    icon: "Polygon",
+    symbol: "MATIC",
+    defaultRpc: "https://rpc-amoy.polygon.technology/",
   },
   Solana: {
     key: "Solana",
-    id: 1,
     context: Context.SOLANA,
-    finalityThreshold: 32,
     displayName: "Solana",
     explorerUrl: "https://explorer.solana.com/",
     explorerName: "Solana Explorer",
-    gasToken: "SOL",
     chainId: 0,
     icon: "Solana",
-    maxBlockSearch: 2000,
     symbol: "SOL",
     defaultRpc: "https://api.devnet.solana.com",
-    wrappedGasToken: "So11111111111111111111111111111111111111112",
   },
   Aptos: {
     key: "Aptos",
-    id: 22,
     context: Context.APTOS,
-    finalityThreshold: 0,
     displayName: "Aptos",
     explorerUrl: "https://explorer.aptoslabs.com?network=testnet",
     explorerName: "Aptos Explorer",
-    gasToken: "APT",
     chainId: 0,
     icon: "Aptos",
-    maxBlockSearch: 0,
     symbol: "APT",
     defaultRpc: "https://fullnode.testnet.aptos.dev",
   },

package/src/config/testnet/tokens.ts

@@ -29,6 +29,42 @@ export const testnetTokens: Record<string, TokenConfig> = {
     },
     icon: "USDC",
   },
+  BaseSepolia: {
+    symbol: "USDC",
+    icon: "USDC",
+    decimals: 6,
+    tokenId: {
+      chain: "BaseSepolia",
+      address: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
+    },
+  },
+  Avalanche: {
+    symbol: "USDC",
+    icon: "USDC",
+    decimals: 6,
+    tokenId: {
+      chain: "Avalanche",
+      address: "0x5425890298aed601595a70AB815c96711a31Bc65",
+    },
+  },
+  ArbitrumSepolia: {
+    symbol: "USDC",
+    icon: "USDC",
+    decimals: 6,
+    tokenId: {
+      chain: "ArbitrumSepolia",
+      address: "0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d",
+    },
+  },
+  PolygonSepolia: {
+    symbol: "USDC",
+    icon: "USDC",
+    decimals: 6,
+    tokenId: {
+      chain: "PolygonSepolia",
+      address: "0x41E94Eb019C0762f9Bfcf9Fb1E58725BfB0e7582",
+    },
+  },
   // Sui: {
   //   symbol: "USDC",
   //   tokenId: {

package/src/config/types.ts

@@ -1,4 +1,3 @@
-import { ChainId } from "@wormhole-foundation/sdk";
 import { Chain } from "../CrossChainCore";
 
 export enum Context {
@@ -9,9 +8,7 @@ export enum Context {
 
 export type BaseChainConfig = {
   key: Chain;
-  id: ChainId;
   context: Context;
-  finalityThreshold: number;
   disabledAsSource?: boolean;
   disabledAsDestination?: boolean;
 };
@@ -21,11 +18,8 @@ export interface ChainConfig extends BaseChainConfig {
   displayName: string;
   explorerUrl: string;
   explorerName: string;
-  gasToken: string;
-  wrappedGasToken?: string;
   chainId: number | string;
   icon: Chain;
-  maxBlockSearch: number;
   symbol?: string;
 }
 

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

@@ -56,7 +56,7 @@ export class Signer<N extends Network, C extends Chain>
   }
 
   chain(): C {
-    return this._chain.displayName as C;
+    return this._chain.key as C;
   }
   address(): string {
     return this._address;

package/src/providers/wormhole/wormhole.ts

@@ -200,6 +200,8 @@ export class WormholeProvider
     }
     logger.log("signerAddress", signerAddress);
 
+    //const chainContext =
+
     const signer = new Signer(
       this.getChainConfig(sourceChain),
       signerAddress,
@@ -207,6 +209,10 @@ export class WormholeProvider
       wallet
     );
 
+    logger.log("signer", signer);
+    logger.log("wormholeRequest", this.wormholeRequest);
+    logger.log("wormholeQuote", this.wormholeQuote);
+
     let receipt = await this.wormholeRoute.initiate(
       this.wormholeRequest,
       signer,

package/src/utils/getUsdcBalance.ts

@@ -2,6 +2,7 @@ import { Aptos, AptosConfig, Network } from "@aptos-labs/ts-sdk";
 import { Connection, PublicKey } from "@solana/web3.js";
 import { mainnetTokens, testnetTokens } from "../config";
 import { ethers, JsonRpcProvider } from "ethers";
+import { Chain } from "../CrossChainCore";
 
 export const getSolanaWalletUSDCBalance = async (
   walletAddress: string,
@@ -35,12 +36,13 @@ export const getSolanaWalletUSDCBalance = async (
 export const getEthereumWalletUSDCBalance = async (
   walletAddress: string,
   aptosNetwork: Network,
+  chain: Chain,
   rpc: string
 ): Promise<string> => {
   const token =
     aptosNetwork === Network.MAINNET
-      ? mainnetTokens["Ethereum"]
-      : testnetTokens["Sepolia"];
+      ? mainnetTokens[chain]
+      : testnetTokens[chain];
 
   const tokenAddress = token.tokenId.address;
   const connection = new JsonRpcProvider(rpc);

package/src/version.ts

@@ -1 +1 @@
-export const CROSS_CHAIN_CORE_VERSION = "5.0.1";
+export const CROSS_CHAIN_CORE_VERSION = "5.1.0";