0xtrails 0.7.0 → 0.8.0

package/src/tokenBalances.ts

@@ -256,11 +256,7 @@ export interface GetTokenBalancesWithPrice {
   >
 }
 
-export function useTokenBalances(
-  address: Address.Address,
-  indexerGatewayClient?: SequenceIndexerGateway,
-  sequenceApiClient?: TrailsClient,
-): {
+export function useTokenBalances(address: Address.Address | null): {
   tokenBalancesData: GetTokenBalancesSummaryReturn | undefined
   isLoadingBalances: boolean
   isLoadingPrices: boolean
@@ -268,13 +264,8 @@ export function useTokenBalances(
   balanceError: Error | null
   sortedTokens: Token[]
 } {
-  // Always call hooks unconditionally to fix React rules violation
-  const hookIndexerClient = useIndexerGatewayClient()
-  const hookTrailsClient = useTrailsClient()
-
-  // Use passed parameters if available, otherwise use hook results
-  const indexerClient = indexerGatewayClient ?? hookIndexerClient
-  const apiClient = sequenceApiClient ?? hookTrailsClient
+  // Use hooks to get clients
+  const indexerClient = useIndexerGatewayClient()
 
   // Fetch token balances with improved query key structure
   const {
@@ -285,7 +276,7 @@ export function useTokenBalances(
     queryKey: ["getTokenBalancesWithPrices", "summary", address],
     queryFn: async (): Promise<GetTokenBalancesWithPrice> => {
       if (!address) {
-        logger.console.warn("[trails-sdk] No account address or indexer client")
+        logger.console.warn("[trails-sdk] No account address provided")
         return {
           balances: [],
           nativeBalances: [],
@@ -377,7 +368,6 @@ export function useTokenBalances(
           }
         }),
       ) ?? [],
-    apiClient,
   )
 
   const { data: sortedTokens = [], isLoading: isLoadingSortedTokens } =

package/src/transactionIntent/handlers/crossChain.ts

@@ -7,7 +7,7 @@ import type {
 } from "viem"
 import { JsonEncode } from "@0xtrails/api"
 import { getChainRpcClient } from "../../chains.js"
-import type { FeeOption, TrailsApi } from "@0xtrails/api"
+import type { FeeOption, TrailsApi, RouteProvider } from "@0xtrails/api"
 import type { IntentTransaction } from "@0xtrails/api"
 import type { PrepareSendReturn, SendReturn } from "../types.js"
 import type { TransactionState } from "../../transactions.js"
@@ -116,7 +116,8 @@ export async function handleCrossChain({
   slippageTolerance,
   tradeType,
   originNativeTokenPriceUsd,
-  quoteProvider,
+  swapProvider,
+  bridgeProvider,
   fundMethod,
   mode,
   checkoutOnHandlers,
@@ -159,7 +160,8 @@ export async function handleCrossChain({
   slippageTolerance: string
   tradeType: TradeType
   originNativeTokenPriceUsd?: number | null
-  quoteProvider?: string | null
+  swapProvider?: RouteProvider | null
+  bridgeProvider?: RouteProvider | null
   fundMethod?: string
   mode?: "pay" | "fund" | "earn" | "swap"
   checkoutOnHandlers?: Partial<CheckoutOnHandlers>
@@ -178,8 +180,6 @@ export async function handleCrossChain({
   trailsApiKey?: string
   trailsApiUrl?: string
 }): Promise<PrepareSendReturn> {
-  const salt = Date.now().toString()
-
   const intentArgs = await getIntentArgs(
     mainSignerAddress,
     originChainId,
@@ -190,10 +190,10 @@ export async function handleCrossChain({
     tradeType === TradeType.EXACT_OUTPUT ? swapAmount : "0", // destinationTokenAmount
     recipient,
     destinationCalldata,
-    salt,
     slippageTolerance,
     tradeType,
-    quoteProvider,
+    swapProvider,
+    bridgeProvider,
     undefined, // connector - not available in this context
     walletId, // walletId - use this to check for Sequence wallets
     isSmartWallet, // isSmartWallet - force onlyNativeGasFee when true
@@ -350,6 +350,19 @@ export async function handleCrossChain({
     estimatedGasLimitForQuote,
   )
 
+  if (
+    intent.quote?.routeProviders &&
+    intent.quote.routeProviders.length === 1
+  ) {
+    swapProvider = intent.quote.routeProviders[0]!
+  } else if (
+    intent.quote?.routeProviders &&
+    intent.quote.routeProviders.length === 2
+  ) {
+    swapProvider = intent.quote.routeProviders[0]!
+    bridgeProvider = intent.quote.routeProviders[1]!
+  }
+
   const quote = await getNormalizedQuoteObject({
     originDepositAddress: originIntentAddress,
     destinationDepositAddress: intent.destinationIntentAddress,
@@ -377,7 +390,6 @@ export async function handleCrossChain({
     priceImpactUsd: getPriceImpactUsdFromIntent(intent),
     transactionStates,
     originNativeTokenPriceUsd,
-    quoteProvider: intent.quote?.quoteProvider,
     noSufficientBalance,
     estimatedGasLimit: estimatedGasLimitForQuote,
     intent,
@@ -1347,8 +1359,7 @@ export async function handleCrossChain({
           logger.console.log(
             "[trails-sdk] Starting destinationSendMetaTxnPromise",
             {
-              quoteProvider: intent.quote.quoteProvider,
-              hasQuoteProviderRequestId: !!intent.quote.quoteProviderRequestId,
+              routeProviders: intent.quote.routeProviders || [],
               hasPrecondition1: !!destinationPre,
               hasMetaTxn1: !!destinationMeta,
             },

package/src/transactionIntent/handlers/sameChainSameToken.ts

@@ -1,7 +1,7 @@
 import type { Account, Chain, WalletClient, TransactionReceipt } from "viem"
 import { formatUnits } from "viem"
 import { getChainRpcClient } from "../../chains.js"
-import type { FeeOption, TrailsApi } from "@0xtrails/api"
+import type { FeeOption, TrailsApi, RouteProvider } from "@0xtrails/api"
 import type { PrepareSendReturn, SendReturn } from "../types.js"
 import type { IntentTransaction } from "@0xtrails/api"
 import type { TransactionState } from "../../transactions.js"
@@ -62,7 +62,7 @@ export async function handleSameChainSameToken({
   destinationTokenPriceUsd,
   originNativeTokenPriceUsd,
   slippageTolerance,
-  quoteProvider,
+  swapProvider,
   checkoutOnHandlers,
   mode,
   fundMethod,
@@ -97,7 +97,7 @@ export async function handleSameChainSameToken({
   destinationTokenPriceUsd?: number | null
   originNativeTokenPriceUsd?: number | null
   slippageTolerance: string
-  quoteProvider?: string | null
+  swapProvider?: RouteProvider | null
   checkoutOnHandlers?: Partial<CheckoutOnHandlers>
   mode?: "pay" | "fund" | "earn" | "swap"
   fundMethod?: string
@@ -201,7 +201,6 @@ export async function handleSameChainSameToken({
       destinationChainId: effectiveOriginChainId,
       originNativeTokenPriceUsd,
       slippageTolerance,
-      quoteProvider: quoteProvider || "direct",
       noSufficientBalance,
       estimatedGasLimit: estimatedGasLimitForQuote,
       trailsApiKey: trailsApiKey || "",
@@ -451,7 +450,6 @@ export async function handleSameChainSameToken({
   }
 
   // For same-chain transactions, use Intent flow to support gasless deposits
-  const salt = Date.now().toString()
   const intentArgs = await getIntentArgs(
     mainSignerAddress,
     effectiveOriginChainId,
@@ -462,10 +460,10 @@ export async function handleSameChainSameToken({
     "0", // destinationTokenAmount (exact input)
     recipient,
     destinationCalldata,
-    salt,
     slippageTolerance,
     TradeType.EXACT_INPUT,
-    quoteProvider || "",
+    swapProvider,
+    null,
     undefined, // connector - not available in this context
     walletId, // walletId - use this to check for Sequence wallets
     isSmartWallet, // isSmartWallet - force onlyNativeGasFee when true
@@ -534,6 +532,13 @@ export async function handleSameChainSameToken({
     estimatedGasLimitForQuote,
   )
 
+  if (
+    intent.quote?.routeProviders &&
+    intent.quote.routeProviders.length === 1
+  ) {
+    swapProvider = intent.quote.routeProviders[0]!
+  }
+
   const quote = await getNormalizedQuoteObject({
     originDepositAddress: intent.originIntentAddress,
     destinationDepositAddress: intent.destinationIntentAddress,
@@ -552,7 +557,6 @@ export async function handleSameChainSameToken({
     destinationChainId: effectiveOriginChainId,
     originNativeTokenPriceUsd,
     slippageTolerance,
-    quoteProvider: intent.quote?.quoteProvider || "",
     noSufficientBalance,
     estimatedGasLimit: estimatedGasLimitForQuote,
     intent,

package/src/transactionIntent/quote/normalizeQuote.ts

@@ -1,7 +1,7 @@
-import type { Intent } from "@0xtrails/api"
+import type { Intent, RouteProvider } from "@0xtrails/api"
 import type { TransactionState } from "../../transactions.js"
 import type { PrepareSendQuote, PrepareSendFees } from "../types.js"
-import type { QuoteProviderInfo } from "../../widget/hooks/useQuote.js"
+import type { RouteProviderInfo } from "../../widget/hooks/useQuote.js"
 import { formatUnits } from "viem"
 import { mainnet } from "viem/chains"
 import { getTokenInfo } from "../../tokens.js"
@@ -64,7 +64,6 @@ export async function getNormalizedQuoteObject({
   priceImpact,
   priceImpactUsd,
   originNativeTokenPriceUsd,
-  quoteProvider,
   noSufficientBalance,
   estimatedGasLimit,
   intent,
@@ -91,7 +90,6 @@ export async function getNormalizedQuoteObject({
   priceImpact?: string
   priceImpactUsd?: string
   originNativeTokenPriceUsd?: number | null
-  quoteProvider?: string
   noSufficientBalance?: boolean
   estimatedGasLimit?: bigint
   intent?: Intent
@@ -262,30 +260,34 @@ export async function getNormalizedQuoteObject({
     destinationToken.symbol,
   )
 
-  let quoteProviderUrl = ""
-  if (quoteProvider === "cctp") {
-    quoteProviderUrl = "https://www.circle.com/"
-  } else if (quoteProvider === "relay") {
-    quoteProviderUrl = "https://relay.link/"
-  } else if (quoteProvider === "lifi") {
-    quoteProviderUrl = "https://li.fi/"
+  // Map RouteProvider enum values to display names and URLs
+  const routeProviderInfo: Record<
+    RouteProvider,
+    { name: string; url: string }
+  > = {
+    AUTO: { name: "", url: "" },
+    CCTP: { name: "Circle CCTP", url: "https://www.circle.com/" },
+    RELAY: { name: "Relay", url: "https://relay.link/" },
+    LIFI: { name: "LiFi", url: "https://li.fi/" },
+    ZEROX: { name: "0x", url: "https://0x.org/" },
+    SUSHI: { name: "Sushi", url: "https://www.sushi.com/" },
   }
 
-  const quoteProviderNames = {
-    cctp: "Circle CCTP",
-    relay: "Relay",
-    lifi: "LiFi",
-  }
-
-  const quoteProviderName =
-    quoteProviderNames[quoteProvider as keyof typeof quoteProviderNames] ||
-    quoteProvider ||
-    ""
-  const quoteProviderInfo: QuoteProviderInfo = {
-    id: quoteProvider || "",
-    name: quoteProviderName || "",
-    url: quoteProviderUrl || "",
-  }
+  // Build routeProviders array from intent.quote.routeProviders
+  const routeProviders: RouteProviderInfo[] =
+    intent?.quote?.routeProviders && Array.isArray(intent.quote.routeProviders)
+      ? intent.quote.routeProviders.map((provider) => {
+          const info = routeProviderInfo[provider] || {
+            name: provider,
+            url: "",
+          }
+          return {
+            id: provider,
+            name: info.name,
+            url: info.url,
+          }
+        })
+      : []
 
   const priceImpactUsdDisplay = formatUsdAmountDisplay(priceImpactUsd)
 
@@ -401,7 +403,7 @@ export async function getNormalizedQuoteObject({
     destinationAmountMinDisplay: formatAmountDisplay(
       destinationAmountMinFormatted,
     ),
-    quoteProvider: quoteProviderInfo,
+    routeProviders,
     noSufficientBalance: noSufficientBalance || false,
     trailsFeeBreakdown,
     grandTotalUsd,

package/src/transactionIntent/quote/quoteHelpers.ts

@@ -1,4 +1,4 @@
-import type { QuoteIntentRequest } from "@0xtrails/api"
+import type { QuoteIntentRequest, RouteProvider } from "@0xtrails/api"
 import type { Connector } from "wagmi"
 import { getIsCustomCalldata } from "../../contractUtils.js"
 import {
@@ -19,21 +19,16 @@ export async function getIntentArgs(
   destinationTokenAmount: string,
   recipient: string,
   destinationCalldata: string | undefined,
-  _destinationSalt: string = Date.now().toString(),
   slippageTolerance: string, // 0.03 = 3%
   tradeType: TradeType,
-  provider?: string | null,
+  swapProvider?: RouteProvider | null,
+  bridgeProvider?: RouteProvider | null,
   connector?: Connector | undefined,
   walletId?: string | undefined,
   isSmartWallet?: boolean,
 ): Promise<QuoteIntentRequest> {
   const hasCustomCalldata = getIsCustomCalldata(destinationCalldata)
 
-  let effectiveProvider = provider
-  if (provider === "auto") {
-    effectiveProvider = undefined
-  }
-
   // Check if wallet is Sequence wallet (via connector or walletId)
   const isSequence = connector
     ? isSequenceWallet(connector)
@@ -74,7 +69,8 @@ export async function getIntentArgs(
     onlyNativeGasFee,
     options: {
       slippageTolerance: Number(slippageTolerance),
-      quoteProvider: effectiveProvider || undefined,
+      swapProvider: swapProvider || undefined,
+      bridgeProvider: bridgeProvider || undefined,
     },
     tradeType,
   }

package/src/transactionIntent/types.ts

@@ -13,11 +13,12 @@ import type {
   FeeOption,
   GasFeeOptions,
   ExecuteIntentResponse,
+  RouteProvider,
 } from "@0xtrails/api"
 import type { TransactionState } from "../transactions.js"
 import type { Token } from "../tokens.js"
 import type { CheckoutOnHandlers } from "../widget/hooks/useCheckout.js"
-import type { QuoteProviderInfo } from "../widget/hooks/useQuote.js"
+import type { RouteProviderInfo } from "../widget/hooks/useQuote.js"
 import type { TrailsFeeBreakdown } from "../fees.js"
 import type { IntentTransaction } from "@0xtrails/api"
 
@@ -54,7 +55,8 @@ export type PrepareSendOptions = {
   gasless?: boolean
   slippageTolerance?: string
   originNativeTokenPriceUsd?: number | null
-  quoteProvider?: string | null
+  swapProvider?: RouteProvider | null
+  bridgeProvider?: RouteProvider | null
   fundMethod?: string
   mode?: "pay" | "fund" | "earn" | "swap"
   originPublicClient?: PublicClient
@@ -125,7 +127,7 @@ export type PrepareSendQuote = {
   gasCostFormatted: string
   originTokenRate: string
   destinationTokenRate: string
-  quoteProvider: QuoteProviderInfo | null
+  routeProviders?: RouteProviderInfo[]
   noSufficientBalance: boolean
   trailsFeeBreakdown?: TrailsFeeBreakdown | null
   grandTotalUsd?: number

package/src/transactions.ts

@@ -265,6 +265,7 @@ export type IntentTransaction = {
   originIntentAddress: string
   destinationIntentAddress: string
   mainSigner: string
+  intentId?: string
   metaTxnId?: string
   txnHash?: string
   executionStatus?: string
@@ -279,6 +280,10 @@ export type IntentTransaction = {
   // Transaction hashes from API response
   originTransactionHash?: string // Transaction hash from API
   destinationTransactionHash?: string // Transaction hash from API
+  // Transaction statuses from API response
+  depositTransactionStatus?: string // Deposit transaction status from API
+  originTransactionStatus?: string // Origin transaction status from API
+  destinationTransactionStatus?: string // Destination transaction status from API
   // Enriched token information
   originToken?: {
     symbol: string