0xtrails 0.4.0 → 0.4.2

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,

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
@@ -438,13 +438,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")
@@ -779,6 +783,7 @@ export async function handleCrossChain({
             walletId,
             abortSignal,
             intentId: intent.intentId,
+            executeIntentFn,
           })
 
           // In gasless mode, depositUserTxnReceipt will be null because the transaction

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 = {
@@ -447,6 +466,7 @@ export async function handleSameChainSameToken({
             executeIntentFn,
             depositRecipientOverride: recipient,
             isSameChainSameToken: true,
+            destinationCalldata,
           })
 
           // attemptUserDepositTx handles both gasless and non-gasless flows

package/src/transactionIntent/quote/quoteHelpers.ts

@@ -1,5 +1,4 @@
 import type { QuoteIntentRequest } from "@0xsequence/trails-api"
-import { QuoteProviderType } from "@0xsequence/trails-api"
 import { getIsCustomCalldata } from "../../contractUtils.js"
 import type { TradeType } from "../types.js"
 
@@ -20,8 +19,9 @@ export function getIntentArgs(
 ): QuoteIntentRequest {
   const hasCustomCalldata = getIsCustomCalldata(destinationCalldata)
 
-  if (!provider || provider === "auto") {
-    provider = undefined
+  let effectiveProvider = provider
+  if (provider === "auto") {
+    effectiveProvider = undefined
   }
 
   const intentArgs: QuoteIntentRequest = {
@@ -37,14 +37,7 @@ export function getIntentArgs(
     destinationCallValue: "0",
     options: {
       slippageTolerance: Number(slippageTolerance),
-      quoteProvider:
-        provider === "relay"
-          ? QuoteProviderType.RELAY
-          : provider === "cctp"
-            ? QuoteProviderType.CCTPV2
-            : provider === "lifi"
-              ? QuoteProviderType.LIFI
-              : undefined,
+      quoteProvider: effectiveProvider || undefined,
     },
     tradeType,
   }

package/src/transactionIntent/types.ts

@@ -72,7 +72,7 @@ export type PrepareSendOptions = {
   quoteProvider?: string | null
   fundMethod?: string
   mode?: "pay" | "fund" | "earn" | "swap" | "receive"
-  checkoutOnHandlers?: CheckoutOnHandlers
+  checkoutOnHandlers?: Partial<CheckoutOnHandlers>
   refundAddress?: string
   selectedFeeToken?: SelectedFeeToken
   walletId?: string

package/src/widget/components/FeeOptions.tsx

@@ -11,6 +11,7 @@ import { getTokenImageUrl } from "../../tokens.js"
 import { TokenImage } from "./TokenImage.js"
 import { ethAddress, zeroAddress } from "viem"
 import type { FeeOption as APIFeeOption } from "../../widget/hooks/useSelectedFeeToken.js"
+import { SelectedFeeToken } from "../../prepareSend.js"
 
 const ZERO_ADDRESS = zeroAddress.toLowerCase()
 const ETH_ADDRESS = ethAddress.toLowerCase()
@@ -67,7 +68,7 @@ const safeFormatUsdDisplay = (option: APIFeeOption): string => {
 
 interface FeeOptionsProps {
   feeOptions: APIFeeOption[]
-  selectedFeeToken: APIFeeOption | null
+  selectedFeeToken: APIFeeOption | SelectedFeeToken | null
   setSelectedFeeToken: (token: APIFeeOption | null) => void
   chainId?: number
   isRefetching?: boolean // When true, the fee quote is stale and being refreshed, so hide the component

package/src/widget/components/PoolDeposit.tsx

@@ -5,10 +5,10 @@ import {
   Search,
   Loader2,
 } from "lucide-react"
-import { useEffect, useState, useRef } from "react"
+import { useEffect, useState, useRef, useMemo } from "react"
 import type React from "react"
 import type { Account, WalletClient } from "viem"
-import { zeroAddress } from "viem"
+import { parseUnits, zeroAddress } from "viem"
 import type { TransactionState } from "../../transactions.js"
 import type { OnCompleteProps } from "../hooks/useSendForm.js"
 import type { CheckoutOnHandlers } from "../hooks/useCheckout.js"
@@ -36,6 +36,9 @@ import type { SupportedToken } from "../../tokens.js"
 import { logger } from "../../logger.js"
 import { DynamicSizeInputField } from "./DynamicSizeInputField.js"
 import { FeeOptions } from "./FeeOptions.js"
+import { generateAaveDepositCalldata } from "../../aave.js"
+import { generateMorphoDepositCalldata } from "../../morpho.js"
+import { TRAILS_ROUTER_PLACEHOLDER_AMOUNT } from "../../trailsRouter.js"
 
 interface PoolDepositProps {
   account?: Account
@@ -106,6 +109,67 @@ export const PoolDeposit: React.FC<PoolDepositProps> = ({
     allSupportedTokens: false,
   })
 
+  // Memoized generated calldata
+  const generatedDepositCalldata = useMemo(() => {
+    if (!selectedPool || !amount || !walletClient || Number(amount) <= 0) {
+      logger.console.log(
+        "Skipping calldata generation: missing pool/amount/wallet or invalid amount",
+      )
+      return undefined
+    }
+
+    try {
+      const decimals = selectedPool.token.decimals
+      if (typeof decimals !== "number" || decimals < 0 || decimals > 18) {
+        throw new Error(`Invalid decimals: ${decimals}`)
+      }
+
+      // Check if same-chain same-token for direct amount usage
+      const isSameChainSameToken =
+        originToken &&
+        originToken.chainId === selectedPool.chainId &&
+        (originToken.contractAddress ?? zeroAddress).toLowerCase() ===
+          selectedPool.token.address.toLowerCase()
+
+      let amountForCalldata: string
+      if (isSameChainSameToken) {
+        // Parse real amount with pool decimals for direct deposit
+        const parsedAmount = parseUnits(amount, decimals)
+        amountForCalldata = parsedAmount.toString()
+        logger.console.log(
+          `Same-chain same-token deposit: Parsed amount: ${amount} -> ${parsedAmount} wei (decimals: ${decimals})`,
+        )
+      } else {
+        // Use placeholder for wrapping in routed flows
+        amountForCalldata = TRAILS_ROUTER_PLACEHOLDER_AMOUNT.toString()
+        logger.console.log(
+          `Routed deposit (different-token or cross-chain): Using placeholder for ${selectedPool.protocol} pool: ${selectedPool.name}`,
+        )
+      }
+
+      logger.console.log(
+        `Generating deposit calldata for ${selectedPool.protocol} pool: ${selectedPool.name} (amount: ${amountForCalldata})`,
+      )
+
+      switch (selectedPool.protocol.toLowerCase()) {
+        case "aave":
+          return generateAaveDepositCalldata(
+            walletClient,
+            selectedPool,
+            amountForCalldata,
+          )
+        case "morpho":
+          return generateMorphoDepositCalldata(walletClient, amountForCalldata)
+        default:
+          logger.console.warn(`Unsupported protocol: ${selectedPool.protocol}`)
+          return undefined
+      }
+    } catch (error) {
+      logger.console.error("Error generating deposit calldata:", error)
+      return undefined
+    }
+  }, [walletClient, selectedPool, amount, originToken])
+
   // Use useSendForm for quote functionality when both token and pool are selected
   const {
     balanceFormatted,
@@ -125,7 +189,7 @@ export const PoolDeposit: React.FC<PoolDepositProps> = ({
     toRecipient: selectedPool?.depositAddress,
     toChainId: selectedPool?.chainId,
     toToken: selectedPool?.token.address,
-    toCalldata: undefined,
+    toCalldata: generatedDepositCalldata,
     walletClient,
     onTransactionStateChange,
     onError,
@@ -521,7 +585,7 @@ export const PoolDeposit: React.FC<PoolDepositProps> = ({
       {/* Fee Options */}
       <FeeOptions
         feeOptions={feeOptions || []}
-        selectedFeeToken={selectedFeeToken}
+        selectedFeeToken={selectedFeeToken as any}
         setSelectedFeeToken={(token) => setSelectedFeeToken(token as any)}
         chainId={originToken?.chainId}
         isRefetching={isLoadingQuote}

package/src/widget/hooks/useDebugScreens.ts

@@ -182,7 +182,7 @@ export const useDebugScreens = ({
                 "https://polygonscan.com/tx/0x45bb2259631e73f32841a6058b0a4008c75bca296942bec6326d188978d5353d",
               chainId: 137,
               state: "pending",
-              label: "Transfer",
+              label: "Deposit",
             },
             {
               transactionHash:
@@ -207,7 +207,7 @@ export const useDebugScreens = ({
                 "https://polygonscan.com/tx/0x45bb2259631e73f32841a6058b0a4008c75bca296942bec6326d188978d5353d",
               chainId: 137,
               state: "confirmed",
-              label: "Transfer",
+              label: "Deposit",
             },
             {
               transactionHash:
@@ -232,7 +232,7 @@ export const useDebugScreens = ({
                 "https://polygonscan.com/tx/0x45bb2259631e73f32841a6058b0a4008c75bca296942bec6326d188978d5353d",
               chainId: 137,
               state: "confirmed",
-              label: "Transfer",
+              label: "Deposit",
             },
             {
               transactionHash:
@@ -257,7 +257,7 @@ export const useDebugScreens = ({
                 "https://polygonscan.com/tx/0x45bb2259631e73f32841a6058b0a4008c75bca296942bec6326d188978d5353d",
               chainId: 137,
               state: "pending",
-              label: "Transfer",
+              label: "Deposit",
             },
             {
               transactionHash:
@@ -291,7 +291,7 @@ export const useDebugScreens = ({
                 "https://polygonscan.com/tx/0x45bb2259631e73f32841a6058b0a4008c75bca296942bec6326d188978d5353d",
               chainId: 137,
               state: "confirmed",
-              label: "Transfer",
+              label: "Deposit",
             },
             {
               transactionHash:
@@ -325,7 +325,7 @@ export const useDebugScreens = ({
                 "https://polygonscan.com/tx/0x45bb2259631e73f32841a6058b0a4008c75bca296942bec6326d188978d5353d",
               chainId: 137,
               state: "confirmed",
-              label: "Transfer",
+              label: "Deposit",
             },
             {
               transactionHash:
@@ -359,7 +359,7 @@ export const useDebugScreens = ({
                 "https://polygonscan.com/tx/0x45bb2259631e73f32841a6058b0a4008c75bca296942bec6326d188978d5353d",
               chainId: 137,
               state: "confirmed",
-              label: "Transfer",
+              label: "Deposit",
             },
             {
               transactionHash:
@@ -393,7 +393,7 @@ export const useDebugScreens = ({
                 "https://polygonscan.com/tx/0x45bb2259631e73f32841a6058b0a4008c75bca296942bec6326d188978d5353d",
               chainId: 137,
               state: "confirmed",
-              label: "Transfer",
+              label: "Deposit",
             },
             {
               transactionHash:
@@ -436,7 +436,7 @@ export const useDebugScreens = ({
                 "https://polygonscan.com/tx/0x45bb2259631e73f32841a6058b0a4008c75bca296942bec6326d188978d5353d",
               chainId: 137,
               state: "confirmed",
-              label: "Transfer",
+              label: "Deposit",
             },
             {
               transactionHash:
@@ -470,7 +470,7 @@ export const useDebugScreens = ({
                 "https://polygonscan.com/tx/0x45bb2259631e73f32841a6058b0a4008c75bca296942bec6326d188978d5353d",
               chainId: 137,
               state: "confirmed",
-              label: "Transfer",
+              label: "Deposit",
             },
             {
               transactionHash:
@@ -502,7 +502,7 @@ export const useDebugScreens = ({
                 "https://polygonscan.com/tx/0x45bb2259631e73f32841a6058b0a4008c75bca296942bec6326d188978d5353d",
               chainId: 137,
               state: "confirmed",
-              label: "Transfer",
+              label: "Deposit",
             },
             {
               transactionHash: