0xtrails 0.1.13 → 0.2.0

package/src/prepareSend.ts

@@ -1,9 +1,9 @@
 import type {
-  GetIntentCallsPayloadsArgs,
+  GetIntentCallsPayloadParams,
   GetIntentCallsPayloadsReturn,
   IntentPrecondition,
-  SequenceAPIClient,
 } from "@0xsequence/trails-api"
+import type { TrailsAPIClient } from "@0xsequence/trails-api"
 import type { Relayer } from "@0xsequence/wallet-core"
 import { useQuery } from "@tanstack/react-query"
 import type {
@@ -51,11 +51,7 @@ import {
 import { queueCCTPTransfer } from "./cctpqueue.js"
 import { getChainInfo, getTestnetChainInfo } from "./chains.js"
 import { attemptSwitchChain } from "./chainSwitch.js"
-import {
-  getSameChainSwapDifferentIntentAddresses,
-  getSequenceEnv,
-  getSlippageTolerance,
-} from "./config.js"
+import { getSequenceEnv, getSlippageTolerance } from "./config.js"
 import { intentEntrypoints, MINIMUM_USD_AMOUNT_FOR_SWAP } from "./constants.js"
 import {
   decodeGuestModuleEvents,
@@ -66,9 +62,10 @@ import { InsufficientBalanceError } from "./error.js"
 import { estimateGasCostUsd } from "./estimate.js"
 import { getExplorerUrl } from "./explorer.js"
 import {
-  getDepositToIntentCalls,
+  getNeedsIntentEntrypointApproval,
   getPermitCalls,
   getPermitSignature,
+  signIntent,
 } from "./gasless.js"
 import { useIndexerGatewayClient } from "./indexerClient.js"
 import {
@@ -89,8 +86,8 @@ import { findFirstPreconditionForChainId } from "./preconditions.js"
 import { calcAmountUsdPrice, getTokenPrice } from "./prices.js"
 import {
   TRAILS_CONTRACT_PLACEHOLDER_AMOUNT,
-  wrapCalldataWithProxyCallerIfNeeded,
-} from "./proxyCaller.js"
+  wrapCalldataWithBalanceInjectorIfNeeded,
+} from "./balanceInjector.js"
 import { getQueryParam } from "./queryParams.js"
 import type { MetaTxnReceipt, RelayerEnv } from "./relayer.js"
 import { useRelayers } from "./relayer.js"
@@ -127,6 +124,9 @@ import { requestWithTimeout } from "./utils.js"
 import type { CheckoutOnHandlers } from "./widget/hooks/useCheckout.js"
 import { logger } from "./logger.js"
 import { getIsCustomCalldata } from "./contractUtils.js"
+import type { SequenceAPIClient } from "@0xsequence/api"
+import { useTrailsClient } from "./trailsClient.js"
+import { updatePersistentToast } from "./toast.js"
 
 export enum TradeType {
   EXACT_INPUT = "EXACT_INPUT",
@@ -150,6 +150,7 @@ export type PrepareSendOptions = {
   client?: WalletClient
   dryMode: boolean
   apiClient: SequenceAPIClient
+  trailsClient: TrailsAPIClient
   originRelayer: Relayer.Standard.Rpc.RpcRelayer
   destinationRelayer: Relayer.Standard.Rpc.RpcRelayer
   destinationCalldata?: string
@@ -316,7 +317,7 @@ function getIntentArgs(
   slippageTolerance: string, // 0.03 = 3%
   tradeType: TradeType,
   provider?: string | null,
-): GetIntentCallsPayloadsArgs {
+): GetIntentCallsPayloadParams {
   const hasCustomCalldata = getIsCustomCalldata(destinationCalldata)
 
   if (!provider || provider === "auto") {
@@ -363,6 +364,7 @@ export async function prepareSend(
     client: walletClient,
     dryMode = false,
     apiClient,
+    trailsClient,
     originRelayer,
     destinationRelayer,
     destinationCalldata,
@@ -380,10 +382,22 @@ export async function prepareSend(
   } = options
   let { sourceTokenPriceUsd, destinationTokenPriceUsd } = options
 
+  if (!sourceTokenDecimals) {
+    throw new Error("Source token decimals not provided")
+  }
+  if (!destinationTokenDecimals) {
+    throw new Error("Destination token decimals not provided")
+  }
+
   let hasCustomCalldata = getIsCustomCalldata(destinationCalldata)
   const mainSignerAddress = account.address
   const transactionStates: TransactionState[] = []
 
+  // Validate recipient is not zero address
+  if (recipient === zeroAddress) {
+    throw new Error("Recipient address cannot be zero address")
+  }
+
   // Validate CCTP destination token requirement
   validateCctpDestinationToken(
     destinationTokenAddress,
@@ -394,7 +408,11 @@ export async function prepareSend(
   let effectiveDestinationAddress = recipient
   let effectiveDestinationCalldata = destinationCalldata
 
-  if (!hasCustomCalldata && tradeType === TradeType.EXACT_INPUT) {
+  if (
+    !hasCustomCalldata &&
+    tradeType === TradeType.EXACT_INPUT &&
+    destinationTokenAddress !== zeroAddress
+  ) {
     // we need to set custom calldata for the cctp transfer in order to have destination intent adddress execution needed for metatxn tracking
     effectiveDestinationCalldata = getERC20TransferData({
       recipient,
@@ -404,12 +422,8 @@ export async function prepareSend(
     hasCustomCalldata = true
   }
 
-  if (
-    hasCustomCalldata &&
-    destinationTokenAddress !== zeroAddress &&
-    tradeType === TradeType.EXACT_INPUT
-  ) {
-    const wrapResult = wrapCalldataWithProxyCallerIfNeeded({
+  if (hasCustomCalldata && tradeType === TradeType.EXACT_INPUT) {
+    const wrapResult = wrapCalldataWithBalanceInjectorIfNeeded({
       token: destinationTokenAddress,
       target: effectiveDestinationAddress,
       calldata: effectiveDestinationCalldata as `0x${string}`,
@@ -421,7 +435,7 @@ export async function prepareSend(
     })
 
     if (wrapResult) {
-      effectiveDestinationAddress = wrapResult.proxyCallerAddress
+      effectiveDestinationAddress = wrapResult.balanceInjectorAddress
       effectiveDestinationCalldata = wrapResult.encodedCalldata
     }
   }
@@ -562,13 +576,7 @@ export async function prepareSend(
   })
 
   // additional execute tx on same chain if needed
-  if (
-    isToSameChain &&
-    hasCustomCalldata &&
-    !isToSameToken &&
-    // TODO: remove this once it's stable https://github.com/0xsequence/stack/pull/1273
-    getSameChainSwapDifferentIntentAddresses()
-  ) {
+  if (isToSameChain && hasCustomCalldata && !isToSameToken) {
     transactionStates.push({
       transactionHash: "",
       explorerUrl: "",
@@ -654,6 +662,7 @@ export async function prepareSend(
     recipient: effectiveDestinationAddress,
     destinationCalldata: effectiveDestinationCalldata,
     apiClient,
+    trailsClient,
     sourceTokenPriceUsd,
     destinationTokenPriceUsd,
     sourceTokenDecimals,
@@ -692,7 +701,7 @@ async function sendHandlerForDifferentChainDifferentToken({
   destinationTokenSymbol,
   recipient,
   destinationCalldata,
-  apiClient,
+  trailsClient,
   sourceTokenPriceUsd,
   destinationTokenPriceUsd,
   sourceTokenDecimals,
@@ -729,6 +738,7 @@ async function sendHandlerForDifferentChainDifferentToken({
   recipient: string
   destinationCalldata?: string
   apiClient: SequenceAPIClient
+  trailsClient: TrailsAPIClient
   sourceTokenPriceUsd?: number | null
   destinationTokenPriceUsd?: number | null
   sourceTokenDecimals: number
@@ -993,8 +1003,10 @@ async function sendHandlerForDifferentChainDifferentToken({
   logger.console.log("[trails-sdk] Creating intent with args:", intentArgs)
 
   const intent = await getIntentCallsPayloadsFromIntents(
-    apiClient,
-    intentArgs,
+    trailsClient,
+    {
+      params: intentArgs,
+    },
     {
       originTokenSymbol,
       destinationTokenSymbol,
@@ -1003,18 +1015,21 @@ async function sendHandlerForDifferentChainDifferentToken({
   )
   logger.console.log("[trails-sdk] Got intent:", intent)
 
-  if (!intent.preconditions?.length || !intent.calls?.length) {
+  if (
+    !intent.payloads.preconditions?.length ||
+    !intent.payloads.calls?.length
+  ) {
     throw new Error("Invalid intent")
   }
 
-  const originIntentAddress = intent.originIntentAddress
+  const originIntentAddress = intent.payloads.originIntentAddress
   logger.console.log(
     "[trails-sdk] origin intent address:",
     originIntentAddress.toString(),
   )
 
   const firstPrecondition = findFirstPreconditionForChainId(
-    intent.preconditions,
+    intent.payloads.preconditions,
     originChainId,
   )
 
@@ -1025,8 +1040,8 @@ async function sendHandlerForDifferentChainDifferentToken({
   const firstPreconditionMin = firstPrecondition?.data?.min?.toString()
   const depositAmount = firstPreconditionMin
 
-  const quoteToAmount = intent.quote.toAmount
-  const quoteToAmountMin = intent.quote.toAmountMin
+  const quoteToAmount = intent.payloads.quote.toAmount
+  const quoteToAmountMin = intent.payloads.quote.toAmountMin
 
   const originSendAmountFormatted = formatRawAmount(
     depositAmount,
@@ -1091,7 +1106,7 @@ async function sendHandlerForDifferentChainDifferentToken({
 
   const quote = await getNormalizedQuoteObject({
     originDepositAddress: originIntentAddress,
-    destinationDepositAddress: intent.destinationIntentAddress,
+    destinationDepositAddress: intent.payloads.destinationIntentAddress,
     destinationAddress: recipient,
     destinationCalldata,
     originAmount: depositAmount,
@@ -1114,7 +1129,7 @@ async function sendHandlerForDifferentChainDifferentToken({
     priceImpactUsd: getPriceImpactUsdFromIntent(intent),
     transactionStates,
     originNativeTokenPriceUsd,
-    quoteProvider: intent?.quote?.quoteProvider,
+    quoteProvider: intent.payloads?.quote?.quoteProvider,
     noSufficientBalance,
     minimumNotMet,
   })
@@ -1161,10 +1176,10 @@ async function sendHandlerForDifferentChainDifferentToken({
       feeTokenAddress?: string | null
     }): Promise<SendReturn> => {
       await commitIntentConfig(
-        apiClient,
+        trailsClient,
         mainSignerAddress,
-        intent.calls,
-        intent.preconditions,
+        intent.payloads.calls,
+        intent.payloads.preconditions,
         {
           originTokenSymbol,
           destinationTokenSymbol,
@@ -1291,6 +1306,7 @@ async function sendHandlerForDifferentChainDifferentToken({
           originTokenSymbol,
           destinationTokenSymbol,
           depositAmountUsd,
+          trailsClient,
         })
 
         if (!originUserTxReceipt) {
@@ -1303,6 +1319,15 @@ async function sendHandlerForDifferentChainDifferentToken({
           transactionStates[0]?.label,
         )
         onTransactionStateChange(transactionStates)
+
+        setTimeout(() => {
+          const destinationChain = getChainInfo(destinationChainId)
+          updatePersistentToast(
+            "In Progress",
+            `Your transaction to ${destinationChain?.name || "chain"} is in progress`,
+            "info",
+          )
+        }, 1000)
       }
 
       const checkForDepositTx = async () => {
@@ -1361,8 +1386,8 @@ async function sendHandlerForDifferentChainDifferentToken({
             try {
               const response = await getAccountTransactionHistory({
                 chainId: destinationChainId,
-                accountAddress:
-                  intent.destinationIntentAddress as `0x${string}`,
+                accountAddress: intent.payloads
+                  .destinationIntentAddress as `0x${string}`,
               })
               logger.console.log(
                 "[trails-sdk] getAccountTransactionHistory response",
@@ -1414,16 +1439,16 @@ async function sendHandlerForDifferentChainDifferentToken({
       // First phase: Send meta transactions and queue CCTP
       const originSendMetaTxnPromise = async () => {
         logger.console.log("[trails-sdk] Starting originSendMetaTxnPromise", {
-          hasMetaTxn: !!intent.metaTxns[0],
-          hasPrecondition: !!intent.preconditions[0],
-          metaTxnId: intent.metaTxns[0]?.id,
-          chainId: intent.metaTxns[0]?.chainId,
+          hasMetaTxn: !!intent.payloads.metaTxns[0],
+          hasPrecondition: !!intent.payloads.preconditions[0],
+          metaTxnId: intent.payloads.metaTxns[0]?.id,
+          chainId: intent.payloads.metaTxns[0]?.chainId,
         })
 
-        if (intent.metaTxns[0] && intent.preconditions[0]) {
+        if (intent.payloads.metaTxns[0] && intent.payloads.preconditions[0]) {
           // Extract fee quote from intent response using metatxnid as key
-          const metaTxnId = intent.metaTxns[0].id
-          const feeQuote = intent.feeQuotes?.[metaTxnId]
+          const metaTxnId = intent.payloads.metaTxns[0].id
+          const feeQuote = intent.payloads.feeQuotes?.[metaTxnId]
           logger.console.log(
             "[trails-sdk] Extracted fee quote for origin meta txn",
             {
@@ -1437,16 +1462,17 @@ async function sendHandlerForDifferentChainDifferentToken({
             "[trails-sdk] Calling sendMetaTxAndWaitForReceipt for origin",
             {
               metaTxnId,
-              chainId: intent.metaTxns[0].chainId,
-              walletAddress: intent.metaTxns[0].walletAddress,
-              contract: intent.metaTxns[0].contract,
+              chainId: intent.payloads.metaTxns[0].chainId,
+              walletAddress: intent.payloads.metaTxns[0].walletAddress,
+              contract: intent.payloads.metaTxns[0].contract,
             },
           )
 
           const { waitForReceipt } = await sendMetaTxAndWaitForReceipt({
-            metaTx: intent.metaTxns[0] as MetaTxn,
+            metaTx: intent.payloads.metaTxns[0] as MetaTxn,
             relayer: originRelayer,
-            precondition: intent.preconditions[0] as IntentPrecondition,
+            precondition: intent.payloads
+              .preconditions[0] as IntentPrecondition,
             feeQuote: feeQuote,
           })
 
@@ -1463,8 +1489,8 @@ async function sendHandlerForDifferentChainDifferentToken({
           logger.console.warn(
             "[trails-sdk] Skipping origin sendMetaTxn - missing metaTxn or precondition",
             {
-              hasMetaTxn: !!intent.metaTxns[0],
-              hasPrecondition: !!intent.preconditions[0],
+              hasMetaTxn: !!intent.payloads.metaTxns[0],
+              hasPrecondition: !!intent.payloads.preconditions[0],
             },
           )
         }
@@ -1474,23 +1500,25 @@ async function sendHandlerForDifferentChainDifferentToken({
         logger.console.log(
           "[trails-sdk] Starting destinationSendMetaTxnPromise",
           {
-            quoteProvider: intent.quote.quoteProvider,
-            hasQuoteProviderRequestId: !!intent.quote.quoteProviderRequestId,
-            hasPrecondition1: !!intent.preconditions[1],
-            hasMetaTxn1: !!intent.metaTxns[1],
+            quoteProvider: intent.payloads.quote.quoteProvider,
+            hasQuoteProviderRequestId:
+              !!intent.payloads.quote.quoteProviderRequestId,
+            hasPrecondition1: !!intent.payloads.preconditions[1],
+            hasMetaTxn1: !!intent.payloads.metaTxns[1],
           },
         )
 
         if (
-          intent.quote.quoteProvider === "relay" &&
-          intent.quote.quoteProviderRequestId &&
-          !intent.preconditions[1] &&
-          !intent.metaTxns[1]
+          intent.payloads.quote.quoteProvider === "relay" &&
+          intent.payloads.quote.quoteProviderRequestId &&
+          !intent.payloads.preconditions[1] &&
+          !intent.payloads.metaTxns[1]
         ) {
           logger.console.log(
             "[trails-sdk] Setting up relay destination promise",
             {
-              quoteProviderRequestId: intent.quote.quoteProviderRequestId,
+              quoteProviderRequestId:
+                intent.payloads.quote.quoteProviderRequestId,
             },
           )
           // For relay, we'll wait for the receipt in the wait phase
@@ -1501,7 +1529,8 @@ async function sendHandlerForDifferentChainDifferentToken({
             logger.console.log(
               "[trails-sdk] waitForRelayDestinationTx starting",
               {
-                quoteProviderRequestId: intent.quote.quoteProviderRequestId,
+                quoteProviderRequestId:
+                  intent.payloads.quote.quoteProviderRequestId,
                 aborted: abortSignal?.aborted,
               },
             )
@@ -1515,13 +1544,14 @@ async function sendHandlerForDifferentChainDifferentToken({
               }
 
               const txHash = await waitForRelayDestinationTx(
-                intent.quote.quoteProviderRequestId,
+                intent.payloads.quote.quoteProviderRequestId,
               )
               logger.console.log(
                 "[trails-sdk] waitForRelayDestinationTx completed",
                 {
                   txHash,
-                  quoteProviderRequestId: intent.quote.quoteProviderRequestId,
+                  quoteProviderRequestId:
+                    intent.payloads.quote.quoteProviderRequestId,
                 },
               )
               if (txHash) {
@@ -1559,7 +1589,8 @@ async function sendHandlerForDifferentChainDifferentToken({
                 logger.console.warn(
                   "[trails-sdk] No txHash returned from waitForRelayDestinationTx",
                   {
-                    quoteProviderRequestId: intent.quote.quoteProviderRequestId,
+                    quoteProviderRequestId:
+                      intent.payloads.quote.quoteProviderRequestId,
                   },
                 )
               }
@@ -1568,7 +1599,8 @@ async function sendHandlerForDifferentChainDifferentToken({
                 "[trails-sdk] Error waiting for relay destination tx",
                 {
                   error: error instanceof Error ? error.message : String(error),
-                  quoteProviderRequestId: intent.quote.quoteProviderRequestId,
+                  quoteProviderRequestId:
+                    intent.payloads.quote.quoteProviderRequestId,
                 },
               )
               if (transactionStates?.[2]) {
@@ -1583,16 +1615,16 @@ async function sendHandlerForDifferentChainDifferentToken({
           logger.console.log(
             "[trails-sdk] Setting up destination meta transaction promise (non-relay)",
             {
-              quoteProvider: intent.quote.quoteProvider,
-              hasMetaTxn1: !!intent.metaTxns[1],
-              hasPrecondition1: !!intent.preconditions[1],
+              quoteProvider: intent.payloads.quote.quoteProvider,
+              hasMetaTxn1: !!intent.payloads.metaTxns[1],
+              hasPrecondition1: !!intent.payloads.preconditions[1],
             },
           )
 
-          if (intent.metaTxns[1] && intent.preconditions[1]) {
+          if (intent.payloads.metaTxns[1] && intent.payloads.preconditions[1]) {
             // Extract fee quote from intent response using metatxnid as key
-            const metaTxnId = intent.metaTxns[1].id
-            const feeQuote = intent.feeQuotes?.[metaTxnId]
+            const metaTxnId = intent.payloads.metaTxns[1].id
+            const feeQuote = intent.payloads.feeQuotes?.[metaTxnId]
             logger.console.log(
               "[trails-sdk] Extracted fee quote for destination meta txn",
               {
@@ -1606,16 +1638,17 @@ async function sendHandlerForDifferentChainDifferentToken({
               "[trails-sdk] Calling sendMetaTxAndWaitForReceipt for destination",
               {
                 metaTxnId,
-                chainId: intent.metaTxns[1].chainId,
-                walletAddress: intent.metaTxns[1].walletAddress,
-                contract: intent.metaTxns[1].contract,
+                chainId: intent.payloads.metaTxns[1].chainId,
+                walletAddress: intent.payloads.metaTxns[1].walletAddress,
+                contract: intent.payloads.metaTxns[1].contract,
               },
             )
 
             const { waitForReceipt } = await sendMetaTxAndWaitForReceipt({
-              metaTx: intent.metaTxns[1] as MetaTxn,
+              metaTx: intent.payloads.metaTxns[1] as MetaTxn,
               relayer: destinationRelayer,
-              precondition: intent.preconditions[1] as IntentPrecondition,
+              precondition: intent.payloads
+                .preconditions[1] as IntentPrecondition,
               feeQuote: feeQuote,
             })
 
@@ -1632,12 +1665,12 @@ async function sendHandlerForDifferentChainDifferentToken({
             logger.console.warn(
               "[trails-sdk] Skipping destination sendMetaTxn - missing metaTxn or precondition",
               {
-                hasMetaTxn: !!intent.metaTxns[1],
-                hasPrecondition: !!intent.preconditions[1],
+                hasMetaTxn: !!intent.payloads.metaTxns[1],
+                hasPrecondition: !!intent.payloads.preconditions[1],
               },
             )
           }
-          // } else if (intent.destinationIntentAddress) {
+          // } else if (intent.payloads.destinationIntentAddress) {
           //   destinationMetaTxnReceiptPromise = checkForDestinationDepositTx
           // }
         }
@@ -1645,14 +1678,14 @@ async function sendHandlerForDifferentChainDifferentToken({
 
       let queueCctpPromise: (() => Promise<void>) | null = null
 
-      const isCctp = intent.quote.quoteProvider === "cctp"
+      const isCctp = intent.payloads.quote.quoteProvider === "cctp"
       if (isCctp) {
         queueCctpPromise = async () => {
           while (true) {
             const originMetaTxnHash = originMetaTxnReceipt?.txnHash
             if (originMetaTxnHash) {
               await queueCCTPTransfer({
-                apiClient,
+                trailsClient,
                 sourceTxHash: originMetaTxnHash,
                 sourceChainId: originChainId,
                 destinationChainId: destinationChainId,
@@ -1814,9 +1847,14 @@ async function sendHandlerForDifferentChainDifferentToken({
                   transactionStates[2].decodedTrailsTokenSweeperEvents.findIndex(
                     (event) =>
                       event.type === "Refund" ||
-                      event.type === "RefundAndSweep" ||
-                      event.type === "Sweep",
-                  ) !== -1
+                      event.type === "RefundAndSweep",
+                  ) !== -1 ||
+                  (transactionStates[2].decodedTrailsTokenSweeperEvents.findIndex(
+                    (event) => event.type === "Sweep",
+                  ) !== -1 &&
+                    transactionStates[2].decodedGuestModuleEvents.findIndex(
+                      (event) => event.type === "CallFailed",
+                    ) !== -1)
                 logger.console.log("[trails-sdk] Destination meta-tx events", {
                   chainId: destinationChainId,
                   callFailed: (
@@ -1838,7 +1876,7 @@ async function sendHandlerForDifferentChainDifferentToken({
               error,
             )
             // For relay transactions, this might be expected if still waiting
-            if (intent.quote.quoteProvider === "relay") {
+            if (intent.payloads.quote.quoteProvider === "relay") {
               logger.console.log(
                 "[trails-sdk] Relay transaction still waiting, this is normal",
               )
@@ -1867,7 +1905,7 @@ async function sendHandlerForDifferentChainDifferentToken({
       ])
       logger.console.log("[trails-sdk] Phase 2 completed successfully")
 
-      // Track payment completion
+      // Track payment completion for different chain and different token
       if (originUserTxReceipt && destinationMetaTxnReceipt) {
         trackPaymentCompleted({
           userAddress: account.address,
@@ -2126,7 +2164,7 @@ async function sendHandlerForSameChainSameToken({
               token: effectiveOriginTokenAddress,
               account: account.address,
               spender: recipient,
-              amount: BigInt(swapAmount),
+              amount: maxUint256,
             })
 
             if (needsApproval) {
@@ -2149,6 +2187,13 @@ async function sendHandlerForSameChainSameToken({
           }
         }
 
+        // Show persistent toast for checkout flow
+        updatePersistentToast(
+          "Payment Started",
+          "Waiting for wallet confirmation...",
+          "info",
+        )
+
         logger.console.log("[trails-sdk] origin call params", originCallParams)
         const txHash = await sendOriginTransaction(
           account,
@@ -2181,6 +2226,14 @@ async function sendHandlerForSameChainSameToken({
           depositTokenAmountUsd: depositAmountUsd?.toString(),
         })
 
+        // Remove persistent toast and show success
+        const chainInfo = getChainInfo(effectiveOriginChainId)
+        updatePersistentToast(
+          "Transfer Confirmed",
+          `Your transaction on ${chainInfo?.name || "chain"} has been confirmed`,
+          "info",
+        )
+
         try {
           onTransactionStateChange([
             getTransactionStateFromReceipt(
@@ -2502,6 +2555,8 @@ async function attemptGaslessDeposit({
   walletClient,
   chain,
   account,
+  trailsClient,
+  originRelayer,
 }: {
   paymasterUrl?: string
   depositTokenAddress: string
@@ -2511,6 +2566,7 @@ async function attemptGaslessDeposit({
   walletClient: WalletClient
   chain: Chain
   account: Account
+  trailsClient: TrailsAPIClient
   originRelayer: Relayer.Standard.Rpc.RpcRelayer
   feeOptions: any
   feeTokenAddress?: string
@@ -2527,30 +2583,24 @@ async function attemptGaslessDeposit({
   const intentEntrypoint = intentEntrypoints[chain.id]
   logger.console.log("[trails-sdk] intentEntrypoint", intentEntrypoint)
 
-  let calls: Array<{
-    to: string
-    data: string
-    value: string
-  }> = []
+  // If intent entrypoint is not available, fall back to old flow
+  if (!intentEntrypoint) {
+    logger.console.log(
+      "[trails-sdk] No intent entrypoint for chain, using fallback flow",
+    )
 
-  if (paymasterUrl) {
-    logger.console.log("[trails-sdk] doing gasless with paymaster")
-    const delegatorSmartAccount = await getDelegatorSmartAccount({
-      publicClient,
-    })
+    let calls: Array<{
+      to: string
+      data: string
+      value: string
+    }> = []
 
-    if (intentEntrypoint) {
-      calls = await getDepositToIntentCalls({
+    if (paymasterUrl) {
+      logger.console.log("[trails-sdk] doing gasless with paymaster")
+      const delegatorSmartAccount = await getDelegatorSmartAccount({
         publicClient,
-        walletClient,
-        account,
-        intentEntrypoint,
-        depositTokenAddress: depositTokenAddress as `0x${string}`,
-        depositTokenAmount: BigInt(depositTokenAmount),
-        depositRecipient: depositRecipient as `0x${string}`,
-        chain,
       })
-    } else {
+
       calls = await getPaymasterGaslessTransaction({
         walletClient,
         chain,
@@ -2559,65 +2609,52 @@ async function attemptGaslessDeposit({
         recipient: depositRecipient as `0x${string}`,
         delegatorSmartAccount,
       })
-    }
 
-    logger.console.log("[trails-sdk] calls", calls)
-
-    const txHash = await sendPaymasterGaslessTransaction({
-      walletClient,
-      publicClient,
-      chain,
-      paymasterUrl,
-      delegatorSmartAccount,
-      calls,
-    })
+      logger.console.log("[trails-sdk] calls", calls)
 
-    if (onOriginSend) {
-      onOriginSend()
-    }
-
-    const receipt = await publicClient.waitForTransactionReceipt({
-      hash: txHash as `0x${string}`,
-    })
-    logger.console.log("[trails-sdk] receipt", receipt)
-    originUserTxReceipt = receipt
-  } else {
-    logger.console.log("[trails-sdk] doing gasless with sequence wallet")
-    const delegatorPrivateKey = generatePrivateKey()
-    const delegatorAccount = privateKeyToAccount(delegatorPrivateKey)
-    const delegatorClient = createWalletClient({
-      account: delegatorAccount,
-      chain,
-      transport: http(),
-    })
+      const txHash = await sendPaymasterGaslessTransaction({
+        walletClient,
+        publicClient,
+        chain,
+        paymasterUrl,
+        delegatorSmartAccount,
+        calls,
+      })
 
-    logger.console.log("[trails-sdk] attempting to switch chain")
-    await attemptSwitchChain({
-      walletClient,
-      desiredChainId: originChainId,
-    })
+      if (onOriginSend) {
+        onOriginSend()
+      }
 
-    logger.console.log("[trails-sdk] creating sequence wallet")
-    const sequenceWalletAddress = await simpleCreateSequenceWallet(
-      delegatorAccount as any,
-    )
-    logger.console.log(
-      "[trails-sdk] sequenceWalletAddress",
-      sequenceWalletAddress,
-    )
+      const receipt = await publicClient.waitForTransactionReceipt({
+        hash: txHash as `0x${string}`,
+      })
+      logger.console.log("[trails-sdk] receipt", receipt)
+      return receipt
+    } else {
+      logger.console.log("[trails-sdk] doing gasless with sequence wallet")
+      const delegatorPrivateKey = generatePrivateKey()
+      const delegatorAccount = privateKeyToAccount(delegatorPrivateKey)
+      const delegatorClient = createWalletClient({
+        account: delegatorAccount,
+        chain,
+        transport: http(),
+      })
 
-    if (intentEntrypoint) {
-      calls = await getDepositToIntentCalls({
-        publicClient,
+      logger.console.log("[trails-sdk] attempting to switch chain")
+      await attemptSwitchChain({
         walletClient,
-        account,
-        intentEntrypoint,
-        depositTokenAddress: depositTokenAddress as `0x${string}`,
-        depositTokenAmount: BigInt(depositTokenAmount),
-        depositRecipient: depositRecipient as `0x${string}`,
-        chain,
+        desiredChainId: originChainId,
       })
-    } else {
+
+      logger.console.log("[trails-sdk] creating sequence wallet")
+      const sequenceWalletAddress = await simpleCreateSequenceWallet(
+        delegatorAccount as any,
+      )
+      logger.console.log(
+        "[trails-sdk] sequenceWalletAddress",
+        sequenceWalletAddress,
+      )
+
       const { signature, deadline } = await getPermitSignature({
         publicClient,
         walletClient,
@@ -2637,44 +2674,181 @@ async function attemptGaslessDeposit({
         depositRecipient as `0x${string}`,
         depositTokenAddress as `0x${string}`,
       )
+
+      logger.console.log("[trails-sdk] calls", calls)
+
+      const sequenceTxHash = await sequenceSendTransaction(
+        sequenceWalletAddress,
+        delegatorClient,
+        publicClient,
+        calls,
+        chain,
+      )
+      logger.console.log("[trails-sdk] sequenceTxHash", sequenceTxHash)
+      if (onOriginSend) {
+        onOriginSend()
+      }
+
+      const receipt = await publicClient.waitForTransactionReceipt({
+        hash: sequenceTxHash as `0x${string}`,
+      })
+      logger.console.log("[trails-sdk] receipt", receipt)
+      return receipt
     }
+  }
 
-    logger.console.log("[trails-sdk] calls", calls)
-
-    // const feeOptions = await getFeeOptions(
-    //   originRelayer,
-    //   sequenceWalletAddress,
-    //   originChainId,
-    //   calls.map((call) => ({
-    //     to: call.to,
-    //     value: BigInt(call.value),
-    //     data: call.data,
-    //     gasLimit: BigInt(0),
-    //     delegateCall: false,
-    //     onlyFallback: false,
-    //     behaviorOnError: "revert",
-    //   })) as Payload.Call[],
-    // )
-
-    // logger.console.log("[trails-sdk] feeOptions", feeOptions)
-
-    const sequenceTxHash = await sequenceSendTransaction(
-      sequenceWalletAddress,
-      delegatorClient,
-      publicClient,
-      calls,
-      chain,
+  // NEW FLOW: Use Intent Entrypoint API with permit2 support
+  logger.console.log(
+    "[trails-sdk] Using Intent Entrypoint API flow with permit2 support for gasless deposit",
+  )
+
+  try {
+    const deadline = Math.floor(Date.now() / 1000) + 3600 // 1 hour from now
+
+    // 1. Check if we need approval for permit2
+    const needsApproval = await getNeedsIntentEntrypointApproval({
+      client: publicClient,
+      token: depositTokenAddress as `0x${string}`,
+      account: account.address,
+      entrypoint: intentEntrypoint as `0x${string}`,
+      amount: BigInt(depositTokenAmount),
+    })
+
+    logger.console.log("[trails-sdk] Checking permit2 requirements", {
+      userAddress: account.address,
+      tokenAddress: depositTokenAddress,
+      amount: depositTokenAmount,
+      intentAddress: depositRecipient,
+      chainID: originChainId,
+      deadline,
+      needsApproval,
+    })
+
+    // 2. Get permit signature if approval needed
+    let permitSignature: string | undefined
+    let permitDeadline: number | undefined
+
+    if (needsApproval) {
+      logger.console.log("[trails-sdk] Getting permit signature for approval")
+      // NOTE: Currently signing for exact deposit amount because API encodes permitAmount = amount
+      // TODO: Update API to accept permitAmount parameter, then change to maxUint256 for unlimited approval
+      const permitSig = await getPermitSignature({
+        publicClient,
+        walletClient,
+        signer: account.address,
+        spender: intentEntrypoint as `0x${string}`,
+        tokenAddress: depositTokenAddress as `0x${string}`,
+        amount: BigInt(depositTokenAmount), // Sign for exact amount to match API encoding
+        chain,
+        deadline: BigInt(deadline),
+      })
+      permitSignature = permitSig.signature
+      permitDeadline = Number(permitSig.deadline)
+      logger.console.log(
+        "[trails-sdk] Permit signature obtained for amount:",
+        depositTokenAmount,
+      )
+    }
+
+    // 3. Get intent signature
+    logger.console.log("[trails-sdk] Requesting intent signature via EIP-712")
+    const { signature: intentSignature } = await signIntent({
+      client: walletClient,
+      intentParams: {
+        user: account.address,
+        token: depositTokenAddress as `0x${string}`,
+        amount: BigInt(depositTokenAmount),
+        intentAddress: depositRecipient as `0x${string}`,
+        deadline: BigInt(deadline),
+        chainId: originChainId,
+        contractAddress: intentEntrypoint as `0x${string}`,
+      },
+    })
+    logger.console.log("[trails-sdk] Intent signature received")
+
+    // 4. Call the deposit endpoint with permit2 support
+    logger.console.log(
+      "[trails-sdk] Calling getIntentEntrypointDeposit with permit2 enabled",
+      { usePermit: needsApproval },
     )
-    logger.console.log("[trails-sdk] sequenceTxHash", sequenceTxHash)
+    const depositDataResponse = await trailsClient.getIntentEntrypointDeposit({
+      params: {
+        userAddress: account.address,
+        tokenAddress: depositTokenAddress,
+        amount: depositTokenAmount,
+        intentAddress: depositRecipient,
+        chainID: originChainId,
+        deadline,
+        intentSignature,
+        usePermit: needsApproval, // Use permit2 if approval needed
+        permitSignature,
+        permitDeadline,
+      },
+    })
+
+    const depositData = depositDataResponse.result
+    logger.console.log("[trails-sdk] Deposit data received:", {
+      depositWalletAddress: depositData.depositWalletAddress,
+      entrypointAddress: depositData.entrypointAddress,
+      metaTxnId: depositData.metaTxn?.id,
+      usedPermit2: needsApproval,
+    })
+
+    // 5. Send meta transaction via relayer
+    logger.console.log("[trails-sdk] Sending meta transaction to relayer")
+    const feeQuoteObj = depositData.feeQuote
+      ? ({
+          _tag: "FeeQuote",
+          _quote: { toJSON: () => depositData.feeQuote },
+        } as any)
+      : undefined
+
+    const opHash = await relayerSendMetaTx(
+      originRelayer,
+      depositData.metaTxn as any,
+      [], // No preconditions for gasless deposit
+      feeQuoteObj,
+    )
+    logger.console.log("[trails-sdk] Meta transaction sent, opHash:", opHash)
+
     if (onOriginSend) {
       onOriginSend()
     }
 
-    const receipt = await publicClient.waitForTransactionReceipt({
-      hash: sequenceTxHash as `0x${string}`,
-    })
-    logger.console.log("[trails-sdk] receipt", receipt)
-    originUserTxReceipt = receipt
+    // 6. Wait for transaction receipt
+    logger.console.log("[trails-sdk] Waiting for transaction receipt")
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+      const receipt: any = await getMetaTxStatus(
+        originRelayer,
+        depositData.metaTxn.id,
+        Number(depositData.metaTxn.chainId),
+      )
+      logger.console.log("[trails-sdk] Meta transaction status:", receipt)
+
+      if (receipt?.transactionHash) {
+        const metaTxnReceipt = receipt.data?.receipt
+        if (!metaTxnReceipt) {
+          throw new Error("No meta txn receipt found")
+        }
+
+        // Get the full transaction receipt
+        const txReceipt = await publicClient.getTransactionReceipt({
+          hash: receipt.transactionHash as `0x${string}`,
+        })
+        logger.console.log("[trails-sdk] Transaction receipt:", txReceipt)
+        originUserTxReceipt = txReceipt
+        break
+      }
+
+      await new Promise((resolve) => setTimeout(resolve, 1000))
+    }
+  } catch (error) {
+    logger.console.error(
+      "[trails-sdk] Error in Intent Entrypoint gasless deposit with permit2:",
+      error,
+    )
+    throw error
   }
 
   return originUserTxReceipt
@@ -2835,6 +3009,13 @@ export async function attemptNonGaslessUserDeposit({
           : "0x0",
       })
 
+      // Update persistent toast before wallet interaction
+      updatePersistentToast(
+        "Waiting for Confirmation",
+        "Please confirm the transaction in your wallet...",
+        "info",
+      )
+
       // Send the batched call via EIP-7702
       const result = (await walletClient.request({
         method: "wallet_sendCalls",
@@ -2881,6 +3062,14 @@ export async function attemptNonGaslessUserDeposit({
         onOriginSend()
       }
 
+      // Update persistent toast after transaction sent
+      const chainInfo = getChainInfo(originChainId)
+      updatePersistentToast(
+        "Transaction Submitted",
+        `Waiting for confirmation on ${chainInfo?.name || "chain"}...`,
+        "info",
+      )
+
       const receipt = await publicClient.waitForTransactionReceipt({
         hash: txHash as `0x${string}`,
       })
@@ -2912,6 +3101,13 @@ export async function attemptNonGaslessUserDeposit({
         logger.console.log("[trails-sdk] nativeFeeReceipt", feeReceipt)
       }
 
+      // Show persistent toast for checkout flow
+      updatePersistentToast(
+        "Payment Started",
+        "Waiting for wallet confirmation...",
+        "info",
+      )
+
       const txHash = await sendOriginTransaction(
         account,
         walletClient,
@@ -2944,6 +3140,13 @@ export async function attemptNonGaslessUserDeposit({
         hash: txHash,
       })
 
+      const chainInfo = getChainInfo(originChainId)
+      updatePersistentToast(
+        "Transfer Confirmed",
+        `Your transaction on ${chainInfo?.name || "chain"} has been confirmed`,
+        "info",
+      )
+
       trackTransactionConfirmed({
         transactionHash: txHash,
         chainId: originChainId,
@@ -2990,6 +3193,7 @@ async function attemptUserDepositTx({
   depositAmountUsd,
   feeOptions,
   feeTokenAddress,
+  trailsClient,
 }: {
   originTokenAddress: string
   gasless: boolean
@@ -3017,6 +3221,7 @@ async function attemptUserDepositTx({
   depositAmountUsd: number
   feeOptions?: any
   feeTokenAddress?: string | null
+  trailsClient: TrailsAPIClient
 }): Promise<TransactionReceipt | null> {
   let originUserTxReceipt: TransactionReceipt | null = null
   const originChainId = chain.id
@@ -3050,6 +3255,7 @@ async function attemptUserDepositTx({
         walletClient,
         chain,
         account,
+        trailsClient,
         originRelayer,
         feeOptions,
         feeTokenAddress: feeTokenAddress || "",
@@ -3270,6 +3476,9 @@ async function checkAccountBalance({
         abi: erc20Abi,
         functionName: "decimals",
       })
+      if (!decimals) {
+        throw new Error("Decimals not found")
+      }
       balanceFormatted = formatUnits(balance, decimals)
       requiredAmountFormatted = formatUnits(requiredAmount, decimals)
     }
@@ -3335,7 +3544,7 @@ function getNeedsLifiNativeFee({
       formatUnits(BigInt(destinationTokenAmount), destinationTokenDecimals),
     )
     const depositAmountFormatted = Number(
-      formatUnits(BigInt(depositAmount), destinationTokenDecimals),
+      formatUnits(BigInt(depositAmount), sourceTokenDecimals),
     )
     logger.console.log("[trails-sdk] destinationAmount", destinationAmount)
     logger.console.log(
@@ -3380,6 +3589,8 @@ export type UseQuoteProps = {
   slippageTolerance?: string | number | null
   onStatusUpdate?: ((transactionStates: TransactionState[]) => void) | null
   quoteProvider?: string | null
+  gasless?: boolean
+  paymasterUrl?: string
 }
 
 export type SwapReturn = {
@@ -3421,6 +3632,8 @@ export type Quote = {
   destinationTokenRate?: string
   fromAmountUsdDisplay?: string
   toAmountUsdDisplay?: string
+  gasCostUsd?: number
+  gasCostUsdDisplay?: string
 }
 
 export type UseQuoteReturn = {
@@ -3444,8 +3657,11 @@ export function useQuote({
   slippageTolerance,
   onStatusUpdate,
   quoteProvider,
+  gasless,
+  paymasterUrl,
 }: Partial<UseQuoteProps> = {}): UseQuoteReturn {
   const apiClient = useAPIClient()
+  const trailsClient = useTrailsClient()
   const { getRelayer } = useRelayers({
     env: getSequenceEnv() as RelayerEnv,
   })
@@ -3471,6 +3687,7 @@ export function useQuote({
       if (
         !walletClient ||
         !apiClient ||
+        !trailsClient ||
         !fromTokenAddress ||
         !toTokenAddress ||
         !swapAmount ||
@@ -3506,19 +3723,27 @@ export function useQuote({
       //   return null
       // }
 
+      // logger.console.log("supportedTokens", supportedTokens)
+
       const originToken = supportedTokens?.find(
         (token) =>
-          token.contractAddress === fromTokenAddress &&
-          token.chainId === fromChainId,
+          token.contractAddress?.toLowerCase() ===
+            fromTokenAddress?.toLowerCase() && token.chainId === fromChainId,
       )
       const destinationToken = supportedTokens?.find(
         (token) =>
-          token.contractAddress === toTokenAddress &&
-          token.chainId === toChainId,
+          token.contractAddress?.toLowerCase() ===
+            toTokenAddress?.toLowerCase() && token.chainId === toChainId,
       )
 
-      const sourceTokenDecimals = originToken?.decimals ?? 18
-      const destinationTokenDecimals = destinationToken?.decimals ?? 18
+      const sourceTokenDecimals = originToken?.decimals
+      if (!sourceTokenDecimals) {
+        throw new Error("Source token decimals not found")
+      }
+      const destinationTokenDecimals = destinationToken?.decimals
+      if (!destinationTokenDecimals) {
+        throw new Error("Destination token decimals not found")
+      }
       const destinationTokenSymbol = destinationToken?.symbol ?? ""
       const originTokenSymbol = originToken?.symbol ?? ""
 
@@ -3537,6 +3762,7 @@ export function useQuote({
         destinationCalldata: toCalldata as string,
         client: walletClient,
         apiClient,
+        trailsClient,
         originRelayer,
         destinationRelayer,
         sourceTokenDecimals,
@@ -3546,6 +3772,8 @@ export function useQuote({
         onTransactionStateChange: onStatusUpdate ?? (() => {}),
         slippageTolerance: slippageTolerance?.toString(),
         quoteProvider: quoteProvider,
+        gasless: gasless ?? false,
+        paymasterUrl: paymasterUrl,
       }
 
       logger.console.log("[trails-sdk] options", options)
@@ -3573,6 +3801,8 @@ export function useQuote({
           prepareSendQuote.originAmountUsdDisplay ?? undefined,
         toAmountUsdDisplay:
           prepareSendQuote.destinationAmountUsdDisplay ?? undefined,
+        gasCostUsd: prepareSendQuote.gasCostUsd ?? undefined,
+        gasCostUsdDisplay: prepareSendQuote.gasCostUsdDisplay ?? undefined,
       }
 
       const swap = async (): Promise<SwapReturn> => {
@@ -3645,7 +3875,7 @@ export function getFeesFromIntent(
     toAmountUsd,
   }: { tradeType: TradeType; fromAmountUsd: number; toAmountUsd: number },
 ): PrepareSendFees {
-  const totalFeeAmountUsd = intent?.trailsFee?.totalFeeUSD ?? 0
+  const totalFeeAmountUsd = intent.payloads?.trailsFee?.totalFeeUSD ?? 0
   const totalFeeAmountUsdDisplay = formatUsdAmountDisplay(totalFeeAmountUsd)
 
   logger.console.log("[trails-sdk] getFeesFromIntent", {
@@ -3657,8 +3887,8 @@ export function getFeesFromIntent(
   })
 
   return {
-    feeTokenAddress: intent.trailsFee?.feeToken ?? zeroAddress,
-    totalFeeAmount: intent.trailsFee?.totalFeeAmount ?? "0",
+    feeTokenAddress: intent.payloads.trailsFee?.feeToken ?? zeroAddress,
+    totalFeeAmount: intent.payloads.trailsFee?.totalFeeAmount ?? "0",
     totalFeeAmountUsd: totalFeeAmountUsd.toString(),
     totalFeeAmountUsdDisplay,
   }
@@ -3667,20 +3897,20 @@ export function getFeesFromIntent(
 export function getSlippageToleranceFromIntent(
   intent: GetIntentCallsPayloadsReturn,
 ): string {
-  return intent.quote?.maxSlippage?.toString() ?? "0"
+  return intent.payloads.quote?.maxSlippage?.toString() ?? "0"
 }
 
 export function getPriceImpactFromIntent(
   intent: GetIntentCallsPayloadsReturn,
 ): string {
-  return intent?.quote?.priceImpact?.toString() ?? "0"
+  return intent.payloads?.quote?.priceImpact?.toString() ?? "0"
 }
 
 export function getPriceImpactUsdFromIntent(
   intent: GetIntentCallsPayloadsReturn,
 ): string {
   // Temporary type assertion until API types are regenerated
-  return (intent?.quote as any)?.priceImpactUsd?.toString() ?? "0"
+  return (intent.payloads?.quote as any)?.priceImpactUsd?.toString() ?? "0"
 }
 
 export function getFeesFromRelaySdkQuote(quote: RelayQuote): PrepareSendFees {