0xtrails 0.5.0 → 0.6.0

package/src/transactionIntent/handlers/crossChain.ts

@@ -5,11 +5,11 @@ import type {
   WalletClient,
   TransactionReceipt,
 } from "viem"
-import { createPublicClient, createWalletClient, http } from "viem"
-import { generatePrivateKey, privateKeyToAccount } from "viem/accounts"
-import type { TrailsApi } from "@0xsequence/trails-api"
-import type { Attestation } from "../../cctp.js"
-import type { MetaTxnReceipt, PrepareSendReturn, SendReturn } from "../types.js"
+import { JsonEncode } from "@0xsequence/trails-api"
+import { getPublicRpcClient } from "../../chains.js"
+import type { FeeOption, TrailsApi } from "@0xsequence/trails-api"
+import type { IntentTransaction } from "@0xsequence/trails-api"
+import type { PrepareSendReturn, SendReturn } from "../types.js"
 import type { TransactionState } from "../../transactions.js"
 import type { CheckoutOnHandlers } from "../../widget/hooks/useCheckout.js"
 import type {
@@ -18,42 +18,26 @@ import type {
   DepositSignature,
   ExecuteIntentResponse,
 } from "@0xsequence/trails-api"
-import { TradeType, type SelectedFeeToken } from "../types.js"
+import { TradeType } from "../types.js"
 import { logger } from "../../logger.js"
 import {
   isTestnetDebugMode,
   getTestnetOriginTokenAddress,
 } from "../utils/testnetHelpers.js"
-import { shouldUseCctp, validateCctpDestinationToken } from "../validators.js"
-import { getQueryParam } from "../../queryParams.js"
-import { getIsCustomCalldata } from "../../contractUtils.js"
 import { getNormalizedQuoteObject } from "../quote/normalizeQuote.js"
-import {
-  cctpTransfer,
-  cctpTransferWithCustomCall,
-  getCCTPRelayerCallData,
-  getMintUSDCData,
-  getMessageTransmitter,
-} from "../../cctp.js"
 import { getChainInfo, getTestnetChainInfo } from "../../chains.js"
 import { getTransactionStateFromReceipt } from "../execution/transactionState.js"
-import {
-  simpleCreateSequenceWallet,
-  sequenceSendTransaction,
-} from "../../sequenceWallet.js"
 import { getIntentArgs } from "../quote/quoteHelpers.js"
 import {
   quoteIntent,
   commitIntent,
   buildCrossChainDepositParams,
 } from "../../intents.js"
-import { findFirstPreconditionForChainId } from "../../preconditions.js"
 import {
   decodeTrailsTokenSweeperEvents,
   decodeGuestModuleEvents,
 } from "../../decoders.js"
 import { updatePersistentToast } from "../../toast.js"
-import { queueCCTPTransfer } from "../../cctpqueue.js"
 import { formatRawAmount } from "../../tokenBalances.js"
 import { calcAmountUsdPrice } from "../../prices.js"
 import { checkAccountBalance } from "../utils/balanceChecker.js"
@@ -63,16 +47,15 @@ import {
   getPriceImpactFromIntent,
   getPriceImpactUsdFromIntent,
 } from "../quote/feeExtractors.js"
-import { getNeedsLifiNativeFee } from "../utils/lifiHelpers.js"
 import { attemptUserDepositTx } from "../deposits/depositOrchestrator.js"
 import {
   getAccountTransactionHistory,
   getTxTimeDiff,
 } from "../../transactions.js"
 import { trackPaymentCompleted, trackPaymentError } from "../../analytics.js"
-import { POLLING_INTERVALS } from "../constants.js"
 import { pollIntentReceipt } from "../../intentReceiptPoller.js"
 import type { IntentReceipt } from "@0xsequence/trails-api"
+import { POLLING_INTERVALS } from "../constants.js"
 
 /**
  * @description
@@ -140,7 +123,7 @@ export async function handleCrossChain({
   fundMethod,
   mode,
   checkoutOnHandlers,
-  selectedFeeToken,
+  selectedFeeOption,
   walletId,
   abortSignal,
   commitIntentFn,
@@ -180,7 +163,7 @@ export async function handleCrossChain({
   fundMethod?: string
   mode?: "pay" | "fund" | "earn" | "swap" | "receive"
   checkoutOnHandlers?: Partial<CheckoutOnHandlers>
-  selectedFeeToken?: SelectedFeeToken
+  selectedFeeOption?: FeeOption | null
   walletId?: string
   abortSignal?: AbortSignal
   commitIntentFn?: (intent: Intent) => Promise<CommitIntentResponse>
@@ -192,251 +175,9 @@ export async function handleCrossChain({
   sequenceProjectAccessKey?: string
   sequenceIndexerUrl?: string
 }): Promise<PrepareSendReturn> {
-  const testnet = isTestnetDebugMode()
-  const useCctp = shouldUseCctp(
-    originTokenAddress,
-    destinationTokenAddress,
-    originChainId,
-    destinationChainId,
-  )
-
-  const cctpFlag = getQueryParam("cctp") === "true"
-  const hasCustomCalldata = getIsCustomCalldata(destinationCalldata)
-
-  // Validate CCTP destination token requirement for explicit CCTP usage
-  if (useCctp && cctpFlag) {
-    validateCctpDestinationToken(
-      destinationTokenAddress,
-      destinationChainId,
-      "cctp",
-    )
-    logger.console.log("[trails-sdk] using cctp")
-
-    const quote = await getNormalizedQuoteObject({
-      destinationAddress: recipient,
-      destinationCalldata,
-      originAmount: swapAmount,
-      originTokenPriceUsd: sourceTokenPriceUsd?.toString() || null,
-      destinationAmount: swapAmount,
-      destinationTokenPriceUsd: destinationTokenPriceUsd?.toString() || null,
-      originTokenAddress: originTokenAddress,
-      destinationTokenAddress: destinationTokenAddress,
-      originChainId,
-      destinationChainId,
-      transactionStates,
-      originNativeTokenPriceUsd,
-      slippageTolerance,
-      quoteProvider: "cctp",
-    })
-
-    // Call onCheckoutQuote callback if provided
-    if (checkoutOnHandlers?.triggerCheckoutQuote) {
-      checkoutOnHandlers.triggerCheckoutQuote(quote)
-    }
-
-    return {
-      quote,
-      send: async ({
-        onOriginSend,
-        selectedFeeToken: runtimeSelectedFeeToken,
-      }: {
-        onOriginSend?: () => void
-        selectedFeeToken?: SelectedFeeToken
-      }): Promise<SendReturn> => {
-        // Use runtime selectedFeeToken if provided, otherwise fall back to the one from prepareSend
-        const effectiveSelectedFeeToken =
-          runtimeSelectedFeeToken ?? selectedFeeToken
-        logger.console.log(
-          "[trails-sdk] [FEE-SELECT] [GASLESS-FLOW] send() called (LEGACY PATH):",
-          {
-            runtimeSelectedFeeToken,
-            prepareTimeSelectedFeeToken: selectedFeeToken,
-            effectiveSelectedFeeToken,
-          },
-        )
-        const originChain = testnet ? getTestnetChainInfo(chain)! : chain
-        const destinationChain = testnet
-          ? getTestnetChainInfo(destinationChainId)!
-          : getChainInfo(destinationChainId)
-
-        if (!originChain || !destinationChain) {
-          logger.console.error("[trails-sdk] Invalid chain", {
-            originChain,
-            destinationChain,
-            originChainId,
-            destinationChainId,
-            chain,
-            testnet,
-          })
-          throw new Error("Invalid chain")
-        }
-
-        logger.console.log("[trails-sdk] originChain", originChain)
-        logger.console.log("[trails-sdk] destinationChain", destinationChain)
-
-        const originPublicClient = createPublicClient({
-          chain: originChain,
-          transport: http(),
-        })
-
-        let txHash: `0x${string}`
-        let waitForAttestation: () => Promise<Attestation>
-
-        if (hasCustomCalldata) {
-          const result = await cctpTransferWithCustomCall({
-            walletClient,
-            originChain,
-            destinationChain,
-            amount: BigInt(swapAmount),
-          })
-
-          txHash = result.txHash
-          waitForAttestation = result.waitForAttestation
-        } else {
-          const result = await cctpTransfer({
-            walletClient,
-            originChain,
-            destinationChain,
-            amount: BigInt(swapAmount),
-          })
-
-          txHash = result.txHash
-          waitForAttestation = result.waitForAttestation
-        }
-
-        if (onOriginSend) {
-          onOriginSend()
-        }
-
-        logger.console.log("[trails-sdk] waiting for tx", txHash)
-
-        const receipt = await originPublicClient.waitForTransactionReceipt({
-          hash: txHash,
-        })
-
-        logger.console.log("[trails-sdk] tx receipt", receipt)
-
-        transactionStates[0] = getTransactionStateFromReceipt(
-          receipt,
-          originChain.id,
-          transactionStates[0]?.label,
-        )
-        transactionStates[1] = getTransactionStateFromReceipt(
-          receipt,
-          originChain.id,
-          transactionStates[1]?.label,
-        )
-
-        onTransactionStateChange(transactionStates)
-        // Also trigger checkout status update if handler is provided
-        if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
-          checkoutOnHandlers.triggerCheckoutStatusUpdate(transactionStates)
-        }
-
-        const attestation = await waitForAttestation()
-
-        if (!attestation) {
-          throw new Error("Failed to retrieve attestation")
-        }
-
-        const tokenMessenger = getMessageTransmitter(destinationChain.id)!
-
-        logger.console.log("[trails-sdk] tokenMessenger", tokenMessenger)
-        const calls: {
-          to: `0x${string}`
-          data: `0x${string}`
-          value: bigint
-        }[] = []
-
-        if (hasCustomCalldata) {
-          calls.push(
-            await getCCTPRelayerCallData({
-              attestation,
-              targetContract: recipient,
-              calldata: destinationCalldata as `0x${string}`,
-              gasLimit: 300000n,
-              destinationChain,
-            }),
-          )
-        } else {
-          calls.push(
-            await getMintUSDCData({
-              tokenMessenger,
-              attestation,
-            }),
-          )
-        }
-
-        logger.console.log("[trails-sdk] calls", calls)
-        const delegatorPrivateKey = generatePrivateKey()
-        const delegatorAccount = privateKeyToAccount(delegatorPrivateKey)
-        const delegatorClient = createWalletClient({
-          account: delegatorAccount,
-          chain: destinationChain,
-          transport: http(),
-        })
-        const destinationPublicClient = createPublicClient({
-          chain: destinationChain,
-          transport: http(),
-        })
-        logger.console.log("[trails-sdk] delegatorClient", delegatorClient)
-
-        const sequenceWalletAddress = await simpleCreateSequenceWallet(
-          delegatorAccount as any,
-        )
-        logger.console.log(
-          "[trails-sdk] sequenceWalletAddress",
-          sequenceWalletAddress,
-        )
-        if (!sequenceProjectAccessKey) {
-          throw new Error("Trails api key is required")
-        }
-        const sequenceTxHash = await sequenceSendTransaction(
-          sequenceWalletAddress,
-          delegatorClient,
-          destinationPublicClient,
-          calls,
-          destinationChain,
-          sequenceProjectAccessKey,
-        )
-
-        const destinationReceipt =
-          await destinationPublicClient.waitForTransactionReceipt({
-            hash: sequenceTxHash as `0x${string}`,
-          })
-
-        logger.console.log(
-          "[trails-sdk] destinationReceipt",
-          destinationReceipt,
-        )
-
-        if (transactionStates[2]) {
-          transactionStates[2] = getTransactionStateFromReceipt(
-            destinationReceipt,
-            destinationChain.id,
-            transactionStates[2]?.label,
-          )
-        }
-
-        onTransactionStateChange(transactionStates)
-        // Also trigger checkout status update if handler is provided
-        if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
-          checkoutOnHandlers.triggerCheckoutStatusUpdate(transactionStates)
-        }
-
-        return {
-          depositUserTxnReceipt: receipt,
-          originMetaTxnReceipt: null,
-          destinationMetaTxnReceipt: null,
-          totalCompletionSeconds: 0,
-        }
-      },
-    }
-  }
+  const salt = Date.now().toString()
 
-  const destinationSalt = Date.now().toString()
-
-  const intentArgs = getIntentArgs(
+  const intentArgs = await getIntentArgs(
     mainSignerAddress,
     originChainId,
     originTokenAddress,
@@ -446,13 +187,18 @@ export async function handleCrossChain({
     tradeType === TradeType.EXACT_OUTPUT ? swapAmount : "0", // destinationTokenAmount
     recipient,
     destinationCalldata,
-    destinationSalt,
+    salt,
     slippageTolerance,
     tradeType,
     quoteProvider,
+    undefined, // connector - not available in this context
+    walletId, // walletId - use this to check for Sequence wallets
   )
 
-  logger.console.log("[trails-sdk] Creating intent with args:", intentArgs)
+  logger.console.log(
+    "[trails-sdk] Creating intent for cross-chain with args:",
+    intentArgs,
+  )
 
   const { intent, gasFeeOptions } = await quoteIntent(
     trailsClient,
@@ -466,7 +212,7 @@ export async function handleCrossChain({
   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")
   }
 
@@ -476,17 +222,8 @@ export async function handleCrossChain({
     originIntentAddress.toString(),
   )
 
-  const firstPrecondition = findFirstPreconditionForChainId(
-    intent.preconditions,
-    originChainId,
-  )
-
-  if (!firstPrecondition) {
-    throw new Error("No precondition found for origin chain")
-  }
-
-  const firstPreconditionMin = firstPrecondition?.minAmount?.toString()
-  const depositAmount = firstPreconditionMin
+  // Use depositTransaction amount - this is the actual amount to deposit
+  const depositAmount = intent.depositTransaction.amount?.toString()
 
   const quoteToAmount = intent.quote.toAmount
   const quoteToAmountMin = intent.quote.toAmountMin
@@ -551,7 +288,7 @@ export async function handleCrossChain({
   const originCallParamsForEstimate = buildCrossChainDepositParams({
     originTokenAddress,
     originIntentAddress,
-    depositAmount: firstPreconditionMin,
+    depositAmount,
     fee,
     originChainId,
     chain,
@@ -622,8 +359,8 @@ export async function handleCrossChain({
   // Gasless fee options are now returned in QuoteIntentResponse.gasFeeOptions
   // and properly propagated from getIntent()
   const effectiveGasless =
-    selectedFeeToken !== null &&
-    selectedFeeToken !== undefined &&
+    selectedFeeOption !== null &&
+    selectedFeeOption !== undefined &&
     walletId !== "sequence-waas"
   if (effectiveGasless) {
     logger.console.log(
@@ -645,21 +382,19 @@ export async function handleCrossChain({
     feeOptions: gasFeeOptions,
     send: async ({
       onOriginSend,
-      selectedFeeToken: runtimeSelectedFeeToken,
+      selectedFeeOption: runtimeSelectedFeeOption,
     }: {
       onOriginSend?: () => void
-      selectedFeeToken?: SelectedFeeToken
+      selectedFeeOption?: FeeOption | null
     }): Promise<SendReturn> => {
       try {
-        // 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
         logger.console.log(
           "[trails-sdk] [FEE-SELECT] [GASLESS-FLOW] send() called with:",
           {
-            runtimeSelectedFeeToken,
-            prepareTimeSelectedFeeToken: selectedFeeToken,
-            effectiveSelectedFeeToken,
+            runtimeSelectedFeeOption,
+            effectiveSelectedFeeOption,
           },
         )
         const commitIntentFnToUse =
@@ -685,20 +420,7 @@ export async function handleCrossChain({
         }
 
         logger.console.log("[trails-sdk] sending origin transaction")
-        const usingLIfi = false
-        let needsNativeFee = false
-
-        if (usingLIfi) {
-          needsNativeFee = getNeedsLifiNativeFee({
-            originTokenAddress,
-            destinationTokenAmount: swapAmount,
-            destinationTokenDecimals,
-            sourceTokenDecimals,
-            sourceTokenPriceUsd: sourceTokenPriceUsd ?? null,
-            destinationTokenPriceUsd: destinationTokenPriceUsd ?? null,
-            depositAmount,
-          })
-        }
+        const needsNativeFee = false
 
         logger.console.log("[trails-sdk] needsNativeFee", needsNativeFee)
         logger.console.log(
@@ -719,8 +441,8 @@ export async function handleCrossChain({
         )
 
         let depositUserTxnReceipt: TransactionReceipt | null = null
-        let originMetaTxnReceipt: MetaTxnReceipt | null = null
-        let destinationMetaTxnReceipt: MetaTxnReceipt | null = null
+        let originIntentTransaction: IntentTransaction | null = null
+        let destinationIntentTransaction: IntentTransaction | null = null
 
         const testnet = isTestnetDebugMode()
         const effectiveOriginChain = testnet
@@ -732,10 +454,11 @@ export async function handleCrossChain({
 
         logger.console.log("[trails-sdk] testnet", testnet)
 
-        const destinationPublicClient = createPublicClient({
-          chain: getChainInfo(destinationChainId)!,
-          transport: http(),
-        })
+        const destinationChainInfo = getChainInfo(destinationChainId)
+        if (!destinationChainInfo) {
+          throw new Error(`Chain ${destinationChainId} not found`)
+        }
+        const destinationPublicClient = getPublicRpcClient(destinationChainInfo)
 
         const depositPromise = async () => {
           logger.console.log(
@@ -759,14 +482,14 @@ export async function handleCrossChain({
               paymasterUrl,
               chain: effectiveOriginChain.id,
               account: account.address,
-              firstPreconditionMin,
+              depositAmount,
               originIntentAddress,
               fee,
               dryMode,
               feeOptions: gasFeeOptions,
-              selectedFeeToken: effectiveSelectedFeeToken,
-              selectedFeeTokenType: typeof effectiveSelectedFeeToken,
-              selectedFeeTokenValue: JSON.stringify(effectiveSelectedFeeToken),
+              selectedFeeOption: effectiveSelectedFeeOption,
+              selectedFeeOptionType: typeof effectiveSelectedFeeOption,
+              selectedFeeOptionValue: JsonEncode(effectiveSelectedFeeOption),
               checkoutOnHandlers,
             },
           )
@@ -776,7 +499,7 @@ export async function handleCrossChain({
             paymasterUrl,
             chain: effectiveOriginChain,
             account,
-            firstPreconditionMin,
+            depositAmount,
             originIntentAddress,
             onOriginSend,
             publicClient,
@@ -797,7 +520,7 @@ export async function handleCrossChain({
             feeOptions: gasFeeOptions,
             checkoutOnHandlers,
             trailsClient,
-            selectedFeeToken: effectiveSelectedFeeToken,
+            selectedFeeOption: effectiveSelectedFeeOption,
             walletId,
             abortSignal,
             intentId: intent.intentId,
@@ -987,6 +710,52 @@ export async function handleCrossChain({
                   )
                 }
 
+                // 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 (
+                  originDepositTxReceipt.status === "success" &&
+                  intent.intentId &&
+                  (fundMethod === "qr-code" || fundMethod === "exchange") &&
+                  !executeIntentCalled
+                ) {
+                  logger.console.log(
+                    "[trails-sdk] Calling executeIntent with detected deposit transaction hash (QR code mode)",
+                    {
+                      intentId: intent.intentId,
+                      txHash: originDepositTxReceipt.transactionHash,
+                      fundMethod,
+                    },
+                  )
+                  try {
+                    const executeIntentFnToUse =
+                      executeIntentFn ||
+                      trailsClient.executeIntent.bind(trailsClient)
+                    await executeIntentFnToUse({
+                      intentId: intent.intentId,
+                      depositTransactionHash:
+                        originDepositTxReceipt.transactionHash,
+                    })
+                    executeIntentCalled = true
+                    logger.console.log(
+                      "[trails-sdk] executeIntent completed successfully (QR code mode)",
+                    )
+
+                    // Now that executeIntent has been called, start unified polling if not already started
+                    if (!unifiedPollerPromise) {
+                      logger.console.log(
+                        "[trails-sdk] Starting unified polling after executeIntent (QR code mode)",
+                      )
+                      startUnifiedPolling()
+                    }
+                  } catch (error) {
+                    logger.console.error(
+                      "[trails-sdk] Error calling executeIntent (QR code mode):",
+                      error,
+                    )
+                  }
+                }
+
                 if (onOriginSend) {
                   onOriginSend()
                 }
@@ -1088,6 +857,7 @@ export async function handleCrossChain({
         // Unified polling via shared poller instead of separate loops
         let unifiedPollerAbortController: AbortController | null = null
         let unifiedPollerPromise: Promise<IntentReceipt | null> | null = null
+        let executeIntentCalled = false // Track if executeIntent has been called (for QR code mode)
 
         // Helper function to start unified polling for both origin and destination transactions
         const startUnifiedPolling = () => {
@@ -1226,7 +996,9 @@ export async function handleCrossChain({
                   )
 
                   // Store the transaction hash
-                  originMetaTxnReceipt = { txnHash: txHash } as MetaTxnReceipt
+                  originIntentTransaction = {
+                    txnHash: txHash,
+                  } as IntentTransaction
 
                   const originTxnReceipt =
                     await publicClient.getTransactionReceipt({
@@ -1325,9 +1097,9 @@ export async function handleCrossChain({
                   )
 
                   // Store the transaction hash
-                  destinationMetaTxnReceipt = {
+                  destinationIntentTransaction = {
                     txnHash: txHash,
-                  } as MetaTxnReceipt
+                  } as IntentTransaction
 
                   const destinationTxnReceipt =
                     await destinationPublicClient.getTransactionReceipt({
@@ -1442,15 +1214,17 @@ export async function handleCrossChain({
 
         // First phase: Send meta transactions and queue CCTP
         const originSendMetaTxnPromise = async () => {
+          const originMeta = intent.originMetaTxn
+          const originPre = intent.originPrecondition
           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: !!originMeta,
+            hasPrecondition: !!originPre,
+            metaTxnId: originMeta?.id,
+            chainId: originMeta?.chainId,
           })
 
-          if (intent.metaTxns[0] && intent.preconditions[0]) {
-            const metaTxnId = intent.metaTxns[0].id
+          if (originMeta && originPre) {
+            const metaTxnId = originMeta.id
             const feeQuote = undefined
             logger.console.log("[trails-sdk] Processing origin meta txn", {
               metaTxnId,
@@ -1462,9 +1236,9 @@ export async function handleCrossChain({
               "[trails-sdk] NOTE: Client-side meta transaction submission deprecated",
               {
                 metaTxnId,
-                chainId: intent.metaTxns[0].chainId,
-                walletAddress: intent.metaTxns[0].walletAddress,
-                contract: intent.metaTxns[0].contract,
+                chainId: originMeta.chainId,
+                walletAddress: originMeta.walletAddress,
+                contract: originMeta.contract,
                 message:
                   "Transaction submission now handled by backend via executeIntent. Monitoring via WaitIntentReceipt API.",
               },
@@ -1482,21 +1256,23 @@ export async function handleCrossChain({
             logger.console.warn(
               "[trails-sdk] Skipping origin sendMetaTxn - missing metaTxn or precondition",
               {
-                hasMetaTxn: !!intent.metaTxns[0],
-                hasPrecondition: !!intent.preconditions[0],
+                hasMetaTxn: !!intent.originMetaTxn,
+                hasPrecondition: !!intent.originPrecondition,
               },
             )
           }
         }
 
         const destinationSendMetaTxnPromise = async () => {
+          const destinationPre = intent.destinationPrecondition
+          const destinationMeta = intent.destinationMetaTxn
           logger.console.log(
             "[trails-sdk] Starting destinationSendMetaTxnPromise",
             {
               quoteProvider: intent.quote.quoteProvider,
               hasQuoteProviderRequestId: !!intent.quote.quoteProviderRequestId,
-              hasPrecondition1: !!intent.preconditions[1],
-              hasMetaTxn1: !!intent.metaTxns[1],
+              hasPrecondition1: !!destinationPre,
+              hasMetaTxn1: !!destinationMeta,
             },
           )
 
@@ -1507,41 +1283,6 @@ export async function handleCrossChain({
           )
         }
 
-        let queueCctpPromise: (() => Promise<void>) | null = null
-
-        const isCctp = intent.quote.quoteProvider === "cctp"
-        if (isCctp) {
-          queueCctpPromise = async () => {
-            while (true) {
-              // Check if we should abort
-              if (abortSignal?.aborted) {
-                logger.console.log(
-                  "[trails-sdk] Aborting CCTP queue due to abort signal",
-                )
-                return
-              }
-
-              const originMetaTxnHash = (
-                originMetaTxnReceipt as MetaTxnReceipt | null
-              )?.txnHash
-              if (originMetaTxnHash) {
-                await queueCCTPTransfer({
-                  trailsClient,
-                  sourceTxHash: originMetaTxnHash,
-                  sourceChainId: originChainId,
-                  destinationChainId: destinationChainId,
-                })
-                break
-              }
-              await new Promise((resolve) =>
-                setTimeout(resolve, POLLING_INTERVALS.CCTP_QUEUE),
-              )
-            }
-          }
-        } else {
-          queueCctpPromise = () => Promise.resolve()
-        }
-
         // Only start polling for external deposits if needed:
         // - QR code or exchange funding (external deposits)
         // - Gasless flow (relayer-executed deposits)
@@ -1583,12 +1324,43 @@ export async function handleCrossChain({
           "[trails-sdk] Starting Phase 2: Waiting for receipts and executing deposit",
         )
 
+        // Helper function to wait for unifiedPollerPromise to be created (for QR code mode)
+        const waitForUnifiedPollerToStart = async () => {
+          if (fundMethod !== "qr-code" && fundMethod !== "exchange") {
+            return // No need to wait for non-QR code modes
+          }
+
+          const maxWaitTime = 5 * 60 * 1000 // 5 minutes max wait
+          const startTime = Date.now()
+          // Wait for unifiedPollerPromise to be created (after executeIntent is called)
+          while (!unifiedPollerPromise) {
+            if (Date.now() - startTime > maxWaitTime) {
+              logger.console.error(
+                "[trails-sdk] Timeout waiting for unified poller to start (QR code mode)",
+              )
+              throw new Error(
+                "Timeout waiting for deposit detection and executeIntent in QR code mode",
+              )
+            }
+            await new Promise((resolve) => setTimeout(resolve, 100))
+            // Check abort signal
+            if (abortSignal?.aborted) {
+              logger.console.log(
+                "[trails-sdk] Aborting wait for unified poller due to abort signal",
+              )
+              return
+            }
+          }
+        }
+
         const waitForOriginMetaTxnReceiptPromise = async () => {
           logger.console.log(
             "[trails-sdk] Waiting for origin meta transaction receipt via unified poller",
           )
           // The unified poller handles origin transaction discovery and decoding via callbacks
-          // We just need to wait for it to complete
+          // For QR code mode, wait for unifiedPollerPromise to be created first (after executeIntent is called)
+          await waitForUnifiedPollerToStart()
+
           if (unifiedPollerPromise) {
             try {
               await unifiedPollerPromise
@@ -1606,7 +1378,9 @@ export async function handleCrossChain({
             "[trails-sdk] Waiting for destination meta transaction receipt via unified poller",
           )
           // The unified poller handles destination transaction discovery and decoding via callbacks
-          // We just need to wait for it to complete
+          // For QR code mode, wait for unifiedPollerPromise to be created first (after executeIntent is called)
+          await waitForUnifiedPollerToStart()
+
           if (unifiedPollerPromise) {
             try {
               await unifiedPollerPromise
@@ -1632,10 +1406,17 @@ export async function handleCrossChain({
 
         // Start unified polling after deposit transaction is submitted and executeIntent is called
         // This ensures the backend has received the executeIntent call before we start polling waitIntentReceipt
-        logger.console.log(
-          "[trails-sdk] Starting unified polling after executeIntent has been called",
-        )
-        startUnifiedPolling()
+        // For QR code mode, unified polling will be started after executeIntent is called in checkForDepositTx
+        if (fundMethod !== "qr-code" && fundMethod !== "exchange") {
+          logger.console.log(
+            "[trails-sdk] Starting unified polling after executeIntent has been called",
+          )
+          startUnifiedPolling()
+        } else {
+          logger.console.log(
+            "[trails-sdk] Delaying unified polling for QR code mode - will start after executeIntent is called",
+          )
+        }
 
         // Now wait for all the receipts and CCTP processing
         logger.console.log(
@@ -1644,7 +1425,6 @@ export async function handleCrossChain({
         await Promise.all([
           waitForOriginMetaTxnReceiptPromise(),
           waitForDestinationMetaTxnReceiptPromise(),
-          queueCctpPromise(),
         ])
         logger.console.log("[trails-sdk] Phase 2 completed successfully")
 
@@ -1657,10 +1437,10 @@ export async function handleCrossChain({
         const hasRequiredReceipts =
           (depositUserTxnReceipt || effectiveGasless) &&
           (isDestinationCrossChain
-            ? destinationMetaTxnReceipt
+            ? destinationIntentTransaction
             : isSameChain
-              ? originMetaTxnReceipt
-              : destinationMetaTxnReceipt)
+              ? originIntentTransaction
+              : destinationIntentTransaction)
 
         if (hasRequiredReceipts) {
           // Check if any transaction failed or was refunded
@@ -1681,7 +1461,7 @@ export async function handleCrossChain({
               ? (depositUserTxnReceipt as TransactionReceipt).transactionHash
               : undefined,
             destinationTxHash: (
-              destinationMetaTxnReceipt as unknown as MetaTxnReceipt
+              destinationIntentTransaction as unknown as IntentTransaction
             )?.txnHash,
             originChainId,
             destinationChainId,
@@ -1755,8 +1535,8 @@ export async function handleCrossChain({
 
         return {
           depositUserTxnReceipt,
-          originMetaTxnReceipt,
-          destinationMetaTxnReceipt,
+          originIntentTransaction,
+          destinationIntentTransaction,
           totalCompletionSeconds: await getTxTimeDiff(
             transactionStates[0],
             transactionStates[2],