0xtrails 0.13.0 → 0.13.2

package/src/recover.ts

@@ -1,5 +1,6 @@
 import type { Payload as WalletPayload } from "@0xsequence/wallet-primitives"
 import {
+  type Config,
   Constants,
   Erc6492,
   Payload,
@@ -21,7 +22,11 @@ import { attemptSwitchChain } from "./chainSwitch.js"
 import { SEQUENCE_V3_CONTRACT_ADDRESSES } from "./constants.js"
 import { decodeGuestModuleEvents } from "./decoders.js"
 import { splitSignature } from "./gasless.js"
-import { abortIntent, getIntentConfigurationFromCalls } from "./intents.js"
+import {
+  abortIntent,
+  getIntentConfigurationFromAddress,
+  getIntentConfigurationFromCalls,
+} from "./intents.js"
 import { logger } from "./logger.js"
 import { type TrailsClient, useTrailsClient } from "./trailsClient.js"
 import {
@@ -39,6 +44,28 @@ import { getERC20TransferData } from "./utils.js"
 import { useGetIntent } from "./widget/hooks/useGetIntent.js"
 
 import { normalizeAddress } from "./utils/address.js"
+import {
+  type KeyMachineClient,
+  useKeyMachineClient,
+} from "./keyMachineClient.js"
+
+function getIntentProtocol(
+  intent: Intent | null | undefined,
+): IntentProtocolVersion {
+  const rawIntentProtocol = (
+    intent as { intentProtocol?: string; intentProtocolVersion?: string }
+  )?.intentProtocol
+  const rawIntentProtocolVersion = (
+    intent as { intentProtocol?: string; intentProtocolVersion?: string }
+  )?.intentProtocolVersion
+  const rawVersion = rawIntentProtocol ?? rawIntentProtocolVersion
+
+  if (rawVersion === "v1.5" || rawVersion === "v1_5") {
+    return IntentProtocolVersion.v1_5
+  }
+
+  return IntentProtocolVersion.v1
+}
 /**
  * Checks if an address is deployed by checking for bytecode
  * @param address - The address to check
@@ -132,8 +159,9 @@ export async function signPayload(
 
 export interface BuildRefundTransactionWithSignatureParams {
   trailsClient: TrailsClient
+  keyMachineClient: KeyMachineClient
   intentId: string
-  intentProtocolVersion: IntentProtocolVersion
+  intentProtocol: IntentProtocolVersion
   mainSigner: Address.Address
   checkpoint: number
   calls: Array<IntentCalls>
@@ -152,8 +180,9 @@ export async function buildRefundTransactionWithSignature(
 ): Promise<{ to: `0x${string}`; data: Hex.Hex }> {
   const {
     trailsClient,
+    keyMachineClient,
     intentId,
-    intentProtocolVersion,
+    intentProtocol,
     mainSigner,
     checkpoint,
     calls,
@@ -210,7 +239,7 @@ export async function buildRefundTransactionWithSignature(
   // In the current version, calls are already pre-filtered in the hook
   // to contain only the calls for the selected intent address (origin or destination)
   logger.console.log("[refund] Using pre-filtered calls for configuration:", {
-    intentProtocolVersion,
+    intentProtocol,
     callsCount: calls.length,
     chainId,
     intentAddress,
@@ -222,25 +251,39 @@ export async function buildRefundTransactionWithSignature(
     throw new Error("Invalid calls provided for intent configuration")
   }
 
+  let intentConfig: Config.Config
+  let imageHash: Hex.Hex
+  let resolvedAddress: Address.Address
   const context = SEQUENCE_V3_CONTRACT_ADDRESSES
-  const {
-    config: intentConfig,
-    imageHash,
-    address: apiAddress,
-  } = await getIntentConfigurationFromCalls(
-    trailsClient,
-    intentId,
-    intentProtocolVersion,
-    mainSigner,
-    checkpoint,
-    calls[0]!,
-    isOriginIntent,
-    context,
+  // Attempt to get the intent configuration from the address
+  const configFromAddress = await getIntentConfigurationFromAddress(
+    keyMachineClient,
+    intentAddress,
   )
+  if (configFromAddress) {
+    intentConfig = configFromAddress.config
+    imageHash = configFromAddress.imageHash
+    resolvedAddress = configFromAddress.address
+  } else {
+    // Fallback to reconstruction
+    const configFromCalls = await getIntentConfigurationFromCalls(
+      trailsClient,
+      intentId,
+      intentProtocol,
+      mainSigner,
+      checkpoint,
+      calls[0]!,
+      isOriginIntent,
+      context,
+    )
+    intentConfig = configFromCalls.config
+    imageHash = configFromCalls.imageHash
+    resolvedAddress = configFromCalls.address
+  }
 
   logger.console.log("[refund] Image hash:", imageHash)
 
-  if (!Address.isEqual(apiAddress, intentAddress)) {
+  if (!Address.isEqual(resolvedAddress, intentAddress)) {
     throw new Error(
       "API address does not match intent address. Probably config is wrong",
     )
@@ -813,6 +856,7 @@ function buildCallsForSelectedAddress(
  */
 async function buildRecoverTxFromSignature(params: {
   trailsClient: TrailsClient
+  keyMachineClient: KeyMachineClient
   intentData: Intent
   mainSigner: Address.Address
   selected: SelectedIntentAddress
@@ -827,6 +871,7 @@ async function buildRecoverTxFromSignature(params: {
 }> {
   const {
     trailsClient,
+    keyMachineClient,
     intentData,
     mainSigner,
     selected,
@@ -846,14 +891,14 @@ async function buildRecoverTxFromSignature(params: {
     throw new Error("Chain ID not found for selected intent address")
   }
 
-  const intentProtocolVersion =
-    intentData.intentProtocolVersion ?? IntentProtocolVersion.v1
+  const intentProtocol = getIntentProtocol(intentData)
   const checkpoint = Number(intentData.salt)
 
   const result = await buildRefundTransactionWithSignature({
     trailsClient,
+    keyMachineClient,
     intentId: intentData.intentId,
-    intentProtocolVersion,
+    intentProtocol,
     checkpoint,
     mainSigner,
     calls,
@@ -987,7 +1032,7 @@ export interface UseIntentRecoverReturn {
   }>
 }
 
-export interface UseIntentRecoverWithSignatureParams {
+export interface UseIntentRecoverWithAddressParams {
   intentId: string | undefined
   /** Signer for the recovery tx and default refund receiver */
   walletAddress: `0x${string}` | undefined
@@ -995,7 +1040,7 @@ export interface UseIntentRecoverWithSignatureParams {
   refundToAddress?: `0x${string}`
 }
 
-export interface UseIntentRecoverWithSignatureReturn {
+export interface UseIntentRecoverWithAddressReturn {
   intent: Intent | null
   isLoadingIntent: boolean
   isLoadingBalances: boolean
@@ -1205,7 +1250,7 @@ export function useIntentRecoverWithAddress({
   intentId,
   walletAddress,
   refundToAddress,
-}: UseIntentRecoverWithSignatureParams): UseIntentRecoverWithSignatureReturn {
+}: UseIntentRecoverWithAddressParams): UseIntentRecoverWithAddressReturn {
   const {
     intent: intentData,
     isLoading: isLoadingIntent,
@@ -1217,7 +1262,7 @@ export function useIntentRecoverWithAddress({
   })
 
   const trailsClient = useTrailsClient()
-
+  const keyMachineClient = useKeyMachineClient()
   const originIntentAddressForBalances = intentData?.originIntentAddress
     ? Address.from(intentData.originIntentAddress)
     : null
@@ -1354,6 +1399,7 @@ export function useIntentRecoverWithAddress({
       }
       return buildRecoverTxFromSignature({
         trailsClient,
+        keyMachineClient,
         intentData,
         mainSigner: Address.from(walletAddress),
         selected: selectedIntentAddress,
@@ -1368,6 +1414,7 @@ export function useIntentRecoverWithAddress({
       selectedIntentAddress,
       effectiveRefundAddress,
       trailsClient,
+      keyMachineClient,
     ],
   )
 
@@ -1416,6 +1463,7 @@ export function useIntentRecoverWithBalances({
   refundToAddress,
 }: UseIntentRecoverWithBalancesParams): UseIntentRecoverWithBalancesReturn {
   const trailsClient = useTrailsClient()
+  const keyMachineClient = useKeyMachineClient()
 
   const originTokenBalancesData = intentData?.originIntentAddress
     ? balancesByIntentAddress[normalizeAddress(intentData.originIntentAddress)]
@@ -1563,7 +1611,20 @@ export function useIntentRecoverWithBalances({
         throw new Error("No intent address selected for recovery")
       }
 
-      if (!intentData.intentProtocolVersion) {
+      const rawIntentProtocol = (
+        intentData as {
+          intentProtocol?: string
+          intentProtocolVersion?: string
+        }
+      ).intentProtocol
+      const rawIntentProtocolVersion = (
+        intentData as {
+          intentProtocol?: string
+          intentProtocolVersion?: string
+        }
+      ).intentProtocolVersion
+
+      if (!rawIntentProtocol && !rawIntentProtocolVersion) {
         logger.console.log(
           "[recover] Intent configuration version not found, using V1",
         )
@@ -1571,6 +1632,7 @@ export function useIntentRecoverWithBalances({
 
       return buildRecoverTxFromSignature({
         trailsClient,
+        keyMachineClient,
         intentData,
         mainSigner: Address.from(walletClient.account.address),
         selected: selectedIntentAddress,
@@ -1585,6 +1647,7 @@ export function useIntentRecoverWithBalances({
       selectedIntentAddress,
       effectiveRefundAddress,
       trailsClient,
+      keyMachineClient,
     ],
   )
 

package/src/tokens.ts

@@ -1,12 +1,12 @@
-import { useQuery } from "@tanstack/react-query"
+import {
+  useQuery,
+  useQueryClient,
+  type QueryClient,
+} from "@tanstack/react-query"
 import { DAY_MS, retryDelay } from "./utils/time.js"
 import { queryPersister } from "./query/persister.js"
 import { erc20Abi, zeroAddress } from "viem"
-import {
-  getChainInfo,
-  getChainRpcClient,
-  getSupportedSequenceChains,
-} from "./chains.js"
+import { getChainInfo, getChainRpcClient } from "./chains.js"
 import {
   arbitrum,
   base,
@@ -46,6 +46,9 @@ import { getTrailsClient } from "./trailsClient.js"
 import { formatBalanceFields, formatPriceFields } from "./utils/format.js"
 import { PROD_SEQUENCE_METADATA_URL } from "./constants.js"
 import { SequenceMetadata } from "@0xsequence/metadata"
+import { chainQueries } from "./query/chains.queries.js"
+import { tokenListQueries } from "./query/tokenList.queries.js"
+import { queryClient as defaultQueryClient } from "./query/client.js"
 
 // ApiTokenInfo type from trails-api (internal use only)
 interface ApiTokenInfo {
@@ -417,12 +420,16 @@ export function getCachedTokenImageUrl(
 export async function getSupportedTokens(config: {
   trailsApiKey: string
   trailsApiUrl: string
+  queryClient?: QueryClient
 }): Promise<Token[]> {
-  const sequenceChains = await getSupportedSequenceChains({
-    trailsApiUrl: config.trailsApiUrl,
-    trailsApiKey: config.trailsApiKey,
-  })
-  const chainIds = sequenceChains.map((chain) => chain.id)
+  const effectiveQueryClient = config.queryClient ?? defaultQueryClient
+  const chains = await effectiveQueryClient.ensureQueryData(
+    chainQueries.supported({
+      trailsApiUrl: config.trailsApiUrl,
+      trailsApiKey: config.trailsApiKey,
+    }),
+  )
+  const chainIds = chains.map((chain) => chain.id)
 
   // Get trails client using provided config
   const trailsClient = getTrailsClient({
@@ -444,11 +451,23 @@ export async function getSupportedTokens(config: {
       // When filtering by a single chain, use limit of 100, otherwise use 30 per chain
       // Type assertion needed because TrailsClient extends TrailsApi which has these methods
       const limit = chainIds.length === 1 ? 100 : 30
-      const tokenListResponse = await trailsClient.getTokenList({
-        chainIds,
-        includeAllListed: true,
-        limit, // Limit per chain - 100 for single chain, 30 for multiple chains
-      })
+      const tokenListResponse =
+        chainIds.length > 0
+          ? await effectiveQueryClient.ensureQueryData(
+              tokenListQueries.catalog(
+                trailsClient,
+                {
+                  trailsApiUrl: config.trailsApiUrl,
+                  trailsApiKey: config.trailsApiKey,
+                },
+                {
+                  chainIds,
+                  includeAllListed: true,
+                  limit,
+                },
+              ),
+            )
+          : { tokens: [] }
 
       // The API already handles sorting (featured first, then alphabetically) and deduplication
       // Map ApiTokenInfo from API to Token format using conversion helper
@@ -551,24 +570,22 @@ export function useSupportedTokens({
 } {
   const { customTokens } = useCustomTokens()
   const trailsConfig = useTrails()
+  const queryClient = useQueryClient()
   const { data: supportedTokens = EMPTY_TOKENS, isLoading: isLoadingTokens } =
     useQuery({
-      queryKey: [
-        "supportedTokens",
-        trailsConfig.trailsApiUrl,
-        trailsConfig.trailsApiKey,
-      ],
+      queryKey: ["supportedTokens"],
       queryFn: async () => {
         return getSupportedTokens({
           trailsApiKey: trailsConfig.trailsApiKey,
           trailsApiUrl: trailsConfig.trailsApiUrl,
+          queryClient,
         })
       },
       staleTime: DAY_MS,
       gcTime: DAY_MS,
-      refetchOnMount: false, // Don't refetch when cached data exists (persistence-friendly)
-      refetchOnWindowFocus: false, // Don't refetch when window regains focus
-      refetchOnReconnect: false, // Don't refetch on network reconnect
+      refetchOnMount: false,
+      refetchOnWindowFocus: false,
+      refetchOnReconnect: false,
       enabled: !disabled,
       persister: queryPersister.persisterFn,
     })
@@ -670,6 +687,7 @@ export async function getTokenInfo(
     trailsApiKey: string
     trailsApiUrl: string
     sequenceMetadataUrl: string
+    queryClient?: QueryClient
   },
 ): Promise<Token | null> {
   const normalizedAddress = normalizeAddress(contractAddress)
@@ -717,7 +735,11 @@ export async function getTokenInfo(
   }
 
   // Look in supported tokens
-  const tokens = await getSupportedTokens(config)
+  const tokens = await getSupportedTokens({
+    trailsApiKey: config.trailsApiKey,
+    trailsApiUrl: config.trailsApiUrl,
+    queryClient: config.queryClient,
+  })
   const token = tokens.find(
     (t) =>
       t.chainId === chainId &&
@@ -855,6 +877,60 @@ export async function getTokenInfo(
   }
 }
 
+/**
+ * Search for a token by contract address across all chains using the
+ * Sequence Metadata findContractInfo endpoint. Returns one Token per
+ * chain where the contract is deployed with valid ERC-20 metadata.
+ */
+export async function searchTokenByAddress(
+  contractAddress: string,
+  config: {
+    sequenceMetadataUrl: string
+    trailsApiKey: string
+  },
+): Promise<Token[]> {
+  const normalizedAddress = normalizeAddress(contractAddress)
+
+  const metadataClient = new SequenceMetadata(
+    config.sequenceMetadataUrl,
+    config.trailsApiKey,
+  )
+
+  const { contractInfoList } = await metadataClient.findContractInfo({
+    contractAddress: normalizedAddress,
+  })
+
+  return (contractInfoList || [])
+    .filter(
+      (info) =>
+        info.deployed === true && info.decimals != null && info.decimals > 0,
+    )
+    .map((info): Token => {
+      const addr = normalizeAddress(info.address)
+      const chainInfo = getChainInfo(info.chainId)
+      const token: Token = {
+        tokenId: `${info.symbol}-${chainInfo?.name || `chain-${info.chainId}`}`,
+        symbol: info.symbol,
+        name: info.name,
+        decimals: info.decimals!,
+        chainId: info.chainId,
+        contractAddress: addr,
+        chainName: chainInfo?.name || `Chain ${info.chainId}`,
+        imageUrl:
+          info.logoURI ||
+          getTokenImageUrl({
+            chainId: info.chainId,
+            contractAddress: addr,
+            symbol: info.symbol,
+          }),
+        isCustomToken: true,
+      }
+
+      setTokenInfoCache(`${info.chainId}:${addr}`, token)
+      return token
+    })
+}
+
 // Mapping of hyphenated symbols to their canonical token symbols.
 // The Sequence API returns BNB-USD, but we want to use USDT instead.
 const HYPHENATED_SYMBOL_MAP: Record<string, string> = {
@@ -864,7 +940,11 @@ const HYPHENATED_SYMBOL_MAP: Record<string, string> = {
 export async function getTokenAddress(
   chainId: number,
   tokenSymbol: string,
-  config: { trailsApiKey: string; trailsApiUrl: string },
+  config: {
+    trailsApiKey: string
+    trailsApiUrl: string
+    queryClient?: QueryClient
+  },
 ) {
   const chainInfo = getChainInfo(chainId)
   // Normalize token symbol: trim whitespace and convert to uppercase for comparison
@@ -915,6 +995,7 @@ export function useTokenAddress({
   tokenSymbol,
 }: UseTokenAddressProps) {
   const trailsConfig = useTrails()
+  const queryClient = useQueryClient()
   const { data: tokenAddress } = useQuery({
     queryKey: ["tokenAddress", chainId, tokenSymbol],
     queryFn: () =>
@@ -922,6 +1003,7 @@ export function useTokenAddress({
         ? getTokenAddress(chainId, tokenSymbol, {
             trailsApiKey: trailsConfig.trailsApiKey,
             trailsApiUrl: trailsConfig.trailsApiUrl,
+            queryClient,
           })
         : null,
     enabled: !!chainId && !!tokenSymbol,

package/src/transactionIntent/deposits/depositOrchestrator.ts

@@ -9,11 +9,11 @@ import type { FeeOption, TrailsApi } from "@0xtrails/api"
 import type { TransactionState } from "../../transactions.js"
 import type { CheckoutOnHandlers } from "../../widget/hooks/useCheckout.js"
 import type { FundMethod } from "../types.js"
-import type {
-  DepositSignature,
-  GasFeeOptions,
-  ExecuteIntentResponse,
-  TrailsContracts,
+import {
+  type DepositSignature,
+  type GasFeeOptions,
+  type ExecuteIntentResponse,
+  type TrailsContracts,
   IntentProtocolVersion,
 } from "@0xtrails/api"
 import type { QueryClient } from "@tanstack/react-query"
@@ -59,7 +59,7 @@ export async function attemptUserDepositTx({
   sequenceProjectAccessKey,
   sequenceIndexerUrl,
   depositTransaction,
-  intentProtocolVersion,
+  intentProtocol,
 }: {
   queryClient?: QueryClient
   originTokenAddress: string
@@ -106,7 +106,7 @@ export async function attemptUserDepositTx({
     value?: string | bigint
     chainId: number
   }
-  intentProtocolVersion: IntentProtocolVersion
+  intentProtocol: IntentProtocolVersion
 }): Promise<TransactionReceipt | null> {
   let depositUserTxnReceipt: TransactionReceipt | null = null
   const originChainId = chain.id
@@ -119,7 +119,7 @@ export async function attemptUserDepositTx({
   logger.console.log(
     "[trails-sdk] [intent-protocol] attemptUserDepositTx called",
     {
-      intentProtocolVersion,
+      intentProtocol,
       fundMethod,
       intentId,
       hasPaymasterUrl: !!paymasterUrl,
@@ -162,12 +162,12 @@ export async function attemptUserDepositTx({
     logger.console.log(
       "[trails-sdk] [intent-protocol] [gasless-flow] Entering gasless deposit flow",
       {
-        intentProtocolVersion,
+        intentProtocol,
         doGasless,
         hasPaymasterUrl: !!paymasterUrl,
         paymasterUrl,
         gaslessFlowDifference:
-          intentProtocolVersion === "v1"
+          intentProtocol === IntentProtocolVersion.v1
             ? "v1: requires intent signature + nonce + infinite permit"
             : "v1.5: simplified (permit only if needed)",
       },
@@ -192,7 +192,7 @@ export async function attemptUserDepositTx({
         onTransactionStateChange,
         transactionStates,
         executeIntentFn,
-        intentProtocolVersion,
+        intentProtocol,
       })
       // Gasless deposit submitted to backend, monitoring happens separately
       depositUserTxnReceipt = null

package/src/transactionIntent/deposits/gaslessDeposit.ts

@@ -1,12 +1,12 @@
 import type { Account, Chain, WalletClient } from "viem"
 import { maxUint256 } from "viem"
-import type {
-  TrailsApi,
-  GasFeeOptions,
-  FeeOption,
-  DepositSignature,
-  ExecuteIntentResponse,
-  TrailsContracts,
+import {
+  type TrailsApi,
+  type GasFeeOptions,
+  type FeeOption,
+  type DepositSignature,
+  type ExecuteIntentResponse,
+  type TrailsContracts,
   IntentProtocolVersion,
 } from "@0xtrails/api"
 import type { CheckoutOnHandlers } from "../../widget/hooks/useCheckout.js"
@@ -53,7 +53,7 @@ export async function attemptGaslessDeposit({
   onTransactionStateChange,
   transactionStates,
   executeIntentFn,
-  intentProtocolVersion,
+  intentProtocol,
 }: {
   paymasterUrl?: string
   depositTokenAddress: string
@@ -77,7 +77,7 @@ export async function attemptGaslessDeposit({
     depositTransactionHash?: string
     depositSignature?: DepositSignature
   }) => Promise<ExecuteIntentResponse>
-  intentProtocolVersion: IntentProtocolVersion
+  intentProtocol: IntentProtocolVersion
 }): Promise<void> {
   const originChainId = chain.id
 
@@ -304,42 +304,43 @@ export async function attemptGaslessDeposit({
       }
     }
 
+    const isV1 = intentProtocol === IntentProtocolVersion.v1
+
     logger.console.log(
       "[trails-sdk] [intent-protocol] [gasless-flow] Checking approval requirements",
       {
-        intentProtocolVersion,
-        isV1: intentProtocolVersion === "v1",
-        checkingEntrypointApproval: intentProtocolVersion === "v1",
+        intentProtocol,
+        isV1,
+        checkingEntrypointApproval: isV1,
       },
     )
 
-    const needsApproval =
-      intentProtocolVersion === "v1"
-        ? await getNeedsIntentEntrypointApproval({
-            client: publicClient,
-            token: depositTokenAddress as `0x${string}`,
-            account: account.address,
-            entrypoint:
-              TRAILS_CONTRACTS.trailsIntentEntrypointAddress as `0x${string}`,
-            amount: requiredAmount, // Check if we have enough allowance for this specific transaction
-          })
-        : false
+    const needsApproval = isV1
+      ? await getNeedsIntentEntrypointApproval({
+          client: publicClient,
+          token: depositTokenAddress as `0x${string}`,
+          account: account.address,
+          entrypoint:
+            TRAILS_CONTRACTS.trailsIntentEntrypointAddress as `0x${string}`,
+          amount: requiredAmount, // Check if we have enough allowance for this specific transaction
+        })
+      : false
 
     logger.console.log(
       "[trails-sdk] [intent-protocol] [gasless-flow] Approval check result",
       {
-        intentProtocolVersion,
+        intentProtocol,
         needsApproval,
-        reason:
-          intentProtocolVersion === "v1"
-            ? "v1: checked entrypoint approval"
-            : "v1.5: skipped entrypoint approval (not needed)",
+        reason: isV1
+          ? "v1: checked entrypoint approval"
+          : "v1.5: skipped entrypoint approval (not needed)",
       },
     )
 
     const depositTokenIsNative = isNativeToken(depositTokenAddressLower)
     const shouldAttachPermit =
-      !depositTokenIsNative && (intentProtocolVersion !== "v1" || needsApproval)
+      !depositTokenIsNative &&
+      (intentProtocol !== IntentProtocolVersion.v1 || needsApproval)
 
     logger.console.log(
       "[trails-sdk] [gasless-flow] Checking permit requirements",
@@ -352,7 +353,7 @@ export async function attemptGaslessDeposit({
         chainID: originChainId,
         deadline,
         needsApproval,
-        intentProtocolVersion,
+        intentProtocol,
         shouldAttachPermit,
       },
     )
@@ -369,7 +370,7 @@ export async function attemptGaslessDeposit({
       )
 
       let spender: `0x${string}`
-      if (intentProtocolVersion === "v1") {
+      if (isV1) {
         // Use infinite approval (maxUint256) to entrypoint
         permitAmount = maxUint256
         spender =
@@ -415,7 +416,6 @@ export async function attemptGaslessDeposit({
       let permitSig: Awaited<ReturnType<typeof getPermitSignature>> | undefined
       try {
         permitSig = await getPermitSignature({
-          publicClient,
           walletClient,
           signer: account.address,
           spender,
@@ -449,16 +449,15 @@ export async function attemptGaslessDeposit({
     logger.console.log(
       "[trails-sdk] [intent-protocol] [gasless-flow] Intent signature check",
       {
-        intentProtocolVersion,
-        requiresIntentSignature: intentProtocolVersion === "v1",
-        reason:
-          intentProtocolVersion === "v1"
-            ? "v1: requires EIP-712 intent signature + nonce"
-            : "v1.5: no intent signature needed (backend manages)",
+        intentProtocol,
+        requiresIntentSignature: isV1,
+        reason: isV1
+          ? "v1: requires EIP-712 intent signature + nonce"
+          : "v1.5: no intent signature needed (backend manages)",
       },
     )
 
-    if (intentProtocolVersion === "v1") {
+    if (isV1) {
       // Intent signature is only needed for v1
       logger.console.log(
         "[trails-sdk] [intent-protocol] [gasless-flow] v1: Starting intent signature flow",