0xtrails 0.5.0 → 0.6.0

package/src/transactionIntent/deposits/gaslessDeposit.ts

@@ -1,11 +1,5 @@
 import type { Account, Chain, WalletClient } from "viem"
-import {
-  createPublicClient,
-  ethAddress,
-  http,
-  maxUint256,
-  zeroAddress,
-} from "viem"
+import { maxUint256 } from "viem"
 import type {
   TrailsApi,
   GasFeeOptions,
@@ -13,10 +7,10 @@ import type {
   DepositSignature,
   ExecuteIntentResponse,
 } from "@0xsequence/trails-api"
-import type { SelectedFeeToken } from "../types.js"
 import type { CheckoutOnHandlers } from "../../widget/hooks/useCheckout.js"
 import type { TransactionState } from "../../transactions.js"
 import { logger } from "../../logger.js"
+import { isNativeToken } from "../../utils.js"
 import { attemptSwitchChain } from "../../chainSwitch.js"
 import { getTransactionStateFromReceipt } from "../execution/transactionState.js"
 import {
@@ -30,8 +24,10 @@ import {
   getUserNonce,
   signIntent,
   getPermitSignature,
+  validateGaslessSignature,
 } from "../../gasless.js"
 import { getIsUserRejectionError } from "../../error.js"
+import { getPublicRpcClient } from "../../chains.js"
 
 export async function attemptGaslessDeposit({
   paymasterUrl,
@@ -44,7 +40,7 @@ export async function attemptGaslessDeposit({
   account,
   trailsClient,
   feeOptions,
-  selectedFeeToken,
+  selectedFeeOption: selectedFeeOptionParam,
   checkoutOnHandlers,
   intentId,
   onTransactionStateChange,
@@ -61,7 +57,7 @@ export async function attemptGaslessDeposit({
   account: Account
   trailsClient: TrailsApi
   feeOptions?: GasFeeOptions
-  selectedFeeToken?: SelectedFeeToken
+  selectedFeeOption?: FeeOption | null
   abortSignal?: AbortSignal
   checkoutOnHandlers?: Partial<CheckoutOnHandlers>
   intentId?: string
@@ -84,16 +80,13 @@ export async function attemptGaslessDeposit({
       depositRecipient,
       hasFeeOptions: !!feeOptions,
       feeOptionsLength: feeOptions?.feeOptions?.length,
-      selectedFeeToken,
-      hasSelectedFeeToken: !!selectedFeeToken,
+      selectedFeeOption: selectedFeeOptionParam,
+      hasSelectedFeeOption: !!selectedFeeOptionParam,
       paymasterUrl,
     },
   )
 
-  const publicClient = createPublicClient({
-    chain,
-    transport: http(),
-  })
+  const publicClient = getPublicRpcClient(chain)
 
   logger.console.log("[trails-sdk] [GASLESS-FLOW] Intent entrypoint check:", {
     chainId: chain.id,
@@ -101,9 +94,9 @@ export async function attemptGaslessDeposit({
     intentEntrypoint: TRAILS_INTENT_ENTRYPOINT_ADDRESS,
   })
 
-  // NEW FLOW: Use Intent Entrypoint API with permit2 support
+  // NEW FLOW: Use Intent Entrypoint API with EIP-2162 permit signature support
   logger.console.log(
-    "[trails-sdk] Using Intent Entrypoint API flow with permit2 support for gasless deposit",
+    "[trails-sdk] Using Intent Entrypoint API flow with EIP-2162 permit signature support for gasless deposit",
   )
 
   // Switch to correct chain before requesting signatures
@@ -226,55 +219,55 @@ export async function attemptGaslessDeposit({
     }
 
     const deadline = Math.floor(Date.now() / 1000) + 3600 // 1 hour from now
-    const hasFeeOptions = Boolean(
-      feeOptions && feeOptions.feeOptions?.length > 0,
-    )
+    const feeOptionsList = feeOptions?.feeOptions ?? []
+    const hasFeeOptions = feeOptionsList.length > 0
+    const userExplicitlySelectedNativeFee = selectedFeeOptionParam === null
 
     // 1. Check if we need approval - check if we have enough allowance for this transaction (deposit + fee if same token)
     let requiredAmount = BigInt(depositTokenAmount)
 
-    // Match selectedFeeToken by tokenAddress to get the latest fee amount from feeOptions
-    let selectedFeeOption: FeeOption | null = null
-    if (selectedFeeToken && hasFeeOptions && feeOptions) {
-      // Find matching fee option by tokenAddress to get latest amount
-      selectedFeeOption =
-        feeOptions.feeOptions.find(
+    // Start with the caller's selection (unless they explicitly chose native gas)
+    let selectedFeeOption: FeeOption | null | undefined =
+      userExplicitlySelectedNativeFee
+        ? null
+        : (selectedFeeOptionParam ?? undefined)
+
+    if (selectedFeeOption && hasFeeOptions) {
+      const matchedOption =
+        feeOptionsList.find(
           (opt) =>
             opt.tokenAddress?.toLowerCase() ===
-            selectedFeeToken.tokenAddress?.toLowerCase(),
+            selectedFeeOption?.tokenAddress?.toLowerCase(),
         ) || null
-      logger.console.log(
-        "[trails-sdk] Matched selectedFeeToken to latest fee option:",
-        {
-          selectedFeeToken,
-          matchedOption: selectedFeeOption,
-        },
-      )
-    }
 
-    // Fallback to first fee option if no match or no selectedFeeToken
-    if (!selectedFeeOption && hasFeeOptions && feeOptions) {
-      selectedFeeOption = feeOptions.feeOptions[0] || null
-      logger.console.log(
-        "[trails-sdk] Using first fee option as fallback:",
-        selectedFeeOption,
-      )
+      if (matchedOption) {
+        selectedFeeOption = matchedOption
+        logger.console.log(
+          "[trails-sdk] Matched selectedFeeOption to latest fee option:",
+          {
+            selectedFeeOption,
+            matchedOption,
+          },
+        )
+      }
     }
 
+    const depositTokenAddressLower = depositTokenAddress.toLowerCase()
+
     // Only include fee in required amount if the fee token is the same as the deposit token
     if (selectedFeeOption?.amount && selectedFeeOption?.tokenAddress) {
-      const feeTokenIsSameAsDepositToken =
+      const feeOptionIsSameAsDepositToken =
         selectedFeeOption.tokenAddress.toLowerCase() ===
-        depositTokenAddress.toLowerCase()
+        depositTokenAddressLower
 
-      if (feeTokenIsSameAsDepositToken) {
+      if (feeOptionIsSameAsDepositToken) {
         requiredAmount = requiredAmount + BigInt(selectedFeeOption.amount)
         logger.console.log(
           "[trails-sdk] Fee token matches deposit token, including fee in required approval amount:",
           {
             depositAmount: depositTokenAmount,
             feeAmount: selectedFeeOption.amount,
-            feeTokenAddress: selectedFeeOption.tokenAddress,
+            feeOptionAddress: selectedFeeOption.tokenAddress,
             depositTokenAddress,
             totalRequired: requiredAmount.toString(),
           },
@@ -286,7 +279,7 @@ export async function attemptGaslessDeposit({
             depositAmount: depositTokenAmount,
             depositTokenAddress,
             feeAmount: selectedFeeOption.amount,
-            feeTokenAddress: selectedFeeOption.tokenAddress,
+            feeOptionAddress: selectedFeeOption.tokenAddress,
             depositTokenRequired: requiredAmount.toString(),
           },
         )
@@ -301,6 +294,9 @@ export async function attemptGaslessDeposit({
       amount: requiredAmount, // Check if we have enough allowance for this specific transaction
     })
 
+    const depositTokenIsNative = isNativeToken(depositTokenAddressLower)
+    const shouldAttachPermit = needsApproval && !depositTokenIsNative
+
     logger.console.log(
       "[trails-sdk] [GASLESS-FLOW] Checking permit requirements",
       {
@@ -320,7 +316,7 @@ export async function attemptGaslessDeposit({
     let permitSignature: string | undefined
     let permitDeadline: number | undefined
 
-    if (needsApproval) {
+    if (shouldAttachPermit) {
       logger.console.log(
         "[trails-sdk] Getting permit signature for deposit token infinite approval",
       )
@@ -385,13 +381,12 @@ export async function attemptGaslessDeposit({
 
     // 4. Get intent signature
     logger.console.log("[trails-sdk] Requesting intent signature via EIP-712")
-    // Get fee collector address from the new schema:
-    // Priority: selectedFeeOption.feeCollectorAddress > feeOptions.feeCollectorAddress
-    const feeCollectorAddress = (selectedFeeOption?.feeCollectorAddress ||
-      feeOptions?.feeCollectorAddress) as `0x${string}` | undefined
+    const feeCollectorAddress = feeOptions?.feeCollectorAddress as
+      | `0x${string}`
+      | undefined
 
     // Validate that we have a valid fee collector address
-    if (!feeCollectorAddress || feeCollectorAddress === zeroAddress) {
+    if (!feeCollectorAddress || isNativeToken(feeCollectorAddress)) {
       throw new Error(
         "[trails-sdk] Fee collector address not provided by API. Cannot proceed with gasless deposit. " +
           "Please ensure the API is returning feeCollectorAddress in the gasFeeOptions response.",
@@ -428,6 +423,9 @@ export async function attemptGaslessDeposit({
       intentSignature = result.signature
       logger.console.log("[trails-sdk] Intent signature received")
 
+      // Validate signature length for gasless flow
+      validateGaslessSignature(intentSignature)
+
       // Trigger signature confirmed callback after successful signing
       if (checkoutOnHandlers?.triggerCheckoutSignatureConfirmed) {
         checkoutOnHandlers.triggerCheckoutSignatureConfirmed()
@@ -460,8 +458,14 @@ export async function attemptGaslessDeposit({
       )
     }
 
-    // Validate that we have a selected fee option
+    // Validate that we have a selected fee option for gasless deposit signature
     if (!selectedFeeOption) {
+      logger.console.error(
+        "[trails-sdk] Missing selected fee option for gasless deposit signature",
+        {
+          selectedFeeOption,
+        },
+      )
       throw new Error(
         "[trails-sdk] selectedFeeOption is required for gasless deposits",
       )
@@ -517,7 +521,7 @@ export async function attemptGaslessDeposit({
     }
   } catch (error) {
     logger.console.error(
-      "[trails-sdk] Error in Intent Entrypoint gasless deposit with permit2:",
+      "[trails-sdk] Error in Intent Entrypoint gasless deposit with EIP-2162 permit signature",
       error,
     )
     throw error
@@ -527,7 +531,7 @@ export async function attemptGaslessDeposit({
 export function getDoGasless(
   originTokenAddress: string,
   feeOptions?: GasFeeOptions,
-  selectedFeeToken?: SelectedFeeToken,
+  selectedFeeOption?: FeeOption | null,
   walletId?: string,
 ): boolean {
   // Don't use gasless flow for sequence-waas wallet
@@ -540,66 +544,33 @@ export function getDoGasless(
 
   const hasFeeOptions = Boolean(feeOptions && feeOptions.feeOptions?.length > 0)
 
-  // Important: The UI passes selectedFeeToken in these states:
+  // Important: The UI passes selectedFeeOption in these states:
   // - null: User explicitly chose "Pay with native gas"
   // - {object}: User selected a fee token OR it was auto-selected
   // - undefined: Should not happen (initial state auto-selects if options exist)
 
-  // If selectedFeeToken is null, user explicitly chose native gas
-  if (selectedFeeToken === null) {
+  // If selectedFeeOption is null, user explicitly chose native gas
+  if (selectedFeeOption === null) {
     logger.console.log(
       "[trails-sdk] [GASLESS-FLOW] [FEE-SELECT] getDoGasless: User explicitly selected native gas (null)",
     )
     return false
   }
 
-  // If selectedFeeToken is undefined and no fee options, can't do gasless
-  if (!selectedFeeToken && !hasFeeOptions) {
+  // If selectedFeeOption is undefined and no fee options, can't do gasless
+  if (!selectedFeeOption && !hasFeeOptions) {
     logger.console.log(
       "[trails-sdk] [GASLESS-FLOW] [FEE-SELECT] getDoGasless: No fee token selected and no fee options available",
     )
     return false
   }
 
-  // If selectedFeeToken is undefined but fee options exist, use first ERC20 option
-  let effectiveFeeToken = selectedFeeToken
-  if (!effectiveFeeToken && hasFeeOptions && feeOptions) {
-    const firstFeeOption = feeOptions.feeOptions[0]
-
-    // Check if first option is native gas
-    const isFirstOptionNative =
-      firstFeeOption?.tokenAddress === zeroAddress ||
-      firstFeeOption?.tokenAddress?.toLowerCase() === zeroAddress ||
-      firstFeeOption?.tokenAddress === ethAddress ||
-      firstFeeOption?.tokenAddress?.toLowerCase() === ethAddress.toLowerCase()
-
-    if (!isFirstOptionNative && firstFeeOption?.tokenAddress) {
-      // First fee option is ERC20, use it
-      effectiveFeeToken = firstFeeOption
-      logger.console.log(
-        "[trails-sdk] [GASLESS-FLOW] [FEE-SELECT] getDoGasless: No fee token selected, using first ERC20 fee option",
-        {
-          feeOption: effectiveFeeToken,
-        },
-      )
-    } else {
-      logger.console.log(
-        "[trails-sdk] [GASLESS-FLOW] [FEE-SELECT] getDoGasless: First fee option is native gas, skipping gasless",
-      )
-      return false
-    }
-  }
-
   // Check if the effective fee token is native gas
   const isNativeGasFee =
-    !effectiveFeeToken ||
-    effectiveFeeToken.tokenAddress === zeroAddress ||
-    effectiveFeeToken.tokenAddress?.toLowerCase() === zeroAddress ||
-    effectiveFeeToken.tokenAddress === ethAddress ||
-    effectiveFeeToken.tokenAddress?.toLowerCase() === ethAddress.toLowerCase()
+    !selectedFeeOption || isNativeToken(selectedFeeOption.tokenAddress)
 
   // Don't use gasless if origin token is native (sending ETH)
-  if (originTokenAddress === zeroAddress) {
+  if (isNativeToken(originTokenAddress)) {
     logger.console.log(
       "[trails-sdk] [GASLESS-FLOW] getDoGasless: Origin token is native, skipping gasless",
     )
@@ -611,7 +582,7 @@ export function getDoGasless(
     logger.console.log(
       "[trails-sdk] [GASLESS-FLOW] [FEE-SELECT] getDoGasless: Fee token is native gas, skipping gasless",
       {
-        effectiveFeeToken,
+        selectedFeeOption,
       },
     )
     return false
@@ -623,8 +594,7 @@ export function getDoGasless(
     {
       originTokenAddress,
       hasFeeOptions,
-      selectedFeeToken,
-      effectiveFeeToken,
+      selectedFeeOption,
       feeOptionsCount: feeOptions?.feeOptions?.length || 0,
     },
   )

package/src/transactionIntent/deposits/standardDeposit.ts

@@ -9,7 +9,6 @@ import { parseUnits, encodeFunctionData } from "viem"
 import type { TransactionState } from "../../transactions.js"
 import type { CheckoutOnHandlers } from "../../widget/hooks/useCheckout.js"
 import { logger } from "../../logger.js"
-import { getNeedsLifiNativeFee } from "../utils/lifiHelpers.js"
 import {
   buildCrossChainDepositParams,
   buildSameChainSameTokenTransactionParams,
@@ -18,16 +17,15 @@ import {
 import { getIsCustomCalldata } from "../../contractUtils.js"
 import { estimateGasLimit } from "../../estimate.js"
 import { attemptSwitchChain } from "../../chainSwitch.js"
-import { requestWithTimeout } from "../../utils.js"
+import { requestWithTimeout, isNativeToken } 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,
-  firstPreconditionMin,
+  depositAmount,
   onOriginSend,
   publicClient,
   walletClient,
@@ -36,11 +34,6 @@ export async function attemptStandardDeposit({
   account,
   fee,
   dryMode,
-  sourceTokenPriceUsd,
-  destinationTokenPriceUsd,
-  swapAmount,
-  destinationTokenDecimals,
-  sourceTokenDecimals,
   originIntentAddress,
   onTransactionStateChange,
   transactionStates,
@@ -53,7 +46,7 @@ export async function attemptStandardDeposit({
   destinationCalldata,
 }: {
   originTokenAddress: string
-  firstPreconditionMin: string
+  depositAmount: string
   onOriginSend?: () => void
   publicClient: PublicClient
   walletClient: WalletClient
@@ -80,20 +73,8 @@ export async function attemptStandardDeposit({
 }): Promise<TransactionReceipt | null> {
   console.log("IN ATTEMPT STANDARD DEPOSIT!")
   let depositUserTxnReceipt: TransactionReceipt | null = null
-  const usingLIfi = false
-  let needsNativeFee = false
-
-  if (usingLIfi) {
-    needsNativeFee = getNeedsLifiNativeFee({
-      originTokenAddress,
-      destinationTokenAmount: swapAmount,
-      destinationTokenDecimals,
-      sourceTokenDecimals,
-      sourceTokenPriceUsd: sourceTokenPriceUsd ?? null,
-      destinationTokenPriceUsd: destinationTokenPriceUsd ?? null,
-      depositAmount: firstPreconditionMin,
-    })
-  }
+  const needsNativeFee = false
+
   let nativeFee = parseUnits("0.00005", 18).toString()
   if (originChainId === 137) {
     nativeFee = parseUnits("1.5", 18).toString()
@@ -110,14 +91,14 @@ export async function attemptStandardDeposit({
         recipient: recipient || originIntentAddress,
         effectiveOriginTokenAddress: originTokenAddress,
         destinationCalldata,
-        swapAmount: firstPreconditionMin,
+        swapAmount: depositAmount,
         effectiveOriginChainId: originChainId,
         effectiveOriginChain: chain,
       })
     : buildCrossChainDepositParams({
         originTokenAddress,
         originIntentAddress,
-        depositAmount: firstPreconditionMin,
+        depositAmount: depositAmount,
         fee,
         originChainId,
         chain,
@@ -129,7 +110,7 @@ export async function attemptStandardDeposit({
 
   if (
     isSameChainSameToken &&
-    originTokenAddress !== zeroAddress &&
+    !isNativeToken(originTokenAddress) &&
     hasCustomCalldata &&
     !dryMode &&
     recipient
@@ -165,7 +146,7 @@ export async function attemptStandardDeposit({
       args: [account.address, recipient as `0x${string}`],
     })) as bigint
 
-    const requiredAmount = BigInt(firstPreconditionMin)
+    const requiredAmount = BigInt(depositAmount)
 
     if (currentAllowance < requiredAmount) {
       logger.console.log(
@@ -178,6 +159,11 @@ export async function attemptStandardDeposit({
         args: [recipient as `0x${string}`, requiredAmount],
       }) as `0x${string}`
 
+      // Trigger approval request callback before sending transaction
+      if (checkoutOnHandlers?.triggerCheckoutApprovalRequest) {
+        checkoutOnHandlers.triggerCheckoutApprovalRequest()
+      }
+
       let approveHash: `0x${string}`
       let approveReceipt: TransactionReceipt
       try {
@@ -196,12 +182,20 @@ export async function attemptStandardDeposit({
           },
         )
 
+        // Trigger approval confirmed callback after hash is received
+        if (checkoutOnHandlers?.triggerCheckoutApprovalConfirmed) {
+          checkoutOnHandlers.triggerCheckoutApprovalConfirmed(approveHash)
+        }
+
         approveReceipt = await publicClient.waitForTransactionReceipt({
           hash: approveHash,
         })
       } catch (error) {
         // Check if this is a user rejection error
         if (getIsUserRejectionError(error)) {
+          if (checkoutOnHandlers?.triggerCheckoutApprovalRejected) {
+            checkoutOnHandlers.triggerCheckoutApprovalRejected(error)
+          }
           if (checkoutOnHandlers?.triggerCheckoutSignatureRejected) {
             checkoutOnHandlers.triggerCheckoutSignatureRejected(error)
           }

package/src/transactionIntent/execution/transactionState.ts

@@ -1,5 +1,5 @@
 import type { TransactionReceipt } from "viem"
-import type { MetaTxnReceipt } from "../types.js"
+import type { IntentTransaction } from "@0xsequence/trails-api"
 import type {
   TransactionState,
   TransactionStateStatus,
@@ -7,7 +7,7 @@ import type {
 import { getExplorerUrl } from "../../explorer.js"
 
 export function getTransactionStateFromReceipt(
-  receipt: TransactionReceipt | MetaTxnReceipt,
+  receipt: TransactionReceipt | IntentTransaction,
   chainId: number,
   label: string = "Transaction",
 ): TransactionState {