@aptos-labs/cross-chain-core 6.0.0 → 6.1.0

package/dist/index.js

@@ -32,7 +32,7 @@ var index_exports = {};
 __export(index_exports, {
   AptosLocalSigner: () => AptosLocalSigner,
   Context: () => Context,
-  CrossChainCore: () => CrossChainCore2,
+  CrossChainCore: () => CrossChainCore,
   EVM_CHAIN_NAMES: () => EVM_CHAIN_NAMES,
   EthereumChainIdToMainnetChain: () => EthereumChainIdToMainnetChain,
   EthereumChainIdToTestnetChain: () => EthereumChainIdToTestnetChain,
@@ -54,120 +54,355 @@ __export(index_exports, {
   validateExpireTimestamp: () => validateExpireTimestamp
 });
 module.exports = __toCommonJS(index_exports);
+var import_ts_sdk7 = require("@aptos-labs/ts-sdk");
 
 // src/CrossChainCore.ts
 var import_ts_sdk5 = require("@aptos-labs/ts-sdk");
 
-// src/providers/wormhole/wormhole.ts
-var import_sdk3 = require("@wormhole-foundation/sdk");
-var import_ts_sdk3 = require("@aptos-labs/ts-sdk");
-var import_aptos = __toESM(require("@wormhole-foundation/sdk/aptos"));
-var import_solana = __toESM(require("@wormhole-foundation/sdk/solana"));
-var import_evm = __toESM(require("@wormhole-foundation/sdk/evm"));
-var import_sui = __toESM(require("@wormhole-foundation/sdk/sui"));
+// src/config/types.ts
+var Context = /* @__PURE__ */ ((Context2) => {
+  Context2["ETH"] = "Ethereum";
+  Context2["SOLANA"] = "Solana";
+  Context2["APTOS"] = "Aptos";
+  Context2["SUI"] = "Sui";
+  return Context2;
+})(Context || {});
 
-// src/utils/logger.ts
-var logger = {
-  log: (...args) => {
-    if (process.env.NODE_ENV === "development") {
-      console.log(...args);
+// src/config/mainnet/chains.ts
+var mainnetChains = {
+  Ethereum: {
+    key: "Ethereum",
+    context: "Ethereum" /* ETH */,
+    displayName: "Ethereum",
+    explorerUrl: "https://etherscan.io/",
+    explorerName: "Etherscan",
+    chainId: 1,
+    icon: "Ethereum",
+    symbol: "ETH",
+    defaultRpc: "https://rpc.ankr.com/eth"
+  },
+  Solana: {
+    key: "Solana",
+    context: "Solana" /* SOLANA */,
+    displayName: "Solana",
+    explorerUrl: "https://solscan.io",
+    explorerName: "Solscan",
+    chainId: 0,
+    icon: "Solana",
+    symbol: "SOL",
+    defaultRpc: "https://solana-rpc.publicnode.com"
+  },
+  Aptos: {
+    key: "Aptos",
+    context: "Aptos" /* APTOS */,
+    displayName: "Aptos",
+    explorerUrl: "https://explorer.aptoslabs.com/",
+    explorerName: "Aptos Explorer",
+    chainId: 0,
+    icon: "Aptos",
+    symbol: "APT",
+    defaultRpc: "https://fullnode.mainnet.aptos.dev"
+  },
+  Avalanche: {
+    key: "Avalanche",
+    context: "Ethereum" /* 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: "Ethereum" /* ETH */,
+    chainId: 8453,
+    displayName: "Base",
+    explorerUrl: "https://basescan.org",
+    explorerName: "BaseScan",
+    icon: "Base",
+    symbol: "BASE",
+    defaultRpc: "https://mainnet.base.org"
+  },
+  Arbitrum: {
+    key: "Arbitrum",
+    context: "Ethereum" /* 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: "Ethereum" /* 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",
+    context: "Sui" /* SUI */,
+    displayName: "Sui",
+    explorerUrl: "https://suiscan.xyz/",
+    explorerName: "Suiscan",
+    chainId: 0,
+    icon: "Sui",
+    symbol: "SUI",
+    defaultRpc: "https://fullnode.mainnet.sui.io:443"
+  }
+};
+
+// src/config/mainnet/tokens.ts
+var mainnetTokens = {
+  Ethereum: {
+    symbol: "USDC",
+    tokenId: {
+      chain: "Ethereum",
+      address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
+    },
+    icon: "USDC",
+    decimals: 6
+  },
+  Solana: {
+    symbol: "USDC",
+    tokenId: {
+      chain: "Solana",
+      address: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
+    },
+    icon: "USDC",
+    decimals: 6
+  },
+  Aptos: {
+    symbol: "USDC",
+    decimals: 6,
+    tokenId: {
+      chain: "Aptos",
+      address: "0xbae207659db88bea0cbead6da0ed00aac12edcdda169e591cd41c94180b46f3b"
+    },
+    icon: "USDC"
+  },
+  Base: {
+    symbol: "USDC",
+    decimals: 6,
+    icon: "USDC",
+    tokenId: {
+      chain: "Base",
+      address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
     }
   },
-  warn: (...args) => {
-    if (process.env.NODE_ENV === "development") {
-      console.warn(...args);
+  Arbitrum: {
+    symbol: "USDC",
+    decimals: 6,
+    icon: "USDC",
+    tokenId: {
+      chain: "Arbitrum",
+      address: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831"
     }
   },
-  error: (...args) => {
-    if (process.env.NODE_ENV === "development") {
-      console.error(...args);
+  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,
+    tokenId: {
+      chain: "Sui",
+      address: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC"
+    },
+    icon: "USDC"
   }
 };
 
-// src/utils/receiptSerialization.ts
-var import_sdk = require("@wormhole-foundation/sdk");
-function uint8ArrayToBase64(bytes) {
-  let binary = "";
-  for (let i = 0; i < bytes.length; i++) {
-    binary += String.fromCharCode(bytes[i]);
-  }
-  return btoa(binary);
-}
-function base64ToUint8Array(base64) {
-  const binary = atob(base64);
-  const bytes = new Uint8Array(binary.length);
-  for (let i = 0; i < binary.length; i++) {
-    bytes[i] = binary.charCodeAt(i);
-  }
-  return bytes;
-}
-function serializeReceipt(receipt) {
-  return JSON.parse(
-    JSON.stringify(receipt, (_key, value) => {
-      if (typeof value === "bigint") {
-        return { __type: "bigint", value: value.toString() };
-      }
-      if (value instanceof import_sdk.UniversalAddress) {
-        return {
-          __type: "UniversalAddress",
-          value: uint8ArrayToBase64(value.toUint8Array())
-        };
-      }
-      if (value instanceof Uint8Array) {
-        return {
-          __type: "Uint8Array",
-          value: uint8ArrayToBase64(value)
-        };
-      }
-      return value;
-    })
-  );
-}
-function deserializeReceipt(obj) {
-  function revive(value, key) {
-    if (value && typeof value === "object") {
-      const objValue = value;
-      if ("__type" in objValue) {
-        if (objValue.__type === "bigint") {
-          return BigInt(objValue.value);
-        }
-        if (objValue.__type === "UniversalAddress") {
-          return new import_sdk.UniversalAddress(
-            base64ToUint8Array(objValue.value)
-          );
-        }
-        if (objValue.__type === "Uint8Array") {
-          return base64ToUint8Array(objValue.value);
-        }
-      }
-      const addressFields = [
-        "sender",
-        "recipient",
-        "destinationCaller",
-        "burnToken",
-        "mintRecipient",
-        "messageSender"
-      ];
-      if (key && addressFields.includes(key) && "address" in objValue) {
-        const addressBytes = revive(objValue.address);
-        if (addressBytes instanceof Uint8Array) {
-          return new import_sdk.UniversalAddress(addressBytes);
-        }
-      }
-      if (Array.isArray(value)) {
-        return value.map((v, i) => revive(v, String(i)));
-      }
-      const result = {};
-      for (const k in objValue) {
-        result[k] = revive(objValue[k], k);
-      }
-      return result;
+// src/config/testnet/chains.ts
+var testnetChains = {
+  Sepolia: {
+    key: "Sepolia",
+    context: "Ethereum" /* ETH */,
+    chainId: 11155111,
+    displayName: "Sepolia",
+    explorerUrl: "https://sepolia.etherscan.io/",
+    explorerName: "Etherscan",
+    icon: "Ethereum",
+    symbol: "ETH",
+    defaultRpc: "https://ethereum-sepolia-rpc.publicnode.com"
+  },
+  BaseSepolia: {
+    key: "BaseSepolia",
+    context: "Ethereum" /* 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: "Ethereum" /* 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: "Ethereum" /* 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: "Ethereum" /* 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",
+    context: "Solana" /* SOLANA */,
+    displayName: "Solana",
+    explorerUrl: "https://solscan.io",
+    explorerName: "Solscan",
+    chainId: 0,
+    icon: "Solana",
+    symbol: "SOL",
+    defaultRpc: "https://api.devnet.solana.com"
+  },
+  Aptos: {
+    key: "Aptos",
+    context: "Aptos" /* APTOS */,
+    displayName: "Aptos",
+    explorerUrl: "https://explorer.aptoslabs.com?network=testnet",
+    explorerName: "Aptos Explorer",
+    chainId: 0,
+    icon: "Aptos",
+    symbol: "APT",
+    defaultRpc: "https://fullnode.testnet.aptos.dev"
+  },
+  Sui: {
+    key: "Sui",
+    context: "Sui" /* SUI */,
+    displayName: "Sui",
+    explorerUrl: "https://suiscan.xyz/testnet",
+    explorerName: "Suiscan",
+    chainId: 0,
+    icon: "Sui",
+    symbol: "SUI",
+    defaultRpc: "https://fullnode.testnet.sui.io:443"
+  }
+};
+
+// src/config/testnet/tokens.ts
+var testnetTokens = {
+  Sepolia: {
+    symbol: "USDC",
+    icon: "USDC",
+    decimals: 6,
+    tokenId: {
+      chain: "Sepolia",
+      address: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238"
     }
-    return value;
+  },
+  Solana: {
+    symbol: "USDC",
+    tokenId: {
+      chain: "Solana",
+      address: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU"
+    },
+    icon: "USDC",
+    decimals: 6
+  },
+  Aptos: {
+    symbol: "USDC",
+    decimals: 6,
+    tokenId: {
+      chain: "Aptos",
+      address: "0x69091fbab5f7d635ee7ac5098cf0c1efbe31d68fec0f2cd565e8d168daf52832"
+    },
+    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: {
+      chain: "Sui",
+      address: "0xa1ec7fc00a6f40db9693ad1415d0c193ad3906494428cf252621037bd7117e29::usdc::USDC"
+    },
+    icon: "USDC",
+    decimals: 6
   }
-  return revive(obj);
-}
+};
 
 // src/providers/wormhole/signers/AptosLocalSigner.ts
 var import_ts_sdk = require("@aptos-labs/ts-sdk");
@@ -181,6 +416,14 @@ function validateExpireTimestamp(value) {
   }
 }
 var TransferError = class extends Error {
+  /** Source-chain burn transaction hash — available when the burn succeeded before the failure. */
+  originChainTxnId;
+  /**
+   * The underlying error that caused this failure.
+   * Mirrors ES2022 Error.cause — declared explicitly because the project's
+   * TypeScript lib target does not include ES2022 ErrorOptions.
+   */
+  cause;
   constructor(message, originChainTxnId, cause) {
     super(message);
     this.name = "TransferError";
@@ -189,6 +432,16 @@ var TransferError = class extends Error {
   }
 };
 var WithdrawError = class extends Error {
+  /** Aptos burn transaction hash — always available when this error is thrown. */
+  originChainTxnId;
+  /** The withdraw phase that failed ("tracking" or "claiming"). */
+  phase;
+  /**
+   * The underlying error that caused this failure.
+   * Mirrors ES2022 Error.cause — declared explicitly because the project's
+   * TypeScript lib target does not include ES2022 ErrorOptions.
+   */
+  cause;
   constructor(message, originChainTxnId, phase, cause) {
     super(message);
     this.name = "WithdrawError";
@@ -200,8 +453,14 @@ var WithdrawError = class extends Error {
 
 // src/providers/wormhole/signers/AptosLocalSigner.ts
 var AptosLocalSigner = class {
+  _chain;
+  _options;
+  _wallet;
+  _sponsorAccount;
+  _onTransactionSigned;
+  _crossChainCore;
+  _claimedTransactionHashes = [];
   constructor(chain, options, wallet, feePayerAccount, crossChainCore, onTransactionSigned) {
-    this._claimedTransactionHashes = [];
     this._chain = chain;
     this._options = options;
     this._wallet = wallet;
@@ -262,7 +521,7 @@ async function signAndSendTransaction(request, wallet, sponsorAccount, crossChai
   const txnToSign = await aptos2.transaction.build.simple({
     data: payload,
     sender: wallet.accountAddress.toString(),
-    withFeePayer: sponsorAccount ? true : false,
+    withFeePayer: !!sponsorAccount,
     ...typeof expireTimestamp !== "undefined" ? { options: { expireTimestamp } } : {}
   });
   const senderAuthenticator = await aptos2.transaction.sign({
@@ -287,112 +546,28 @@ async function signAndSendTransaction(request, wallet, sponsorAccount, crossChai
   return tx.hash;
 }
 
-// src/providers/wormhole/signers/AptosSigner.ts
-var import_ts_sdk2 = require("@aptos-labs/ts-sdk");
-var import_wallet_standard = require("@aptos-labs/wallet-standard");
-var import_gas_station_client = require("@aptos-labs/gas-station-client");
-async function signAndSendTransaction2(request, wallet, sponsorAccount, dappNetwork, crossChainCore) {
-  if (!wallet) {
-    throw new Error("wallet.sendTransaction is undefined");
-  }
-  const payload = request.transaction;
-  payload.functionArguments = payload.functionArguments.map((a) => {
-    if (a instanceof Uint8Array) {
-      return Array.from(a);
-    } else if (typeof a === "bigint") {
-      return a.toString();
-    } else {
-      return a;
-    }
-  });
-  let aptosConfig;
-  const useGasStation = sponsorAccount && !isAccount(sponsorAccount);
-  if (useGasStation) {
-    const gasStationClient = new import_gas_station_client.GasStationClient({
-      network: dappNetwork,
-      apiKey: sponsorAccount[dappNetwork]
-    });
-    const transactionSubmitter = new import_gas_station_client.GasStationTransactionSubmitter(gasStationClient);
-    aptosConfig = new import_ts_sdk2.AptosConfig({
-      network: dappNetwork,
-      pluginSettings: {
-        TRANSACTION_SUBMITTER: transactionSubmitter
-      }
-    });
-  } else {
-    aptosConfig = new import_ts_sdk2.AptosConfig({
-      network: dappNetwork
-    });
-  }
-  const aptos2 = new import_ts_sdk2.Aptos(aptosConfig);
-  const functionArguments = extractFunctionArguments(
-    payload.functionArguments
-  );
-  const withdrawFunction = "0x5e2d961f06cd27aa07554a39d55f5ce1e58dff35d803c3529b1cd5c4fa3ab584::withdraw::deposit_for_burn";
-  const transactionData = {
-    function: withdrawFunction,
-    functionArguments
-  };
-  const expireTimestamp = crossChainCore?._dappConfig?.getExpireTimestamp?.();
-  if (typeof expireTimestamp !== "undefined") {
-    validateExpireTimestamp(expireTimestamp);
-  }
-  const txnToSign = await aptos2.transaction.build.simple({
-    data: transactionData,
-    sender: (await wallet.features["aptos:account"]?.account()).address.toString(),
-    withFeePayer: sponsorAccount ? true : false,
-    ...typeof expireTimestamp !== "undefined" ? { options: { expireTimestamp } } : {}
-  });
-  const response = await wallet.features["aptos:signTransaction"]?.signTransaction(txnToSign);
-  if (response?.status === import_wallet_standard.UserResponseStatus.REJECTED) {
-    throw new Error("User has rejected the request");
-  }
-  const txnToSubmit = {
-    transaction: txnToSign,
-    senderAuthenticator: response.args
+// src/providers/wormhole/signers/SolanaLocalSigner.ts
+var import_web32 = require("@solana/web3.js");
+
+// src/providers/wormhole/signers/solanaUtils.ts
+var import_web3 = require("@solana/web3.js");
+var import_sdk_solana = require("@wormhole-foundation/sdk-solana");
+async function sendAndConfirmTransaction(serializedTx, blockhash, lastValidBlockHeight, config) {
+  const {
+    connection,
+    commitment,
+    retryIntervalMs = 5e3,
+    verbose = false
+  } = config;
+  const sendOptions = {
+    skipPreflight: true,
+    maxRetries: 0,
+    preflightCommitment: commitment
   };
-  if (sponsorAccount && isAccount(sponsorAccount)) {
-    const feePayerSignerAuthenticator = aptos2.transaction.signAsFeePayer({
-      signer: sponsorAccount,
-      transaction: txnToSign
-    });
-    txnToSubmit.feePayerAuthenticator = feePayerSignerAuthenticator;
-  }
-  const txnSubmitted = await aptos2.transaction.submit.simple(txnToSubmit);
-  const tx = await aptos2.waitForTransaction({
-    transactionHash: txnSubmitted.hash
-  });
-  return tx.hash;
-}
-function extractFunctionArguments(functionArguments) {
-  const deserializer1 = new import_ts_sdk2.Deserializer(functionArguments[0].bcsToBytes());
-  const amount = deserializer1.deserializeU64();
-  const deserializer2 = new import_ts_sdk2.Deserializer(functionArguments[1].bcsToBytes());
-  const destination_domain = deserializer2.deserializeU32();
-  const mint_recipient = new import_ts_sdk2.AccountAddress(functionArguments[2].bcsToBytes());
-  const burn_token = new import_ts_sdk2.AccountAddress(functionArguments[3].bcsToBytes());
-  return [amount, destination_domain, mint_recipient, burn_token];
-}
-function isAccount(obj) {
-  return "accountAddress" in obj;
-}
-
-// src/providers/wormhole/signers/SolanaSigner.ts
-var import_web32 = require("@solana/web3.js");
-var import_web33 = require("@solana/web3.js");
-var import_derived_wallet_solana = require("@aptos-labs/derived-wallet-solana");
-
-// src/providers/wormhole/signers/solanaUtils.ts
-var import_web3 = require("@solana/web3.js");
-var import_sdk_solana = require("@wormhole-foundation/sdk-solana");
-async function sendAndConfirmTransaction(serializedTx, blockhash, lastValidBlockHeight, config) {
-  const { connection, commitment, retryIntervalMs = 5e3, verbose = false } = config;
-  const sendOptions = {
-    skipPreflight: true,
-    maxRetries: 0,
-    preflightCommitment: commitment
-  };
-  const signature = await connection.sendRawTransaction(serializedTx, sendOptions);
+  const signature = await connection.sendRawTransaction(
+    serializedTx,
+    sendOptions
+  );
   const confirmTransactionPromise = connection.confirmTransaction(
     { signature, blockhash, lastValidBlockHeight },
     commitment
@@ -455,7 +630,9 @@ function formatTransactionError(err) {
 }
 async function addPriorityFeeInstructions(connection, transaction, priorityFeeConfig, verbose = false) {
   const computeBudgetIxFilter = (ix) => ix.programId.toString() !== "ComputeBudget111111111111111111111111111111";
-  transaction.instructions = transaction.instructions.filter(computeBudgetIxFilter);
+  transaction.instructions = transaction.instructions.filter(
+    computeBudgetIxFilter
+  );
   const instructions = await createPriorityFeeInstructions(
     connection,
     transaction,
@@ -507,19 +684,21 @@ async function createPriorityFeeInstructions(connection, transaction, priorityFe
 async function simulateAndGetComputeUnits(connection, transaction) {
   let unitsUsed = 2e5;
   let simulationAttempts = 0;
-  simulationLoop: while (true) {
-    const response = await connection.simulateTransaction(transaction);
+  while (true) {
+    const response = await connection.simulateTransaction(
+      transaction
+    );
     if (response.value.err) {
       if (checkKnownSimulationError(response.value)) {
         if (simulationAttempts < 5) {
           simulationAttempts++;
           await sleep(1e3);
-          continue simulationLoop;
+          continue;
         }
       } else if (simulationAttempts < 3) {
         simulationAttempts++;
         await sleep(1e3);
-        continue simulationLoop;
+        continue;
       }
       throw new Error(
         `Simulation failed: ${JSON.stringify(response.value.err)}
@@ -570,15 +749,15 @@ async function calculatePriorityFee(connection, transaction, rpcProvider, config
 function checkKnownSimulationError(response) {
   const errors = {};
   if (response.err === "BlockhashNotFound") {
-    errors["BlockhashNotFound"] = "Blockhash not found during simulation. Trying again.";
+    errors.BlockhashNotFound = "Blockhash not found during simulation. Trying again.";
   }
   if (response.logs) {
     for (const line of response.logs) {
       if (line.includes("SlippageToleranceExceeded")) {
-        errors["SlippageToleranceExceeded"] = "Slippage failure during simulation. Trying again.";
+        errors.SlippageToleranceExceeded = "Slippage failure during simulation. Trying again.";
       }
       if (line.includes("RequireGteViolated")) {
-        errors["RequireGteViolated"] = "Swap instruction failure during simulation. Trying again.";
+        errors.RequireGteViolated = "Swap instruction failure during simulation. Trying again.";
       }
     }
   }
@@ -612,157 +791,35 @@ async function sleep(timeout) {
   return new Promise((resolve) => setTimeout(resolve, timeout));
 }
 
-// src/providers/wormhole/signers/SolanaSigner.ts
-async function signAndSendTransaction3(request, wallet, options, crossChainCore) {
-  if (!wallet || !(wallet instanceof import_derived_wallet_solana.SolanaDerivedWallet)) {
-    throw new Error("Invalid wallet type or missing Solana wallet");
-  }
-  const commitment = options?.commitment ?? crossChainCore?._dappConfig?.solanaConfig?.commitment ?? "finalized";
-  const connection = new import_web33.Connection(
-    crossChainCore?._dappConfig?.solanaConfig?.rpc ?? crossChainCore?.CHAINS["Solana"]?.defaultRpc ?? "https://api.devnet.solana.com"
-    // Last resort fallback
-  );
-  const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash(commitment);
-  const unsignedTx = await setPriorityFeeInstructions(
-    connection,
-    blockhash,
-    lastValidBlockHeight,
-    request,
-    crossChainCore?._dappConfig?.solanaConfig?.priorityFeeConfig
-  );
-  if (!wallet.solanaWallet.signTransaction) {
-    throw new Error("Wallet does not support signing transactions");
-  }
-  const tx = await wallet.solanaWallet.signTransaction(unsignedTx);
-  if (!tx) throw new Error("Failed to sign transaction");
-  if (request.transaction.signers && tx instanceof import_web32.Transaction) {
-    tx.partialSign(...request.transaction.signers);
-  }
-  const serializedTx = tx.serialize();
-  const signature = await sendAndConfirmTransaction(
-    serializedTx,
-    blockhash,
-    lastValidBlockHeight,
-    {
-      connection,
-      commitment,
-      retryIntervalMs: 5e3,
-      verbose: false
-    }
-  );
-  return signature;
-}
-async function setPriorityFeeInstructions(connection, blockhash, lastValidBlockHeight, request, priorityFeeConfig) {
-  const unsignedTx = request.transaction.transaction;
-  unsignedTx.recentBlockhash = blockhash;
-  unsignedTx.lastValidBlockHeight = lastValidBlockHeight;
-  await addPriorityFeeInstructions(
-    connection,
-    unsignedTx,
-    priorityFeeConfig,
-    false
-  );
-  return unsignedTx;
-}
-
-// src/providers/wormhole/signers/EthereumSigner.ts
-var import_ethers = require("ethers");
-async function signAndSendTransaction4(request, wallet, chainName) {
-  if (!wallet) {
-    throw new Error("wallet.sendTransaction is undefined");
-  }
-  const chainId = await wallet.eip1193Provider.request({
-    method: "eth_chainId"
-  });
-  const actualChainId = parseInt(chainId, 16);
-  if (!actualChainId) throw new Error("No signer found for chain" + chainName);
-  const expectedChainId = request.transaction.chainId ? (0, import_ethers.getBigInt)(request.transaction.chainId) : void 0;
-  if (!actualChainId || !expectedChainId || BigInt(actualChainId) !== expectedChainId) {
-    throw new Error(
-      `Signer is not connected to the right chain. Expected ${expectedChainId}, got ${actualChainId}`
-    );
-  }
-  const provider = new import_ethers.ethers.BrowserProvider(
-    wallet.eip1193Provider
-  );
-  const signer = await provider.getSigner();
-  let response;
-  try {
-    response = await signer.sendTransaction(request.transaction);
-  } catch (e) {
-    const message = e instanceof Error ? e.message : String(e);
-    const hashMatch = message.match(/"hash":\s*"(0x[a-fA-F0-9]{64})"/);
-    if (hashMatch) {
-      console.warn("Extracted EVM tx hash from error:", hashMatch[1]);
-      return hashMatch[1];
-    }
-    throw e;
-  }
-  try {
-    const receipt = await response.wait();
-    return receipt?.hash || response.hash || "";
-  } catch (e) {
-    if (e?.code === "TRANSACTION_REPLACED") {
-      if (e.reason === "repriced") {
-        const replacementHash = e.receipt?.hash || e.replacement?.hash;
-        if (replacementHash) {
-          console.warn(
-            "EVM transaction was repriced. Using replacement hash:",
-            replacementHash
-          );
-          return replacementHash;
-        }
-      }
-      throw e;
-    }
-    if (response.hash) {
-      console.warn(
-        "EVM transaction wait failed but tx was submitted:",
-        response.hash
-      );
-      return response.hash;
-    }
-    throw e;
-  }
-}
-
-// src/providers/wormhole/signers/SuiSigner.ts
-async function signAndSendTransaction5(request, wallet) {
-  if (!wallet) {
-    throw new Error("wallet is undefined");
-  }
-  const suiDerivedWallet = wallet;
-  const signAndExecuteTransactionFeature = suiDerivedWallet.suiWallet.features["sui:signAndExecuteTransaction"];
-  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;
-}
-
-// src/providers/wormhole/signers/Signer.ts
-var Signer = class {
-  constructor(chain, address, options, wallet, crossChainCore, sponsorAccount, onTransactionSigned, trackAsSourceChain = true) {
-    this._claimedTransactionHashes = [];
-    this._chain = chain;
-    this._address = address;
-    this._options = options;
-    this._wallet = wallet;
-    this._crossChainCore = crossChainCore;
-    this._sponsorAccount = sponsorAccount;
-    this._onTransactionSigned = onTransactionSigned;
-    this._trackAsSourceChain = trackAsSourceChain;
+// src/providers/wormhole/signers/SolanaLocalSigner.ts
+var SolanaLocalSigner = class {
+  keypair;
+  connection;
+  commitment;
+  retryIntervalMs;
+  priorityFeeConfig;
+  verbose;
+  _onTransactionSigned;
+  _claimedTransactionHashes = [];
+  constructor(config) {
+    this.keypair = config.keypair;
+    this.connection = config.connection;
+    this.commitment = config.commitment ?? "finalized";
+    this.retryIntervalMs = config.retryIntervalMs ?? 5e3;
+    this.priorityFeeConfig = config.priorityFeeConfig;
+    this.verbose = config.verbose ?? false;
+    this._onTransactionSigned = config.onTransactionSigned;
   }
   chain() {
-    return this._chain.key;
+    return "Solana";
   }
   address() {
-    return this._address;
+    return this.keypair.publicKey.toBase58();
   }
+  /**
+   * Returns all transaction hashes from the most recent signAndSend call,
+   * joined by comma. If only one transaction was signed, returns a single hash string.
+   */
   claimedTransactionHashes() {
     return this._claimedTransactionHashes.join(",");
   }
@@ -771,1023 +828,1031 @@ var Signer = class {
     this._claimedTransactionHashes = [];
     for (const tx of txs) {
       this._onTransactionSigned?.(tx.description, null);
-      const txId = await signAndSendTransaction6(
-        this._chain,
-        tx,
-        this._wallet,
-        this._options,
-        this._crossChainCore,
-        this._sponsorAccount
-      );
-      if (this._trackAsSourceChain) {
-        this._crossChainCore._lastSourceChainTxId = txId;
-      }
+      const txId = await this.signAndSendTransaction(tx);
       this._onTransactionSigned?.(tx.description, txId);
       txHashes.push(txId);
       this._claimedTransactionHashes.push(txId);
     }
     return txHashes;
   }
-};
-var signAndSendTransaction6 = async (chain, request, wallet, options = {}, crossChainCore, sponsorAccount) => {
-  if (!wallet) {
-    throw new Error("wallet is undefined");
-  }
-  const dappNetwork = crossChainCore._dappConfig.aptosNetwork;
-  if (chain.context === "Solana") {
-    const signature = await signAndSendTransaction3(
-      request,
-      wallet,
-      options,
-      crossChainCore
-    );
-    return signature;
-  } else if (chain.context === "Ethereum") {
-    const tx = await signAndSendTransaction4(
-      request,
-      wallet,
-      chain.displayName
-    );
-    return tx;
-  } else if (chain.context === "Sui") {
-    const tx = await signAndSendTransaction5(
-      request,
-      wallet
-    );
-    return tx;
-  } else if (chain.context === "Aptos") {
-    const tx = await signAndSendTransaction2(
-      request,
-      wallet,
-      sponsorAccount,
-      dappNetwork,
-      crossChainCore
-    );
-    return tx;
-  } else {
-    throw new Error(`Unsupported chain: ${chain}`);
-  }
-};
-
-// src/providers/wormhole/utils.ts
-var import_sdk2 = require("@wormhole-foundation/sdk");
-async function createCCTPRoute(wh, sourceChain, destChain, tokens) {
-  const sourceToken = import_sdk2.Wormhole.tokenId(
-    sourceChain,
-    tokens[sourceChain].tokenId.address
-  );
-  const destToken = import_sdk2.Wormhole.tokenId(
-    destChain,
+  async signAndSendTransaction(request) {
+    const { blockhash, lastValidBlockHeight } = await this.connection.getLatestBlockhash(this.commitment);
+    let unsignedTx = request.transaction ?? request;
+    const additionalSigners = request.transaction?.signers;
+    const MAX_UNWRAP_DEPTH = 10;
+    let unwrapDepth = 0;
+    while (unsignedTx && typeof unsignedTx === "object" && "transaction" in unsignedTx && !(unsignedTx instanceof import_web32.Transaction) && !("signatures" in unsignedTx && "message" in unsignedTx)) {
+      if (++unwrapDepth > MAX_UNWRAP_DEPTH) {
+        throw new Error(
+          "Transaction unwrapping exceeded maximum depth \u2014 possible circular nesting"
+        );
+      }
+      unsignedTx = unsignedTx.transaction;
+    }
+    const isVersioned = unsignedTx.message !== void 0 && unsignedTx.signatures !== void 0 && typeof unsignedTx.message.recentBlockhash !== "undefined";
+    if (isVersioned) {
+      unsignedTx.message.recentBlockhash = blockhash;
+      if (this.verbose || this.priorityFeeConfig) {
+        console.warn(
+          "SolanaLocalSigner: Versioned transaction detected \u2014 priority fees are not applied. Consider using legacy transactions if priority fees are required."
+        );
+      }
+      unsignedTx.sign([this.keypair]);
+      if (additionalSigners && additionalSigners.length > 0) {
+        unsignedTx.sign(additionalSigners);
+      }
+    } else if (unsignedTx instanceof import_web32.Transaction) {
+      unsignedTx.recentBlockhash = blockhash;
+      unsignedTx.lastValidBlockHeight = lastValidBlockHeight;
+      if (this.priorityFeeConfig) {
+        await addPriorityFeeInstructions(
+          this.connection,
+          unsignedTx,
+          this.priorityFeeConfig,
+          this.verbose
+        );
+      }
+      if (additionalSigners && additionalSigners.length > 0) {
+        unsignedTx.sign(this.keypair, ...additionalSigners);
+      } else {
+        unsignedTx.sign(this.keypair);
+      }
+    } else if (unsignedTx.recentBlockhash !== void 0 || unsignedTx.feePayer !== void 0) {
+      unsignedTx.recentBlockhash = blockhash;
+      unsignedTx.lastValidBlockHeight = lastValidBlockHeight;
+      if (this.priorityFeeConfig) {
+        await addPriorityFeeInstructions(
+          this.connection,
+          unsignedTx,
+          this.priorityFeeConfig,
+          this.verbose
+        );
+      }
+      if (additionalSigners && additionalSigners.length > 0) {
+        unsignedTx.sign(this.keypair, ...additionalSigners);
+      } else {
+        unsignedTx.sign(this.keypair);
+      }
+    } else {
+      throw new Error(
+        `Unsupported transaction type: ${unsignedTx?.constructor?.name}`
+      );
+    }
+    const serializedTx = unsignedTx.serialize();
+    const signature = await sendAndConfirmTransaction(
+      serializedTx,
+      blockhash,
+      lastValidBlockHeight,
+      {
+        connection: this.connection,
+        commitment: this.commitment,
+        retryIntervalMs: this.retryIntervalMs,
+        verbose: this.verbose
+      }
+    );
+    return signature;
+  }
+};
+
+// src/providers/wormhole/utils.ts
+var import_sdk = require("@wormhole-foundation/sdk");
+async function createCCTPRoute(wh, sourceChain, destChain, tokens) {
+  const sourceToken = import_sdk.Wormhole.tokenId(
+    sourceChain,
+    tokens[sourceChain].tokenId.address
+  );
+  const destToken = import_sdk.Wormhole.tokenId(
+    destChain,
     tokens[destChain].tokenId.address
   );
-  const destContext = wh.getPlatform((0, import_sdk2.chainToPlatform)(destChain)).getChain(destChain);
-  const sourceContext = wh.getPlatform((0, import_sdk2.chainToPlatform)(sourceChain)).getChain(sourceChain);
-  const request = await import_sdk2.routes.RouteTransferRequest.create(
+  const destContext = wh.getPlatform((0, import_sdk.chainToPlatform)(destChain)).getChain(destChain);
+  const sourceContext = wh.getPlatform((0, import_sdk.chainToPlatform)(sourceChain)).getChain(sourceChain);
+  const request = await import_sdk.routes.RouteTransferRequest.create(
     wh,
     { source: sourceToken, destination: destToken },
     sourceContext,
     destContext
   );
-  const resolver = wh.resolver([import_sdk2.routes.CCTPRoute]);
+  const resolver = wh.resolver([import_sdk.routes.CCTPRoute]);
   const foundRoutes = await resolver.findRoutes(request);
   const cctpRoute = foundRoutes[0];
-  if (!cctpRoute || !import_sdk2.routes.isManual(cctpRoute)) {
+  if (!cctpRoute || !import_sdk.routes.isManual(cctpRoute)) {
     throw new Error("Expected manual CCTP route");
   }
   return { route: cctpRoute, request };
 }
 
 // src/providers/wormhole/wormhole.ts
-var WormholeProvider = class {
-  constructor(core) {
-    this.crossChainCore = core;
-  }
-  get wormholeContext() {
-    return this._wormholeContext;
-  }
-  async setWormholeContext(sourceChain) {
-    const dappNetwork = this.crossChainCore._dappConfig?.aptosNetwork;
-    if (dappNetwork === import_ts_sdk3.Network.DEVNET) {
-      throw new Error("Devnet is not supported on Wormhole");
+var import_ts_sdk3 = require("@aptos-labs/ts-sdk");
+var import_sdk3 = require("@wormhole-foundation/sdk");
+var import_aptos = __toESM(require("@wormhole-foundation/sdk/aptos"));
+var import_evm = __toESM(require("@wormhole-foundation/sdk/evm"));
+var import_solana = __toESM(require("@wormhole-foundation/sdk/solana"));
+var import_sui = __toESM(require("@wormhole-foundation/sdk/sui"));
+
+// src/utils/logger.ts
+var logger = {
+  log: (...args) => {
+    if (process.env.NODE_ENV === "development") {
+      console.log(...args);
     }
-    if (!sourceChain) {
-      throw new Error("Origin chain not selected");
+  },
+  warn: (...args) => {
+    if (process.env.NODE_ENV === "development") {
+      console.warn(...args);
     }
-    const isMainnet = dappNetwork === import_ts_sdk3.Network.MAINNET;
-    const platforms = [import_aptos.default, import_solana.default, import_evm.default, import_sui.default];
-    const dappConfig = this.crossChainCore._dappConfig;
-    const chains = this.crossChainCore.CHAINS;
-    const solanaRpc = dappConfig?.solanaConfig?.rpc ?? chains["Solana"]?.defaultRpc;
-    const suiRpc = dappConfig?.suiConfig?.rpc ?? chains["Sui"]?.defaultRpc;
-    const evmChainsConfig = {};
-    for (const name of EVM_CHAIN_NAMES) {
-      const rpc = dappConfig?.evmConfig?.[name]?.rpc ?? chains[name]?.defaultRpc;
-      if (rpc) {
-        evmChainsConfig[name] = { rpc };
-      }
+  },
+  error: (...args) => {
+    if (process.env.NODE_ENV === "development") {
+      console.error(...args);
     }
-    const wh = await (0, import_sdk3.wormhole)(isMainnet ? "Mainnet" : "Testnet", platforms, {
-      chains: {
-        ...solanaRpc ? { Solana: { rpc: solanaRpc } } : {},
-        ...suiRpc ? { Sui: { rpc: suiRpc } } : {},
-        ...evmChainsConfig
-      }
-    });
-    this._wormholeContext = wh;
   }
-  async getRoute(sourceChain, destinationChain) {
-    if (!this._wormholeContext) {
-      throw new Error("Wormhole context not initialized");
-    }
-    const { route: cctpRoute, request } = await createCCTPRoute(
-      this._wormholeContext,
-      sourceChain,
-      destinationChain,
-      this.crossChainCore.TOKENS
-    );
-    this.wormholeRoute = cctpRoute;
-    this.wormholeRequest = request;
-    this.destinationChain = destinationChain;
-    return { route: cctpRoute, request };
+};
+
+// src/utils/receiptSerialization.ts
+var import_sdk2 = require("@wormhole-foundation/sdk");
+function uint8ArrayToBase64(bytes) {
+  let binary = "";
+  for (let i = 0; i < bytes.length; i++) {
+    binary += String.fromCharCode(bytes[i]);
   }
-  async getQuote(input) {
-    const { amount, originChain, type } = input;
-    if (!this._wormholeContext) {
-      await this.setWormholeContext(originChain);
-    }
-    logger.log("type", type);
-    const sourceChain = type === "transfer" ? originChain : "Aptos";
-    const destinationChain = type === "transfer" ? "Aptos" : originChain;
-    const { route, request } = await this.getRoute(
-      sourceChain,
-      destinationChain
-    );
-    const transferParams = {
-      amount,
-      options: { nativeGas: 0 }
-    };
-    const validated = await route.validate(request, transferParams);
-    if (!validated.valid) {
-      logger.log("invalid", validated.valid);
-      throw new Error(`Invalid quote: ${validated.error}`);
-    }
-    const quote = await route.quote(request, validated.params);
-    if (!quote.success) {
-      logger.log("quote failed", quote.success);
-      throw new Error(`Invalid quote: ${quote.error}`);
+  return btoa(binary);
+}
+function base64ToUint8Array(base64) {
+  const binary = atob(base64);
+  const bytes = new Uint8Array(binary.length);
+  for (let i = 0; i < binary.length; i++) {
+    bytes[i] = binary.charCodeAt(i);
+  }
+  return bytes;
+}
+function serializeReceipt(receipt) {
+  return JSON.parse(
+    JSON.stringify(receipt, (_key, value) => {
+      if (typeof value === "bigint") {
+        return { __type: "bigint", value: value.toString() };
+      }
+      if (value instanceof import_sdk2.UniversalAddress) {
+        return {
+          __type: "UniversalAddress",
+          value: uint8ArrayToBase64(value.toUint8Array())
+        };
+      }
+      if (value instanceof Uint8Array) {
+        return {
+          __type: "Uint8Array",
+          value: uint8ArrayToBase64(value)
+        };
+      }
+      return value;
+    })
+  );
+}
+function deserializeReceipt(obj) {
+  function revive(value, key) {
+    if (value && typeof value === "object") {
+      const objValue = value;
+      if ("__type" in objValue) {
+        if (objValue.__type === "bigint") {
+          return BigInt(objValue.value);
+        }
+        if (objValue.__type === "UniversalAddress") {
+          return new import_sdk2.UniversalAddress(
+            base64ToUint8Array(objValue.value)
+          );
+        }
+        if (objValue.__type === "Uint8Array") {
+          return base64ToUint8Array(objValue.value);
+        }
+      }
+      const addressFields = [
+        "sender",
+        "recipient",
+        "destinationCaller",
+        "burnToken",
+        "mintRecipient",
+        "messageSender"
+      ];
+      if (key && addressFields.includes(key) && "address" in objValue) {
+        const addressBytes = revive(objValue.address);
+        if (addressBytes instanceof Uint8Array) {
+          return new import_sdk2.UniversalAddress(addressBytes);
+        }
+      }
+      if (Array.isArray(value)) {
+        return value.map((v, i) => revive(v, String(i)));
+      }
+      const result = {};
+      for (const k in objValue) {
+        result[k] = revive(objValue[k], k);
+      }
+      return result;
     }
-    this.wormholeQuote = quote;
-    logger.log("quote", quote);
-    return quote;
+    return value;
   }
-  async submitCCTPTransfer(input) {
-    const { sourceChain, wallet, destinationAddress, onTransactionSigned } = input;
-    if (!this._wormholeContext) {
-      await this.setWormholeContext(sourceChain);
-    }
-    if (!this.wormholeRoute || !this.wormholeRequest || !this.wormholeQuote) {
-      throw new Error("Wormhole route, request, or quote not initialized");
-    }
-    let signerAddress;
-    const chainContext = this.getChainConfig(sourceChain).context;
-    if (chainContext === "Solana") {
-      signerAddress = wallet.solanaWallet.publicKey?.toBase58() || "";
-    } else if (chainContext === "Ethereum") {
-      [signerAddress] = await wallet.eip1193Provider.request({
-        method: "eth_requestAccounts"
-      });
-    } else if (chainContext === "Sui") {
-      signerAddress = wallet.suiWallet.accounts[0].address || "";
+  return revive(obj);
+}
+
+// src/providers/wormhole/signers/AptosSigner.ts
+var import_gas_station_client = require("@aptos-labs/gas-station-client");
+var import_ts_sdk2 = require("@aptos-labs/ts-sdk");
+var import_wallet_standard = require("@aptos-labs/wallet-standard");
+async function signAndSendTransaction2(request, wallet, sponsorAccount, dappNetwork, crossChainCore) {
+  if (!wallet) {
+    throw new Error("wallet.sendTransaction is undefined");
+  }
+  const payload = request.transaction;
+  payload.functionArguments = payload.functionArguments.map((a) => {
+    if (a instanceof Uint8Array) {
+      return Array.from(a);
+    } else if (typeof a === "bigint") {
+      return a.toString();
     } else {
-      throw new Error("Unsupported chain context: " + chainContext);
+      return a;
     }
-    logger.log("signerAddress", signerAddress);
-    const signer = new Signer(
-      this.getChainConfig(sourceChain),
-      signerAddress,
-      {},
-      wallet,
-      this.crossChainCore,
-      void 0,
-      onTransactionSigned
+  });
+  let aptosConfig;
+  const useGasStation = sponsorAccount && !isAccount(sponsorAccount);
+  if (useGasStation) {
+    const gasStationClient = new import_gas_station_client.GasStationClient({
+      network: dappNetwork,
+      apiKey: sponsorAccount[dappNetwork]
+    });
+    const transactionSubmitter = new import_gas_station_client.GasStationTransactionSubmitter(
+      gasStationClient
     );
-    logger.log("signer", signer);
-    logger.log("wormholeRequest", this.wormholeRequest);
-    logger.log("wormholeQuote", this.wormholeQuote);
-    let receipt = await this.wormholeRoute.initiate(
-      this.wormholeRequest,
-      signer,
-      this.wormholeQuote,
-      import_sdk3.Wormhole.chainAddress("Aptos", destinationAddress.toString())
+    aptosConfig = new import_ts_sdk2.AptosConfig({
+      network: dappNetwork,
+      pluginSettings: {
+        TRANSACTION_SUBMITTER: transactionSubmitter
+      }
+    });
+  } else {
+    aptosConfig = new import_ts_sdk2.AptosConfig({
+      network: dappNetwork
+    });
+  }
+  const aptos2 = new import_ts_sdk2.Aptos(aptosConfig);
+  const functionArguments = extractFunctionArguments(
+    payload.functionArguments
+  );
+  const withdrawFunction = "0x5e2d961f06cd27aa07554a39d55f5ce1e58dff35d803c3529b1cd5c4fa3ab584::withdraw::deposit_for_burn";
+  const transactionData = {
+    function: withdrawFunction,
+    functionArguments
+  };
+  const expireTimestamp = crossChainCore?._dappConfig?.getExpireTimestamp?.();
+  if (typeof expireTimestamp !== "undefined") {
+    validateExpireTimestamp(expireTimestamp);
+  }
+  const txnToSign = await aptos2.transaction.build.simple({
+    data: transactionData,
+    sender: (await wallet.features["aptos:account"]?.account()).address.toString(),
+    withFeePayer: !!sponsorAccount,
+    ...typeof expireTimestamp !== "undefined" ? { options: { expireTimestamp } } : {}
+  });
+  const response = await wallet.features["aptos:signTransaction"]?.signTransaction(txnToSign);
+  if (response?.status === import_wallet_standard.UserResponseStatus.REJECTED) {
+    throw new Error("User has rejected the request");
+  }
+  const txnToSubmit = {
+    transaction: txnToSign,
+    senderAuthenticator: response.args
+  };
+  if (sponsorAccount && isAccount(sponsorAccount)) {
+    const feePayerSignerAuthenticator = aptos2.transaction.signAsFeePayer({
+      signer: sponsorAccount,
+      transaction: txnToSign
+    });
+    txnToSubmit.feePayerAuthenticator = feePayerSignerAuthenticator;
+  }
+  const txnSubmitted = await aptos2.transaction.submit.simple(txnToSubmit);
+  const tx = await aptos2.waitForTransaction({
+    transactionHash: txnSubmitted.hash
+  });
+  return tx.hash;
+}
+function extractFunctionArguments(functionArguments) {
+  const deserializer1 = new import_ts_sdk2.Deserializer(functionArguments[0].bcsToBytes());
+  const amount = deserializer1.deserializeU64();
+  const deserializer2 = new import_ts_sdk2.Deserializer(functionArguments[1].bcsToBytes());
+  const destination_domain = deserializer2.deserializeU32();
+  const mint_recipient = new import_ts_sdk2.AccountAddress(functionArguments[2].bcsToBytes());
+  const burn_token = new import_ts_sdk2.AccountAddress(functionArguments[3].bcsToBytes());
+  return [amount, destination_domain, mint_recipient, burn_token];
+}
+function isAccount(obj) {
+  return "accountAddress" in obj;
+}
+
+// src/providers/wormhole/signers/EthereumSigner.ts
+var import_ethers = require("ethers");
+async function signAndSendTransaction3(request, wallet, chainName) {
+  if (!wallet) {
+    throw new Error("wallet.sendTransaction is undefined");
+  }
+  const chainId = await wallet.eip1193Provider.request({
+    method: "eth_chainId"
+  });
+  const actualChainId = parseInt(chainId, 16);
+  if (!actualChainId) throw new Error(`No signer found for chain${chainName}`);
+  const expectedChainId = request.transaction.chainId ? (0, import_ethers.getBigInt)(request.transaction.chainId) : void 0;
+  if (!actualChainId || !expectedChainId || BigInt(actualChainId) !== expectedChainId) {
+    throw new Error(
+      `Signer is not connected to the right chain. Expected ${expectedChainId}, got ${actualChainId}`
     );
-    const originChainTxnId = "originTxs" in receipt ? receipt.originTxs[receipt.originTxs.length - 1].txid : void 0;
-    return { originChainTxnId: originChainTxnId || "", receipt };
   }
-  async claimCCTPTransfer(input) {
-    let { receipt, mainSigner, sponsorAccount, onTransactionSigned } = input;
-    if (!this.wormholeRoute) {
-      throw new Error("Wormhole route not initialized");
-    }
-    if (sponsorAccount && !isAccount(sponsorAccount)) {
-      throw new Error(
-        "AptosLocalSigner does not support GasStationApiKey as a sponsor account. Wormhole claim transactions are script-based and cannot be submitted via the gas station. Please provide an Account instance as the sponsor, or omit the sponsor account."
-      );
+  const provider = new import_ethers.ethers.BrowserProvider(
+    wallet.eip1193Provider
+  );
+  const signer = await provider.getSigner();
+  let response;
+  try {
+    response = await signer.sendTransaction(request.transaction);
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
+    const hashMatch = message.match(/"hash":\s*"(0x[a-fA-F0-9]{64})"/);
+    if (hashMatch) {
+      console.warn("Extracted EVM tx hash from error:", hashMatch[1]);
+      return hashMatch[1];
     }
-    logger.log("mainSigner", mainSigner.accountAddress.toString());
-    let retries = 0;
-    const maxRetries = 5;
-    const baseDelay = 1e3;
-    while (retries < maxRetries) {
-      try {
-        for await (receipt of this.wormholeRoute.track(receipt, 120 * 1e3)) {
-          if (receipt.state >= import_sdk3.TransferState.SourceInitiated) {
-            logger.log("Receipt is on track ", receipt);
-            try {
-              const signer = new AptosLocalSigner(
-                "Aptos",
-                {},
-                mainSigner,
-                // the account that signs the "claim" transaction
-                sponsorAccount,
-                // the fee payer account
-                this.crossChainCore,
-                onTransactionSigned
-              );
-              if (import_sdk3.routes.isManual(this.wormholeRoute)) {
-                const circleAttestationReceipt = await this.wormholeRoute.complete(signer, receipt);
-                logger.log("Claim receipt: ", circleAttestationReceipt);
-                const destinationChainTxnId = signer.claimedTransactionHashes();
-                return { destinationChainTxnId };
-              } else {
-                return { destinationChainTxnId: "" };
-              }
-            } catch (e) {
-              console.error("Failed to claim", e);
-              return { destinationChainTxnId: "" };
-            }
-          }
+    throw e;
+  }
+  try {
+    const receipt = await response.wait();
+    return receipt?.hash || response.hash || "";
+  } catch (e) {
+    if (e?.code === "TRANSACTION_REPLACED") {
+      if (e.reason === "repriced") {
+        const replacementHash = e.receipt?.hash || e.replacement?.hash;
+        if (replacementHash) {
+          console.warn(
+            "EVM transaction was repriced. Using replacement hash:",
+            replacementHash
+          );
+          return replacementHash;
         }
-      } catch (e) {
-        console.error(
-          `Error tracking transfer (attempt ${retries + 1} / ${maxRetries}):`,
-          e
-        );
-        const delay = baseDelay * Math.pow(2, retries);
-        await (0, import_ts_sdk3.sleep)(delay);
-        retries++;
       }
+      throw e;
     }
-    return { destinationChainTxnId: "" };
-  }
-  /**
-   * Initiates a transfer of USDC funds from the source chain wallet to the destination chain wallet
-   * @param args
-   * @returns
-   */
-  async transfer(input) {
-    if (this.crossChainCore._dappConfig?.aptosNetwork === import_ts_sdk3.Network.DEVNET) {
-      throw new Error("Devnet is not supported on Wormhole");
-    }
-    if (input.amount) {
-      await this.getQuote({
-        amount: input.amount,
-        originChain: input.sourceChain,
-        type: "transfer"
-      });
-    }
-    let { originChainTxnId, receipt } = await this.submitCCTPTransfer(input);
-    try {
-      const { destinationChainTxnId } = await this.claimCCTPTransfer({
-        receipt,
-        mainSigner: input.mainSigner,
-        sponsorAccount: input.sponsorAccount,
-        onTransactionSigned: input.onTransactionSigned
-      });
-      return { originChainTxnId, destinationChainTxnId };
-    } catch (error) {
-      throw new TransferError(
-        error?.message ?? "Transfer claim failed after source-chain burn",
-        originChainTxnId,
-        error
+    if (response.hash) {
+      console.warn(
+        "EVM transaction wait failed but tx was submitted:",
+        response.hash
       );
+      return response.hash;
     }
+    throw e;
   }
-  // --- Split withdraw flow: initiateWithdraw + trackWithdraw + claimWithdraw ---
-  /**
-   * Phase 1: Initiates a withdraw by burning USDC on Aptos.
-   * The user signs the Aptos burn transaction via their wallet.
-   * Returns a receipt that can be tracked and later claimed.
-   */
-  async initiateWithdraw(input) {
-    const { wallet, destinationAddress, sponsorAccount, onTransactionSigned } = input;
-    if (!this._wormholeContext) {
-      throw new Error("Wormhole context not initialized");
+}
+
+// src/providers/wormhole/signers/SolanaSigner.ts
+var import_derived_wallet_solana = require("@aptos-labs/derived-wallet-solana");
+var import_web33 = require("@solana/web3.js");
+async function signAndSendTransaction4(request, wallet, options, crossChainCore) {
+  if (!wallet || !(wallet instanceof import_derived_wallet_solana.SolanaDerivedWallet)) {
+    throw new Error("Invalid wallet type or missing Solana wallet");
+  }
+  const commitment = options?.commitment ?? crossChainCore?._dappConfig?.solanaConfig?.commitment ?? "finalized";
+  const connection = new import_web33.Connection(
+    crossChainCore?._dappConfig?.solanaConfig?.rpc ?? crossChainCore?.CHAINS.Solana?.defaultRpc ?? "https://api.devnet.solana.com"
+    // Last resort fallback
+  );
+  const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash(commitment);
+  const unsignedTx = await setPriorityFeeInstructions(
+    connection,
+    blockhash,
+    lastValidBlockHeight,
+    request,
+    crossChainCore?._dappConfig?.solanaConfig?.priorityFeeConfig
+  );
+  if (!wallet.solanaWallet.signTransaction) {
+    throw new Error("Wallet does not support signing transactions");
+  }
+  const tx = await wallet.solanaWallet.signTransaction(unsignedTx);
+  if (!tx) throw new Error("Failed to sign transaction");
+  if (request.transaction.signers && tx instanceof import_web33.Transaction) {
+    tx.partialSign(...request.transaction.signers);
+  }
+  const serializedTx = tx.serialize();
+  const signature = await sendAndConfirmTransaction(
+    serializedTx,
+    blockhash,
+    lastValidBlockHeight,
+    {
+      connection,
+      commitment,
+      retryIntervalMs: 5e3,
+      verbose: false
     }
-    if (!this.wormholeRoute || !this.wormholeRequest || !this.wormholeQuote) {
-      throw new Error("Wormhole route, request, or quote not initialized");
+  );
+  return signature;
+}
+async function setPriorityFeeInstructions(connection, blockhash, lastValidBlockHeight, request, priorityFeeConfig) {
+  const unsignedTx = request.transaction.transaction;
+  unsignedTx.recentBlockhash = blockhash;
+  unsignedTx.lastValidBlockHeight = lastValidBlockHeight;
+  await addPriorityFeeInstructions(
+    connection,
+    unsignedTx,
+    priorityFeeConfig,
+    false
+  );
+  return unsignedTx;
+}
+
+// src/providers/wormhole/signers/SuiSigner.ts
+async function signAndSendTransaction5(request, wallet) {
+  if (!wallet) {
+    throw new Error("wallet is undefined");
+  }
+  const suiDerivedWallet = wallet;
+  const signAndExecuteTransactionFeature = suiDerivedWallet.suiWallet.features["sui:signAndExecuteTransaction"];
+  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;
+}
+
+// src/providers/wormhole/signers/Signer.ts
+var Signer = class {
+  _chain;
+  _address;
+  _options;
+  _wallet;
+  _crossChainCore;
+  _sponsorAccount;
+  _onTransactionSigned;
+  _claimedTransactionHashes = [];
+  /**
+   * When true, signed tx hashes are written to
+   * `_crossChainCore._lastSourceChainTxId` as a recovery side-channel.
+   * Set to false for destination-chain claim signers so they don't
+   * overwrite the source-chain burn hash.
+   */
+  _trackAsSourceChain;
+  constructor(chain, address, options, wallet, crossChainCore, sponsorAccount, onTransactionSigned, trackAsSourceChain = true) {
+    this._chain = chain;
+    this._address = address;
+    this._options = options;
+    this._wallet = wallet;
+    this._crossChainCore = crossChainCore;
+    this._sponsorAccount = sponsorAccount;
+    this._onTransactionSigned = onTransactionSigned;
+    this._trackAsSourceChain = trackAsSourceChain;
+  }
+  chain() {
+    return this._chain.key;
+  }
+  address() {
+    return this._address;
+  }
+  claimedTransactionHashes() {
+    return this._claimedTransactionHashes.join(",");
+  }
+  async signAndSend(txs) {
+    const txHashes = [];
+    this._claimedTransactionHashes = [];
+    for (const tx of txs) {
+      this._onTransactionSigned?.(tx.description, null);
+      const txId = await signAndSendTransaction6(
+        this._chain,
+        tx,
+        this._wallet,
+        this._options,
+        this._crossChainCore,
+        this._sponsorAccount
+      );
+      if (this._trackAsSourceChain) {
+        this._crossChainCore._lastSourceChainTxId = txId;
+      }
+      this._onTransactionSigned?.(tx.description, txId);
+      txHashes.push(txId);
+      this._claimedTransactionHashes.push(txId);
     }
-    const signer = new Signer(
-      this.getChainConfig("Aptos"),
-      (await wallet.features["aptos:account"].account()).address.toString(),
-      {},
+    return txHashes;
+  }
+};
+var signAndSendTransaction6 = async (chain, request, wallet, options = {}, crossChainCore, sponsorAccount) => {
+  if (!wallet) {
+    throw new Error("wallet is undefined");
+  }
+  const dappNetwork = crossChainCore._dappConfig.aptosNetwork;
+  if (chain.context === "Solana") {
+    const signature = await signAndSendTransaction4(
+      request,
       wallet,
-      this.crossChainCore,
-      sponsorAccount,
-      onTransactionSigned
+      options,
+      crossChainCore
     );
-    const wormholeDestAddress = import_sdk3.Wormhole.chainAddress(
-      this.destinationChain,
-      destinationAddress.toString()
+    return signature;
+  } else if (chain.context === "Ethereum") {
+    const tx = await signAndSendTransaction3(
+      request,
+      wallet,
+      chain.displayName
     );
-    const receipt = await this.wormholeRoute.initiate(
-      this.wormholeRequest,
-      signer,
-      this.wormholeQuote,
-      wormholeDestAddress
+    return tx;
+  } else if (chain.context === "Sui") {
+    const tx = await signAndSendTransaction5(
+      request,
+      wallet
     );
-    logger.log("initiateWithdraw receipt", receipt);
-    const originChainTxnId = "originTxs" in receipt ? receipt.originTxs[receipt.originTxs.length - 1].txid : void 0;
-    return { originChainTxnId: originChainTxnId || "", receipt };
+    return tx;
+  } else if (chain.context === "Aptos") {
+    const tx = await signAndSendTransaction2(
+      request,
+      wallet,
+      sponsorAccount,
+      dappNetwork,
+      crossChainCore
+    );
+    return tx;
+  } else {
+    throw new Error(`Unsupported chain: ${chain}`);
   }
-  /**
-   * Phase 2: Tracks a withdraw receipt until attestation is ready.
-   * This polls Wormhole and returns once the receipt reaches the Attested state.
-   */
-  async trackWithdraw(receipt) {
-    if (!this.wormholeRoute) {
-      throw new Error("Wormhole route not initialized");
+};
+
+// src/providers/wormhole/wormhole.ts
+var WormholeProvider = class {
+  crossChainCore;
+  _wormholeContext;
+  wormholeRoute;
+  wormholeRequest;
+  wormholeQuote;
+  destinationChain;
+  constructor(core) {
+    this.crossChainCore = core;
+  }
+  get wormholeContext() {
+    return this._wormholeContext;
+  }
+  async setWormholeContext(sourceChain) {
+    const dappNetwork = this.crossChainCore._dappConfig?.aptosNetwork;
+    if (dappNetwork === import_ts_sdk3.Network.DEVNET) {
+      throw new Error("Devnet is not supported on Wormhole");
     }
-    let retries = 0;
-    const maxRetries = 5;
-    const baseDelay = 1e3;
-    while (retries < maxRetries) {
-      try {
-        for await (receipt of this.wormholeRoute.track(receipt, 120 * 1e3)) {
-          if (receipt.state >= import_sdk3.TransferState.Attested) {
-            logger.log("trackWithdraw: receipt attested", receipt);
-            return receipt;
-          }
-        }
-      } catch (e) {
-        console.error(
-          `Error tracking withdraw (attempt ${retries + 1} / ${maxRetries}):`,
-          e
-        );
-        const delay = baseDelay * Math.pow(2, retries);
-        await (0, import_ts_sdk3.sleep)(delay);
-        retries++;
-      }
+    if (!sourceChain) {
+      throw new Error("Origin chain not selected");
     }
-    throw new Error("Failed to track withdraw to attested state");
-  }
-  /**
-   * Phase 3: Claims the withdraw on the destination chain.
-   *
-   * If the destination is Solana and `solanaConfig.serverClaimUrl` is configured
-   * in the dapp config, the SDK automatically POSTs the attested receipt to that
-   * URL — no wallet popup required. The dapp's server endpoint handles signing
-   * and submitting the claim transaction.
-   *
-   * Otherwise falls back to the wallet-based Signer (triggers wallet popup).
-   */
-  async claimWithdraw(input) {
-    const { claimChain, destinationAddress, receipt } = input;
-    const serverClaimUrl = this.crossChainCore._dappConfig?.solanaConfig?.serverClaimUrl;
-    if (claimChain === "Solana" && serverClaimUrl) {
-      logger.log("claimWithdraw: using server-side claim via", serverClaimUrl);
-      const response = await fetch(serverClaimUrl, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          receipt: serializeReceipt(receipt),
-          destinationAddress,
-          claimChain
-        })
-      });
-      if (!response.ok) {
-        const errorData = await response.json().catch(() => ({}));
-        throw new Error(
-          errorData.error || `Server-side claim failed with status ${response.status}`
-        );
+    const isMainnet = dappNetwork === import_ts_sdk3.Network.MAINNET;
+    const platforms = [import_aptos.default, import_solana.default, import_evm.default, import_sui.default];
+    const dappConfig = this.crossChainCore._dappConfig;
+    const chains = this.crossChainCore.CHAINS;
+    const solanaRpc = dappConfig?.solanaConfig?.rpc ?? chains.Solana?.defaultRpc;
+    const suiRpc = dappConfig?.suiConfig?.rpc ?? chains.Sui?.defaultRpc;
+    const evmChainsConfig = {};
+    for (const name of EVM_CHAIN_NAMES) {
+      const rpc = dappConfig?.evmConfig?.[name]?.rpc ?? chains[name]?.defaultRpc;
+      if (rpc) {
+        evmChainsConfig[name] = { rpc };
       }
-      const result = await response.json();
-      return { destinationChainTxnId: result.destinationChainTxnId };
     }
-    if (!this.wormholeRoute) {
-      throw new Error("Wormhole route not initialized");
+    const wh = await (0, import_sdk3.wormhole)(isMainnet ? "Mainnet" : "Testnet", platforms, {
+      chains: {
+        ...solanaRpc ? { Solana: { rpc: solanaRpc } } : {},
+        ...suiRpc ? { Sui: { rpc: suiRpc } } : {},
+        ...evmChainsConfig
+      }
+    });
+    this._wormholeContext = wh;
+  }
+  async getRoute(sourceChain, destinationChain) {
+    if (!this._wormholeContext) {
+      throw new Error("Wormhole context not initialized");
     }
-    if (!input.wallet) {
-      throw new Error(
-        "Wallet is required for claim when serverClaimUrl is not configured"
-      );
+    const { route: cctpRoute, request } = await createCCTPRoute(
+      this._wormholeContext,
+      sourceChain,
+      destinationChain,
+      this.crossChainCore.TOKENS
+    );
+    this.wormholeRoute = cctpRoute;
+    this.wormholeRequest = request;
+    this.destinationChain = destinationChain;
+    return { route: cctpRoute, request };
+  }
+  async getQuote(input) {
+    const { amount, originChain, type } = input;
+    if (!this._wormholeContext) {
+      await this.setWormholeContext(originChain);
     }
-    const claimSigner = new Signer(
-      this.getChainConfig(claimChain),
-      destinationAddress,
+    logger.log("type", type);
+    const sourceChain = type === "transfer" ? originChain : "Aptos";
+    const destinationChain = type === "transfer" ? "Aptos" : originChain;
+    const { route, request } = await this.getRoute(
+      sourceChain,
+      destinationChain
+    );
+    const transferParams = {
+      amount,
+      options: { nativeGas: 0 }
+    };
+    const validated = await route.validate(request, transferParams);
+    if (!validated.valid) {
+      logger.log("invalid", validated.valid);
+      throw new Error(`Invalid quote: ${validated.error}`);
+    }
+    const quote = await route.quote(request, validated.params);
+    if (!quote.success) {
+      logger.log("quote failed", quote.success);
+      throw new Error(`Invalid quote: ${quote.error}`);
+    }
+    this.wormholeQuote = quote;
+    logger.log("quote", quote);
+    return quote;
+  }
+  async submitCCTPTransfer(input) {
+    const { sourceChain, wallet, destinationAddress, onTransactionSigned } = input;
+    if (!this._wormholeContext) {
+      await this.setWormholeContext(sourceChain);
+    }
+    if (!this.wormholeRoute || !this.wormholeRequest || !this.wormholeQuote) {
+      throw new Error("Wormhole route, request, or quote not initialized");
+    }
+    let signerAddress;
+    const chainContext = this.getChainConfig(sourceChain).context;
+    if (chainContext === "Solana") {
+      signerAddress = wallet.solanaWallet.publicKey?.toBase58() || "";
+    } else if (chainContext === "Ethereum") {
+      [signerAddress] = await wallet.eip1193Provider.request({
+        method: "eth_requestAccounts"
+      });
+    } else if (chainContext === "Sui") {
+      signerAddress = wallet.suiWallet.accounts[0].address || "";
+    } else {
+      throw new Error(`Unsupported chain context: ${chainContext}`);
+    }
+    logger.log("signerAddress", signerAddress);
+    const signer = new Signer(
+      this.getChainConfig(sourceChain),
+      signerAddress,
       {},
-      input.wallet,
+      wallet,
       this.crossChainCore,
       void 0,
-      input.onTransactionSigned,
-      false
+      onTransactionSigned
     );
-    if (import_sdk3.routes.isManual(this.wormholeRoute)) {
-      const circleAttestationReceipt = await this.wormholeRoute.complete(
-        claimSigner,
-        receipt
+    logger.log("signer", signer);
+    logger.log("wormholeRequest", this.wormholeRequest);
+    logger.log("wormholeQuote", this.wormholeQuote);
+    const receipt = await this.wormholeRoute.initiate(
+      this.wormholeRequest,
+      signer,
+      this.wormholeQuote,
+      import_sdk3.Wormhole.chainAddress("Aptos", destinationAddress.toString())
+    );
+    const originChainTxnId = "originTxs" in receipt ? receipt.originTxs[receipt.originTxs.length - 1].txid : void 0;
+    return { originChainTxnId: originChainTxnId || "", receipt };
+  }
+  async claimCCTPTransfer(input) {
+    let { receipt, mainSigner, sponsorAccount, onTransactionSigned } = input;
+    if (!this.wormholeRoute) {
+      throw new Error("Wormhole route not initialized");
+    }
+    if (sponsorAccount && !isAccount(sponsorAccount)) {
+      throw new Error(
+        "AptosLocalSigner does not support GasStationApiKey as a sponsor account. Wormhole claim transactions are script-based and cannot be submitted via the gas station. Please provide an Account instance as the sponsor, or omit the sponsor account."
       );
-      logger.log("claimWithdraw receipt:", circleAttestationReceipt);
-      const destinationChainTxnId = claimSigner.claimedTransactionHashes();
-      return { destinationChainTxnId };
-    } else {
-      throw new Error("Automatic route not supported for manual claim");
     }
+    logger.log("mainSigner", mainSigner.accountAddress.toString());
+    let retries = 0;
+    const maxRetries = 5;
+    const baseDelay = 1e3;
+    while (retries < maxRetries) {
+      try {
+        for await (receipt of this.wormholeRoute.track(receipt, 120 * 1e3)) {
+          if (receipt.state >= import_sdk3.TransferState.SourceInitiated) {
+            logger.log("Receipt is on track ", receipt);
+            try {
+              const signer = new AptosLocalSigner(
+                "Aptos",
+                {},
+                mainSigner,
+                // the account that signs the "claim" transaction
+                sponsorAccount,
+                // the fee payer account
+                this.crossChainCore,
+                onTransactionSigned
+              );
+              if (import_sdk3.routes.isManual(this.wormholeRoute)) {
+                const circleAttestationReceipt = await this.wormholeRoute.complete(signer, receipt);
+                logger.log("Claim receipt: ", circleAttestationReceipt);
+                const destinationChainTxnId = signer.claimedTransactionHashes();
+                return { destinationChainTxnId };
+              } else {
+                return { destinationChainTxnId: "" };
+              }
+            } catch (e) {
+              console.error("Failed to claim", e);
+              return { destinationChainTxnId: "" };
+            }
+          }
+        }
+      } catch (e) {
+        console.error(
+          `Error tracking transfer (attempt ${retries + 1} / ${maxRetries}):`,
+          e
+        );
+        const delay = baseDelay * 2 ** retries;
+        await (0, import_ts_sdk3.sleep)(delay);
+        retries++;
+      }
+    }
+    return { destinationChainTxnId: "" };
   }
   /**
-   * Withdraws USDC from Aptos to a destination chain.
-   * Orchestrates all three phases internally:
-   *   1. Initiate — user signs the Aptos burn transaction
-   *   2. Track — wait for Wormhole attestation
-   *   3. Claim — if serverClaimUrl is configured for Solana, delegates to
-   *      the server; otherwise uses the wallet-based signer.
-   *
-   * The optional `onPhaseChange` callback lets the dapp update its UI
-   * as the flow progresses.
+   * Initiates a transfer of USDC funds from the source chain wallet to the destination chain wallet
+   * @param args
+   * @returns
    */
-  async withdraw(input) {
-    const {
-      sourceChain,
-      wallet,
-      destinationAddress,
-      sponsorAccount,
-      onPhaseChange,
-      onTransactionSigned
-    } = input;
-    onPhaseChange?.("initiating");
-    const { originChainTxnId, receipt } = await this.initiateWithdraw({
-      wallet,
-      destinationAddress,
-      sponsorAccount,
-      onTransactionSigned
-    });
-    let currentPhase = "tracking";
+  async transfer(input) {
+    if (this.crossChainCore._dappConfig?.aptosNetwork === import_ts_sdk3.Network.DEVNET) {
+      throw new Error("Devnet is not supported on Wormhole");
+    }
+    if (input.amount) {
+      await this.getQuote({
+        amount: input.amount,
+        originChain: input.sourceChain,
+        type: "transfer"
+      });
+    }
+    const { originChainTxnId, receipt } = await this.submitCCTPTransfer(input);
     try {
-      onPhaseChange?.("tracking");
-      const attestedReceipt = await this.trackWithdraw(receipt);
-      currentPhase = "claiming";
-      onPhaseChange?.("claiming");
-      const { destinationChainTxnId } = await this.claimWithdraw({
-        claimChain: sourceChain,
-        destinationAddress: destinationAddress.toString(),
-        receipt: attestedReceipt,
-        wallet,
-        onTransactionSigned
+      const { destinationChainTxnId } = await this.claimCCTPTransfer({
+        receipt,
+        mainSigner: input.mainSigner,
+        sponsorAccount: input.sponsorAccount,
+        onTransactionSigned: input.onTransactionSigned
       });
       return { originChainTxnId, destinationChainTxnId };
     } catch (error) {
-      throw new WithdrawError(
-        error?.message ?? "Withdraw failed after Aptos burn",
+      throw new TransferError(
+        error?.message ?? "Transfer claim failed after source-chain burn",
         originChainTxnId,
-        currentPhase,
         error
       );
     }
   }
+  // --- Split withdraw flow: initiateWithdraw + trackWithdraw + claimWithdraw ---
   /**
-   * Retries a failed `claimWithdraw` call with configurable exponential backoff.
-   *
-   * Use this when the claim phase of a withdrawal fails (e.g., RPC instability,
-   * network congestion) but the Aptos burn transaction has already been submitted.
-   * The attested receipt can be recovered from the `WithdrawError` thrown by
-   * `withdraw()` and passed directly to this method.
-   *
-   * @example
-   * ```ts
-   * try {
-   *   await provider.withdraw({ ... });
-   * } catch (error) {
-   *   if (error instanceof WithdrawError && error.phase === "claiming") {
-   *     const result = await provider.retryWithdrawClaim({
-   *       sourceChain,
-   *       destinationAddress,
-   *       receipt: attestedReceipt,
-   *       wallet,
-   *       maxRetries: 5,
-   *     });
-   *   }
-   * }
-   * ```
+   * Phase 1: Initiates a withdraw by burning USDC on Aptos.
+   * The user signs the Aptos burn transaction via their wallet.
+   * Returns a receipt that can be tracked and later claimed.
    */
-  async retryWithdrawClaim(input) {
-    const {
-      maxRetries = 5,
-      initialDelayMs = 2e3,
-      backoffMultiplier = 2,
-      ...claimInput
-    } = input;
-    let lastError;
-    let delay = initialDelayMs;
-    for (let attempt = 0; attempt <= maxRetries; attempt++) {
-      try {
-        const result = await this.claimWithdraw(claimInput);
-        return { ...result, retriesUsed: attempt };
-      } catch (error) {
-        lastError = error;
-        logger.log(
-          `retryWithdrawClaim: attempt ${attempt + 1}/${maxRetries + 1} failed: ${lastError.message}`
-        );
-        if (attempt < maxRetries) {
-          await (0, import_ts_sdk3.sleep)(delay);
-          delay *= backoffMultiplier;
-        }
-      }
+  async initiateWithdraw(input) {
+    const { wallet, destinationAddress, sponsorAccount, onTransactionSigned } = input;
+    if (!this._wormholeContext) {
+      throw new Error("Wormhole context not initialized");
     }
-    throw new Error(
-      `Claim failed after ${maxRetries + 1} attempts: ${lastError?.message}`
-    );
-  }
-  getChainConfig(chain) {
-    const chainConfig = this.crossChainCore.CHAINS[chain];
-    if (!chainConfig) {
-      throw new Error(`Chain config not found for chain: ${chain}`);
+    if (!this.wormholeRoute || !this.wormholeRequest || !this.wormholeQuote) {
+      throw new Error("Wormhole route, request, or quote not initialized");
     }
-    return chainConfig;
-  }
-};
-
-// src/providers/wormhole/signers/SolanaLocalSigner.ts
-var import_web34 = require("@solana/web3.js");
-var SolanaLocalSigner = class {
-  constructor(config) {
-    this._claimedTransactionHashes = [];
-    this.keypair = config.keypair;
-    this.connection = config.connection;
-    this.commitment = config.commitment ?? "finalized";
-    this.retryIntervalMs = config.retryIntervalMs ?? 5e3;
-    this.priorityFeeConfig = config.priorityFeeConfig;
-    this.verbose = config.verbose ?? false;
-    this._onTransactionSigned = config.onTransactionSigned;
-  }
-  chain() {
-    return "Solana";
-  }
-  address() {
-    return this.keypair.publicKey.toBase58();
+    const signer = new Signer(
+      this.getChainConfig("Aptos"),
+      (await wallet.features["aptos:account"].account()).address.toString(),
+      {},
+      wallet,
+      this.crossChainCore,
+      sponsorAccount,
+      onTransactionSigned
+    );
+    const wormholeDestAddress = import_sdk3.Wormhole.chainAddress(
+      this.destinationChain,
+      destinationAddress.toString()
+    );
+    const receipt = await this.wormholeRoute.initiate(
+      this.wormholeRequest,
+      signer,
+      this.wormholeQuote,
+      wormholeDestAddress
+    );
+    logger.log("initiateWithdraw receipt", receipt);
+    const originChainTxnId = "originTxs" in receipt ? receipt.originTxs[receipt.originTxs.length - 1].txid : void 0;
+    return { originChainTxnId: originChainTxnId || "", receipt };
   }
   /**
-   * Returns all transaction hashes from the most recent signAndSend call,
-   * joined by comma. If only one transaction was signed, returns a single hash string.
+   * Phase 2: Tracks a withdraw receipt until attestation is ready.
+   * This polls Wormhole and returns once the receipt reaches the Attested state.
    */
-  claimedTransactionHashes() {
-    return this._claimedTransactionHashes.join(",");
-  }
-  async signAndSend(txs) {
-    const txHashes = [];
-    this._claimedTransactionHashes = [];
-    for (const tx of txs) {
-      this._onTransactionSigned?.(tx.description, null);
-      const txId = await this.signAndSendTransaction(tx);
-      this._onTransactionSigned?.(tx.description, txId);
-      txHashes.push(txId);
-      this._claimedTransactionHashes.push(txId);
-    }
-    return txHashes;
-  }
-  async signAndSendTransaction(request) {
-    const { blockhash, lastValidBlockHeight } = await this.connection.getLatestBlockhash(this.commitment);
-    let unsignedTx = request.transaction ?? request;
-    const additionalSigners = request.transaction?.signers;
-    const MAX_UNWRAP_DEPTH = 10;
-    let unwrapDepth = 0;
-    while (unsignedTx && typeof unsignedTx === "object" && "transaction" in unsignedTx && !(unsignedTx instanceof import_web34.Transaction) && !("signatures" in unsignedTx && "message" in unsignedTx)) {
-      if (++unwrapDepth > MAX_UNWRAP_DEPTH) {
-        throw new Error(
-          "Transaction unwrapping exceeded maximum depth \u2014 possible circular nesting"
-        );
-      }
-      unsignedTx = unsignedTx.transaction;
-    }
-    const isVersioned = unsignedTx.message !== void 0 && unsignedTx.signatures !== void 0 && typeof unsignedTx.message.recentBlockhash !== "undefined";
-    if (isVersioned) {
-      unsignedTx.message.recentBlockhash = blockhash;
-      if (this.verbose || this.priorityFeeConfig) {
-        console.warn(
-          "SolanaLocalSigner: Versioned transaction detected \u2014 priority fees are not applied. Consider using legacy transactions if priority fees are required."
-        );
-      }
-      unsignedTx.sign([this.keypair]);
-      if (additionalSigners && additionalSigners.length > 0) {
-        unsignedTx.sign(additionalSigners);
-      }
-    } else if (unsignedTx instanceof import_web34.Transaction) {
-      unsignedTx.recentBlockhash = blockhash;
-      unsignedTx.lastValidBlockHeight = lastValidBlockHeight;
-      if (this.priorityFeeConfig) {
-        await addPriorityFeeInstructions(
-          this.connection,
-          unsignedTx,
-          this.priorityFeeConfig,
-          this.verbose
-        );
-      }
-      if (additionalSigners && additionalSigners.length > 0) {
-        unsignedTx.sign(this.keypair, ...additionalSigners);
-      } else {
-        unsignedTx.sign(this.keypair);
-      }
-    } else if (unsignedTx.recentBlockhash !== void 0 || unsignedTx.feePayer !== void 0) {
-      unsignedTx.recentBlockhash = blockhash;
-      unsignedTx.lastValidBlockHeight = lastValidBlockHeight;
-      if (this.priorityFeeConfig) {
-        await addPriorityFeeInstructions(
-          this.connection,
-          unsignedTx,
-          this.priorityFeeConfig,
-          this.verbose
-        );
-      }
-      if (additionalSigners && additionalSigners.length > 0) {
-        unsignedTx.sign(this.keypair, ...additionalSigners);
-      } else {
-        unsignedTx.sign(this.keypair);
-      }
-    } else {
-      throw new Error(
-        `Unsupported transaction type: ${unsignedTx?.constructor?.name}`
-      );
-    }
-    const serializedTx = unsignedTx.serialize();
-    const signature = await sendAndConfirmTransaction(
-      serializedTx,
-      blockhash,
-      lastValidBlockHeight,
-      {
-        connection: this.connection,
-        commitment: this.commitment,
-        retryIntervalMs: this.retryIntervalMs,
-        verbose: this.verbose
-      }
-    );
-    return signature;
-  }
-};
-
-// src/config/types.ts
-var Context = /* @__PURE__ */ ((Context2) => {
-  Context2["ETH"] = "Ethereum";
-  Context2["SOLANA"] = "Solana";
-  Context2["APTOS"] = "Aptos";
-  Context2["SUI"] = "Sui";
-  return Context2;
-})(Context || {});
-
-// src/config/testnet/chains.ts
-var testnetChains = {
-  Sepolia: {
-    key: "Sepolia",
-    context: "Ethereum" /* ETH */,
-    chainId: 11155111,
-    displayName: "Sepolia",
-    explorerUrl: "https://sepolia.etherscan.io/",
-    explorerName: "Etherscan",
-    icon: "Ethereum",
-    symbol: "ETH",
-    defaultRpc: "https://ethereum-sepolia-rpc.publicnode.com"
-  },
-  BaseSepolia: {
-    key: "BaseSepolia",
-    context: "Ethereum" /* 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: "Ethereum" /* 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: "Ethereum" /* 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: "Ethereum" /* 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",
-    context: "Solana" /* SOLANA */,
-    displayName: "Solana",
-    explorerUrl: "https://solscan.io",
-    explorerName: "Solscan",
-    chainId: 0,
-    icon: "Solana",
-    symbol: "SOL",
-    defaultRpc: "https://api.devnet.solana.com"
-  },
-  Aptos: {
-    key: "Aptos",
-    context: "Aptos" /* APTOS */,
-    displayName: "Aptos",
-    explorerUrl: "https://explorer.aptoslabs.com?network=testnet",
-    explorerName: "Aptos Explorer",
-    chainId: 0,
-    icon: "Aptos",
-    symbol: "APT",
-    defaultRpc: "https://fullnode.testnet.aptos.dev"
-  },
-  Sui: {
-    key: "Sui",
-    context: "Sui" /* SUI */,
-    displayName: "Sui",
-    explorerUrl: "https://suiscan.xyz/testnet",
-    explorerName: "Suiscan",
-    chainId: 0,
-    icon: "Sui",
-    symbol: "SUI",
-    defaultRpc: "https://fullnode.testnet.sui.io:443"
-  }
-};
-
-// src/config/testnet/tokens.ts
-var testnetTokens = {
-  Sepolia: {
-    symbol: "USDC",
-    icon: "USDC",
-    decimals: 6,
-    tokenId: {
-      chain: "Sepolia",
-      address: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238"
-    }
-  },
-  Solana: {
-    symbol: "USDC",
-    tokenId: {
-      chain: "Solana",
-      address: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU"
-    },
-    icon: "USDC",
-    decimals: 6
-  },
-  Aptos: {
-    symbol: "USDC",
-    decimals: 6,
-    tokenId: {
-      chain: "Aptos",
-      address: "0x69091fbab5f7d635ee7ac5098cf0c1efbe31d68fec0f2cd565e8d168daf52832"
-    },
-    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"
+  async trackWithdraw(receipt) {
+    if (!this.wormholeRoute) {
+      throw new Error("Wormhole route not initialized");
     }
-  },
-  Sui: {
-    symbol: "USDC",
-    tokenId: {
-      chain: "Sui",
-      address: "0xa1ec7fc00a6f40db9693ad1415d0c193ad3906494428cf252621037bd7117e29::usdc::USDC"
-    },
-    icon: "USDC",
-    decimals: 6
-  }
-};
-
-// src/config/mainnet/chains.ts
-var mainnetChains = {
-  Ethereum: {
-    key: "Ethereum",
-    context: "Ethereum" /* ETH */,
-    displayName: "Ethereum",
-    explorerUrl: "https://etherscan.io/",
-    explorerName: "Etherscan",
-    chainId: 1,
-    icon: "Ethereum",
-    symbol: "ETH",
-    defaultRpc: "https://rpc.ankr.com/eth"
-  },
-  Solana: {
-    key: "Solana",
-    context: "Solana" /* SOLANA */,
-    displayName: "Solana",
-    explorerUrl: "https://solscan.io",
-    explorerName: "Solscan",
-    chainId: 0,
-    icon: "Solana",
-    symbol: "SOL",
-    defaultRpc: "https://solana-rpc.publicnode.com"
-  },
-  Aptos: {
-    key: "Aptos",
-    context: "Aptos" /* APTOS */,
-    displayName: "Aptos",
-    explorerUrl: "https://explorer.aptoslabs.com/",
-    explorerName: "Aptos Explorer",
-    chainId: 0,
-    icon: "Aptos",
-    symbol: "APT",
-    defaultRpc: "https://fullnode.mainnet.aptos.dev"
-  },
-  Avalanche: {
-    key: "Avalanche",
-    context: "Ethereum" /* 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: "Ethereum" /* ETH */,
-    chainId: 8453,
-    displayName: "Base",
-    explorerUrl: "https://basescan.org",
-    explorerName: "BaseScan",
-    icon: "Base",
-    symbol: "BASE",
-    defaultRpc: "https://mainnet.base.org"
-  },
-  Arbitrum: {
-    key: "Arbitrum",
-    context: "Ethereum" /* 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: "Ethereum" /* 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",
-    context: "Sui" /* SUI */,
-    displayName: "Sui",
-    explorerUrl: "https://suiscan.xyz/",
-    explorerName: "Suiscan",
-    chainId: 0,
-    icon: "Sui",
-    symbol: "SUI",
-    defaultRpc: "https://fullnode.mainnet.sui.io:443"
+    let retries = 0;
+    const maxRetries = 5;
+    const baseDelay = 1e3;
+    while (retries < maxRetries) {
+      try {
+        for await (receipt of this.wormholeRoute.track(receipt, 120 * 1e3)) {
+          if (receipt.state >= import_sdk3.TransferState.Attested) {
+            logger.log("trackWithdraw: receipt attested", receipt);
+            return receipt;
+          }
+        }
+      } catch (e) {
+        console.error(
+          `Error tracking withdraw (attempt ${retries + 1} / ${maxRetries}):`,
+          e
+        );
+        const delay = baseDelay * 2 ** retries;
+        await (0, import_ts_sdk3.sleep)(delay);
+        retries++;
+      }
+    }
+    throw new Error("Failed to track withdraw to attested state");
   }
-};
-
-// src/config/mainnet/tokens.ts
-var mainnetTokens = {
-  Ethereum: {
-    symbol: "USDC",
-    tokenId: {
-      chain: "Ethereum",
-      address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
-    },
-    icon: "USDC",
-    decimals: 6
-  },
-  Solana: {
-    symbol: "USDC",
-    tokenId: {
-      chain: "Solana",
-      address: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
-    },
-    icon: "USDC",
-    decimals: 6
-  },
-  Aptos: {
-    symbol: "USDC",
-    decimals: 6,
-    tokenId: {
-      chain: "Aptos",
-      address: "0xbae207659db88bea0cbead6da0ed00aac12edcdda169e591cd41c94180b46f3b"
-    },
-    icon: "USDC"
-  },
-  Base: {
-    symbol: "USDC",
-    decimals: 6,
-    icon: "USDC",
-    tokenId: {
-      chain: "Base",
-      address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
+  /**
+   * Phase 3: Claims the withdraw on the destination chain.
+   *
+   * If the destination is Solana and `solanaConfig.serverClaimUrl` is configured
+   * in the dapp config, the SDK automatically POSTs the attested receipt to that
+   * URL — no wallet popup required. The dapp's server endpoint handles signing
+   * and submitting the claim transaction.
+   *
+   * Otherwise falls back to the wallet-based Signer (triggers wallet popup).
+   */
+  async claimWithdraw(input) {
+    const { claimChain, destinationAddress, receipt } = input;
+    const serverClaimUrl = this.crossChainCore._dappConfig?.solanaConfig?.serverClaimUrl;
+    if (claimChain === "Solana" && serverClaimUrl && !input.skipServerClaim) {
+      logger.log("claimWithdraw: using server-side claim via", serverClaimUrl);
+      const response = await fetch(serverClaimUrl, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          receipt: serializeReceipt(receipt),
+          destinationAddress,
+          claimChain
+        })
+      });
+      if (!response.ok) {
+        const errorData = await response.json().catch(() => ({}));
+        throw new Error(
+          errorData.error || `Server-side claim failed with status ${response.status}`
+        );
+      }
+      const result = await response.json();
+      return { destinationChainTxnId: result.destinationChainTxnId };
     }
-  },
-  Arbitrum: {
-    symbol: "USDC",
-    decimals: 6,
-    icon: "USDC",
-    tokenId: {
-      chain: "Arbitrum",
-      address: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831"
+    if (!this.wormholeRoute) {
+      throw new Error("Wormhole route not initialized");
     }
-  },
-  Avalanche: {
-    symbol: "USDC",
-    decimals: 6,
-    icon: "USDC",
-    tokenId: {
-      chain: "Avalanche",
-      address: "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E"
+    if (!input.wallet) {
+      throw new Error(
+        "Wallet is required for claim when serverClaimUrl is not configured"
+      );
     }
-  },
-  Polygon: {
-    symbol: "USDC",
-    decimals: 6,
-    icon: "USDC",
-    tokenId: {
-      chain: "Polygon",
-      address: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359"
+    const claimSigner = new Signer(
+      this.getChainConfig(claimChain),
+      destinationAddress,
+      {},
+      input.wallet,
+      this.crossChainCore,
+      void 0,
+      input.onTransactionSigned,
+      false
+    );
+    if (import_sdk3.routes.isManual(this.wormholeRoute)) {
+      const circleAttestationReceipt = await this.wormholeRoute.complete(
+        claimSigner,
+        receipt
+      );
+      logger.log("claimWithdraw receipt:", circleAttestationReceipt);
+      const destinationChainTxnId = claimSigner.claimedTransactionHashes();
+      return { destinationChainTxnId };
+    } else {
+      throw new Error("Automatic route not supported for manual claim");
     }
-  },
-  Sui: {
-    symbol: "USDC",
-    decimals: 6,
-    tokenId: {
-      chain: "Sui",
-      address: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC"
-    },
-    icon: "USDC"
+  }
+  /**
+   * Withdraws USDC from Aptos to a destination chain.
+   * Orchestrates all three phases internally:
+   *   1. Initiate — user signs the Aptos burn transaction
+   *   2. Track — wait for Wormhole attestation
+   *   3. Claim — if serverClaimUrl is configured for Solana, delegates to
+   *      the server; otherwise uses the wallet-based signer.
+   *
+   * The optional `onPhaseChange` callback lets the dapp update its UI
+   * as the flow progresses.
+   */
+  async withdraw(input) {
+    const {
+      sourceChain,
+      wallet,
+      destinationAddress,
+      sponsorAccount,
+      onPhaseChange,
+      onTransactionSigned
+    } = input;
+    onPhaseChange?.("initiating");
+    const { originChainTxnId, receipt } = await this.initiateWithdraw({
+      wallet,
+      destinationAddress,
+      sponsorAccount,
+      onTransactionSigned
+    });
+    let currentPhase = "tracking";
+    try {
+      onPhaseChange?.("tracking");
+      const attestedReceipt = await this.trackWithdraw(receipt);
+      currentPhase = "claiming";
+      onPhaseChange?.("claiming");
+      const { destinationChainTxnId } = await this.claimWithdraw({
+        claimChain: sourceChain,
+        destinationAddress: destinationAddress.toString(),
+        receipt: attestedReceipt,
+        wallet,
+        onTransactionSigned
+      });
+      return { originChainTxnId, destinationChainTxnId };
+    } catch (error) {
+      throw new WithdrawError(
+        error?.message ?? "Withdraw failed after Aptos burn",
+        originChainTxnId,
+        currentPhase,
+        error
+      );
+    }
+  }
+  /**
+   * Retries a failed `claimWithdraw` call with configurable exponential backoff.
+   *
+   * Use this when the claim phase of a withdrawal fails (e.g., RPC instability,
+   * network congestion) but the Aptos burn transaction has already been submitted.
+   * The attested receipt can be recovered from the `WithdrawError` thrown by
+   * `withdraw()` and passed directly to this method.
+   *
+   * @example
+   * ```ts
+   * try {
+   *   await provider.withdraw({ ... });
+   * } catch (error) {
+   *   if (error instanceof WithdrawError && error.phase === "claiming") {
+   *     const result = await provider.retryWithdrawClaim({
+   *       sourceChain,
+   *       destinationAddress,
+   *       receipt: attestedReceipt,
+   *       wallet,
+   *       maxRetries: 5,
+   *     });
+   *   }
+   * }
+   * ```
+   */
+  async retryWithdrawClaim(input) {
+    const {
+      maxRetries = 5,
+      initialDelayMs = 2e3,
+      backoffMultiplier = 2,
+      ...claimInput
+    } = input;
+    let lastError;
+    let delay = initialDelayMs;
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      try {
+        const result = await this.claimWithdraw(claimInput);
+        return { ...result, retriesUsed: attempt };
+      } catch (error) {
+        lastError = error;
+        logger.log(
+          `retryWithdrawClaim: attempt ${attempt + 1}/${maxRetries + 1} failed: ${lastError.message}`
+        );
+        if (attempt < maxRetries) {
+          await (0, import_ts_sdk3.sleep)(delay);
+          delay *= backoffMultiplier;
+        }
+      }
+    }
+    throw new Error(
+      `Claim failed after ${maxRetries + 1} attempts: ${lastError?.message}`
+    );
+  }
+  getChainConfig(chain) {
+    const chainConfig = this.crossChainCore.CHAINS[chain];
+    if (!chainConfig) {
+      throw new Error(`Chain config not found for chain: ${chain}`);
+    }
+    return chainConfig;
   }
 };
 
 // src/utils/getUsdcBalance.ts
 var import_ts_sdk4 = require("@aptos-labs/ts-sdk");
-var import_web35 = require("@solana/web3.js");
-var import_ethers2 = require("ethers");
 var import_client = require("@mysten/sui/client");
+var import_web34 = require("@solana/web3.js");
+var import_ethers2 = require("ethers");
 var getSolanaWalletUSDCBalance = async (walletAddress, aptosNetwork, rpc) => {
-  const address = new import_web35.PublicKey(walletAddress);
-  const tokenAddress = aptosNetwork === import_ts_sdk4.Network.MAINNET ? mainnetTokens["Solana"].tokenId.address : testnetTokens["Solana"].tokenId.address;
-  const connection = new import_web35.Connection(rpc);
+  const address = new import_web34.PublicKey(walletAddress);
+  const tokenAddress = aptosNetwork === import_ts_sdk4.Network.MAINNET ? mainnetTokens.Solana.tokenId.address : testnetTokens.Solana.tokenId.address;
+  const connection = new import_web34.Connection(rpc);
   const splToken = await connection.getTokenAccountsByOwner(address, {
-    mint: new import_web35.PublicKey(tokenAddress)
+    mint: new import_web34.PublicKey(tokenAddress)
   });
   if (splToken.value.length === 0) {
     return "0";
@@ -1807,7 +1872,7 @@ var getEthereumWalletUSDCBalance = async (walletAddress, aptosNetwork, chain, rp
   return import_ethers2.ethers.formatUnits(balance, token.decimals).toString();
 };
 var getAptosWalletUSDCBalance = async (walletAddress, aptosNetwork) => {
-  const token = aptosNetwork === import_ts_sdk4.Network.MAINNET ? mainnetTokens["Aptos"] : testnetTokens["Aptos"];
+  const token = aptosNetwork === import_ts_sdk4.Network.MAINNET ? mainnetTokens.Aptos : testnetTokens.Aptos;
   const tokenAddress = token.tokenId.address;
   const aptosConfig = new import_ts_sdk4.AptosConfig({ network: aptosNetwork });
   const connection = new import_ts_sdk4.Aptos(aptosConfig);
@@ -1825,7 +1890,7 @@ var getAptosWalletUSDCBalance = async (walletAddress, aptosNetwork) => {
   return import_ethers2.ethers.formatUnits(BigInt(response[0].amount), token.decimals);
 };
 var getSuiWalletUSDCBalance = async (walletAddress, aptosNetwork, rpc) => {
-  const token = aptosNetwork === import_ts_sdk4.Network.MAINNET ? mainnetTokens["Sui"] : testnetTokens["Sui"];
+  const token = aptosNetwork === import_ts_sdk4.Network.MAINNET ? mainnetTokens.Sui : testnetTokens.Sui;
   const client = new import_client.SuiClient({
     url: rpc
   });
@@ -1864,13 +1929,20 @@ var EthereumChainIdToMainnetChain = {
   43114: mainnetChains.Avalanche,
   137: mainnetChains.Polygon
 };
-var CrossChainCore2 = class {
+var CrossChainCore = class {
+  _dappConfig = {
+    aptosNetwork: import_ts_sdk5.Network.TESTNET
+  };
+  CHAINS = testnetChains;
+  TOKENS = testnetTokens;
+  /**
+   * Last known source-chain transaction ID, set by signers immediately after
+   * a transaction is submitted. Acts as a recovery side-channel so that
+   * callers can retrieve the tx hash even when the orchestration layer throws
+   * before returning it (e.g. claim failure after a successful burn).
+   */
+  _lastSourceChainTxId;
   constructor(args) {
-    this._dappConfig = {
-      aptosNetwork: import_ts_sdk5.Network.TESTNET
-    };
-    this.CHAINS = testnetChains;
-    this.TOKENS = testnetTokens;
     this._dappConfig = args.dappConfig;
     if (args.dappConfig?.aptosNetwork === import_ts_sdk5.Network.MAINNET) {
       this.CHAINS = mainnetChains;
@@ -1931,9 +2003,6 @@ var CrossChainCore2 = class {
     }
   }
 };
-
-// src/index.ts
-var import_ts_sdk7 = require("@aptos-labs/ts-sdk");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AptosLocalSigner,