0xtrails 0.2.6 → 0.4.0

package/src/trailsClient.ts

@@ -1,27 +1,22 @@
 import { useConfig } from "@0xsequence/hooks"
-import { TrailsAPIClient } from "@0xsequence/trails-api"
+import { TrailsApi } from "@0xsequence/trails-api"
 import { useMemo } from "react"
 import { getTrailsApiUrl, getSequenceProjectAccessKey } from "./config.js"
 
 export type TrailsClientConfig = {
-  hostname?: string
-  projectAccessKey?: string
+  apiKey?: string
   jwt?: string
+  hostname?: string
 }
 
-// Trails client for interacting with Trails APIs only
-export class TrailsClient extends TrailsAPIClient {
-  constructor(hostname?: string, projectAccessKey?: string, jwt?: string) {
-    super(hostname || getTrailsApiUrl(), projectAccessKey, jwt)
-  }
-}
+export class TrailsClient extends TrailsApi {}
 
 export function getTrailsClient({
-  hostname,
-  projectAccessKey = getSequenceProjectAccessKey(),
+  apiKey = getSequenceProjectAccessKey(),
   jwt,
+  hostname,
 }: TrailsClientConfig = {}): TrailsClient {
-  return new TrailsClient(hostname, projectAccessKey, jwt)
+  return new TrailsApi(apiKey, { jwt, hostname })
 }
 
 export const useTrailsClient = (config?: TrailsClientConfig) => {
@@ -30,19 +25,11 @@ export const useTrailsClient = (config?: TrailsClientConfig) => {
   const trailsClient = useMemo(() => {
     return getTrailsClient({
       hostname: config?.hostname || getTrailsApiUrl(),
-      projectAccessKey:
-        getSequenceProjectAccessKey() ||
-        config?.projectAccessKey ||
-        projectAccessKey,
+      apiKey:
+        getSequenceProjectAccessKey() || config?.apiKey || projectAccessKey,
       jwt: config?.jwt || jwt,
     })
-  }, [
-    config?.hostname,
-    config?.projectAccessKey,
-    config?.jwt,
-    projectAccessKey,
-    jwt,
-  ])
+  }, [config?.hostname, config?.apiKey, config?.jwt, projectAccessKey, jwt])
 
   return trailsClient
 }

package/src/transactionIntent/constants.ts

@@ -0,0 +1,11 @@
+// Polling intervals for different operations
+export const POLLING_INTERVALS = {
+  // Consistent interval for transaction history polling (3 seconds)
+  TRANSACTION_HISTORY: 3000,
+  // Consistent interval for meta transaction polling (2 seconds)
+  META_TRANSACTION: 2000,
+  // Consistent interval for CCTP queue polling (5 seconds)
+  CCTP_QUEUE: 5000,
+  // Consistent interval for failure polling (2 seconds)
+  FAILURE_POLLING: 2000,
+} as const

package/src/transactionIntent/deposits/depositOrchestrator.ts

@@ -0,0 +1,210 @@
+import type {
+  Account,
+  Chain,
+  PublicClient,
+  WalletClient,
+  TransactionReceipt,
+} from "viem"
+import { zeroAddress } from "viem"
+import type { TrailsApi } from "@0xsequence/trails-api"
+import type { TransactionState } from "../../transactions.js"
+import type { CheckoutOnHandlers } from "../../widget/hooks/useCheckout.js"
+import type {
+  DepositSignature,
+  GasFeeOptions,
+  ExecuteIntentResponse,
+} from "@0xsequence/trails-api"
+import type { SelectedFeeToken } from "../types.js"
+import { logger } from "../../logger.js"
+import { attemptGaslessDeposit, getDoGasless } from "./gaslessDeposit.js"
+import { attemptStandardDeposit } from "./standardDeposit.js"
+
+export async function attemptUserDepositTx({
+  originTokenAddress,
+  paymasterUrl,
+  chain,
+  account,
+  firstPreconditionMin,
+  originIntentAddress,
+  onOriginSend,
+  publicClient,
+  walletClient,
+  destinationTokenDecimals,
+  sourceTokenDecimals,
+  fee,
+  dryMode,
+  sourceTokenPriceUsd,
+  destinationTokenPriceUsd,
+  swapAmount,
+  onTransactionStateChange,
+  transactionStates,
+  fundMethod,
+  originTokenSymbol,
+  destinationTokenSymbol,
+  depositAmountUsd,
+  feeOptions,
+  trailsClient,
+  selectedFeeToken,
+  walletId,
+  abortSignal,
+  checkoutOnHandlers,
+  intentId,
+  executeIntentFn,
+  depositRecipientOverride,
+  isSameChainSameToken,
+}: {
+  originTokenAddress: string
+  paymasterUrl?: string
+  chain: Chain
+  account: Account
+  firstPreconditionMin: string
+  originIntentAddress: string
+  onOriginSend?: () => void
+  publicClient: PublicClient
+  walletClient: WalletClient
+  destinationTokenDecimals: number
+  sourceTokenDecimals: number
+  swapAmount: string
+  dryMode: boolean
+  sourceTokenPriceUsd: number | null
+  destinationTokenPriceUsd: number | null
+  fee: string
+  onTransactionStateChange: (transactionStates: TransactionState[]) => void
+  transactionStates: TransactionState[]
+  fundMethod?: string
+  originTokenSymbol: string
+  destinationTokenSymbol: string
+  depositAmountUsd: number
+  feeOptions?: GasFeeOptions
+  trailsClient: TrailsApi
+  selectedFeeToken?: SelectedFeeToken
+  walletId?: string
+  abortSignal?: AbortSignal
+  checkoutOnHandlers?: CheckoutOnHandlers
+  intentId?: string
+  executeIntentFn?: (params: {
+    intentId: string
+    depositTransactionHash?: string
+    depositSignature?: DepositSignature
+  }) => Promise<ExecuteIntentResponse>
+  depositRecipientOverride?: string
+  isSameChainSameToken?: boolean
+}): Promise<TransactionReceipt | null> {
+  let depositUserTxnReceipt: TransactionReceipt | null = null
+  const originChainId = chain.id
+
+  // Use override recipient if provided (for same-chain same-token non-gasless transfers)
+  // Otherwise use originIntentAddress
+  const effectiveDepositRecipient =
+    depositRecipientOverride || originIntentAddress
+
+  logger.console.log("[trails-sdk] attemptUserDepositTx called with:", {
+    fundMethod,
+    intentId,
+    hasPaymasterUrl: !!paymasterUrl,
+    depositRecipientOverride,
+    effectiveDepositRecipient,
+    isSameChainSameToken,
+  })
+
+  // Skip wallet deposit if fund method is qr-code
+  if (fundMethod === "qr-code" || fundMethod === "exchange") {
+    logger.console.log(
+      "[trails-sdk] Skipping wallet deposit for QR code mode - fundMethod is:",
+      fundMethod,
+    )
+    return null
+  }
+
+  const doGasless = getDoGasless(
+    originTokenAddress,
+    feeOptions,
+    selectedFeeToken,
+    walletId,
+  )
+  logger.console.log(
+    "[trails-sdk] [GASLESS-FLOW] [FEE-SELECT] doGasless check results:",
+    {
+      doGasless,
+      paymasterUrl,
+      hasFeeOptions: !!feeOptions,
+      feeOptionsCount: feeOptions?.feeOptions?.length || 0,
+      selectedFeeToken,
+      selectedFeeTokenSet:
+        selectedFeeToken !== null && selectedFeeToken !== undefined,
+      originTokenAddress,
+      isNotNative: originTokenAddress !== zeroAddress,
+    },
+  )
+  if (doGasless || paymasterUrl) {
+    logger.console.log(
+      "[trails-sdk] [GASLESS-FLOW] Entering gasless deposit flow",
+      {
+        doGasless,
+        hasPaymasterUrl: !!paymasterUrl,
+        paymasterUrl,
+      },
+    )
+    try {
+      await attemptGaslessDeposit({
+        paymasterUrl,
+        depositTokenAddress: originTokenAddress,
+        depositTokenAmount: firstPreconditionMin,
+        depositRecipient: originIntentAddress,
+        onOriginSend,
+        walletClient,
+        chain,
+        account,
+        trailsClient,
+        feeOptions: feeOptions,
+        selectedFeeToken: selectedFeeToken,
+        abortSignal,
+        checkoutOnHandlers,
+        intentId,
+        onTransactionStateChange,
+        transactionStates,
+        executeIntentFn,
+      })
+      // Gasless deposit submitted to backend, monitoring happens separately
+      depositUserTxnReceipt = null
+    } catch (error) {
+      logger.console.log("[trails-sdk] gassless attempt failed", error)
+      // If doGasless is true (ERC20 fee selected), re-throw error since we must use gasless
+      if (doGasless) {
+        throw error
+      }
+    }
+  }
+
+  // If gasless attempt failed, try to send a regular transaction
+  if (!depositUserTxnReceipt && !doGasless) {
+    depositUserTxnReceipt = await attemptStandardDeposit({
+      originTokenAddress,
+      firstPreconditionMin,
+      originIntentAddress,
+      onOriginSend,
+      publicClient,
+      walletClient,
+      originChainId,
+      chain,
+      account,
+      fee,
+      dryMode,
+      sourceTokenPriceUsd,
+      destinationTokenPriceUsd,
+      swapAmount,
+      destinationTokenDecimals,
+      sourceTokenDecimals,
+      onTransactionStateChange,
+      transactionStates,
+      originTokenSymbol,
+      destinationTokenSymbol,
+      depositAmountUsd,
+      checkoutOnHandlers,
+      isSameChainSameToken,
+      recipient: effectiveDepositRecipient,
+    })
+  }
+
+  return depositUserTxnReceipt
+}