0xtrails 0.1.2 → 0.1.3

package/src/prepareSend.ts

@@ -154,8 +154,10 @@ export type PrepareSendOptions = {
   slippageTolerance?: string
   originNativeTokenPriceUsd?: number | null
   quoteProvider?: string | null
-  fundMethod?: string | null
+  fundMethod?: string
+  mode?: "pay" | "fund" | "earn" | "swap"
   checkoutOnHandlers?: CheckoutOnHandlers
+  refundAddress?: string
 }
 
 export type PrepareSendFees = {
@@ -357,6 +359,7 @@ export async function prepareSend(
     originNativeTokenPriceUsd,
     quoteProvider,
     fundMethod,
+    mode,
     checkoutOnHandlers,
   } = options
 
@@ -404,6 +407,8 @@ export async function prepareSend(
     originTokenAddress,
     destinationTokenAddress,
     destinationTokenAmount: swapAmount,
+    mode,
+    fundMethod,
   })
 
   if (originTokenBalance === "0") {
@@ -414,6 +419,8 @@ export async function prepareSend(
     trackPaymentError({
       error: "Wallet client not provided",
       userAddress: account.address,
+      mode,
+      fundMethod,
     })
     throw new Error("Wallet client not provided")
   }
@@ -423,6 +430,8 @@ export async function prepareSend(
     trackPaymentError({
       error: `Chain ${originChainId} not found`,
       userAddress: account.address,
+      mode,
+      fundMethod,
     })
     throw new Error(`Chain ${originChainId} not found`)
   }
@@ -559,6 +568,7 @@ export async function prepareSend(
     originNativeTokenPriceUsd,
     quoteProvider,
     fundMethod,
+    mode,
     checkoutOnHandlers,
   })
 }
@@ -596,6 +606,7 @@ async function sendHandlerForDifferentChainDifferentToken({
   originNativeTokenPriceUsd,
   quoteProvider,
   fundMethod,
+  mode,
   checkoutOnHandlers,
 }: {
   mainSignerAddress: string
@@ -629,7 +640,8 @@ async function sendHandlerForDifferentChainDifferentToken({
   tradeType: TradeType
   originNativeTokenPriceUsd?: number | null
   quoteProvider?: string | null
-  fundMethod?: string | null
+  fundMethod?: string
+  mode?: "pay" | "fund" | "earn" | "swap"
   checkoutOnHandlers?: CheckoutOnHandlers
 }): Promise<PrepareSendReturn> {
   const testnet = isTestnetDebugMode()
@@ -1256,6 +1268,8 @@ async function sendHandlerForDifferentChainDifferentToken({
             ?.txnHash,
           originChainId,
           destinationChainId,
+          mode,
+          fundMethod,
         })
 
         // Call onCheckoutComplete callback if provided
@@ -1268,6 +1282,8 @@ async function sendHandlerForDifferentChainDifferentToken({
           error: "Payment transactions did not complete successfully",
           userAddress: account.address,
           intentAddress,
+          mode,
+          fundMethod,
         })
 
         // Call onCheckoutError callback if provided
@@ -1307,6 +1323,8 @@ async function sendHandlerForSameChainSameToken({
   originNativeTokenPriceUsd,
   slippageTolerance,
   checkoutOnHandlers,
+  mode,
+  fundMethod,
 }: {
   originTokenAddress: string
   swapAmount: string
@@ -1325,6 +1343,8 @@ async function sendHandlerForSameChainSameToken({
   originNativeTokenPriceUsd?: number | null
   slippageTolerance?: string
   checkoutOnHandlers?: CheckoutOnHandlers
+  mode?: "pay" | "fund" | "earn" | "swap"
+  fundMethod?: string
 }): Promise<PrepareSendReturn> {
   console.log("[trails-sdk] isToSameToken && isToSameChain")
   const testnet = isTestnetDebugMode()
@@ -1506,11 +1526,15 @@ async function sendHandlerForSameChainSameToken({
             userAddress: account.address,
             originTxHash: originUserTxReceipt.transactionHash,
             originChainId: effectiveOriginChainId, // Same chain
+            mode,
+            fundMethod,
           })
         } else if (originUserTxReceipt) {
           trackPaymentError({
             error: "Transaction failed",
             userAddress: account.address,
+            mode,
+            fundMethod,
           })
         }
       }
@@ -1543,6 +1567,8 @@ async function _sendHandlerForSameChainDifferentToken({
   sourceTokenPriceUsd,
   destinationTokenPriceUsd,
   originNativeTokenPriceUsd,
+  mode,
+  fundMethod,
 }: {
   originTokenAddress: string
   swapAmount: string
@@ -1560,6 +1586,8 @@ async function _sendHandlerForSameChainDifferentToken({
   sourceTokenPriceUsd?: number | null
   destinationTokenPriceUsd?: number | null
   originNativeTokenPriceUsd?: number | null
+  mode?: "pay" | "fund" | "earn" | "swap"
+  fundMethod?: string
 }): Promise<PrepareSendReturn> {
   const destinationTxs: { to: string; value: string; data: string }[] = []
   const hasCustomCalldata = getIsCustomCalldata(destinationCalldata)
@@ -1713,11 +1741,15 @@ async function _sendHandlerForSameChainDifferentToken({
           originTxHash: originUserTxReceipt.transactionHash,
           originChainId,
           destinationChainId: originChainId, // Same chain
+          mode,
+          fundMethod,
         })
       } else if (originUserTxReceipt) {
         trackPaymentError({
           error: "Relay transaction failed",
           userAddress: account.address,
+          mode,
+          fundMethod,
         })
       }
 
@@ -2214,7 +2246,7 @@ async function attemptUserDepositTx({
   fee: string
   onTransactionStateChange: (transactionStates: TransactionState[]) => void
   transactionStates: TransactionState[]
-  fundMethod?: string | null
+  fundMethod?: string
 }): Promise<TransactionReceipt | null> {
   let originUserTxReceipt: TransactionReceipt | null = null
   const originChainId = chain.id

package/src/prices.ts

@@ -204,3 +204,24 @@ export function formatTvl(tvl: number): string {
   if (tvl >= 1e3) return `$${(tvl / 1e3).toFixed(1)}K`
   return `$${tvl.toFixed(0)}`
 }
+
+// Helper function to validate numeric values
+export const isValidNumeric = (
+  value: number | string | null | undefined,
+): boolean => {
+  if (value === null || value === undefined || value === "") {
+    return true // Empty values are considered valid
+  }
+  const strValue = String(value).trim()
+  return /^\d+(\.\d+)?$/.test(strValue)
+}
+
+export const isValidInteger = (
+  value: number | string | null | undefined,
+): boolean => {
+  if (value === null || value === undefined || value === "") {
+    return true // Empty values are considered valid
+  }
+  const strValue = String(value).trim()
+  return /^\d+$/.test(strValue)
+}

package/src/relaySdk.ts

@@ -242,6 +242,7 @@ export const relaySupportedChains: Record<number, Chain> = {
   [chains.zircuit.id]: chains.zircuit,
   [chains.zksync.id]: chains.zksync,
   [chains.zora.id]: chains.zora,
+  [chains.katana.id]: chains.katana,
 }
 
 export async function getRelaySupportedChains(): Promise<Chain[]> {

package/src/relayer.ts

@@ -162,6 +162,10 @@ export function getRelayerUrl(
       relayerUrl = "https://v3-xai-relayer.sequence.app"
     } else if (chainId === 56) {
       relayerUrl = "https://v3-bsc-relayer.sequence.app"
+    } else if (chainId === 747474) {
+      relayerUrl = "https://v3-katana-relayer.sequence.app"
+    } else if (chainId === 42793) {
+      relayerUrl = "https://v3-etherlink-relayer.sequence.app"
     } else {
       // Fallback to general dev relayer for other chains if V3 is specified but chain not V3-supported
       relayerUrl = `${baseUrl}${getChainInfo(chainId)!.name?.replace(" ", "-")}-relayer.sequence.app`
@@ -207,6 +211,10 @@ export function getRelayerUrl(
       relayerUrl = "https://dev-xai-relayer.sequence.app"
     } else if (chainId === 56) {
       relayerUrl = "https://dev-bsc-relayer.sequence.app"
+    } else if (chainId === 747474) {
+      relayerUrl = "https://dev-katana-relayer.sequence.app"
+    } else if (chainId === 42793) {
+      relayerUrl = "https://dev-etherlink-relayer.sequence.app"
     } else {
       // Fallback to general dev relayer for other chains if V3 is specified but chain not V3-supported
       relayerUrl = `${baseUrl}${getChainInfo(chainId)!.name?.replace(" ", "-")}-relayer.sequence.app`

package/src/tokenBalances.ts

@@ -283,6 +283,9 @@ export function formatRawAmount(
   balance: string | bigint,
   decimals: number = 18,
 ): string {
+  if (!balance) {
+    return "0"
+  }
   try {
     const formatted = formatUnits(BigInt(balance), decimals)
     return formatAmount(formatted)

package/src/tokens.ts

@@ -1,7 +1,7 @@
 import { QueryClient, useQuery } from "@tanstack/react-query"
 import { zeroAddress, erc20Abi } from "viem"
-import * as chains from "viem/chains"
 import { getChainInfo, getSupportedChains } from "./chains.js"
+import * as chains from "viem/chains"
 import { getRelaySupportedTokens } from "./relaySdk.js"
 import { useReadContracts } from "wagmi"
 import { useMemo } from "react"
@@ -17,6 +17,21 @@ export type SupportedToken = {
   imageUrl: string
 }
 
+export const commonTokenImages: Record<string, string> = {
+  ETH: "https://assets.sequence.info/images/tokens/large/1/0x0000000000000000000000000000000000000000.webp",
+  WETH: "https://assets.coingecko.com/coins/images/39723/small/WETH.PNG?1723733967",
+  POL: "https://assets.sequence.info/images/tokens/large/137/0x0000000000000000000000000000000000000000.webp",
+  USDC: "https://assets.sequence.info/images/tokens/large/1/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.webp",
+  USDT: "https://assets.sequence.info/images/tokens/large/1/0xdac17f958d2ee523a2206206994597c13d831ec7.webp",
+  DAI: "https://assets.sequence.info/images/tokens/large/1/0x6b175474e89094c44da98b954eedeac495271d0f.webp",
+  WBTC: "https://assets.sequence.info/images/tokens/large/1/0x2260fac5e5542a773aa44fbcfedf7c193bc2c599.webp",
+  BAT: "https://assets.sequence.info/images/tokens/large/1/0x0d8775f648430679a709e98d2b0cb6250d2887ef.webp",
+  ARB: "https://assets.sequence.info/images/tokens/large/42161/0x912ce59144191c1204e64559fe8253a0e49e6548.webp",
+  LINK: "https://assets.sequence.info/images/tokens/large/1/0x514910771af9ca656af840dff83e8264ecf986ca.webp",
+  XTZ: "https://assets.sequence.info/images/tokens/large/42793/0x0000000000000000000000000000000000000000.webp",
+  WXTZ: "https://assets.coingecko.com/coins/images/976/standard/Tezos-logo.png?1696502091",
+}
+
 const cacheVersion = "01"
 
 // LocalStorage cache utilities for token images
@@ -303,8 +318,13 @@ export async function getTokenImageUrlOrFallback({
   }
 }
 
+export async function getAllTokens(): Promise<SupportedToken[]> {
+  const relayTokens = (await getRelaySupportedTokens()) as SupportedToken[]
+  return relayTokens
+}
+
 export async function getSupportedTokens(): Promise<SupportedToken[]> {
-  const tokens = await getRelaySupportedTokens()
+  const tokens = await getAllTokens()
   for (const token of tokens) {
     if (!token.imageUrl) {
       token.imageUrl = getTokenImageUrl({
@@ -342,9 +362,13 @@ export async function getSupportedTokens(): Promise<SupportedToken[]> {
 
   const supportedChains = await getSupportedChains()
   const allTokens = [...tokens, ...additionalTokens]
-  const supportedChainTokens = allTokens.filter((token) =>
-    supportedChains.some((chain) => chain.id === token.chainId),
-  )
+  const supportedChainTokens = allTokens.filter((token) => {
+    // Always include Etherlink tokens
+    if (token.chainId === chains.etherlink.id) {
+      return true
+    }
+    return supportedChains.some((chain) => chain.id === token.chainId)
+  })
   const uniqueTokens = supportedChainTokens.filter(
     (token, index, self) =>
       index ===
@@ -357,7 +381,9 @@ export async function getSupportedTokens(): Promise<SupportedToken[]> {
   )
 
   // Sort tokens according to priority order
-  return sortTokens(uniqueTokens as SupportedToken[])
+  const sortedTokens = sortTokens(uniqueTokens as SupportedToken[])
+
+  return sortedTokens
 }
 
 export function useSupportedTokens({ chainId }: { chainId?: number } = {}): {
@@ -426,6 +452,7 @@ export const tokenNamePrefixes: Record<string, string> = {
   [chains.optimism.id]: "Optimistic",
   [chains.arbitrum.id]: "Arbitrum",
   [chains.polygon.id]: "Polygon",
+  [chains.etherlink.id]: "Etherlink",
 }
 
 export function getFormatttedTokenName(
@@ -788,21 +815,8 @@ export function useTokenInfo({
   }
 }
 
-export const commonTokenImages: Record<string, string> = {
-  ETH: "https://assets.sequence.info/images/tokens/large/1/0x0000000000000000000000000000000000000000.webp",
-  POL: "https://assets.sequence.info/images/tokens/large/137/0x0000000000000000000000000000000000000000.webp",
-  USDC: "https://assets.sequence.info/images/tokens/large/1/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48.webp",
-  USDT: "https://assets.sequence.info/images/tokens/large/1/0xdac17f958d2ee523a2206206994597c13d831ec7.webp",
-  DAI: "https://assets.sequence.info/images/tokens/large/1/0x6b175474e89094c44da98b954eedeac495271d0f.webp",
-  WBTC: "https://assets.sequence.info/images/tokens/large/1/0x2260fac5e5542a773aa44fbcfedf7c193bc2c599.webp",
-  BAT: "https://assets.sequence.info/images/tokens/large/1/0x0d8775f648430679a709e98d2b0cb6250d2887ef.webp",
-  ARB: "https://assets.sequence.info/images/tokens/large/42161/0x912ce59144191c1204e64559fe8253a0e49e6548.webp",
-  LINK: "https://assets.sequence.info/images/tokens/large/1/0x514910771af9ca656af840dff83e8264ecf986ca.webp",
-}
-
 export const tokenImageSymbolMap: Record<string, string> = {
   ETH: "ETH",
-  WETH: "ETH",
   cbETH: "ETH",
   POL: "POL",
   WPOL: "POL",
@@ -1018,6 +1032,58 @@ export const commonTokens: SupportedToken[] = [
     chainName: chains.mainnet.name,
     imageUrl: commonTokenImages.LINK!,
   },
+
+  // Etherlink tokens
+  {
+    id: "XTZ-etherlink",
+    symbol: "XTZ",
+    name: "Tezos",
+    contractAddress: "0x0000000000000000000000000000000000000000",
+    decimals: 18,
+    chainId: chains.etherlink.id,
+    chainName: chains.etherlink.name,
+    imageUrl: commonTokenImages.XTZ as string,
+  },
+  {
+    id: "WXTZ-etherlink",
+    symbol: "WXTZ",
+    name: "Wrapped XTZ",
+    contractAddress: "0xc9B53AB2679f573e480d01e0f49e2B5CFB7a3EAb",
+    decimals: 18,
+    chainId: chains.etherlink.id,
+    chainName: chains.etherlink.name,
+    imageUrl: commonTokenImages.WXTZ as string,
+  },
+  {
+    id: "USDC-etherlink",
+    symbol: "USDC",
+    name: "USD Coin",
+    contractAddress: "0x796Ea11Fa2dD751eD01b53C372fFDB4AAa8f00F9",
+    decimals: 6,
+    chainId: chains.etherlink.id,
+    chainName: chains.etherlink.name,
+    imageUrl: commonTokenImages.USDC as string,
+  },
+  {
+    id: "WETH-etherlink",
+    symbol: "WETH",
+    name: "Wrapped ETH",
+    contractAddress: "0xfc24f770F94edBca6D6f885E12d4317320BcB401",
+    decimals: 18,
+    chainId: chains.etherlink.id,
+    chainName: chains.etherlink.name,
+    imageUrl: commonTokenImages.WETH as string,
+  },
+  {
+    id: "USDT-etherlink",
+    symbol: "USDT",
+    name: "Bridged USDT",
+    contractAddress: "0x2C03058C8AFC06713be23e58D2febC8337dbfE6A",
+    decimals: 6,
+    chainId: chains.etherlink.id,
+    chainName: chains.etherlink.name,
+    imageUrl: commonTokenImages.USDT as string,
+  },
 ]
 
 export const wethAddresses: Record<string, string> = {

package/src/trails.ts

@@ -98,7 +98,7 @@ export type UseTrailsReturn = {
     mainSignerAddress: string
     calls: IntentCallsPayload[]
     preconditions: IntentPrecondition[]
-    quoteProvider: "lifi" | "relay" | "cctp"
+    quoteProvider: QuoteProvider
     addressOverrides?: AddressOverrides
   }) => void
   commitIntentConfigPending: boolean
@@ -109,7 +109,7 @@ export type UseTrailsReturn = {
         mainSignerAddress: string
         calls: IntentCallsPayload[]
         preconditions: IntentPrecondition[]
-        quoteProvider: "lifi" | "relay" | "cctp"
+        quoteProvider: QuoteProvider
         addressOverrides?: AddressOverrides
       }
     | undefined

package/src/transactions.ts

@@ -180,6 +180,7 @@ const chainIdToIndexerUrl = {
   660279: "https://xai-indexer.sequence.app",
   56: "https://bsc-indexer.sequence.app",
   421613: "https://arbitrum-nova-sepolia-indexer.sequence.app",
+  42793: "https://etherlink-indexer.sequence.app",
 }
 
 export async function getAccountTransactionHistory({