0xtrails 0.4.1 → 0.4.2

package/src/mutations.ts

@@ -8,6 +8,11 @@ import {
   trackIntentCommitCompleted,
   trackIntentCommitError,
 } from "./analytics.js"
+import {
+  type ExecuteIntentResponse,
+  type IntentStatus,
+  IntentStatusError,
+} from "@0xsequence/trails-api"
 
 /**
  * Hook for committing an intent to the Trails API
@@ -109,11 +114,54 @@ export function useExecuteIntent() {
         )
       }
 
-      const response = await trailsClient.executeIntent({
-        intentId,
-        depositTransactionHash,
-        depositSignature,
-      })
+      let response: ExecuteIntentResponse
+
+      try {
+        response = await trailsClient.executeIntent({
+          intentId,
+          depositTransactionHash,
+          depositSignature,
+        })
+      } catch (error) {
+        logger.console.error(
+          "[trails-sdk] useExecuteIntent: Error executing intent",
+          {
+            intentId,
+            error,
+            errorJSON: JSON.stringify(error, null, 2),
+          },
+        )
+        if (
+          (error instanceof Error &&
+            error?.message?.includes("status=SUCCEEDED")) ||
+          (error instanceof Error &&
+            (error?.cause as Error)?.message?.includes("status=SUCCEEDED")) ||
+          (error instanceof Error &&
+            JSON.stringify(error).includes("status=SUCCEEDED")) ||
+          (error instanceof IntentStatusError &&
+            error?.cause?.toString().includes("status=SUCCEEDED")) ||
+          JSON.stringify(error).includes("status=SUCCEEDED")
+        ) {
+          logger.console.error(
+            "[trails-sdk] useExecuteIntent: Intent already succeeded, treating as success",
+            { intentId },
+          )
+          return {
+            intentId,
+            intentStatus: "SUCCEEDED" as IntentStatus,
+          }
+        } else {
+          logger.console.error(
+            "[trails-sdk] useExecuteIntent did not throw IntentStatusError and is not a SUCCEEDED intent",
+            {
+              intentId,
+              error,
+              errorJSON: JSON.stringify(error, null, 2),
+            },
+          )
+          throw error
+        }
+      }
 
       logger.console.log(
         "[trails-sdk] useExecuteIntent: Execution successful",

package/src/prepareSend.ts

@@ -128,6 +128,16 @@ export async function prepareSend(
   }
 
   if (hasCustomCalldata && tradeType === TradeType.EXACT_INPUT) {
+    logger.console.log("[trails-sdk] Wrapping calldata with Trails Router", {
+      destinationTokenAddress,
+      effectiveDestinationAddress,
+      effectiveDestinationCalldata,
+      swapAmount,
+      originChainId,
+      destinationChainId,
+      originTokenAddress,
+    })
+
     const wrapResult = wrapCalldataWithTrailsRouterIfNeeded({
       token: destinationTokenAddress,
       target: effectiveDestinationAddress,
@@ -261,7 +271,7 @@ export async function prepareSend(
     explorerUrl: "",
     chainId: originChainId,
     state: "pending",
-    label: isToSameChain && isToSameToken ? "Execute" : "Transfer",
+    label: isToSameChain && isToSameToken ? "Execute" : "Deposit",
   })
 
   // swap (+ bridge tx) - skip for same-chain-same-token as there's no second transaction
@@ -353,6 +363,7 @@ export async function prepareSend(
       slippageTolerance: slippageTolerance,
       checkoutOnHandlers,
       paymasterUrl,
+      quoteProvider,
       selectedFeeToken,
       walletId,
       trailsClient,

package/src/trails.ts

@@ -36,7 +36,7 @@ import type {
 import {
   calculateIntentAddress,
   calculateOriginAndDestinationIntentAddresses,
-  getIntent as getIntentFromIntents,
+  quoteIntent as quoteIntentFromIntents,
 } from "./intents.js"
 import {
   useIntentReceiptMonitor,
@@ -64,7 +64,7 @@ export type UseTrailsConfig = {
 export type UseTrailsReturn = {
   trailsClient: TrailsClient
   metaTxns: MetaTxn[] | null
-  intentCallsPayloads: IntentCalls[] | null
+  intentCalls: IntentCalls[] | null
   intentPreconditions: TransactionPrecondition[] | null
   trailsFee: LocalTrailsFee | null
   txnHash: Hex | undefined
@@ -82,8 +82,8 @@ export type UseTrailsReturn = {
   estimateError: Error | null
   calculateIntentAddress: typeof calculateIntentAddress
   calculateOriginAndDestinationIntentAddresses: typeof calculateOriginAndDestinationIntentAddresses
-  committedIntentConfig: Intent | undefined
-  isLoadingCommittedConfig: boolean
+  committedIntent: Intent | undefined
+  isLoadingCommittedIntent: boolean
   committedConfigError: Error | null
   commitIntent: (intent: Intent) => void
   commitIntentPending: boolean
@@ -97,9 +97,8 @@ export type UseTrailsReturn = {
   executeIntentPending: boolean
   executeIntentSuccess: boolean
   executeIntentError: Error | null
-  getIntent: (args: QuoteIntentRequest) => Promise<Intent>
+  getIntentFromQuoteIntent: (args: QuoteIntentRequest) => Promise<Intent>
   operationHashes: { [key: string]: Hex }
-  callIntentCallsPayload: (args: QuoteIntentRequest) => void
   sendOriginTransaction: () => Promise<void>
   switchChain: any // TODO: Add proper type
   isSwitchingChain: boolean
@@ -135,11 +134,11 @@ export type UseTrailsReturn = {
   sentMetaTxns: { [key: string]: number }
   clearIntent: () => void
   intentReceiptStatus: IntentReceiptStatus | null
-  createIntent: (args: QuoteIntentRequest) => void
-  createIntentPending: boolean
-  createIntentSuccess: boolean
-  createIntentError: Error | null
-  createIntentArgs: QuoteIntentRequest | undefined
+  quoteIntent: (args: QuoteIntentRequest) => void
+  quoteIntentPending: boolean
+  quoteIntentSuccess: boolean
+  quoteIntentError: Error | null
+  quoteIntentArgs: QuoteIntentRequest | undefined
   originCallParams: OriginCallParams | null
   updateOriginCallParams: (
     args: { originChainId: number; tokenAddress: string } | null,
@@ -159,7 +158,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
     sequenceProjectAccessKey,
   } = config
   const trailsClient = useTrailsClient({
-    projectAccessKey: sequenceProjectAccessKey,
+    apiKey: sequenceProjectAccessKey,
   })
 
   const [isAutoExecute, setIsAutoExecute] = useState(!disableAutoExecute)
@@ -172,14 +171,12 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
 
   // State declarations
   const [metaTxns, setMetaTxns] = useState<MetaTxn[] | null>(null)
-  const [intentCallsPayloads, setIntentCallsPayloads] = useState<
-    IntentCalls[] | null
-  >(null)
+  const [intentCalls, setIntentCalls] = useState<IntentCalls[] | null>(null)
   const [intentPreconditions, setIntentPreconditions] = useState<
     TransactionPrecondition[] | null
   >(null)
   const [trailsFee, setTrailsFee] = useState<LocalTrailsFee | null>(null)
-  const [quoteIntent, setQuoteIntent] = useState<Intent | null>(null)
+  const [intent, setIntent] = useState<Intent | null>(null)
   const [txnHash, setTxnHash] = useState<Hex | undefined>()
   const [committedOriginIntentAddress, setCommittedOriginIntentAddress] =
     useState<string | null>(null)
@@ -262,9 +259,9 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
       )
 
       try {
-        const originChainId = createIntentMutation.variables?.originChainId
+        const originChainId = quoteIntentMutation.variables?.originChainId
         const destinationChainId =
-          createIntentMutation.variables?.destinationChainId
+          quoteIntentMutation.variables?.destinationChainId
 
         if (!originChainId || !destinationChainId) {
           logger.console.error(
@@ -347,7 +344,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
           )
         }
 
-        // Commit the intent that was returned from quoteIntent
+        // Commit the intent that was returned from intent
         logger.console.log("[useTrails] Committing intent to API...")
         const response = await baseCommitIntentMutation.mutateAsync(intent)
         logger.console.log("[useTrails] API Commit Response:", response)
@@ -385,8 +382,8 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
 
   // New Query to fetch committed intent config
   const {
-    data: committedIntentConfig,
-    isLoading: isLoadingCommittedConfig,
+    data: committedIntent,
+    isLoading: isLoadingCommittedIntent,
     error: committedConfigError,
   } = useQuery<Intent, Error>({
     queryKey: ["getIntent", committedOriginIntentAddress],
@@ -411,13 +408,13 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
     retry: 1,
   })
 
-  async function getIntent(args: QuoteIntentRequest) {
-    const { intent } = await getIntentFromIntents(trailsClient, args)
+  async function getIntentFromQuoteIntent(args: QuoteIntentRequest) {
+    const { intent } = await quoteIntentFromIntents(trailsClient, args)
     return intent
   }
 
   // TODO: Add type for args
-  const createIntentMutation = useMutation<Intent, Error, QuoteIntentRequest>({
+  const quoteIntentMutation = useMutation<Intent, Error, QuoteIntentRequest>({
     mutationFn: async (args: QuoteIntentRequest) => {
       if (
         args.originChainId === args.destinationChainId &&
@@ -439,20 +436,20 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
       setVerificationStatus(null)
       setTrailsFee(null)
       setMetaTxns(null)
-      setIntentCallsPayloads(null)
+      setIntentCalls(null)
       setIntentPreconditions(null)
       setOriginIntentAddress(null)
       setDestinationIntentAddress(null)
 
-      const { intent: data } = await getIntentFromIntents(trailsClient, args)
+      const { intent: data } = await quoteIntentFromIntents(trailsClient, args)
 
       setMetaTxns(data.metaTxns)
-      setIntentCallsPayloads(data.calls)
+      setIntentCalls(data.calls)
       setIntentPreconditions(data.preconditions)
       setTrailsFee(data.fees as any)
       setOriginIntentAddress(data.originIntentAddress)
       setDestinationIntentAddress(data.destinationIntentAddress)
-      setQuoteIntent(data)
+      setIntent(data)
       setCommittedOriginIntentAddress(null)
       setCommittedDestinationIntentAddress(null)
 
@@ -474,19 +471,19 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
         data.metaTxns &&
         data.metaTxns.length > 0
       ) {
-        setIntentCallsPayloads(data.calls)
+        setIntentCalls(data.calls)
         setIntentPreconditions(data.preconditions)
         setMetaTxns(data.metaTxns)
       } else {
         logger.console.warn("API returned success but no operations found.")
-        setIntentCallsPayloads(null)
+        setIntentCalls(null)
         setIntentPreconditions(null)
         setMetaTxns(null)
       }
     },
     onError: (error) => {
       console.error("Intent Config Error:", error)
-      setIntentCallsPayloads(null)
+      setIntentCalls(null)
       setIntentPreconditions(null)
       setMetaTxns(null)
       setTrailsFee(null)
@@ -495,13 +492,9 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
     },
   })
 
-  function callIntentCallsPayload(args: QuoteIntentRequest) {
-    createIntentMutation.mutate(args)
-  }
-
   const clearIntent = useCallback(() => {
     logger.console.log("[Trails] Clearing intent state")
-    setIntentCallsPayloads(null)
+    setIntentCalls(null)
     setIntentPreconditions(null)
     setMetaTxns(null)
     setTrailsFee(null)
@@ -940,7 +933,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
   useEffect(() => {
     if (
       isAutoExecute &&
-      intentCallsPayloads &&
+      intentCalls &&
       intentPreconditions &&
       trailsFee &&
       account.address &&
@@ -949,14 +942,14 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
       !commitIntentMutation.isSuccess
     ) {
       logger.console.log("Auto-committing intent configuration...")
-      if (quoteIntent) {
-        commitIntentMutation.mutate(quoteIntent)
+      if (intent) {
+        commitIntentMutation.mutate(intent)
       }
     }
   }, [
     isAutoExecute,
-    quoteIntent,
-    intentCallsPayloads,
+    intent,
+    intentCalls,
     intentPreconditions,
     trailsFee,
     account.address,
@@ -970,7 +963,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
   useEffect(() => {
     if (
       !originIntentAddress ||
-      !intentCallsPayloads?.[0]?.chainId ||
+      !intentCalls?.[0]?.chainId ||
       !tokenAddress ||
       !originChainId ||
       !intentPreconditions ||
@@ -1053,7 +1046,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
       })
     }
   }, [
-    intentCallsPayloads,
+    intentCalls,
     tokenAddress,
     originChainId,
     intentPreconditions,
@@ -1158,23 +1151,23 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
         const providerFromQuote = trailsFee?.quoteProvider
           ? String(trailsFee.quoteProvider).toLowerCase()
           : undefined
-        const providerFromArgs = createIntentMutation.variables?.options
+        const providerFromArgs = quoteIntentMutation.variables?.options
           ?.quoteProvider
           ? String(
-              createIntentMutation.variables.options.quoteProvider,
+              quoteIntentMutation.variables.options.quoteProvider,
             ).toLowerCase()
           : undefined
         const isCctp =
           providerFromQuote === "cctp" || providerFromArgs === "cctp"
 
-        if (isCctp && createIntentMutation.variables) {
+        if (isCctp && quoteIntentMutation.variables) {
           try {
             queueCCTPTransfer({
               sourceTxHash: intentReceiptStatus.intentReceipt.originTransaction
                 .txnHash as `0x${string}`,
-              sourceChainId: createIntentMutation.variables.originChainId,
+              sourceChainId: quoteIntentMutation.variables.originChainId,
               destinationChainId:
-                createIntentMutation.variables.destinationChainId,
+                quoteIntentMutation.variables.destinationChainId,
               trailsClient,
             })
           } catch (error) {
@@ -1188,7 +1181,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
     intentReceiptStatus.intentReceipt,
     committedOriginIntentAddress,
     trailsFee,
-    createIntentMutation.variables,
+    quoteIntentMutation.variables,
     trailsClient,
   ])
 
@@ -1196,8 +1189,8 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
     setIsAutoExecute(enabled)
   }
 
-  function createIntent(args: QuoteIntentRequest) {
-    createIntentMutation.mutate(args)
+  function quoteIntent(args: QuoteIntentRequest) {
+    quoteIntentMutation.mutate(args)
   }
 
   function commitIntent(intent: Intent) {
@@ -1221,10 +1214,10 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
 
   const originChainIdFromParams = originCallParams?.chainId
 
-  const createIntentPending = createIntentMutation.isPending
-  const createIntentSuccess = createIntentMutation.isSuccess
-  const createIntentError = createIntentMutation.error
-  const createIntentArgs = createIntentMutation.variables
+  const quoteIntentPending = quoteIntentMutation.isPending
+  const quoteIntentSuccess = quoteIntentMutation.isSuccess
+  const quoteIntentError = quoteIntentMutation.error
+  const quoteIntentArgs = quoteIntentMutation.variables
 
   const commitIntentPending = commitIntentMutation.isPending
   const commitIntentSuccess = commitIntentMutation.isSuccess
@@ -1245,7 +1238,7 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
   return {
     trailsClient,
     metaTxns,
-    intentCallsPayloads,
+    intentCalls,
     intentPreconditions,
     trailsFee,
     txnHash,
@@ -1257,8 +1250,8 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
     estimateError,
     calculateIntentAddress,
     calculateOriginAndDestinationIntentAddresses,
-    committedIntentConfig,
-    isLoadingCommittedConfig,
+    committedIntent,
+    isLoadingCommittedIntent,
     committedConfigError,
     commitIntent,
     commitIntentPending,
@@ -1269,9 +1262,8 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
     executeIntentPending,
     executeIntentSuccess,
     executeIntentError,
-    getIntent,
+    getIntentFromQuoteIntent,
     operationHashes,
-    callIntentCallsPayload,
     sendOriginTransaction,
     switchChain,
     isSwitchingChain,
@@ -1296,11 +1288,11 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
     sentMetaTxns,
     clearIntent,
     intentReceiptStatus,
-    createIntent,
-    createIntentPending,
-    createIntentSuccess,
-    createIntentError,
-    createIntentArgs,
+    quoteIntent,
+    quoteIntentPending,
+    quoteIntentSuccess,
+    quoteIntentError,
+    quoteIntentArgs,
     originCallParams,
     updateOriginCallParams,
     originBlockTimestamp,

package/src/transactionIntent/deposits/depositOrchestrator.ts

@@ -52,6 +52,7 @@ export async function attemptUserDepositTx({
   executeIntentFn,
   depositRecipientOverride,
   isSameChainSameToken,
+  destinationCalldata,
 }: {
   originTokenAddress: string
   paymasterUrl?: string
@@ -80,7 +81,7 @@ export async function attemptUserDepositTx({
   selectedFeeToken?: SelectedFeeToken
   walletId?: string
   abortSignal?: AbortSignal
-  checkoutOnHandlers?: CheckoutOnHandlers
+  checkoutOnHandlers?: Partial<CheckoutOnHandlers>
   intentId?: string
   executeIntentFn?: (params: {
     intentId: string
@@ -89,6 +90,7 @@ export async function attemptUserDepositTx({
   }) => Promise<ExecuteIntentResponse>
   depositRecipientOverride?: string
   isSameChainSameToken?: boolean
+  destinationCalldata?: string
 }): Promise<TransactionReceipt | null> {
   let depositUserTxnReceipt: TransactionReceipt | null = null
   const originChainId = chain.id
@@ -203,6 +205,7 @@ export async function attemptUserDepositTx({
       checkoutOnHandlers,
       isSameChainSameToken,
       recipient: effectiveDepositRecipient,
+      destinationCalldata,
     })
   }
 

package/src/transactionIntent/deposits/gaslessDeposit.ts

@@ -62,7 +62,7 @@ export async function attemptGaslessDeposit({
   feeOptions?: GasFeeOptions
   selectedFeeToken?: SelectedFeeToken
   abortSignal?: AbortSignal
-  checkoutOnHandlers?: CheckoutOnHandlers
+  checkoutOnHandlers?: Partial<CheckoutOnHandlers>
   intentId?: string
   onTransactionStateChange?: (transactionStates: TransactionState[]) => void
   transactionStates?: TransactionState[]

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,14 @@ 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"
 
 export async function attemptStandardDeposit({
   originTokenAddress,
@@ -47,6 +49,7 @@ export async function attemptStandardDeposit({
   checkoutOnHandlers,
   isSameChainSameToken,
   recipient,
+  destinationCalldata,
 }: {
   originTokenAddress: string
   firstPreconditionMin: string
@@ -69,9 +72,10 @@ export async function attemptStandardDeposit({
   originTokenSymbol: string
   destinationTokenSymbol: string
   depositAmountUsd: number
-  checkoutOnHandlers?: CheckoutOnHandlers
+  checkoutOnHandlers?: Partial<CheckoutOnHandlers>
   isSameChainSameToken?: boolean
   recipient?: string
+  destinationCalldata?: string
 }): Promise<TransactionReceipt | null> {
   let depositUserTxnReceipt: TransactionReceipt | null = null
   const usingLIfi = false
@@ -100,9 +104,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 +121,122 @@ 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}`
+
+      const approveHash = await sendOriginTransaction(
+        account,
+        walletClient,
+        {
+          to: originTokenAddress as `0x${string}`,
+          data: approveData,
+          value: 0n,
+          chain,
+        },
+        {
+          transactionType: "token_approve",
+          depositTokenAmountUsd: depositAmountUsd?.toString(),
+        },
+      )
+
+      const approveReceipt = await publicClient.waitForTransactionReceipt({
+        hash: approveHash,
+      })
+
+      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,