0xtrails 0.13.0 → 0.13.2

package/src/transactionIntent/deposits/standardDeposit.ts

@@ -11,11 +11,6 @@ import type { CheckoutOnHandlers } from "../../widget/hooks/useCheckout.js"
 import { logger } from "../../logger.js"
 import { sendOriginTransaction } from "../../intents.js"
 import { getIsCustomCalldata } from "../../contractUtils.js"
-import {
-  fetchCachedGasLimit,
-  createGasEstimationParams,
-} from "../../useGasEstimation.js"
-import { queryClient as defaultQueryClient } from "../../query/client.js"
 import type { QueryClient } from "@tanstack/react-query"
 import { attemptSwitchChain } from "../../chainSwitch.js"
 import { requestWithTimeout } from "../../utils.js"
@@ -44,7 +39,6 @@ import { ensureErc20Approval } from "../utils/erc20Approval.js"
  * (executePassthrough in intentHandler.ts) is used instead.
  */
 export async function attemptStandardDeposit({
-  queryClient: paramQueryClient,
   originTokenAddress,
   depositAmount,
   onOriginSend,
@@ -173,25 +167,6 @@ export async function attemptStandardDeposit({
     })
   }
 
-  const effectiveQueryClient = paramQueryClient ?? defaultQueryClient
-
-  const gasLimit = await fetchCachedGasLimit(
-    effectiveQueryClient,
-    publicClient,
-    createGasEstimationParams(
-      account.address,
-      originCallParamsBase.to,
-      originCallParamsBase.data,
-      BigInt(originCallParamsBase.value),
-    ),
-    "standard-deposit",
-  )
-
-  const originCallParams = {
-    ...originCallParamsBase,
-    gasLimit,
-  }
-
   await attemptSwitchChain({
     walletClient,
     desiredChainId: originChainId,
@@ -248,10 +223,10 @@ export async function attemptStandardDeposit({
 
     // Add the origin call
     calls.push({
-      to: originCallParams.to as `0x${string}`,
-      data: originCallParams.data as `0x${string}`,
-      value: originCallParams.value
-        ? `0x${BigInt(originCallParams.value).toString(16)}`
+      to: originCallParamsBase.to as `0x${string}`,
+      data: originCallParamsBase.data as `0x${string}`,
+      value: originCallParamsBase.value
+        ? `0x${BigInt(originCallParamsBase.value).toString(16)}`
         : "0x0",
     })
 
@@ -403,7 +378,7 @@ export async function attemptStandardDeposit({
       txHash = await sendOriginTransaction(
         account,
         walletClient,
-        originCallParams as any,
+        originCallParamsBase as any,
         {
           depositTokenAmountUsd: depositAmountUsd?.toString(),
         },

package/src/transactionIntent/handlers/intentHandler.ts

@@ -48,7 +48,7 @@ import {
 import { updatePersistentToast } from "../../toast.js"
 import { formatRawAmount, rawAmountToNumber } from "../../utils/format.js"
 import { invalidateTokenBalancesCache } from "../../query/balance.queries.js"
-import { calcAmountUsdPrice } from "../../prices.js"
+import { calcAmountUsdPrice } from "../../utils/format.js"
 import { checkAccountBalance } from "../utils/balanceChecker.js"
 import { queryClient as defaultQueryClient } from "../../query/client.js"
 import {
@@ -78,7 +78,10 @@ import {
   updateTransactionStateWithDecodedEvents,
 } from "../helpers/transactionStateHelpers.js"
 import { isSameChain, isSameToken } from "../validators.js"
-import { isSyntheticTransactionHash } from "../../transactions.js"
+import {
+  isSyntheticTransactionHash,
+  isDisplayableTransactionHash,
+} from "../../transactions.js"
 
 /**
  * Parameters for the unified intent handler.
@@ -588,20 +591,25 @@ async function executeIntent(
   // Set up transaction state tracking
   publishTransactionStates(localTransactionStates)
 
-  if (!intent.intentProtocolVersion) {
+  const rawIntentProtocol = (intent as { intentProtocol?: string })
+    .intentProtocol
+
+  if (!rawIntentProtocol) {
     logger.console.log(
       "[trails-sdk] [intent-protocol] Intent protocol version not found in response, defaulting to v1",
     )
   }
-  const intentProtocolVersion =
-    intent.intentProtocolVersion ?? IntentProtocolVersion.v1
+  const intentProtocol =
+    rawIntentProtocol === "v1.5"
+      ? IntentProtocolVersion.v1_5
+      : IntentProtocolVersion.v1
 
   logger.console.log(
     "[trails-sdk] [intent-protocol] === Intent Protocol Version ===",
     {
-      version: intentProtocolVersion,
-      isV1: intentProtocolVersion === IntentProtocolVersion.v1,
-      isV1_5: intentProtocolVersion === IntentProtocolVersion.v1_5,
+      version: intentProtocol,
+      isV1: intentProtocol === IntentProtocolVersion.v1,
+      isV1_5: intentProtocol === IntentProtocolVersion.v1_5,
       intentId: intent.intentId,
       fundMethod,
     },
@@ -718,7 +726,7 @@ async function executeIntent(
       isSameChainSameToken,
       destinationCalldata,
       depositTransaction: intent.depositTransaction,
-      intentProtocolVersion,
+      intentProtocol,
     })
 
     // Update state and call executeIntent
@@ -788,11 +796,17 @@ async function executeIntent(
                 )
 
                 if (receipt.depositTransaction?.status === "SUCCEEDED") {
+                  const existingHash = localTransactionStates[0].transactionHash
+                  const existingExplorerUrl =
+                    localTransactionStates[0].explorerUrl
+                  const hasClientSideHash =
+                    isDisplayableTransactionHash(existingHash)
+
                   localTransactionStates[0] = {
                     ...localTransactionStates[0],
                     state: "confirmed",
-                    transactionHash: "",
-                    explorerUrl: "",
+                    transactionHash: hasClientSideHash ? existingHash : "",
+                    explorerUrl: hasClientSideHash ? existingExplorerUrl : "",
                     txnMinedAt:
                       receipt.depositTransaction?.txnMinedAt || undefined,
                   }
@@ -1406,7 +1420,10 @@ export async function handleIntent(
           tokenAddress: originTokenAddress,
           depositAmount: depositAmount,
           publicClient: effectivePublicClient,
-          knownBalance: originTokenBalance,
+          knownBalance:
+            originTokenBalance && originTokenBalance !== "0"
+              ? originTokenBalance
+              : undefined,
           decimals: originTokenDecimals,
         })
       : Promise.resolve({ hasEnoughBalance: true }),

package/src/transactionIntent/helpers/transactionStateHelpers.ts

@@ -233,13 +233,16 @@ export function applyIntentReceiptToTransactionStates(params: {
       return
     }
 
-    const displayableHash = isDisplayableTransactionHash(txnHash) ? txnHash : ""
+    const hasNewDisplayableHash = isDisplayableTransactionHash(txnHash)
+    const displayableHash = hasNewDisplayableHash
+      ? txnHash
+      : targetState.transactionHash || ""
     const nextExplorerUrl = displayableHash
       ? getExplorerUrl({
           txHash: displayableHash,
           chainId: targetState.chainId,
         })
-      : ""
+      : targetState.explorerUrl || ""
 
     const stateChanged =
       targetState.state !== mappedState ||

package/src/transactionIntent/quote/normalizeQuote.ts

@@ -405,18 +405,24 @@ export async function getNormalizedQuoteObject({
         totalProviderFeesUsdDisplay: "$0.00",
       }
 
-  if (!intent?.intentProtocolVersion) {
+  const rawIntentProtocol = (
+    intent as { intentProtocol?: string } | null | undefined
+  )?.intentProtocol
+
+  if (!rawIntentProtocol) {
     logger.console.log(
       "[trails-sdk] [intent-protocol] Intent protocol version not in API response, defaulting to v1",
     )
   }
-  const intentProtocolVersion =
-    intent?.intentProtocolVersion ?? IntentProtocolVersion.v1
+  const intentProtocol =
+    rawIntentProtocol === "v1.5"
+      ? IntentProtocolVersion.v1_5
+      : IntentProtocolVersion.v1
 
   logger.console.log(
     "[trails-sdk] [intent-protocol] Quote normalized with version",
     {
-      intentProtocolVersion,
+      intentProtocol,
       intentId: intent?.intentId,
     },
   )
@@ -430,7 +436,7 @@ export async function getNormalizedQuoteObject({
   })
 
   return {
-    intentProtocolVersion,
+    intentProtocol,
     originDepositAddress: originDepositAddress || "",
     destinationDepositAddress: destinationDepositAddress || "",
     destinationAddress: destinationAddress || "",

package/src/transactionIntent/types.ts

@@ -130,7 +130,7 @@ export type PrepareSendFees = {
 }
 
 export type PrepareSendQuote = {
-  intentProtocolVersion: IntentProtocolVersion
+  intentProtocol: IntentProtocolVersion
   originDepositAddress: string
   destinationDepositAddress: string
   destinationAddress: string

package/src/transactions.ts

@@ -289,7 +289,8 @@ export type IntentTransaction = {
   intentId?: string
   metaTxnId?: string
   txnHash?: string
-  executionStatus?: string
+  intentStatus?: string // Top-level intent status returned by Trails API history
+  executionStatus?: string // Derived transaction-level status used for detailed progress states
   originChainId?: number
   destinationChainId?: number
   originTokenAddress?: string
@@ -306,6 +307,9 @@ export type IntentTransaction = {
   depositTransactionStatus?: string // Deposit transaction status from API
   originTransactionStatus?: string // Origin transaction status from API
   destinationTransactionStatus?: string // Destination transaction status from API
+  refundTransactionHash?: string // Refund transaction hash from API
+  refundTransactionStatus?: string // Refund transaction status from API
+  refundTransactionChainId?: number // Refund transaction chain ID from API
   // Enriched token information
   originToken?: {
     symbol: string

package/src/utils/format.ts

@@ -1,6 +1,8 @@
 import type { NativeTokenBalance, TokenBalance } from "@0xsequence/indexer"
 import { formatUnits, zeroAddress } from "viem"
 import { logger } from "../logger.js"
+import { parseLocaleNumber } from "../localeUtils.js"
+import { isNonNegativeNumber, isValidNumber } from "./validation.js"
 import { forexRateStore } from "../widget/utils/forexRateStore.js"
 
 // ============================================================================
@@ -18,6 +20,7 @@ export type Price = {
 
 /** Cap used across all USD formatters to prevent display issues */
 const MAX_DISPLAY_VALUE = 100_000_000_000_000
+const MAX_SUPPORTED_TOKEN_DECIMALS = 255
 
 // navigator.language provides the browser's UI language (e.g., 'es-ES', 'en-US')
 // Currently hardcoded to en-US until entire app is updated with locale display values
@@ -80,7 +83,11 @@ function parseRawBalance(
     return null
   }
 
-  if (!Number.isInteger(decimals) || decimals < 0 || decimals > 18) {
+  if (
+    !Number.isInteger(decimals) ||
+    decimals < 0 ||
+    decimals > MAX_SUPPORTED_TOKEN_DECIMALS
+  ) {
     throw new Error("Invalid decimals")
   }
 
@@ -539,3 +546,80 @@ export function formatPriceFields(price: number | string | null | undefined): {
     priceUsdDisplay: usdFields.balanceUsdDisplay,
   }
 }
+
+export function normalizeNumber(
+  number: number | string | null | undefined,
+): number {
+  if (number === null || number === undefined) {
+    return 0
+  }
+
+  // If already a number, return it directly
+  if (typeof number === "number") {
+    // Validate the number
+    if (!isValidNumber(number)) {
+      logger.console.error("[trails-sdk] Invalid number value:", number)
+      return 0
+    }
+    return number
+  }
+
+  // Only parse strings that might be locale-formatted
+  // This should ideally only be used for user input, not internal calculations
+  const normalized = parseLocaleNumber(number)
+
+  // Return 0 for invalid numbers
+  if (!isValidNumber(normalized)) {
+    logger.console.error("[trails-sdk] Error normalizing number string:", {
+      number,
+      normalized,
+    })
+    return 0
+  }
+
+  return normalized
+}
+
+export function calcAmountUsdPrice({
+  amount,
+  usdPrice,
+}: {
+  amount: number | string
+  usdPrice: string | number | null | undefined
+}) {
+  const sanitizedAmount = normalizeNumber(amount)
+  const sanitizedPrice = normalizeNumber(usdPrice)
+
+  // Validate inputs
+  if (!isNonNegativeNumber(sanitizedAmount)) {
+    return 0
+  }
+  if (!isNonNegativeNumber(sanitizedPrice)) {
+    return 0
+  }
+
+  const result = sanitizedAmount * sanitizedPrice
+
+  // Validate result
+  if (!isValidNumber(result)) {
+    logger.console.error("[trails-sdk] Error calculating amount USD:", {
+      sanitizedAmount,
+      sanitizedPrice,
+      result,
+      amount,
+      usdPrice,
+    })
+    return 0
+  }
+
+  return result
+}
+
+export function formatTvl(tvl: number): string {
+  if (tvl >= 1e9) return `$${(tvl / 1e9).toFixed(1)}B`
+  if (tvl >= 1e6) return `$${(tvl / 1e6).toFixed(1)}M`
+  if (tvl >= 1e3) return `$${(tvl / 1e3).toFixed(1)}K`
+  return `$${tvl.toFixed(0)}`
+}
+
+export { isValidInteger, isValidNumeric } from "./validation.js"

package/src/walletUtils.ts

@@ -1,4 +1,5 @@
 import type { Connector } from "wagmi"
+import type { WalletConnector } from "./wallets.js"
 import {
   BaseError,
   formatTransactionRequest,
@@ -202,7 +203,7 @@ export function isSequenceWalletById(walletId: string | undefined): boolean {
 }
 
 export function isWalletConnectConnector(
-  connector: Connector | undefined,
+  connector: Connector | Pick<WalletConnector, "id" | "name"> | undefined,
 ): boolean {
   if (!connector) return false
   const connectorName = connector.name?.toLowerCase() || ""