0xtrails 0.5.0 → 0.6.0

package/src/transactionIntent/handlers/index.ts

@@ -1,3 +1,2 @@
 export * from "./sameChainSameToken.js"
-export * from "./sameChainDifferentToken.js"
 export * from "./crossChain.js"

package/src/transactionIntent/handlers/sameChainSameToken.ts

@@ -1,7 +1,9 @@
 import type { Account, Chain, WalletClient, TransactionReceipt } from "viem"
-import { createPublicClient, http, formatUnits, ethAddress } from "viem"
-import type { TrailsApi } from "@0xsequence/trails-api"
-import type { MetaTxnReceipt, PrepareSendReturn, SendReturn } from "../types.js"
+import { formatUnits } from "viem"
+import { getPublicRpcClient } from "../../chains.js"
+import type { FeeOption, TrailsApi } from "@0xsequence/trails-api"
+import type { PrepareSendReturn, SendReturn } from "../types.js"
+import type { IntentTransaction } from "@0xsequence/trails-api"
 import type { TransactionState } from "../../transactions.js"
 import type { CheckoutOnHandlers } from "../../widget/hooks/useCheckout.js"
 import type {
@@ -10,7 +12,6 @@ import type {
   DepositSignature,
   ExecuteIntentResponse,
 } from "@0xsequence/trails-api"
-import type { SelectedFeeToken } from "../types.js"
 import { logger } from "../../logger.js"
 import {
   isTestnetDebugMode,
@@ -36,39 +37,10 @@ import { getChainInfo } from "../../chains.js"
 import { getTransactionStateFromReceipt } from "../execution/transactionState.js"
 import { calcAmountUsdPrice } from "../../prices.js"
 import { pollIntentReceipt } from "../../intentReceiptPoller.js"
-import { zeroAddress } from "viem"
-
-/**
- * @description
- * This handler manages simple same-chain token transfers (e.g., using USDC to transact with USDC on the same chain).
- * It supports both standard transfers and custom calldata execution.
- *
- * Key characteristics:
- * - Uses the Trails API with getIntent and commitIntent for setup
- * - Single transaction leg (user transfer)
- * - No cross-chain bridging or token swapping required
- * - Direct transaction submission via attemptUserDepositTx (simpler than cross-chain polling)
- * - Supports both gasless and standard fee payment modes
- *
- * Transaction Flow:
- * 1. Get intent via getIntent (Intent object with validation)
- * 2. Commit intent via commitIntent (Record created in backend)
- * 3. User submits transaction via attemptUserDepositTx (handles both gasless and standard)
- * 4. Wait for transaction receipt (direct receipt polling, not via waitIntentReceipt API)
- * 5. Update transaction state and invoke callbacks
- *
- * Error Handling:
- * - Balance validation before transaction submission
- * - Gas estimation for accurate fee calculation
- * - Proper error propagation with checkout error callbacks
- * - Fallback logging for debugging
- *
- * State Management:
- * - transactionStates[0]: User transfer transaction
- * - Updates propagated via onTransactionStateChange callback
- * - Analytics tracking for payment completion or errors
- * - Support for gasless fee options via gasFeeOptions
- */
+import { isNativeToken } from "../../utils.js"
+import { getAccountTransactionHistory } from "../../transactions.js"
+import { POLLING_INTERVALS } from "../constants.js"
+
 export async function handleSameChainSameToken({
   mainSignerAddress,
   originTokenAddress,
@@ -93,12 +65,13 @@ export async function handleSameChainSameToken({
   mode,
   fundMethod,
   paymasterUrl,
-  selectedFeeToken,
   walletId,
   trailsClient,
   abortSignal,
   commitIntentFn,
   executeIntentFn,
+  sequenceProjectAccessKey,
+  sequenceIndexerUrl,
 }: {
   mainSignerAddress: string
   originTokenAddress: string
@@ -124,7 +97,6 @@ export async function handleSameChainSameToken({
   mode?: "pay" | "fund" | "earn" | "swap" | "receive"
   fundMethod?: string
   paymasterUrl?: string
-  selectedFeeToken?: SelectedFeeToken
   walletId?: string
   trailsClient: TrailsApi
   abortSignal?: AbortSignal
@@ -134,6 +106,8 @@ export async function handleSameChainSameToken({
     depositTransactionHash?: string
     depositSignature?: DepositSignature
   }) => Promise<ExecuteIntentResponse>
+  sequenceProjectAccessKey?: string
+  sequenceIndexerUrl?: string
 }): Promise<PrepareSendReturn> {
   logger.console.log("[trails-sdk] isToSameToken && isToSameChain")
   const testnet = isTestnetDebugMode()
@@ -142,10 +116,7 @@ export async function handleSameChainSameToken({
   const effectiveOriginTokenAddress = testnet
     ? getTestnetOriginTokenAddress(effectiveOriginChainId)
     : originTokenAddress
-  const effectivePublicClient = createPublicClient({
-    chain: effectiveOriginChain,
-    transport: http(),
-  })
+  const effectivePublicClient = getPublicRpcClient(effectiveOriginChain)
 
   let noSufficientBalance = false
 
@@ -163,8 +134,8 @@ export async function handleSameChainSameToken({
   const hasCustomCalldata = getIsCustomCalldata(destinationCalldata)
 
   // For same-chain transactions, use Intent flow to support gasless deposits
-  const destinationSalt = Date.now().toString()
-  const intentArgs = getIntentArgs(
+  const salt = Date.now().toString()
+  const intentArgs = await getIntentArgs(
     mainSignerAddress,
     effectiveOriginChainId,
     effectiveOriginTokenAddress,
@@ -174,10 +145,12 @@ export async function handleSameChainSameToken({
     "0", // destinationTokenAmount (exact input)
     recipient,
     destinationCalldata,
-    destinationSalt,
+    salt,
     slippageTolerance,
     TradeType.EXACT_INPUT,
     quoteProvider || "",
+    undefined, // connector - not available in this context
+    walletId, // walletId - use this to check for Sequence wallets
   )
 
   logger.console.log(
@@ -198,7 +171,7 @@ export async function handleSameChainSameToken({
   logger.console.log("[trails-sdk] Quote intent:", intent)
   logger.console.log("[trails-sdk] Quote intent gasFeeOptions:", gasFeeOptions)
 
-  if (!intent.preconditions?.length || !intent.calls?.length) {
+  if (!intent.originPrecondition || !intent.originCalls) {
     throw new Error("Invalid intent")
   }
 
@@ -279,36 +252,29 @@ export async function handleSameChainSameToken({
     feeOptions: gasFeeOptions,
     send: async ({
       onOriginSend,
-      selectedFeeToken: runtimeSelectedFeeToken,
+      selectedFeeOption: runtimeSelectedFeeOption,
     }: {
       onOriginSend?: () => void
-      selectedFeeToken?: any
+      selectedFeeOption?: FeeOption | null
     }): Promise<SendReturn> => {
-      // Use runtime selectedFeeToken if provided, otherwise fall back to the one from prepareSend
-      const effectiveSelectedFeeToken =
-        runtimeSelectedFeeToken ?? selectedFeeToken
+      // Use runtime selectedFeeOption (passed at execution time, always up-to-date)
+      const effectiveSelectedFeeOption = runtimeSelectedFeeOption
       // Check if gasless flow is enabled:
-      // - selectedFeeToken must exist and not be null/undefined
+      // - selectedFeeOption must exist and not be null/undefined
       // - tokenAddress must not be native token (zeroAddress or ethAddress)
       // - walletId must not be sequence-waas
       const effectiveGasless =
-        effectiveSelectedFeeToken !== null &&
-        effectiveSelectedFeeToken !== undefined &&
-        effectiveSelectedFeeToken.tokenAddress !== undefined &&
-        effectiveSelectedFeeToken.tokenAddress !== null &&
-        effectiveSelectedFeeToken.tokenAddress !== zeroAddress &&
-        effectiveSelectedFeeToken.tokenAddress.toLowerCase() !==
-          zeroAddress.toLowerCase() &&
-        effectiveSelectedFeeToken.tokenAddress !== ethAddress &&
-        effectiveSelectedFeeToken.tokenAddress.toLowerCase() !==
-          ethAddress.toLowerCase() &&
+        effectiveSelectedFeeOption !== null &&
+        effectiveSelectedFeeOption !== undefined &&
+        effectiveSelectedFeeOption.tokenAddress !== undefined &&
+        effectiveSelectedFeeOption.tokenAddress !== null &&
+        !isNativeToken(effectiveSelectedFeeOption.tokenAddress) &&
         walletId !== "sequence-waas"
       logger.console.log(
         "[trails-sdk] [FEE-SELECT] [GASLESS-FLOW] send() called for same-chain:",
         {
-          runtimeSelectedFeeToken,
-          prepareTimeSelectedFeeToken: selectedFeeToken,
-          effectiveSelectedFeeToken,
+          runtimeSelectedFeeOption,
+          effectiveSelectedFeeOption,
           effectiveGasless,
         },
       )
@@ -365,8 +331,8 @@ export async function handleSameChainSameToken({
         logger.console.log("[trails-sdk] origin call params", originCallParams)
 
         let depositUserTxnReceipt: TransactionReceipt | null = null
-        const originMetaTxnReceipt: MetaTxnReceipt | null = null
-        const destinationMetaTxnReceipt: MetaTxnReceipt | null = null
+        let originIntentTransaction: IntentTransaction | null = null
+        const destinationIntentTransaction: IntentTransaction | null = null
 
         // Commit the intent
         const commitIntentFnToUse =
@@ -444,7 +410,7 @@ export async function handleSameChainSameToken({
             paymasterUrl,
             chain: effectiveOriginChain,
             account,
-            firstPreconditionMin: swapAmount,
+            depositAmount: swapAmount,
             originIntentAddress: intent.originIntentAddress,
             onOriginSend,
             publicClient: effectivePublicClient,
@@ -464,7 +430,7 @@ export async function handleSameChainSameToken({
             depositAmountUsd,
             feeOptions: gasFeeOptions,
             trailsClient,
-            selectedFeeToken: effectiveSelectedFeeToken,
+            selectedFeeOption: effectiveSelectedFeeOption,
             walletId,
             abortSignal,
             checkoutOnHandlers,
@@ -482,8 +448,187 @@ export async function handleSameChainSameToken({
             isGasless: effectiveGasless,
           })
 
-          // For gasless flows, start polling for both deposit and origin transactions via API
-          if (effectiveGasless && !depositUserTxnReceipt) {
+          // For QR code mode, we need to detect the deposit first, call executeIntent, then start polling
+          // For gasless flows, we can start polling immediately
+          if (fundMethod === "qr-code" || fundMethod === "exchange") {
+            logger.console.log(
+              "[trails-sdk] QR code mode: waiting for deposit transaction before starting polling",
+            )
+            // Use the same approach as cross-chain: check for deposit via indexer
+            const checkForDepositTx = async () => {
+              while (true) {
+                // Check if we should abort
+                if (abortSignal?.aborted) {
+                  logger.console.log(
+                    "[trails-sdk] Aborting deposit tx check due to abort signal",
+                  )
+                  return null
+                }
+
+                try {
+                  if (!sequenceIndexerUrl) {
+                    throw new Error(
+                      "sequenceIndexerUrl is required for QR code mode",
+                    )
+                  }
+                  if (!sequenceProjectAccessKey) {
+                    throw new Error(
+                      "sequenceProjectAccessKey is required for QR code mode",
+                    )
+                  }
+                  const response = await getAccountTransactionHistory({
+                    chainId: effectiveOriginChainId,
+                    accountAddress: intent.originIntentAddress,
+                    abortSignal,
+                    apiKey: sequenceProjectAccessKey,
+                    indexerUrl: sequenceIndexerUrl,
+                  })
+                  logger.console.log(
+                    "[trails-sdk] getAccountTransactionHistory response",
+                    response,
+                  )
+                  if (response.transactions.length > 0) {
+                    const tx = response.transactions[0]
+                    if (!tx?.txnHash) {
+                      await new Promise((resolve) =>
+                        setTimeout(
+                          resolve,
+                          POLLING_INTERVALS.TRANSACTION_HISTORY,
+                        ),
+                      )
+                      continue
+                    }
+                    const depositTxReceipt =
+                      await effectivePublicClient.getTransactionReceipt({
+                        hash: tx.txnHash as `0x${string}`,
+                      })
+
+                    depositUserTxnReceipt = depositTxReceipt
+
+                    localTransactionStates[0] = getTransactionStateFromReceipt(
+                      depositTxReceipt,
+                      effectiveOriginChainId,
+                      localTransactionStates[0]?.label,
+                    )
+                    onTransactionStateChange(localTransactionStates)
+                    if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                      checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                        localTransactionStates,
+                      )
+                    }
+
+                    // Call executeIntent after detecting deposit transaction (for QR code mode)
+                    // This triggers the backend to start executing the intent
+                    // Must be called BEFORE waitIntentReceipt polling starts
+                    if (
+                      depositTxReceipt.status === "success" &&
+                      intent.intentId
+                    ) {
+                      logger.console.log(
+                        "[trails-sdk] Calling executeIntent with detected deposit transaction hash (QR code mode)",
+                        {
+                          intentId: intent.intentId,
+                          txHash: depositTxReceipt.transactionHash,
+                          fundMethod,
+                        },
+                      )
+                      try {
+                        const executeIntentFnToUse =
+                          executeIntentFn ||
+                          trailsClient.executeIntent.bind(trailsClient)
+                        await executeIntentFnToUse({
+                          intentId: intent.intentId,
+                          depositTransactionHash:
+                            depositTxReceipt.transactionHash,
+                        })
+                        logger.console.log(
+                          "[trails-sdk] executeIntent completed successfully (QR code mode)",
+                        )
+
+                        // Now start polling for intent receipt
+                        break
+                      } catch (error) {
+                        logger.console.error(
+                          "[trails-sdk] Error calling executeIntent (QR code mode):",
+                          error,
+                        )
+                      }
+                    }
+
+                    if (onOriginSend) {
+                      onOriginSend()
+                    }
+                    break
+                  }
+                } catch (error) {
+                  logger.console.error("Error checking for deposit tx", error)
+                }
+                await new Promise((resolve) =>
+                  setTimeout(resolve, POLLING_INTERVALS.TRANSACTION_HISTORY),
+                )
+              }
+            }
+
+            // Wait for deposit and executeIntent
+            await checkForDepositTx()
+
+            // Now start polling for intent receipt after executeIntent has been called
+            logger.console.log(
+              "[trails-sdk] Starting polling for intent receipt after executeIntent (QR code mode)",
+            )
+            try {
+              await pollIntentReceipt({
+                intentId: intent.intentId,
+                trailsClient,
+                callbacks: {
+                  onOriginTransactionFound: async (originTxHash) => {
+                    logger.console.log(
+                      "[trails-sdk] Origin intent transaction discovered for same-chain QR code flow",
+                      { originTxHash },
+                    )
+
+                    if (localTransactionStates[1]) {
+                      try {
+                        const originTxReceipt =
+                          await effectivePublicClient.getTransactionReceipt({
+                            hash: originTxHash as `0x${string}`,
+                          })
+
+                        localTransactionStates[1] =
+                          getTransactionStateFromReceipt(
+                            originTxReceipt,
+                            effectiveOriginChainId,
+                            localTransactionStates[1]?.label,
+                          )
+                        onTransactionStateChange(localTransactionStates)
+                        if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                          checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                            localTransactionStates,
+                          )
+                        }
+
+                        originIntentTransaction = {
+                          txnHash: originTxHash,
+                        } as IntentTransaction
+                      } catch (error) {
+                        logger.console.error(
+                          "[trails-sdk] Error fetching origin transaction receipt:",
+                          error,
+                        )
+                      }
+                    }
+                  },
+                },
+                maxWaitTime: 120000, // 120 seconds max wait
+              })
+            } catch (error) {
+              logger.console.error(
+                "[trails-sdk] Error polling for intent receipt (QR code mode):",
+                error,
+              )
+            }
+          } else if (effectiveGasless && !depositUserTxnReceipt) {
+            // For gasless flows (non-QR code), start polling immediately
             logger.console.log(
               "[trails-sdk] Starting unified polling for gasless same-chain transaction with 2 states",
             )
@@ -504,14 +649,6 @@ export async function handleSameChainSameToken({
                           await effectivePublicClient.getTransactionReceipt({
                             hash: txHash as `0x${string}`,
                           })
-                        logger.console.log(
-                          "[trails-sdk] Deposit transaction receipt fetched",
-                          {
-                            txHash,
-                            blockNumber: depositTxReceipt?.blockNumber,
-                            status: depositTxReceipt?.status,
-                          },
-                        )
 
                         localTransactionStates[0] =
                           getTransactionStateFromReceipt(
@@ -520,12 +657,13 @@ export async function handleSameChainSameToken({
                             localTransactionStates[0]?.label,
                           )
                         onTransactionStateChange(localTransactionStates)
-                        // Also trigger checkout status update if handler is provided
                         if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
                           checkoutOnHandlers.triggerCheckoutStatusUpdate(
                             localTransactionStates,
                           )
                         }
+
+                        depositUserTxnReceipt = depositTxReceipt
                       } catch (error) {
                         logger.console.error(
                           "[trails-sdk] Error fetching deposit transaction receipt:",
@@ -540,21 +678,12 @@ export async function handleSameChainSameToken({
                       { originTxHash },
                     )
 
-                    // For same-chain gasless, localTransactionStates[1] is the origin intent transaction
                     if (localTransactionStates[1]) {
                       try {
                         const originTxReceipt =
                           await effectivePublicClient.getTransactionReceipt({
                             hash: originTxHash as `0x${string}`,
                           })
-                        logger.console.log(
-                          "[trails-sdk] Origin transaction receipt fetched",
-                          {
-                            originTxHash,
-                            blockNumber: originTxReceipt?.blockNumber,
-                            status: originTxReceipt?.status,
-                          },
-                        )
 
                         localTransactionStates[1] =
                           getTransactionStateFromReceipt(
@@ -563,12 +692,15 @@ export async function handleSameChainSameToken({
                             localTransactionStates[1]?.label,
                           )
                         onTransactionStateChange(localTransactionStates)
-                        // Also trigger checkout status update if handler is provided
                         if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
                           checkoutOnHandlers.triggerCheckoutStatusUpdate(
                             localTransactionStates,
                           )
                         }
+
+                        originIntentTransaction = {
+                          txnHash: originTxHash,
+                        } as IntentTransaction
                       } catch (error) {
                         logger.console.error(
                           "[trails-sdk] Error fetching origin transaction receipt:",
@@ -588,7 +720,9 @@ export async function handleSameChainSameToken({
             }
           }
 
-          if (depositUserTxnReceipt) {
+          // For non-gasless flows, update the transaction state with the deposit receipt
+          // For gasless flows, skip this as localTransactionStates is already maintained by polling
+          if (depositUserTxnReceipt && !effectiveGasless) {
             try {
               const updatedStates = [
                 getTransactionStateFromReceipt(
@@ -718,8 +852,8 @@ export async function handleSameChainSameToken({
 
         return {
           depositUserTxnReceipt,
-          originMetaTxnReceipt,
-          destinationMetaTxnReceipt,
+          originIntentTransaction,
+          destinationIntentTransaction,
           totalCompletionSeconds: 0,
         }
       } catch (error) {

package/src/transactionIntent/quote/normalizeQuote.ts

@@ -2,10 +2,10 @@ import type { Intent } from "@0xsequence/trails-api"
 import type { TransactionState } from "../../transactions.js"
 import type { PrepareSendQuote, PrepareSendFees } from "../types.js"
 import type { QuoteProviderInfo } from "../../widget/hooks/useQuote.js"
-import { createPublicClient, formatUnits, http } from "viem"
+import { formatUnits } from "viem"
 import { mainnet } from "viem/chains"
 import { getTokenInfo } from "../../tokens.js"
-import { getChainInfo } from "../../chains.js"
+import { getChainInfo, getPublicRpcClient } from "../../chains.js"
 import { logger } from "../../logger.js"
 import {
   formatRawAmount,
@@ -186,10 +186,7 @@ export async function getNormalizedQuoteObject({
 
   const hasCustomCalldata = getIsCustomCalldata(destinationCalldata)
 
-  const publicClient = createPublicClient({
-    chain: originChain,
-    transport: http(),
-  })
+  const publicClient = getPublicRpcClient(originChain)
 
   let gasCostUsd: number = 0
   let gasCostUsdDisplay: string = "0"
@@ -291,6 +288,7 @@ export async function getNormalizedQuoteObject({
     destinationDepositAddress: destinationDepositAddress || "",
     destinationAddress: destinationAddress || "",
     destinationCalldata: hasCustomCalldata ? destinationCalldata || "" : "",
+    intentId: intent?.intentId ?? null,
     originAmount: originAmount || "0",
     originAmountMin: originAmountMin || originAmount || "0",
     originAmountMinUsdFormatted: originAmountMinUsdFormatted || "0",

package/src/transactionIntent/quote/quoteHelpers.ts

@@ -1,8 +1,15 @@
 import type { QuoteIntentRequest } from "@0xsequence/trails-api"
+import type { Connector } from "wagmi"
 import { getIsCustomCalldata } from "../../contractUtils.js"
+import {
+  isSequenceWallet,
+  isSequenceWalletById,
+  isSmartContractWallet,
+} from "../../walletUtils.js"
 import type { TradeType } from "../types.js"
+import { logger } from "../../logger.js"
 
-export function getIntentArgs(
+export async function getIntentArgs(
   mainSignerAddress: string,
   originChainId: number,
   originTokenAddress: string,
@@ -16,7 +23,9 @@ export function getIntentArgs(
   slippageTolerance: string, // 0.03 = 3%
   tradeType: TradeType,
   provider?: string | null,
-): QuoteIntentRequest {
+  connector?: Connector | undefined,
+  walletId?: string | undefined,
+): Promise<QuoteIntentRequest> {
   const hasCustomCalldata = getIsCustomCalldata(destinationCalldata)
 
   let effectiveProvider = provider
@@ -24,6 +33,28 @@ export function getIntentArgs(
     effectiveProvider = undefined
   }
 
+  // Check if wallet is Sequence wallet (via connector or walletId)
+  const isSequence = connector
+    ? isSequenceWallet(connector)
+    : isSequenceWalletById(walletId)
+
+  // Check if wallet is smart contract wallet
+  const isSmartContract = await isSmartContractWallet(
+    mainSignerAddress,
+    originChainId,
+  )
+
+  // Set onlyNativeGasFee to true if wallet is Sequence or smart contract
+  const onlyNativeGasFee = isSequence || isSmartContract
+
+  logger.console.log("[trails-sdk] Wallet check for onlyNativeGasFee:", {
+    isSequence,
+    isSmartContract,
+    onlyNativeGasFee,
+    walletId,
+    connectorName: connector?.name,
+  })
+
   const intentArgs: QuoteIntentRequest = {
     ownerAddress: mainSignerAddress,
     originChainId,
@@ -34,7 +65,8 @@ export function getIntentArgs(
     destinationTokenAddress: destinationTokenAddress,
     destinationTokenAmount: BigInt(destinationTokenAmount),
     destinationCallData: hasCustomCalldata ? destinationCalldata : "0x",
-    destinationCallValue: "0",
+    destinationCallValue: BigInt("0"),
+    onlyNativeGasFee,
     options: {
       slippageTolerance: Number(slippageTolerance),
       quoteProvider: effectiveProvider || undefined,

package/src/transactionIntent/types.ts

@@ -15,28 +15,6 @@ import type { QuoteProviderInfo } from "../widget/hooks/useQuote.js"
 import type { TrailsFeeBreakdown } from "../fees.js"
 import type { IntentTransaction } from "@0xsequence/trails-api"
 
-// Use native IntentTransaction from trails-api instead of deprecated MetaTxnReceipt
-export type MetaTxnReceipt = IntentTransaction
-
-// Flexible fee token type that accepts both full FeeOption and minimal fee token objects
-// Also accepts objects with amountUSD for widget components
-export type SelectedFeeToken =
-  | FeeOption
-  | {
-      tokenAddress: string
-      tokenSymbol?: string
-    }
-  | {
-      tokenAddress: string
-      tokenSymbol: string
-      tokenDecimals: number
-      amount: string
-      amountUSD: number
-      notEnoughBalance?: boolean
-      tokenImageUrl?: string
-      chainId?: number
-    }
-
 export enum TradeType {
   EXACT_INPUT = "EXACT_INPUT",
   EXACT_OUTPUT = "EXACT_OUTPUT",
@@ -75,7 +53,7 @@ export type PrepareSendOptions = {
   mode?: "pay" | "fund" | "earn" | "swap" | "receive"
   checkoutOnHandlers?: Partial<CheckoutOnHandlers>
   refundAddress?: string
-  selectedFeeToken?: SelectedFeeToken
+  selectedFeeOption?: FeeOption | null
   walletId?: string
   abortSignal?: AbortSignal
   // Optional mutation callbacks for React Query integration
@@ -99,6 +77,7 @@ export type PrepareSendQuote = {
   destinationDepositAddress: string
   destinationAddress: string
   destinationCalldata: string
+  intentId?: string | null
   originChain: Chain
   destinationChain: Chain
   originAmount: string
@@ -143,16 +122,16 @@ export type PrepareSendReturn = {
   feeOptions?: GasFeeOptions
   send: ({
     onOriginSend,
-    selectedFeeToken,
+    selectedFeeOption,
   }: {
     onOriginSend?: () => void
-    selectedFeeToken?: SelectedFeeToken
+    selectedFeeOption?: FeeOption | null
   }) => Promise<SendReturn>
 }
 
 export type SendReturn = {
   depositUserTxnReceipt: TransactionReceipt | null
-  originMetaTxnReceipt: MetaTxnReceipt | null
-  destinationMetaTxnReceipt: MetaTxnReceipt | null
+  originIntentTransaction: IntentTransaction | null
+  destinationIntentTransaction: IntentTransaction | null
   totalCompletionSeconds?: number
 }

package/src/transactionIntent/utils/index.ts

@@ -1,3 +1,2 @@
 export * from "./testnetHelpers.js"
 export * from "./balanceChecker.js"
-export * from "./lifiHelpers.js"