0xtrails 0.6.6 → 0.7.0

package/src/transactionIntent/handlers/sameChainSameToken.ts

@@ -1,9 +1,9 @@
 import type { Account, Chain, WalletClient, TransactionReceipt } from "viem"
 import { formatUnits } from "viem"
 import { getChainRpcClient } from "../../chains.js"
-import type { FeeOption, TrailsApi } from "@0xsequence/trails-api"
+import type { FeeOption, TrailsApi } from "@0xtrails/api"
 import type { PrepareSendReturn, SendReturn } from "../types.js"
-import type { IntentTransaction } from "@0xsequence/trails-api"
+import type { IntentTransaction } from "@0xtrails/api"
 import type { TransactionState } from "../../transactions.js"
 import type { CheckoutOnHandlers } from "../../widget/hooks/useCheckout.js"
 import type {
@@ -11,12 +11,9 @@ import type {
   CommitIntentResponse,
   DepositSignature,
   ExecuteIntentResponse,
-} from "@0xsequence/trails-api"
+} from "@0xtrails/api"
 import { logger } from "../../logger.js"
-import {
-  isTestnetDebugMode,
-  getTestnetOriginTokenAddress,
-} from "../utils/testnetHelpers.js"
+import { isTestnetDebugMode } from "../utils/testnetHelpers.js"
 import { checkAccountBalance } from "../utils/balanceChecker.js"
 import { getTestnetChainInfo } from "../../chains.js"
 import { getIsCustomCalldata } from "../../contractUtils.js"
@@ -78,6 +75,8 @@ export async function handleSameChainSameToken({
   sequenceProjectAccessKey,
   sequenceIndexerUrl,
   isSmartWallet,
+  trailsApiKey,
+  trailsApiUrl,
 }: {
   mainSignerAddress: string
   originTokenAddress: string
@@ -100,7 +99,7 @@ export async function handleSameChainSameToken({
   slippageTolerance: string
   quoteProvider?: string | null
   checkoutOnHandlers?: Partial<CheckoutOnHandlers>
-  mode?: "pay" | "fund" | "earn" | "swap" | "receive"
+  mode?: "pay" | "fund" | "earn" | "swap"
   fundMethod?: string
   paymasterUrl?: string
   walletId?: string
@@ -115,27 +114,29 @@ export async function handleSameChainSameToken({
   sequenceProjectAccessKey?: string
   sequenceIndexerUrl?: string
   isSmartWallet?: boolean
+  trailsApiKey?: string
+  trailsApiUrl?: string
 }): Promise<PrepareSendReturn> {
   logger.console.log("[trails-sdk] isToSameToken && isToSameChain")
   const testnet = isTestnetDebugMode()
   const effectiveOriginChain = testnet ? getTestnetChainInfo(chain)! : chain
   const effectiveOriginChainId = effectiveOriginChain.id
-  const effectiveOriginTokenAddress = testnet
-    ? getTestnetOriginTokenAddress(effectiveOriginChainId)
-    : originTokenAddress
+  const effectiveOriginTokenAddress = originTokenAddress
   const effectivePublicClient = getChainRpcClient(effectiveOriginChain.id)
 
   let noSufficientBalance = false
 
-  const { hasEnoughBalance } = await checkAccountBalance({
-    account,
-    tokenAddress: originTokenAddress,
-    depositAmount: swapAmount,
-    publicClient: effectivePublicClient,
-  })
+  if (!(fundMethod === "qr-code" || fundMethod === "exchange")) {
+    const { hasEnoughBalance } = await checkAccountBalance({
+      account,
+      tokenAddress: originTokenAddress,
+      depositAmount: swapAmount,
+      publicClient: effectivePublicClient,
+    })
 
-  if (!hasEnoughBalance) {
-    noSufficientBalance = true
+    if (!hasEnoughBalance) {
+      noSufficientBalance = true
+    }
   }
 
   const hasCustomCalldata = getIsCustomCalldata(destinationCalldata)
@@ -203,6 +204,8 @@ export async function handleSameChainSameToken({
       quoteProvider: quoteProvider || "direct",
       noSufficientBalance,
       estimatedGasLimit: estimatedGasLimitForQuote,
+      trailsApiKey: trailsApiKey || "",
+      trailsApiUrl: trailsApiUrl || "",
       // No intent for direct transfers
     })
 
@@ -372,8 +375,20 @@ export async function handleSameChainSameToken({
                 mode,
                 fundMethod,
                 originTokenAddress: effectiveOriginTokenAddress,
+                originTokenSymbol,
+                originTokenAmount: swapAmount,
+                originTokenAmountFormatted: depositAmountFormatted.toString(),
+                destinationTokenAddress: effectiveOriginTokenAddress, // same chain same token
+                destinationTokenSymbol: destinationTokenSymbol,
+                depositTokenAmount: swapAmount,
+                depositTokenAmountFormatted: depositAmountFormatted.toString(),
                 depositTokenAmountUsd: depositAmountUsd?.toString(),
+                destinationTokenAmount: swapAmount, // same as deposit amount
+                destinationTokenAmountFormatted:
+                  depositAmountFormatted.toString(), // same as deposit amount
                 destinationTokenAmountUsd: depositAmountUsd?.toString(), // same as deposit amount
+                originTokenDecimals: originTokenDecimals,
+                destinationTokenDecimals: originTokenDecimals, // same chain same token
               })
 
               // Call onCheckoutComplete callback if provided
@@ -461,7 +476,7 @@ export async function handleSameChainSameToken({
     intentArgs,
   )
 
-  const { intent, gasFeeOptions } = await quoteIntent(
+  const { intent, gasFeeOptions, trailsContracts } = await quoteIntent(
     trailsClient,
     intentArgs,
     {
@@ -473,6 +488,10 @@ export async function handleSameChainSameToken({
 
   logger.console.log("[trails-sdk] Quote intent:", intent)
   logger.console.log("[trails-sdk] Quote intent gasFeeOptions:", gasFeeOptions)
+  logger.console.log(
+    "[trails-sdk] Quote intent trailsContracts:",
+    trailsContracts,
+  )
 
   if (!intent.originPrecondition || !intent.originCalls) {
     throw new Error("Invalid intent")
@@ -519,6 +538,8 @@ export async function handleSameChainSameToken({
     originDepositAddress: intent.originIntentAddress,
     destinationDepositAddress: intent.destinationIntentAddress,
     destinationAddress: recipient,
+    trailsApiKey: trailsApiKey || "",
+    trailsApiUrl: trailsApiUrl || "",
     destinationCalldata,
     originAmount: swapAmount,
     destinationAmount: swapAmount,
@@ -743,6 +764,7 @@ export async function handleSameChainSameToken({
             destinationTokenSymbol,
             depositAmountUsd,
             feeOptions: gasFeeOptions,
+            trailsContracts,
             trailsClient,
             selectedFeeOption: effectiveSelectedFeeOption,
             walletId,
@@ -1149,8 +1171,20 @@ export async function handleSameChainSameToken({
               mode,
               fundMethod,
               originTokenAddress,
+              originTokenSymbol,
+              originTokenAmount: swapAmount,
+              originTokenAmountFormatted: depositAmountFormatted.toString(),
+              destinationTokenAddress: originTokenAddress, // same chain same token
+              destinationTokenSymbol: destinationTokenSymbol,
+              depositTokenAmount: swapAmount,
+              depositTokenAmountFormatted: depositAmountFormatted.toString(),
               depositTokenAmountUsd: depositAmountUsd?.toString(),
+              destinationTokenAmount: swapAmount, // same as deposit amount
+              destinationTokenAmountFormatted:
+                depositAmountFormatted.toString(), // same as deposit amount
               destinationTokenAmountUsd: depositAmountUsd?.toString(), // same as deposit amount
+              originTokenDecimals: originTokenDecimals,
+              destinationTokenDecimals: originTokenDecimals, // same chain same token
             })
 
             // Call onCheckoutComplete callback with transaction status
@@ -1195,8 +1229,20 @@ export async function handleSameChainSameToken({
                 mode,
                 fundMethod,
                 originTokenAddress,
+                originTokenSymbol,
+                originTokenAmount: swapAmount,
+                originTokenAmountFormatted: depositAmountFormatted.toString(),
+                destinationTokenAddress: originTokenAddress, // same chain same token
+                destinationTokenSymbol: destinationTokenSymbol,
+                depositTokenAmount: swapAmount,
+                depositTokenAmountFormatted: depositAmountFormatted.toString(),
                 depositTokenAmountUsd: depositAmountUsd?.toString(),
+                destinationTokenAmount: swapAmount, // same as deposit amount
+                destinationTokenAmountFormatted:
+                  depositAmountFormatted.toString(), // same as deposit amount
                 destinationTokenAmountUsd: depositAmountUsd?.toString(),
+                originTokenDecimals: originTokenDecimals,
+                destinationTokenDecimals: originTokenDecimals, // same chain same token
               })
 
               // Call onCheckoutComplete callback with transaction status

package/src/transactionIntent/quote/feeExtractors.ts

@@ -1,5 +1,4 @@
-import type { Intent } from "@0xsequence/trails-api"
-import type { RelayQuote } from "../../relaySdk.js"
+import type { Intent } from "@0xtrails/api"
 import { zeroAddress } from "viem"
 import { formatUsdAmountDisplay } from "../../tokenBalances.js"
 import { logger } from "../../logger.js"
@@ -44,33 +43,6 @@ export function getPriceImpactUsdFromIntent(intent: Intent): string {
   return intent?.quote?.priceImpactUsd?.toString() ?? "0"
 }
 
-export function getFeesFromRelaySdkQuote(quote: RelayQuote): PrepareSendFees {
-  const totalFeeAmountUsd = quote?.fees?.relayer?.amount ?? 0
-  const totalFeeAmountUsdDisplay = formatUsdAmountDisplay(totalFeeAmountUsd)
-  return {
-    feeTokenAddress: quote?.fees?.relayer?.currency?.address ?? zeroAddress,
-    totalFeeAmount: quote?.fees?.relayer?.amount ?? "0",
-    totalFeeAmountUsd: totalFeeAmountUsd.toString(),
-    totalFeeAmountUsdDisplay,
-  }
-}
-
-export function getSlippageToleranceFromRelaySdkQuote(
-  quote: RelayQuote,
-): string {
-  return (
-    Number(quote?.details?.slippageTolerance?.origin?.percent ?? "0") / 100
-  ).toString()
-}
-
-export function getPriceImpactFromRelaySdkQuote(quote: RelayQuote): string {
-  return (quote?.details?.swapImpact?.percent ?? 0).toString()
-}
-
-export function getPriceImpactUsdFromRelaySdkQuote(quote: RelayQuote): string {
-  return (quote?.details?.swapImpact?.usd ?? 0).toString()
-}
-
 export function getZeroFees(): PrepareSendFees {
   return {
     feeTokenAddress: zeroAddress,

package/src/transactionIntent/quote/normalizeQuote.ts

@@ -1,4 +1,4 @@
-import type { Intent } from "@0xsequence/trails-api"
+import type { Intent } from "@0xtrails/api"
 import type { TransactionState } from "../../transactions.js"
 import type { PrepareSendQuote, PrepareSendFees } from "../types.js"
 import type { QuoteProviderInfo } from "../../widget/hooks/useQuote.js"
@@ -22,6 +22,7 @@ import {
 } from "../../estimate.js"
 import { extractTrailsFeeBreakdown } from "../../fees.js"
 import { getZeroFees } from "./feeExtractors.js"
+import { formatCompletionTime } from "../../time.js"
 
 // TODO: make this dyanamic
 export function getCompletionEstimateSeconds({
@@ -67,6 +68,8 @@ export async function getNormalizedQuoteObject({
   noSufficientBalance,
   estimatedGasLimit,
   intent,
+  trailsApiKey,
+  trailsApiUrl,
 }: {
   originDepositAddress?: string
   destinationDepositAddress?: string
@@ -92,6 +95,8 @@ export async function getNormalizedQuoteObject({
   noSufficientBalance?: boolean
   estimatedGasLimit?: bigint
   intent?: Intent
+  trailsApiKey: string
+  trailsApiUrl: string
 }): Promise<PrepareSendQuote> {
   if (!destinationChainId) {
     throw new Error("Destination chain id is required")
@@ -109,10 +114,17 @@ export async function getNormalizedQuoteObject({
     throw new Error("Destination token address is required")
   }
 
-  const originToken = await getTokenInfo(originChainId, originTokenAddress)
+  const originToken = await getTokenInfo(originChainId, originTokenAddress, {
+    trailsApiKey,
+    trailsApiUrl,
+  })
   const destinationToken = await getTokenInfo(
     destinationChainId,
     destinationTokenAddress,
+    {
+      trailsApiKey,
+      trailsApiUrl,
+    },
   )
 
   const originChain = getChainInfo(originChainId)
@@ -277,11 +289,65 @@ export async function getNormalizedQuoteObject({
 
   const priceImpactUsdDisplay = formatUsdAmountDisplay(priceImpactUsd)
 
-  // Extract fee breakdown from intent if available
-  let trailsFeeBreakdown = null
-  if (intent) {
-    trailsFeeBreakdown = await extractTrailsFeeBreakdown(intent)
-  }
+  // Extract fee breakdown and calculate all fee values from intent
+  // Use raw USD values to avoid parsing display strings
+  const {
+    trailsFeeBreakdown,
+    grandTotalUsd,
+    grandTotalUsdDisplay,
+    originGasUsd,
+    destGasUsd,
+    totalGasUsd,
+    providerUsd,
+    trailsUsd,
+    swapFeesUsd,
+    totalProviderUsd,
+    allProviderFeesUsd,
+    originGasUsdDisplay,
+    destGasUsdDisplay,
+    totalGasUsdDisplay,
+    providerUsdDisplay,
+    trailsUsdDisplay,
+    explicitProviderUsdDisplay,
+    swapFeesUsdDisplay,
+    totalProviderUsdDisplay,
+    allProviderFeesUsdDisplay,
+  } = intent
+    ? await extractTrailsFeeBreakdown(
+        intent,
+        { trailsApiKey, trailsApiUrl },
+        {
+          originAmountUsd: parseFloat(originAmountUsdFormatted || "0"),
+          destinationAmountUsd: parseFloat(
+            destinationAmountUsdFormatted || "0",
+          ),
+          totalFeesUsd: parseFloat(
+            fees?.totalFeeAmountUsdDisplay?.replace(/[^0-9.-]/g, "") || "0",
+          ),
+        },
+      )
+    : {
+        trailsFeeBreakdown: null,
+        grandTotalUsd: 0,
+        grandTotalUsdDisplay: "$0.00",
+        originGasUsd: 0,
+        destGasUsd: 0,
+        totalGasUsd: 0,
+        providerUsd: 0,
+        trailsUsd: 0,
+        swapFeesUsd: 0,
+        totalProviderUsd: 0,
+        allProviderFeesUsd: 0,
+        originGasUsdDisplay: "$0.00",
+        destGasUsdDisplay: "$0.00",
+        totalGasUsdDisplay: "$0.00",
+        providerUsdDisplay: "$0.00",
+        trailsUsdDisplay: "$0.00",
+        explicitProviderUsdDisplay: "$0.00",
+        swapFeesUsdDisplay: "$0.00",
+        totalProviderUsdDisplay: "$0.00",
+        allProviderFeesUsdDisplay: "$0.00",
+      }
 
   return {
     originDepositAddress: originDepositAddress || "",
@@ -308,6 +374,7 @@ export async function getNormalizedQuoteObject({
     fees: fees || getZeroFees(),
     slippageTolerance: slippageTolerance || "0",
     priceImpact: priceImpact || "0",
+    priceImpactUsd: priceImpactUsd || undefined,
     priceImpactUsdDisplay: priceImpactUsdDisplay || "0",
     originChain,
     destinationChain,
@@ -315,6 +382,12 @@ export async function getNormalizedQuoteObject({
       originChainId,
       destinationChainId,
     }),
+    completionEstimateDisplay: formatCompletionTime(
+      getCompletionEstimateSeconds({
+        originChainId,
+        destinationChainId,
+      }),
+    ),
     transactionStates: transactionStates || [],
     gasCostUsd,
     gasCostUsdDisplay,
@@ -331,6 +404,25 @@ export async function getNormalizedQuoteObject({
     quoteProvider: quoteProviderInfo,
     noSufficientBalance: noSufficientBalance || false,
     trailsFeeBreakdown,
+    grandTotalUsd,
+    grandTotalUsdDisplay,
+    originGasUsd,
+    destGasUsd,
+    totalGasUsd,
+    providerUsd,
+    trailsUsd,
+    swapFeesUsd,
+    totalProviderUsd,
+    allProviderFeesUsd,
+    originGasUsdDisplay,
+    destGasUsdDisplay,
+    totalGasUsdDisplay,
+    providerUsdDisplay,
+    trailsUsdDisplay,
+    explicitProviderUsdDisplay,
+    swapFeesUsdDisplay,
+    totalProviderUsdDisplay,
+    allProviderFeesUsdDisplay,
   }
 }
 

package/src/transactionIntent/quote/quoteHelpers.ts

@@ -1,4 +1,4 @@
-import type { QuoteIntentRequest } from "@0xsequence/trails-api"
+import type { QuoteIntentRequest } from "@0xtrails/api"
 import type { Connector } from "wagmi"
 import { getIsCustomCalldata } from "../../contractUtils.js"
 import {

package/src/transactionIntent/types.ts

@@ -13,13 +13,13 @@ import type {
   FeeOption,
   GasFeeOptions,
   ExecuteIntentResponse,
-} from "@0xsequence/trails-api"
+} from "@0xtrails/api"
 import type { TransactionState } from "../transactions.js"
-import type { SupportedToken } from "../tokens.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 { TrailsFeeBreakdown } from "../fees.js"
-import type { IntentTransaction } from "@0xsequence/trails-api"
+import type { IntentTransaction } from "@0xtrails/api"
 
 export enum TradeType {
   EXACT_INPUT = "EXACT_INPUT",
@@ -56,7 +56,7 @@ export type PrepareSendOptions = {
   originNativeTokenPriceUsd?: number | null
   quoteProvider?: string | null
   fundMethod?: string
-  mode?: "pay" | "fund" | "earn" | "swap" | "receive"
+  mode?: "pay" | "fund" | "earn" | "swap"
   originPublicClient?: PublicClient
   destinationPublicClient?: PublicClient
   checkoutOnHandlers?: Partial<CheckoutOnHandlers>
@@ -65,6 +65,8 @@ export type PrepareSendOptions = {
   walletId?: string
   abortSignal?: AbortSignal
   isSmartWallet?: boolean
+  trailsApiKey?: string
+  trailsApiUrl?: string
   // Optional mutation callbacks for React Query integration
   commitIntentFn?: (intent: Intent) => Promise<CommitIntentResponse>
   executeIntentFn?: (params: {
@@ -107,13 +109,15 @@ export type PrepareSendQuote = {
   destinationAmountFormatted: string
   destinationAmountUsdFormatted: string
   destinationAmountUsdDisplay: string
-  originToken: SupportedToken
-  destinationToken: SupportedToken
+  originToken: Token
+  destinationToken: Token
   fees: PrepareSendFees
   slippageTolerance: string
   priceImpact: string
+  priceImpactUsd?: string
   priceImpactUsdDisplay: string
   completionEstimateSeconds: number
+  completionEstimateDisplay: string
   transactionStates: TransactionState[]
   gasCostUsd: number
   gasCostUsdDisplay: string
@@ -124,6 +128,27 @@ export type PrepareSendQuote = {
   quoteProvider: QuoteProviderInfo | null
   noSufficientBalance: boolean
   trailsFeeBreakdown?: TrailsFeeBreakdown | null
+  grandTotalUsd?: number
+  grandTotalUsdDisplay?: string
+  // Fee breakdown values from extractTrailsFeeBreakdown
+  originGasUsd?: number
+  destGasUsd?: number
+  totalGasUsd?: number
+  providerUsd?: number
+  trailsUsd?: number
+  swapFeesUsd?: number
+  totalProviderUsd?: number
+  allProviderFeesUsd?: number
+  // Display values
+  originGasUsdDisplay?: string
+  destGasUsdDisplay?: string
+  totalGasUsdDisplay?: string
+  providerUsdDisplay?: string
+  trailsUsdDisplay?: string
+  explicitProviderUsdDisplay?: string
+  swapFeesUsdDisplay?: string
+  totalProviderUsdDisplay?: string
+  allProviderFeesUsdDisplay?: string
 }
 
 export type PrepareSendReturn = {

package/src/transactionIntent/utils/testnetHelpers.ts

@@ -1,10 +1,5 @@
 import { getQueryParam } from "../../queryParams.js"
-import { getUSDCTokenAddress } from "../../cctp.js"
 
 export function isTestnetDebugMode(): boolean {
   return getQueryParam("testnet") === "true"
 }
-
-export function getTestnetOriginTokenAddress(testnetChainId: number): string {
-  return getUSDCTokenAddress(testnetChainId)!
-}

package/src/transactionIntent/validators.ts

@@ -1,5 +1,3 @@
-import { getIsUsdcAddress } from "../cctp.js"
-
 export function isSameChain(
   originChainId: number,
   destinationChainId: number,
@@ -27,31 +25,3 @@ export function isSameChainAndToken(
     isSameToken(originTokenAddress, destinationTokenAddress)
   )
 }
-
-export function shouldUseCctp(
-  originTokenAddress: string,
-  destinationTokenAddress: string,
-  originChainId: number,
-  destinationChainId: number,
-) {
-  return (
-    getIsUsdcAddress(originTokenAddress, originChainId) &&
-    getIsUsdcAddress(destinationTokenAddress, destinationChainId)
-  )
-}
-
-export function validateCctpDestinationToken(
-  destinationTokenAddress: string,
-  destinationChainId: number,
-  quoteProvider?: string | null,
-): void {
-  // If CCTP provider is selected, destination token must be USDC
-  if (
-    quoteProvider === "cctp" &&
-    !getIsUsdcAddress(destinationTokenAddress, destinationChainId)
-  ) {
-    throw new Error(
-      `CCTP provider requires destination token to be USDC. Current destination token: ${destinationTokenAddress} on chain ${destinationChainId}. Please ensure the destination token is USDC as listed in the Circle CCTP documentation.`,
-    )
-  }
-}

package/src/transactions.ts

@@ -1,9 +1,9 @@
 import { useQuery } from "@tanstack/react-query"
 import { getChainInfo } from "./chains.js"
-import type { GuestModuleEvent, TrailsTokenSweeperEvent } from "./decoders.js"
+import type { GuestModuleEvent, TokenSweeperEvent } from "./decoders.js"
 import { logger } from "./logger.js"
 import { getExplorerUrl } from "./explorer.js"
-import { JsonEncode } from "@0xsequence/trails-api"
+import { JsonEncode } from "@0xtrails/api"
 import { getChainIndexerUrl } from "./indexerClient.js"
 import { abortControllerRegistry } from "./abortController.js"
 import { useTrails } from "./widget/providers/TrailsProvider.js"
@@ -21,7 +21,7 @@ export type TransactionState = {
   chainId: number
   state: TransactionStateStatus
   label: string
-  decodedTrailsTokenSweeperEvents?: TrailsTokenSweeperEvent[]
+  decodedTokenSweeperEvents?: TokenSweeperEvent[]
   decodedGuestModuleEvents?: GuestModuleEvent[]
   refunded?: boolean
   txnMinedAt?: string

package/src/utils.ts

@@ -121,3 +121,21 @@ export function isZeroAccount(address?: string | null): boolean {
 
 export const normalizeAddress = (address?: string | null): string =>
   (address ?? "").toLowerCase()
+
+/**
+ * Checks if a formatted value (string with currency symbols, commas, etc.) represents zero
+ * Strips all non-numeric characters and checks if the numeric value is zero
+ * @param value - The value to check (can be string like "$1,000.00" or number)
+ * @returns True if the value represents zero
+ */
+export function isValueZero(value?: string | number | null): boolean {
+  if (value === null || value === undefined) return true
+  if (typeof value === "number") return value === 0
+
+  // Strip all non-numeric characters except decimal point and minus sign
+  const numericString = value.replace(/[^0-9.-]/g, "")
+  if (!numericString || numericString === "-") return true
+
+  const numValue = parseFloat(numericString)
+  return Number.isNaN(numValue) || numValue === 0
+}