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

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

@@ -1,25 +1,28 @@
 import {
-  Account,
+  GasStationClient,
+  GasStationTransactionSubmitter,
+} from "@aptos-labs/gas-station-client";
+import {
+  type Account,
   AccountAddress,
-  AccountAuthenticator,
-  AnyRawTransaction,
+  type AccountAuthenticator,
+  type AnyRawTransaction,
   Aptos,
   AptosConfig,
-  Network as AptosNetwork,
+  type Network as AptosNetwork,
   Deserializer,
-  InputGenerateTransactionPayloadData,
-  ScriptFunctionArgumentTypes,
+  type InputGenerateTransactionPayloadData,
+  type ScriptFunctionArgumentTypes,
 } from "@aptos-labs/ts-sdk";
-import { AdapterWallet } from "@aptos-labs/wallet-adapter-core";
-import { Network } from "@wormhole-foundation/sdk";
-import {
+import type { AdapterWallet } from "@aptos-labs/wallet-adapter-core";
+import { UserResponseStatus } from "@aptos-labs/wallet-standard";
+import type { Network } from "@wormhole-foundation/sdk";
+import type {
   AptosChains,
   AptosUnsignedTransaction,
 } from "@wormhole-foundation/sdk-aptos";
-import { GasStationApiKey, validateExpireTimestamp } from "..";
-import { UserResponseStatus } from "@aptos-labs/wallet-standard";
-import { GasStationClient, GasStationTransactionSubmitter } from "@aptos-labs/gas-station-client";
-import { CrossChainCore } from "../../../CrossChainCore";
+import type { CrossChainCore } from "../../../CrossChainCore";
+import { type GasStationApiKey, validateExpireTimestamp } from "..";
 
 export async function signAndSendTransaction(
   request: AptosUnsignedTransaction<Network, AptosChains>,
@@ -44,7 +47,6 @@ export async function signAndSendTransaction(
     }
   });
 
-
   // Configure Aptos client based on sponsor type
   let aptosConfig: AptosConfig;
   const useGasStation = sponsorAccount && !isAccount(sponsorAccount);
@@ -53,10 +55,15 @@ export async function signAndSendTransaction(
     // Gas station flow - configure with plugin upfront
     const gasStationClient = new GasStationClient({
       network: dappNetwork,
-      apiKey: sponsorAccount[dappNetwork as AptosNetwork.TESTNET | AptosNetwork.MAINNET],
+      apiKey:
+        sponsorAccount[
+          dappNetwork as AptosNetwork.TESTNET | AptosNetwork.MAINNET
+        ],
     });
-    const transactionSubmitter = new GasStationTransactionSubmitter(gasStationClient);
-    
+    const transactionSubmitter = new GasStationTransactionSubmitter(
+      gasStationClient,
+    );
+
     aptosConfig = new AptosConfig({
       network: dappNetwork,
       pluginSettings: {
@@ -99,9 +106,9 @@ export async function signAndSendTransaction(
   const txnToSign = await aptos.transaction.build.simple({
     data: transactionData,
     sender: (
-      await wallet.features["aptos:account"]?.account()
+      (await wallet.features["aptos:account"]?.account()) as any
     ).address.toString(),
-    withFeePayer: sponsorAccount ? true : false,
+    withFeePayer: !!sponsorAccount,
     ...(typeof expireTimestamp !== "undefined"
       ? { options: { expireTimestamp } }
       : {}),
@@ -123,8 +130,8 @@ export async function signAndSendTransaction(
     senderAuthenticator: response.args,
   };
 
-   // Only sign as fee payer if it's an Account (not gas station)
-   if (sponsorAccount && isAccount(sponsorAccount)) {
+  // Only sign as fee payer if it's an Account (not gas station)
+  if (sponsorAccount && isAccount(sponsorAccount)) {
     const feePayerSignerAuthenticator = aptos.transaction.signAsFeePayer({
       signer: sponsorAccount,
       transaction: txnToSign,
@@ -166,5 +173,5 @@ function extractFunctionArguments(
 }
 
 export function isAccount(obj: Account | GasStationApiKey): obj is Account {
-  return 'accountAddress' in obj;
+  return "accountAddress" in obj;
 }

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

@@ -1,11 +1,11 @@
-import {
-  EvmUnsignedTransaction,
+import type { EIP1193DerivedWallet } from "@aptos-labs/derived-wallet-ethereum";
+import type { AdapterWallet } from "@aptos-labs/wallet-adapter-core";
+import type { Network } from "@wormhole-foundation/sdk";
+import type {
   EvmChains,
+  EvmUnsignedTransaction,
 } from "@wormhole-foundation/sdk-evm";
-import { Network } from "@wormhole-foundation/sdk";
 import { ethers, getBigInt } from "ethers";
-import { AdapterWallet } from "@aptos-labs/wallet-adapter-core";
-import { EIP1193DerivedWallet } from "@aptos-labs/derived-wallet-ethereum";
 
 export async function signAndSendTransaction(
   request: EvmUnsignedTransaction<Network, EvmChains>,
@@ -23,7 +23,7 @@ export async function signAndSendTransaction(
   });
   const actualChainId = parseInt(chainId, 16);
 
-  if (!actualChainId) throw new Error("No signer found for chain" + chainName);
+  if (!actualChainId) throw new Error(`No signer found for chain${chainName}`);
   const expectedChainId = request.transaction.chainId
     ? getBigInt(request.transaction.chainId)
     : undefined;

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

@@ -1,36 +1,34 @@
-import {
-  UnsignedTransaction,
-  Network,
+import type { Account } from "@aptos-labs/ts-sdk";
+import type { AdapterWallet } from "@aptos-labs/wallet-adapter-core";
+import type {
   Chain,
-  TxHash,
+  Network,
   SignAndSendSigner,
+  TxHash,
+  UnsignedTransaction,
 } from "@wormhole-foundation/sdk";
-import { SolanaUnsignedTransaction } from "@wormhole-foundation/sdk-solana";
-import { AdapterWallet } from "@aptos-labs/wallet-adapter-core";
-import {
-  EvmUnsignedTransaction,
+import type { AptosChains } from "@wormhole-foundation/sdk-aptos/dist/cjs/types";
+import type { AptosUnsignedTransaction } from "@wormhole-foundation/sdk-aptos/dist/cjs/unsignedTransaction";
+import type {
   EvmChains,
+  EvmUnsignedTransaction,
 } from "@wormhole-foundation/sdk-evm";
-import {
+import type { SolanaUnsignedTransaction } from "@wormhole-foundation/sdk-solana";
+import type {
   SuiChains,
   SuiUnsignedTransaction,
 } from "@wormhole-foundation/sdk-sui";
+import type { CrossChainCore } from "../../../CrossChainCore";
 
-import * as solanaSigner from "./SolanaSigner";
-import * as ethereumSigner from "./EthereumSigner";
+import type { ChainConfig } from "../../../config";
+import type { GasStationApiKey, OnTransactionSigned } from "../types";
 import * as aptosSigner from "./AptosSigner";
+import * as ethereumSigner from "./EthereumSigner";
+import * as solanaSigner from "./SolanaSigner";
 import * as suiSigner from "./SuiSigner";
-
-import { ChainConfig } from "../../../config";
-import { CrossChainCore } from "../../../CrossChainCore";
-import { AptosChains } from "@wormhole-foundation/sdk-aptos/dist/cjs/types";
-import { AptosUnsignedTransaction } from "@wormhole-foundation/sdk-aptos/dist/cjs/unsignedTransaction";
-import { GasStationApiKey, OnTransactionSigned } from "../types";
-import { Account } from "@aptos-labs/ts-sdk";
-export class Signer<
-  N extends Network,
-  C extends Chain,
-> implements SignAndSendSigner<N, C> {
+export class Signer<N extends Network, C extends Chain>
+  implements SignAndSendSigner<N, C>
+{
   _chain: ChainConfig;
   _address: string;
   _options: any;

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

@@ -1,22 +1,22 @@
 import {
-  Connection,
-  Keypair,
-  Transaction,
   type Commitment,
+  type Connection,
+  type Keypair,
+  Transaction,
 } from "@solana/web3.js";
-import {
+import type {
   Chain,
   Network,
   SignAndSendSigner,
   TxHash,
   UnsignedTransaction,
 } from "@wormhole-foundation/sdk";
+import type { OnTransactionSigned } from "../types";
 import {
   addPriorityFeeInstructions,
-  PriorityFeeConfig,
+  type PriorityFeeConfig,
   sendAndConfirmTransaction,
 } from "./solanaUtils";
-import { OnTransactionSigned } from "../types";
 
 export interface SolanaLocalSignerConfig {
   /** The Solana keypair to sign transactions with */
@@ -162,7 +162,7 @@ export class SolanaLocalSigner<N extends Network, C extends Chain>
       if (this.verbose || this.priorityFeeConfig) {
         console.warn(
           "SolanaLocalSigner: Versioned transaction detected — priority fees are not applied. " +
-          "Consider using legacy transactions if priority fees are required.",
+            "Consider using legacy transactions if priority fees are required.",
         );
       }
       unsignedTx.sign([this.keypair]);

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

@@ -4,30 +4,29 @@
  * and resending the transaction if it hasn't been confirmed after the specified interval.
  */
 
+import { SolanaDerivedWallet } from "@aptos-labs/derived-wallet-solana";
+import type { AdapterWallet } from "@aptos-labs/wallet-adapter-core";
 import {
-  ConfirmOptions,
+  type ConfirmOptions,
+  Connection,
   Transaction,
-  VersionedTransaction,
+  type VersionedTransaction,
 } from "@solana/web3.js";
-
-import { Connection } from "@solana/web3.js";
-import { Network } from "@wormhole-foundation/sdk";
-import { SolanaUnsignedTransaction } from "@wormhole-foundation/sdk-solana";
-import { AdapterWallet } from "@aptos-labs/wallet-adapter-core";
-import { CrossChainCore } from "../../../CrossChainCore";
-import { SolanaDerivedWallet } from "@aptos-labs/derived-wallet-solana";
+import type { Network } from "@wormhole-foundation/sdk";
+import type { SolanaUnsignedTransaction } from "@wormhole-foundation/sdk-solana";
+import type { CrossChainCore } from "../../../CrossChainCore";
 import {
   addPriorityFeeInstructions,
+  type PriorityFeeConfig,
   sendAndConfirmTransaction,
-  PriorityFeeConfig,
 } from "./solanaUtils";
 
 // Re-export types for backwards compatibility
-export type { SolanaRpcProvider, PriorityFeeConfig } from "./solanaUtils";
+export type { PriorityFeeConfig, SolanaRpcProvider } from "./solanaUtils";
 export {
-  sleep,
-  isEmptyObject,
   determineRpcProvider,
+  isEmptyObject,
+  sleep,
 } from "./solanaUtils";
 
 // See https://docs.triton.one/chains/solana/sending-txs for more information
@@ -48,7 +47,7 @@ export async function signAndSendTransaction(
   // Solana rpc should come from dapp config
   const connection = new Connection(
     crossChainCore?._dappConfig?.solanaConfig?.rpc ??
-      crossChainCore?.CHAINS["Solana"]?.defaultRpc ??
+      crossChainCore?.CHAINS.Solana?.defaultRpc ??
       "https://api.devnet.solana.com", // Last resort fallback
   );
   const { blockhash, lastValidBlockHeight } =

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

@@ -1,14 +1,14 @@
-import { AdapterWallet } from "@aptos-labs/wallet-adapter-core";
-import { Network } from "@wormhole-foundation/sdk";
-import {
-  SuiChains,
-  SuiUnsignedTransaction,
-} from "@wormhole-foundation/sdk-sui";
-import { SuiDerivedWallet } from "@aptos-labs/derived-wallet-sui";
-import {
+import type { SuiDerivedWallet } from "@aptos-labs/derived-wallet-sui";
+import type { AdapterWallet } from "@aptos-labs/wallet-adapter-core";
+import type {
   SuiSignAndExecuteTransactionInput,
   SuiSignAndExecuteTransactionOutput,
 } from "@mysten/wallet-standard";
+import type { Network } from "@wormhole-foundation/sdk";
+import type {
+  SuiChains,
+  SuiUnsignedTransaction,
+} from "@wormhole-foundation/sdk-sui";
 
 export async function signAndSendTransaction(
   request: SuiUnsignedTransaction<Network, SuiChains>,

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

@@ -4,16 +4,16 @@
  */
 
 import {
+  type Commitment,
   ComputeBudgetProgram,
-  Connection,
+  type Connection,
   LAMPORTS_PER_SOL,
-  RpcResponseAndContext,
-  SignatureResult,
-  SimulatedTransactionResponse,
-  Transaction,
-  TransactionInstruction,
-  VersionedTransaction,
-  type Commitment,
+  type RpcResponseAndContext,
+  type SignatureResult,
+  type SimulatedTransactionResponse,
+  type Transaction,
+  type TransactionInstruction,
+  type VersionedTransaction,
 } from "@solana/web3.js";
 import {
   determinePriorityFee,
@@ -67,7 +67,12 @@ export async function sendAndConfirmTransaction(
   lastValidBlockHeight: number,
   config: SendAndConfirmConfig,
 ): Promise<string> {
-  const { connection, commitment, retryIntervalMs = 5000, verbose = false } = config;
+  const {
+    connection,
+    commitment,
+    retryIntervalMs = 5000,
+    verbose = false,
+  } = config;
 
   const sendOptions = {
     skipPreflight: true,
@@ -75,7 +80,10 @@ export async function sendAndConfirmTransaction(
     preflightCommitment: commitment,
   };
 
-  const signature = await connection.sendRawTransaction(serializedTx, sendOptions);
+  const signature = await connection.sendRawTransaction(
+    serializedTx,
+    sendOptions,
+  );
 
   const confirmTransactionPromise = connection.confirmTransaction(
     { signature, blockhash, lastValidBlockHeight },
@@ -150,9 +158,8 @@ export async function sendAndConfirmTransaction(
 export function formatTransactionError(err: unknown): string {
   if (typeof err === "object" && err !== null) {
     try {
-      return `Transaction failed: ${JSON.stringify(
-        err,
-        (_key, value) => (typeof value === "bigint" ? value.toString() : value),
+      return `Transaction failed: ${JSON.stringify(err, (_key, value) =>
+        typeof value === "bigint" ? value.toString() : value,
       )}`;
     } catch {
       // Circular reference or other stringify error
@@ -186,7 +193,9 @@ export async function addPriorityFeeInstructions(
     ix.programId.toString() !== "ComputeBudget111111111111111111111111111111";
 
   // Remove existing compute budget instructions if they were added by the SDK
-  transaction.instructions = transaction.instructions.filter(computeBudgetIxFilter);
+  transaction.instructions = transaction.instructions.filter(
+    computeBudgetIxFilter,
+  );
 
   const instructions = await createPriorityFeeInstructions(
     connection,
@@ -266,8 +275,10 @@ async function simulateAndGetComputeUnits(
   let unitsUsed = 200_000;
   let simulationAttempts = 0;
 
-  simulationLoop: while (true) {
-    const response = await connection.simulateTransaction(transaction as Transaction);
+  while (true) {
+    const response = await connection.simulateTransaction(
+      transaction as Transaction,
+    );
 
     if (response.value.err) {
       if (checkKnownSimulationError(response.value)) {
@@ -275,13 +286,13 @@ async function simulateAndGetComputeUnits(
         if (simulationAttempts < 5) {
           simulationAttempts++;
           await sleep(1000);
-          continue simulationLoop;
+          continue;
         }
       } else if (simulationAttempts < 3) {
         // Number of attempts will be at most 3 for unknown errors
         simulationAttempts++;
         await sleep(1000);
-        continue simulationLoop;
+        continue;
       }
 
       // Still failing after multiple attempts
@@ -358,12 +369,14 @@ async function calculatePriorityFee(
 /**
  * Checks response logs for known simulation errors that can be retried.
  */
-function checkKnownSimulationError(response: SimulatedTransactionResponse): boolean {
+function checkKnownSimulationError(
+  response: SimulatedTransactionResponse,
+): boolean {
   const errors: Record<string, string> = {};
 
   // This error occurs when the blockhash included in a transaction is not deemed to be valid
   if (response.err === "BlockhashNotFound") {
-    errors["BlockhashNotFound"] =
+    errors.BlockhashNotFound =
       "Blockhash not found during simulation. Trying again.";
   }
 
@@ -371,12 +384,12 @@ function checkKnownSimulationError(response: SimulatedTransactionResponse): bool
   if (response.logs) {
     for (const line of response.logs) {
       if (line.includes("SlippageToleranceExceeded")) {
-        errors["SlippageToleranceExceeded"] =
+        errors.SlippageToleranceExceeded =
           "Slippage failure during simulation. Trying again.";
       }
 
       if (line.includes("RequireGteViolated")) {
-        errors["RequireGteViolated"] =
+        errors.RequireGteViolated =
           "Swap instruction failure during simulation. Trying again.";
       }
     }
@@ -406,9 +419,15 @@ export function determineRpcProvider(endpoint: string): SolanaRpcProvider {
   try {
     const url = new URL(endpoint);
     const hostname = url.hostname;
-    if (isHostOrSubdomainOf(hostname, "rpcpool.com") || isHostOrSubdomainOf(hostname, "triton.one")) {
+    if (
+      isHostOrSubdomainOf(hostname, "rpcpool.com") ||
+      isHostOrSubdomainOf(hostname, "triton.one")
+    ) {
       return "triton";
-    } else if (isHostOrSubdomainOf(hostname, "helius-rpc.com") || isHostOrSubdomainOf(hostname, "helius.xyz")) {
+    } else if (
+      isHostOrSubdomainOf(hostname, "helius-rpc.com") ||
+      isHostOrSubdomainOf(hostname, "helius.xyz")
+    ) {
       return "helius";
     } else if (isHostOrSubdomainOf(hostname, "ankr.com")) {
       return "ankr";
@@ -443,4 +462,3 @@ export const isEmptyObject = (value: object | null | undefined): boolean => {
 
   return true;
 };
-

package/src/providers/wormhole/types.ts

@@ -1,7 +1,10 @@
-import { AccountAddressInput, Account, Network } from "@aptos-labs/ts-sdk";
-import { AdapterWallet } from "@aptos-labs/wallet-adapter-core";
-import { routes, AttestationReceipt } from "@wormhole-foundation/sdk/dist/cjs";
-import { Chain, AptosAccount } from "../..";
+import type { Account, AccountAddressInput, Network } from "@aptos-labs/ts-sdk";
+import type { AdapterWallet } from "@aptos-labs/wallet-adapter-core";
+import type {
+  AttestationReceipt,
+  routes,
+} from "@wormhole-foundation/sdk/dist/cjs";
+import type { AptosAccount, Chain } from "../..";
 
 export type WormholeRouteResponse = routes.Route<
   "Mainnet" | "Testnet",
@@ -26,7 +29,9 @@ export interface WormholeQuoteRequest {
   type: "transfer" | "withdraw";
 }
 
-export type GasStationApiKey = Partial<Record<Network.TESTNET | Network.MAINNET, string>>;
+export type GasStationApiKey = Partial<
+  Record<Network.TESTNET | Network.MAINNET, string>
+>;
 
 export interface WormholeTransferRequest {
   sourceChain: Chain;
@@ -40,9 +45,9 @@ export interface WormholeTransferRequest {
 }
 
 export type WithdrawPhase =
-  | "initiating"  // User signing Aptos burn transaction
-  | "tracking"    // Waiting for Wormhole attestation (~60s)
-  | "claiming";   // Claiming on destination chain
+  | "initiating" // User signing Aptos burn transaction
+  | "tracking" // Waiting for Wormhole attestation (~60s)
+  | "claiming"; // Claiming on destination chain
 
 /**
  * Callback fired before and after each individual transaction is signed
@@ -54,7 +59,10 @@ export type WithdrawPhase =
  * @param txId - `null` when called *before* signing; the on-chain
  *   transaction hash when called *after* signing.
  */
-export type OnTransactionSigned = (description: string, txId: string | null) => void;
+export type OnTransactionSigned = (
+  description: string,
+  txId: string | null,
+) => void;
 
 export interface WormholeWithdrawRequest {
   /**
@@ -137,13 +145,20 @@ export interface WormholeClaimWithdrawRequest {
   wallet?: AdapterWallet;
   /** Optional callback fired before and after each individual transaction is signed. */
   onTransactionSigned?: OnTransactionSigned;
+  /**
+   * When true, skip the server-side claim path (serverClaimUrl) and instead
+   * perform a client-side wallet-signed claim. Useful as a fallback when the
+   * server endpoint is unreachable. Requires `wallet` to be provided.
+   */
+  skipServerClaim?: boolean;
 }
 
 export interface WormholeClaimWithdrawResponse {
   destinationChainTxnId: string;
 }
 
-export interface RetryWithdrawClaimRequest extends WormholeClaimWithdrawRequest {
+export interface RetryWithdrawClaimRequest
+  extends WormholeClaimWithdrawRequest {
   /** Maximum number of retry attempts (default: 5). */
   maxRetries?: number;
   /** Initial delay in ms before the first retry (default: 2000). */
@@ -152,7 +167,8 @@ export interface RetryWithdrawClaimRequest extends WormholeClaimWithdrawRequest
   backoffMultiplier?: number;
 }
 
-export interface RetryWithdrawClaimResponse extends WormholeClaimWithdrawResponse {
+export interface RetryWithdrawClaimResponse
+  extends WormholeClaimWithdrawResponse {
   /** Number of retry attempts that were needed (0 means first attempt succeeded). */
   retriesUsed: number;
 }
@@ -191,11 +207,7 @@ export class TransferError extends Error {
    */
   readonly cause?: unknown;
 
-  constructor(
-    message: string,
-    originChainTxnId: string,
-    cause?: unknown,
-  ) {
+  constructor(message: string, originChainTxnId: string, cause?: unknown) {
     super(message);
     this.name = "TransferError";
     this.originChainTxnId = originChainTxnId;

package/src/providers/wormhole/utils.ts

@@ -6,11 +6,11 @@
 import {
   chainToPlatform,
   routes,
+  type TokenId,
   Wormhole,
-  TokenId,
 } from "@wormhole-foundation/sdk";
-import { Chain } from "../../CrossChainCore";
-import { TokenConfig } from "../../config";
+import type { Chain } from "../../CrossChainCore";
+import type { TokenConfig } from "../../config";
 
 export interface CCTPRouteResult {
   route: routes.ManualRoute<"Mainnet" | "Testnet">;
@@ -69,4 +69,3 @@ export async function createCCTPRoute(
 
   return { route: cctpRoute, request };
 }
-