0xtrails 0.4.1 → 0.4.3

package/src/transactionIntent/deposits/standardDeposit.ts

@@ -5,7 +5,7 @@ import type {
   WalletClient,
   TransactionReceipt,
 } from "viem"
-import { parseUnits } from "viem"
+import { parseUnits, encodeFunctionData } from "viem"
 import type { TransactionState } from "../../transactions.js"
 import type { CheckoutOnHandlers } from "../../widget/hooks/useCheckout.js"
 import { logger } from "../../logger.js"
@@ -15,12 +15,15 @@ import {
   buildSameChainSameTokenTransactionParams,
   sendOriginTransaction,
 } from "../../intents.js"
+import { getIsCustomCalldata } from "../../contractUtils.js"
 import { estimateGasLimit } from "../../estimate.js"
 import { attemptSwitchChain } from "../../chainSwitch.js"
 import { requestWithTimeout } from "../../utils.js"
 import { updatePersistentToast } from "../../toast.js"
 import { getChainInfo } from "../../chains.js"
 import { trackTransactionConfirmed } from "../../analytics.js"
+import { zeroAddress } from "viem"
+import { getIsUserRejectionError } from "../../error.js"
 
 export async function attemptStandardDeposit({
   originTokenAddress,
@@ -47,6 +50,7 @@ export async function attemptStandardDeposit({
   checkoutOnHandlers,
   isSameChainSameToken,
   recipient,
+  destinationCalldata,
 }: {
   originTokenAddress: string
   firstPreconditionMin: string
@@ -69,10 +73,12 @@ export async function attemptStandardDeposit({
   originTokenSymbol: string
   destinationTokenSymbol: string
   depositAmountUsd: number
-  checkoutOnHandlers?: CheckoutOnHandlers
+  checkoutOnHandlers?: Partial<CheckoutOnHandlers>
   isSameChainSameToken?: boolean
   recipient?: string
+  destinationCalldata?: string
 }): Promise<TransactionReceipt | null> {
+  console.log("IN ATTEMPT STANDARD DEPOSIT!")
   let depositUserTxnReceipt: TransactionReceipt | null = null
   const usingLIfi = false
   let needsNativeFee = false
@@ -100,9 +106,10 @@ export async function attemptStandardDeposit({
   // For cross-chain deposits, send to intent address for backend processing
   const originCallParamsBase = isSameChainSameToken
     ? buildSameChainSameTokenTransactionParams({
-        hasCustomCalldata: false,
+        hasCustomCalldata: getIsCustomCalldata(destinationCalldata),
         recipient: recipient || originIntentAddress,
         effectiveOriginTokenAddress: originTokenAddress,
+        destinationCalldata,
         swapAmount: firstPreconditionMin,
         effectiveOriginChainId: originChainId,
         effectiveOriginChain: chain,
@@ -116,6 +123,134 @@ export async function attemptStandardDeposit({
         chain,
       })
 
+  const hasCustomCalldata = isSameChainSameToken
+    ? getIsCustomCalldata(destinationCalldata)
+    : false
+
+  if (
+    isSameChainSameToken &&
+    originTokenAddress !== zeroAddress &&
+    hasCustomCalldata &&
+    !dryMode &&
+    recipient
+  ) {
+    // ERC20 custom calldata requires approval to the recipient contract
+    const erc20Abi = [
+      {
+        name: "allowance",
+        type: "function",
+        stateMutability: "view",
+        inputs: [
+          { name: "owner", type: "address" },
+          { name: "spender", type: "address" },
+        ],
+        outputs: [{ type: "uint256" }],
+      } as const,
+      {
+        name: "approve",
+        type: "function",
+        stateMutability: "nonpayable",
+        inputs: [
+          { name: "spender", type: "address" },
+          { name: "amount", type: "uint256" },
+        ],
+        outputs: [{ type: "bool" }],
+      } as const,
+    ] as const
+
+    const currentAllowance = (await publicClient.readContract({
+      address: originTokenAddress as `0x${string}`,
+      abi: erc20Abi,
+      functionName: "allowance",
+      args: [account.address, recipient as `0x${string}`],
+    })) as bigint
+
+    const requiredAmount = BigInt(firstPreconditionMin)
+
+    if (currentAllowance < requiredAmount) {
+      logger.console.log(
+        "[trails-sdk] Insufficient allowance, sending approve transaction...",
+      )
+
+      const approveData = encodeFunctionData({
+        abi: erc20Abi,
+        functionName: "approve",
+        args: [recipient as `0x${string}`, requiredAmount],
+      }) as `0x${string}`
+
+      let approveHash: `0x${string}`
+      let approveReceipt: TransactionReceipt
+      try {
+        approveHash = await sendOriginTransaction(
+          account,
+          walletClient,
+          {
+            to: originTokenAddress as `0x${string}`,
+            data: approveData,
+            value: 0n,
+            chain,
+          },
+          {
+            transactionType: "token_approve",
+            depositTokenAmountUsd: depositAmountUsd?.toString(),
+          },
+        )
+
+        approveReceipt = await publicClient.waitForTransactionReceipt({
+          hash: approveHash,
+        })
+      } catch (error) {
+        // Check if this is a user rejection error
+        if (getIsUserRejectionError(error)) {
+          if (checkoutOnHandlers?.triggerCheckoutSignatureRejected) {
+            checkoutOnHandlers.triggerCheckoutSignatureRejected(error)
+          }
+        }
+        throw error
+      }
+
+      logger.console.log(
+        "[trails-sdk] Approve transaction confirmed:",
+        approveReceipt,
+      )
+
+      // Poll to ensure allowance is updated on-chain before proceeding
+      let updatedAllowance = currentAllowance
+      const maxPollAttempts = 15 // 30 seconds at 2s intervals
+      let pollAttempts = 0
+
+      while (
+        updatedAllowance < requiredAmount &&
+        pollAttempts < maxPollAttempts
+      ) {
+        await new Promise((resolve) => setTimeout(resolve, 2000)) // Wait 2 seconds
+        updatedAllowance = (await publicClient.readContract({
+          address: originTokenAddress as `0x${string}`,
+          abi: erc20Abi,
+          functionName: "allowance",
+          args: [account.address, recipient as `0x${string}`],
+        })) as bigint
+        pollAttempts++
+        logger.console.log(
+          `[trails-sdk] Polling allowance (attempt ${pollAttempts}): ${updatedAllowance.toString()}`,
+        )
+      }
+
+      if (updatedAllowance < requiredAmount) {
+        throw new Error(
+          "Allowance not updated after approve transaction - RPC may be delayed or transaction failed",
+        )
+      }
+
+      logger.console.log(
+        "[trails-sdk] Allowance confirmed updated:",
+        updatedAllowance.toString(),
+      )
+    } else {
+      logger.console.log("[trails-sdk] Sufficient allowance, skipping approve")
+    }
+  }
+
   // Estimate gas limit for consistency with actual transaction
   const gasLimit = await estimateGasLimit(
     publicClient,
@@ -276,31 +411,44 @@ export async function attemptStandardDeposit({
           checkoutOnHandlers.triggerCheckoutSignatureRequest()
         }
 
-        const txHashNativeFee = await sendOriginTransaction(
-          account,
-          walletClient,
-          {
-            to: originIntentAddress,
-            data: "0x00",
-            value: nativeFee,
-            chainId: originChainId,
-            chain,
-          } as any,
-          {
-            depositTokenAmountUsd: depositAmountUsd?.toString(),
-          },
-        ) // TODO: Add proper type
-        logger.console.log("[trails-sdk] origin tx native fee", txHashNativeFee)
+        try {
+          const txHashNativeFee = await sendOriginTransaction(
+            account,
+            walletClient,
+            {
+              to: originIntentAddress,
+              data: "0x00",
+              value: nativeFee,
+              chainId: originChainId,
+              chain,
+            } as any,
+            {
+              depositTokenAmountUsd: depositAmountUsd?.toString(),
+            },
+          ) // TODO: Add proper type
+          logger.console.log(
+            "[trails-sdk] origin tx native fee",
+            txHashNativeFee,
+          )
 
-        // Trigger signature confirmed callback after successful signing
-        if (checkoutOnHandlers?.triggerCheckoutSignatureConfirmed) {
-          checkoutOnHandlers.triggerCheckoutSignatureConfirmed()
+          // Trigger signature confirmed callback after successful signing
+          if (checkoutOnHandlers?.triggerCheckoutSignatureConfirmed) {
+            checkoutOnHandlers.triggerCheckoutSignatureConfirmed()
+          }
+          // Wait for transaction receipt
+          const feeReceipt = await publicClient.waitForTransactionReceipt({
+            hash: txHashNativeFee,
+          })
+          logger.console.log("[trails-sdk] nativeFeeReceipt", feeReceipt)
+        } catch (error) {
+          // Check if this is a user rejection error
+          if (getIsUserRejectionError(error)) {
+            if (checkoutOnHandlers?.triggerCheckoutSignatureRejected) {
+              checkoutOnHandlers.triggerCheckoutSignatureRejected(error)
+            }
+          }
+          throw error
         }
-        // Wait for transaction receipt
-        const feeReceipt = await publicClient.waitForTransactionReceipt({
-          hash: txHashNativeFee,
-        })
-        logger.console.log("[trails-sdk] nativeFeeReceipt", feeReceipt)
       }
 
       // Show persistent toast for checkout flow
@@ -315,19 +463,30 @@ export async function attemptStandardDeposit({
         checkoutOnHandlers.triggerCheckoutSignatureRequest()
       }
 
-      const txHash = await sendOriginTransaction(
-        account,
-        walletClient,
-        originCallParams as any,
-        {
-          depositTokenAmountUsd: depositAmountUsd?.toString(),
-        },
-      ) // TODO: Add proper type
-      logger.console.log("[trails-sdk] origin tx", txHash)
-
-      // Trigger signature confirmed callback after successful signing
-      if (checkoutOnHandlers?.triggerCheckoutSignatureConfirmed) {
-        checkoutOnHandlers.triggerCheckoutSignatureConfirmed()
+      let txHash: `0x${string}`
+      try {
+        txHash = await sendOriginTransaction(
+          account,
+          walletClient,
+          originCallParams as any,
+          {
+            depositTokenAmountUsd: depositAmountUsd?.toString(),
+          },
+        ) // TODO: Add proper type
+        logger.console.log("[trails-sdk] origin tx", txHash)
+
+        // Trigger signature confirmed callback after successful signing
+        if (checkoutOnHandlers?.triggerCheckoutSignatureConfirmed) {
+          checkoutOnHandlers.triggerCheckoutSignatureConfirmed()
+        }
+      } catch (error) {
+        // Check if this is a user rejection error
+        if (getIsUserRejectionError(error)) {
+          if (checkoutOnHandlers?.triggerCheckoutSignatureRejected) {
+            checkoutOnHandlers.triggerCheckoutSignatureRejected(error)
+          }
+        }
+        throw error
       }
 
       if (onOriginSend) {

package/src/transactionIntent/handlers/crossChain.ts

@@ -43,7 +43,7 @@ import {
 } from "../../sequenceWallet.js"
 import { getIntentArgs } from "../quote/quoteHelpers.js"
 import {
-  getIntent,
+  quoteIntent,
   commitIntent,
   buildCrossChainDepositParams,
 } from "../../intents.js"
@@ -177,7 +177,7 @@ export async function handleCrossChain({
   quoteProvider?: string | null
   fundMethod?: string
   mode?: "pay" | "fund" | "earn" | "swap" | "receive"
-  checkoutOnHandlers?: CheckoutOnHandlers
+  checkoutOnHandlers?: Partial<CheckoutOnHandlers>
   selectedFeeToken?: SelectedFeeToken
   walletId?: string
   abortSignal?: AbortSignal
@@ -324,6 +324,10 @@ export async function handleCrossChain({
         )
 
         onTransactionStateChange(transactionStates)
+        // Also trigger checkout status update if handler is provided
+        if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+          checkoutOnHandlers.triggerCheckoutStatusUpdate(transactionStates)
+        }
 
         const attestation = await waitForAttestation()
 
@@ -407,6 +411,10 @@ export async function handleCrossChain({
         }
 
         onTransactionStateChange(transactionStates)
+        // Also trigger checkout status update if handler is provided
+        if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+          checkoutOnHandlers.triggerCheckoutStatusUpdate(transactionStates)
+        }
 
         return {
           depositUserTxnReceipt: receipt,
@@ -438,13 +446,17 @@ export async function handleCrossChain({
 
   logger.console.log("[trails-sdk] Creating intent with args:", intentArgs)
 
-  const { intent, gasFeeOptions } = await getIntent(trailsClient, intentArgs, {
-    originTokenSymbol,
-    destinationTokenSymbol,
-    feeTokenSymbol: originTokenSymbol,
-  })
-  logger.console.log("[trails-sdk] Got intent:", intent)
-  logger.console.log("[trails-sdk] Got gasFeeOptions:", gasFeeOptions)
+  const { intent, gasFeeOptions } = await quoteIntent(
+    trailsClient,
+    intentArgs,
+    {
+      originTokenSymbol,
+      destinationTokenSymbol,
+      feeTokenSymbol: originTokenSymbol,
+    },
+  )
+  logger.console.log("[trails-sdk] Quote intent:", intent)
+  logger.console.log("[trails-sdk] Quote intent gasFeeOptions:", gasFeeOptions)
 
   if (!intent.preconditions?.length || !intent.calls?.length) {
     throw new Error("Invalid intent")
@@ -747,6 +759,7 @@ export async function handleCrossChain({
               selectedFeeToken: effectiveSelectedFeeToken,
               selectedFeeTokenType: typeof effectiveSelectedFeeToken,
               selectedFeeTokenValue: JSON.stringify(effectiveSelectedFeeToken),
+              checkoutOnHandlers,
             },
           )
 
@@ -774,11 +787,13 @@ export async function handleCrossChain({
             destinationTokenSymbol,
             depositAmountUsd,
             feeOptions: gasFeeOptions,
+            checkoutOnHandlers,
             trailsClient,
             selectedFeeToken: effectiveSelectedFeeToken,
             walletId,
             abortSignal,
             intentId: intent.intentId,
+            executeIntentFn,
           })
 
           // In gasless mode, depositUserTxnReceipt will be null because the transaction
@@ -881,6 +896,10 @@ export async function handleCrossChain({
             }
 
             onTransactionStateChange(transactionStates)
+            // Also trigger checkout status update if handler is provided
+            if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+              checkoutOnHandlers.triggerCheckoutStatusUpdate(transactionStates)
+            }
 
             setTimeout(() => {
               const destinationChain = getChainInfo(destinationChainId)
@@ -948,6 +967,12 @@ export async function handleCrossChain({
                   transactionStates[0]?.label,
                 )
                 onTransactionStateChange(transactionStates)
+                // Also trigger checkout status update if handler is provided
+                if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                  checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                    transactionStates,
+                  )
+                }
 
                 if (onOriginSend) {
                   onOriginSend()
@@ -1014,6 +1039,12 @@ export async function handleCrossChain({
                     transactionStates[2]?.label,
                   )
                   onTransactionStateChange(transactionStates)
+                  // Also trigger checkout status update if handler is provided
+                  if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                    checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                      transactionStates,
+                    )
+                  }
 
                   return destinationDepositTxReceipt
                 }
@@ -1087,6 +1118,12 @@ export async function handleCrossChain({
                         transactionStates[0]?.label,
                       )
                       onTransactionStateChange(transactionStates)
+                      // Also trigger checkout status update if handler is provided
+                      if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                        checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                          transactionStates,
+                        )
+                      }
 
                       // Decode events for the deposit transaction
                       try {
@@ -1142,6 +1179,12 @@ export async function handleCrossChain({
                         }
 
                         onTransactionStateChange(transactionStates)
+                        // Also trigger checkout status update if handler is provided
+                        if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                          checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                            transactionStates,
+                          )
+                        }
                       } catch (error) {
                         logger.console.error(
                           "Error decoding deposit tx events",
@@ -1187,6 +1230,12 @@ export async function handleCrossChain({
                       transactionStates[1]?.label,
                     )
                     onTransactionStateChange(transactionStates)
+                    // Also trigger checkout status update if handler is provided
+                    if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                      checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                        transactionStates,
+                      )
+                    }
                   }
 
                   // Decode events for the origin transaction
@@ -1236,6 +1285,12 @@ export async function handleCrossChain({
                     }
 
                     onTransactionStateChange(transactionStates)
+                    // Also trigger checkout status update if handler is provided
+                    if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                      checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                        transactionStates,
+                      )
+                    }
                   } catch (error) {
                     logger.console.error(
                       "Error decoding origin tx events",
@@ -1276,6 +1331,12 @@ export async function handleCrossChain({
                       transactionStates[2]?.label,
                     )
                     onTransactionStateChange(transactionStates)
+                    // Also trigger checkout status update if handler is provided
+                    if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                      checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                        transactionStates,
+                      )
+                    }
                   }
 
                   // Decode events for the destination transaction
@@ -1334,6 +1395,12 @@ export async function handleCrossChain({
                     }
 
                     onTransactionStateChange(transactionStates)
+                    // Also trigger checkout status update if handler is provided
+                    if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                      checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                        transactionStates,
+                      )
+                    }
                   } catch (error) {
                     logger.console.error(
                       "Error decoding destination tx events",
@@ -1626,6 +1693,10 @@ export async function handleCrossChain({
           ) {
             transactionStates[1].state = "aborted"
             onTransactionStateChange(transactionStates)
+            // Also trigger checkout status update if handler is provided
+            if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+              checkoutOnHandlers.triggerCheckoutStatusUpdate(transactionStates)
+            }
           }
           if (
             transactionStates[2] &&
@@ -1634,6 +1705,10 @@ export async function handleCrossChain({
           ) {
             transactionStates[2].state = "aborted"
             onTransactionStateChange(transactionStates)
+            // Also trigger checkout status update if handler is provided
+            if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+              checkoutOnHandlers.triggerCheckoutStatusUpdate(transactionStates)
+            }
           }
 
           // Track payment error if transactions didn't complete successfully

package/src/transactionIntent/handlers/sameChainSameToken.ts

@@ -1,5 +1,5 @@
 import type { Account, Chain, WalletClient, TransactionReceipt } from "viem"
-import { createPublicClient, http, formatUnits } 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 type { TransactionState } from "../../transactions.js"
@@ -21,7 +21,7 @@ import { getTestnetChainInfo } from "../../chains.js"
 import { getIsCustomCalldata } from "../../contractUtils.js"
 import {
   buildSameChainSameTokenTransactionParams,
-  getIntent,
+  quoteIntent,
   commitIntent,
 } from "../../intents.js"
 import { estimateGasLimit } from "../../estimate.js"
@@ -36,6 +36,7 @@ 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
@@ -87,6 +88,7 @@ export async function handleSameChainSameToken({
   destinationTokenPriceUsd,
   originNativeTokenPriceUsd,
   slippageTolerance,
+  quoteProvider,
   checkoutOnHandlers,
   mode,
   fundMethod,
@@ -117,7 +119,8 @@ export async function handleSameChainSameToken({
   destinationTokenPriceUsd?: number | null
   originNativeTokenPriceUsd?: number | null
   slippageTolerance: string
-  checkoutOnHandlers?: CheckoutOnHandlers
+  quoteProvider?: string | null
+  checkoutOnHandlers?: Partial<CheckoutOnHandlers>
   mode?: "pay" | "fund" | "earn" | "swap" | "receive"
   fundMethod?: string
   paymasterUrl?: string
@@ -174,7 +177,7 @@ export async function handleSameChainSameToken({
     destinationSalt,
     slippageTolerance,
     TradeType.EXACT_INPUT,
-    "", // quoteProvider - empty for same-chain
+    quoteProvider || "",
   )
 
   logger.console.log(
@@ -182,14 +185,18 @@ export async function handleSameChainSameToken({
     intentArgs,
   )
 
-  const { intent, gasFeeOptions } = await getIntent(trailsClient, intentArgs, {
-    originTokenSymbol,
-    destinationTokenSymbol,
-    feeTokenSymbol: originTokenSymbol,
-  })
+  const { intent, gasFeeOptions } = await quoteIntent(
+    trailsClient,
+    intentArgs,
+    {
+      originTokenSymbol,
+      destinationTokenSymbol,
+      feeTokenSymbol: originTokenSymbol,
+    },
+  )
 
-  logger.console.log("[trails-sdk] Got intent:", intent)
-  logger.console.log("[trails-sdk] Got gasFeeOptions:", gasFeeOptions)
+  logger.console.log("[trails-sdk] Quote intent:", intent)
+  logger.console.log("[trails-sdk] Quote intent gasFeeOptions:", gasFeeOptions)
 
   if (!intent.preconditions?.length || !intent.calls?.length) {
     throw new Error("Invalid intent")
@@ -280,9 +287,21 @@ export async function handleSameChainSameToken({
       // Use runtime selectedFeeToken if provided, otherwise fall back to the one from prepareSend
       const effectiveSelectedFeeToken =
         runtimeSelectedFeeToken ?? selectedFeeToken
+      // Check if gasless flow is enabled:
+      // - selectedFeeToken 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() &&
         walletId !== "sequence-waas"
       logger.console.log(
         "[trails-sdk] [FEE-SELECT] [GASLESS-FLOW] send() called for same-chain:",
@@ -379,7 +398,7 @@ export async function handleSameChainSameToken({
               explorerUrl: "",
               chainId: effectiveOriginChainId,
               state: "pending",
-              label: effectiveGasless ? "Deposit" : "Execute",
+              label: "Deposit",
             }
 
             const executeState: TransactionState = {
@@ -399,6 +418,12 @@ export async function handleSameChainSameToken({
 
           try {
             onTransactionStateChange(localTransactionStates)
+            // Also trigger checkout status update if handler is provided
+            if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+              checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                localTransactionStates,
+              )
+            }
           } catch (error) {
             logger.console.error(
               "[trails-sdk] Error calling onTransactionStateChange:",
@@ -447,6 +472,7 @@ export async function handleSameChainSameToken({
             executeIntentFn,
             depositRecipientOverride: recipient,
             isSameChainSameToken: true,
+            destinationCalldata,
           })
 
           // attemptUserDepositTx handles both gasless and non-gasless flows
@@ -494,6 +520,12 @@ export async function handleSameChainSameToken({
                             localTransactionStates[0]?.label,
                           )
                         onTransactionStateChange(localTransactionStates)
+                        // Also trigger checkout status update if handler is provided
+                        if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                          checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                            localTransactionStates,
+                          )
+                        }
                       } catch (error) {
                         logger.console.error(
                           "[trails-sdk] Error fetching deposit transaction receipt:",
@@ -531,6 +563,12 @@ export async function handleSameChainSameToken({
                             localTransactionStates[1]?.label,
                           )
                         onTransactionStateChange(localTransactionStates)
+                        // Also trigger checkout status update if handler is provided
+                        if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                          checkoutOnHandlers.triggerCheckoutStatusUpdate(
+                            localTransactionStates,
+                          )
+                        }
                       } catch (error) {
                         logger.console.error(
                           "[trails-sdk] Error fetching origin transaction receipt:",
@@ -560,6 +598,10 @@ export async function handleSameChainSameToken({
                 ),
               ]
               onTransactionStateChange(updatedStates)
+              // Also trigger checkout status update if handler is provided
+              if (checkoutOnHandlers?.triggerCheckoutStatusUpdate) {
+                checkoutOnHandlers.triggerCheckoutStatusUpdate(updatedStates)
+              }
             } catch (error) {
               logger.console.error(
                 "[trails-sdk] Error calling onTransactionStateChange:",