0xtrails 0.1.2 → 0.1.3

package/src/analytics.ts

@@ -147,6 +147,8 @@ abstract class BaseAnalytics {
     originTokenAddress?: string
     destinationTokenAddress?: string
     destinationTokenAmount?: string
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -170,6 +172,8 @@ abstract class BaseAnalytics {
   trackPaymentCompleted(data: {
     userAddress?: string
     intentAddress?: string
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -193,6 +197,8 @@ abstract class BaseAnalytics {
     error: string
     userAddress?: string
     intentAddress?: string
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -245,6 +251,8 @@ abstract class BaseAnalytics {
     originTokenAddress?: string
     destinationTokenAddress?: string
     userAddress?: string
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -277,6 +285,8 @@ abstract class BaseAnalytics {
     feeToken?: string
     userAddress?: string
     intentAddress?: string
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -314,6 +324,8 @@ abstract class BaseAnalytics {
     destinationChainId?: number
     originTokenAddress?: string
     destinationTokenAddress?: string
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -376,6 +388,8 @@ abstract class BaseAnalytics {
     intentAddress?: string
     originChainId?: number
     destinationChainId?: number
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -401,6 +415,8 @@ abstract class BaseAnalytics {
     chainId: number
     userAddress?: string
     intentAddress?: string
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -423,6 +439,8 @@ abstract class BaseAnalytics {
     transactionHash: string
     userAddress?: string
     intentAddress?: string
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -446,6 +464,8 @@ abstract class BaseAnalytics {
     chainId: number
     userAddress?: string
     intentAddress?: string
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -470,6 +490,8 @@ abstract class BaseAnalytics {
     blockNumber?: number
     userAddress?: string
     intentAddress?: string
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -495,6 +517,8 @@ abstract class BaseAnalytics {
     error: string
     userAddress?: string
     intentAddress?: string
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -518,6 +542,8 @@ abstract class BaseAnalytics {
     walletAddress?: string
     contractAddress?: string
     chainId?: number
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -540,6 +566,8 @@ abstract class BaseAnalytics {
     walletAddress?: string
     contractAddress?: string
     chainId?: number
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -563,6 +591,8 @@ abstract class BaseAnalytics {
     walletAddress?: string
     contractAddress?: string
     chainId?: number
+    mode?: string
+    fundMethod?: string
     [key: string]: any
   }) {
     this.track({
@@ -623,6 +653,10 @@ class Analytics extends BaseAnalytics {
       console.log("[trails-sdk] Analytics track:", event)
     }
   }
+
+  getSessionId() {
+    return this.databeat.getSessionId()
+  }
 }
 
 class MockAnalytics extends BaseAnalytics {
@@ -633,8 +667,7 @@ class MockAnalytics extends BaseAnalytics {
     this.loggingEnabled = loggingEnabled
   }
 
-  identifyUser({ address }: { address: string }) {
-    console.log("[trails-sdk] MockAnalytics identifyUser:", address)
+  identifyUser(_data: { address: string }) {
     return this
   }
 
@@ -664,11 +697,19 @@ class MockAnalytics extends BaseAnalytics {
       console.log("[trails-sdk] MockAnalytics track:", event)
     }
   }
+
+  getSessionId() {
+    return `0x${Math.random().toString(16).slice(2, 10)}`
+  }
 }
 
-let singleton: Analytics | null = null
+let singleton: Analytics | MockAnalytics | null = null
 
 export const getAnalytics = () => {
+  if (singleton) {
+    return singleton
+  }
+
   const debugMode = getQueryParam("analyticsDebug") === "true"
   let isLocalhost = true
   if (typeof window !== "undefined") {
@@ -678,13 +719,16 @@ export const getAnalytics = () => {
   }
   const enableMockAnalytics = !DATABEAT_KEY || debugMode || isLocalhost
   if (enableMockAnalytics) {
-    return new MockAnalytics({ loggingEnabled: true }) // return a dummy analytics object
+    singleton = new MockAnalytics({ loggingEnabled: true }) // return a dummy analytics object
   }
   if (!singleton) {
     singleton = new Analytics(DATABEAT_SERVER, {
       jwt: DATABEAT_KEY,
     })
   }
+
+  console.log("[trails-sdk] Analytics sessionId:", singleton.getSessionId())
+
   return singleton
 }
 
@@ -723,6 +767,8 @@ export const trackPaymentStarted = (data: {
   originTokenAddress?: string
   destinationTokenAddress?: string
   destinationTokenAmount?: string
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -732,6 +778,8 @@ export const trackPaymentStarted = (data: {
 export const trackPaymentCompleted = (data: {
   userAddress?: string
   intentAddress?: string
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -742,6 +790,8 @@ export const trackPaymentError = (data: {
   error: string
   userAddress?: string
   intentAddress?: string
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -772,6 +822,8 @@ export const trackIntentQuoteRequested = (data: {
   destinationChainId: number
   tokenAddress?: string
   userAddress?: string
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -793,6 +845,8 @@ export const trackIntentQuoteReceived = (data: {
   feeToken?: string
   userAddress?: string
   intentAddress?: string
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -806,6 +860,8 @@ export const trackIntentQuoteError = (data: {
   destinationChainId?: number
   originTokenAddress?: string
   destinationTokenAddress?: string
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -817,6 +873,8 @@ export const trackIntentCommitStarted = (data: {
   userAddress?: string
   originChainId?: number
   destinationChainId?: number
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -828,6 +886,8 @@ export const trackIntentCommitCompleted = (data: {
   userAddress?: string
   originChainId?: number
   destinationChainId?: number
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -840,6 +900,8 @@ export const trackIntentCommitError = (data: {
   intentAddress?: string
   originChainId?: number
   destinationChainId?: number
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -852,6 +914,8 @@ export const trackTransactionStarted = (data: {
   chainId: number
   userAddress?: string
   intentAddress?: string
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -862,6 +926,8 @@ export const trackTransactionSigned = (data: {
   transactionHash: string
   userAddress?: string
   intentAddress?: string
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -873,6 +939,8 @@ export const trackTransactionSubmitted = (data: {
   chainId: number
   userAddress?: string
   intentAddress?: string
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -884,6 +952,8 @@ export const trackTransactionConfirmed = (data: {
   blockNumber?: number
   userAddress?: string
   intentAddress?: string
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -895,6 +965,8 @@ export const trackTransactionError = (data: {
   error: string
   userAddress?: string
   intentAddress?: string
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -906,6 +978,8 @@ export const trackRelayerCallStarted = (data: {
   walletAddress?: string
   contractAddress?: string
   chainId?: number
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -916,6 +990,8 @@ export const trackRelayerCallCompleted = (data: {
   walletAddress?: string
   contractAddress?: string
   chainId?: number
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
@@ -927,8 +1003,15 @@ export const trackRelayerCallError = (data: {
   walletAddress?: string
   contractAddress?: string
   chainId?: number
+  mode?: string
+  fundMethod?: string
   [key: string]: any
 }) => {
   const analytics = getAnalytics()
   analytics.trackRelayerCallError(data)
 }
+
+export function getSessionId() {
+  const analytics = getAnalytics()
+  return analytics.getSessionId()
+}

package/src/chains.ts

@@ -2,7 +2,9 @@ import { useQuery } from "@tanstack/react-query"
 import type { Chain } from "viem"
 import * as chains from "viem/chains"
 import { getRelaySupportedChains } from "./relaySdk.js"
+import { getLifiSupportedChains } from "./lifi.js"
 import { getRpcSequenceProjectAccessKey } from "./config.js"
+import type { QuoteProvider } from "./intents.js"
 
 export const sequenceRpcUrls: Record<number, string> = {
   [chains.arbitrum.id]: "https://nodes.sequence.app/arbitrum",
@@ -19,6 +21,8 @@ export const sequenceRpcUrls: Record<number, string> = {
   [chains.b3.id]: "https://nodes.sequence.app/b3",
   [chains.blast.id]: "https://nodes.sequence.app/blast",
   [chains.bsc.id]: "https://nodes.sequence.app/bsc",
+  [chains.katana.id]: "https://nodes.sequence.app/katana",
+  [chains.etherlink.id]: "https://nodes.sequence.app/etherlink",
 }
 
 export const getRpcUrl = (
@@ -46,6 +50,8 @@ export const supportedSequenceChains: Record<number, Chain> = {
   [chains.polygon.id]: getChainInfo(chains.polygon.id)!,
   [chains.soneium.id]: getChainInfo(chains.soneium.id)!,
   [chains.xai.id]: getChainInfo(chains.xai.id)!,
+  [chains.katana.id]: getChainInfo(chains.katana.id)!,
+  [chains.etherlink.id]: getChainInfo(chains.etherlink.id)!,
 }
 
 export const supportedSequenceTestnetChains: Record<number, Chain> = {
@@ -61,6 +67,7 @@ export const supportedSequenceTestnetChains: Record<number, Chain> = {
   [chains.optimismSepolia.id]: getChainInfo(chains.optimismSepolia.id)!,
   [chains.soneiumMinato.id]: getChainInfo(chains.soneiumMinato.id)!,
   [chains.xaiTestnet.id]: getChainInfo(chains.xaiTestnet.id)!,
+  [chains.etherlinkTestnet.id]: getChainInfo(chains.etherlinkTestnet.id)!,
 }
 
 export const mainnetChainsToTestnetChains: Record<number, Chain> = {
@@ -78,13 +85,15 @@ export const mainnetChainsToTestnetChains: Record<number, Chain> = {
   [chains.bsc.id]: chains.bscTestnet,
   [chains.arbitrumNova.id]: chains.arbitrumSepolia,
   [chains.apeChain.id]: chains.sepolia,
+  [chains.etherlink.id]: chains.etherlinkTestnet,
 }
 
 // Helper to get chain info
 export function getChainInfo(
-  chainId: number,
+  chainId?: number,
   options?: { usePublicRpc?: boolean },
 ): Chain | null {
+  if (!chainId) return null
   const chainInfo =
     (Object.values(chains) as Array<Chain>).find(
       (chain: Chain) => chain.id === chainId,
@@ -155,13 +164,36 @@ function sortChains(chainList: Chain[]): Chain[] {
   })
 }
 
-export async function getSupportedChains(): Promise<Chain[]> {
-  const sequenceChains = await getSupportedSequenceChains()
+export async function getAllQuoteProviderChains(): Promise<Chain[]> {
   const relayChains = await getRelaySupportedChains()
+  const lifiChains = await getLifiSupportedChains()
+  const allChains = [...relayChains, ...lifiChains]
+  return allChains.filter(
+    (chain, index, self) => index === self.findIndex((c) => c.id === chain.id),
+  )
+}
+
+export async function getSupportedChains({
+  quoteProvider,
+}: {
+  quoteProvider?: QuoteProvider | string
+} = {}): Promise<Chain[]> {
+  let quoteProviderChains: Chain[] = []
+  if (quoteProvider === "relay") {
+    quoteProviderChains = await getRelaySupportedChains()
+  } else if (quoteProvider === "lifi") {
+    quoteProviderChains = await getLifiSupportedChains()
+  } else {
+    quoteProviderChains = await getAllQuoteProviderChains()
+  }
+
+  const sequenceChains = await getSupportedSequenceChains()
 
   // Find intersection of sequence chains and relay chains
   const supportedChains = sequenceChains.filter((sequenceChain) =>
-    relayChains.some((relayChain) => relayChain.id === sequenceChain.id),
+    quoteProviderChains.some(
+      (quoteProviderChain) => quoteProviderChain.id === sequenceChain.id,
+    ),
   )
 
   // Ensure unique chain IDs by filtering duplicates
@@ -169,17 +201,23 @@ export async function getSupportedChains(): Promise<Chain[]> {
     (chain, index, self) => index === self.findIndex((c) => c.id === chain.id),
   )
 
+  const sortedChains = sortChains(uniqueChains)
+
   // Sort chains by priority and then by name
-  return sortChains(uniqueChains)
+  return sortedChains
 }
 
-export function useSupportedChains(): {
+export function useSupportedChains({
+  quoteProvider,
+}: {
+  quoteProvider?: QuoteProvider | string
+} = {}): {
   supportedChains: Chain[]
   isLoadingChains: boolean
 } {
   const { data: supportedChains = [], isLoading: isLoadingChains } = useQuery({
     queryKey: ["supportedChains"],
-    queryFn: getSupportedChains,
+    queryFn: () => getSupportedChains({ quoteProvider }),
     staleTime: 60 * 60 * 1000, // 1 hour - chains rarely change
     gcTime: 24 * 60 * 60 * 1000, // 24 hours - keep in cache for a full day
     refetchOnWindowFocus: false, // Don't refetch when window regains focus

package/src/constants.ts

@@ -1,11 +1,11 @@
 import type { Context as ContextLike } from "@0xsequence/wallet-primitives"
 
 export const SEQUENCE_V3_CONTRACT_ADDRESSES: ContextLike.Context = {
-  factory: "0xBd0F8abD58B4449B39C57Ac9D5C67433239aC447" as `0x${string}`,
-  stage1: "0x53bA242E7C2501839DF2972c75075dc693176Cd0" as `0x${string}`,
-  stage2: "0xa29874c88b8Fd557e42219B04b0CeC693e1712f5" as `0x${string}`,
+  factory: "0x7aaaD48b90Ea2c1DaE03cb68ea1Ed8E1DD26dB38" as `0x${string}`,
+  stage1: "0x4d7c112790F03caFc7287b1a29Aa03da1Bb00C10" as `0x${string}`,
+  stage2: "0x7C96ff440BCE51EEF0C9f748D69246B4b3F28173" as `0x${string}`,
   creationCode:
-    "0x603e600e3d39601e805130553df33d3d34601c57363d3d373d363d30545af43d82803e903d91601c57fd5bf3" as `0x${string}`,
+    "0x6041600e3d396021805130553df33d3d36153402601f57363d3d373d363d30545af43d82803e903d91601f57fd5bf3" as `0x${string}`,
 }
 
 export const ATTESATION_SIGNER_ADDRESS =

package/src/ens.ts

@@ -0,0 +1,17 @@
+import { mainnet } from "viem/chains"
+import { useEnsAddress } from "wagmi"
+
+export function useResolveEnsAddress({ textInput }: { textInput: string }) {
+  const { data: ensAddress, isLoading } = useEnsAddress({
+    name: textInput?.endsWith(".eth") ? textInput : undefined,
+    chainId: mainnet.id,
+    query: {
+      enabled: !!textInput && textInput.endsWith(".eth"),
+    },
+  })
+
+  return {
+    ensAddress,
+    isLoading,
+  }
+}

package/src/error.ts

@@ -3,7 +3,10 @@ export function getFullErrorMessage(err: any) {
 
   let current = err
   while (current) {
-    if (current.message) {
+    if (typeof current === "string") {
+      messages.push(current)
+    }
+    if (typeof current.message === "string") {
       messages.push(current.message)
     }
 
@@ -37,3 +40,15 @@ export class InsufficientBalanceError extends Error {
     this.name = "InsufficientBalanceError"
   }
 }
+
+export function getIsApiError(err: unknown) {
+  const isApiError = /request aborted/gi.test(getErrorString(err).toLowerCase())
+  return isApiError
+}
+
+export function getIsRateLimitedError(err: unknown) {
+  const isRateLimited = /slow down|request rate|rate limit/gi.test(
+    getErrorString(err).toLowerCase(),
+  )
+  return isRateLimited
+}

package/src/lifi.ts

@@ -0,0 +1,58 @@
+import * as chains from "viem/chains"
+import type { Chain } from "viem/chains"
+
+export const lifiSupportedChains: Record<number, Chain> = {
+  [chains.mainnet.id]: chains.mainnet,
+  [chains.polygon.id]: chains.polygon,
+  [chains.arbitrum.id]: chains.arbitrum,
+  [chains.avalanche.id]: chains.avalanche,
+  [chains.optimism.id]: chains.optimism,
+  [chains.base.id]: chains.base,
+  [chains.bsc.id]: chains.bsc,
+  [chains.blast.id]: chains.blast,
+  [chains.gnosis.id]: chains.gnosis,
+  [chains.scroll.id]: chains.scroll,
+  [chains.linea.id]: chains.linea,
+  [chains.zksync.id]: chains.zksync,
+  [chains.polygonZkEvm.id]: chains.polygonZkEvm,
+  [chains.moonriver.id]: chains.moonriver,
+  [chains.fantom.id]: chains.fantom,
+  [chains.moonbeam.id]: chains.moonbeam,
+  [chains.fuse.id]: chains.fuse,
+  [chains.boba.id]: chains.boba,
+  [chains.metis.id]: chains.metis,
+  [chains.lisk.id]: chains.lisk,
+  [chains.unichain.id]: chains.unichain,
+  [chains.aurora.id]: chains.aurora,
+  [chains.sei.id]: chains.sei,
+  [chains.immutableZkEvm.id]: chains.immutableZkEvm,
+  [chains.flare.id]: chains.flare,
+  [chains.sonic.id]: chains.sonic,
+  [chains.gravity.id]: chains.gravity,
+  [chains.taiko.id]: chains.taiko,
+  [chains.soneium.id]: chains.soneium,
+  [chains.swellchain.id]: chains.swellchain,
+  [chains.opBNB.id]: chains.opBNB,
+  [chains.corn.id]: chains.corn,
+  [chains.lens.id]: chains.lens,
+  [chains.cronos.id]: chains.cronos,
+  [chains.abstract.id]: chains.abstract,
+  [chains.rootstock.id]: chains.rootstock,
+  [chains.apeChain.id]: chains.apeChain,
+  [chains.celo.id]: chains.celo,
+  [chains.worldchain.id]: chains.worldchain,
+  [chains.xdc.id]: chains.xdc,
+  [chains.mantle.id]: chains.mantle,
+  [chains.superposition.id]: chains.superposition,
+  [chains.ink.id]: chains.ink,
+  [chains.bob.id]: chains.bob,
+  [chains.berachain.id]: chains.berachain,
+  [chains.kaia.id]: chains.kaia,
+  [chains.plume.id]: chains.plume,
+  [chains.etherlink.id]: chains.etherlink,
+  [chains.katana.id]: chains.katana,
+}
+
+export async function getLifiSupportedChains(): Promise<Chain[]> {
+  return Object.values(lifiSupportedChains)
+}

package/src/mode.ts

@@ -1 +1 @@
-export type Mode = "pay" | "fund" | "earn"
+export type Mode = "pay" | "fund" | "earn" | "swap"

package/src/morpho.ts

@@ -303,9 +303,9 @@ function transformVaultToPool(vaultData: any): Pool | null {
     const apyPercentage = apy * 100
 
     if (tvlInMillions < 1 || apyPercentage > 20) {
-      console.log(
-        `Filtering out vault ${vaultData.address}: TVL=${tvlInMillions.toFixed(2)}M, APY=${apyPercentage.toFixed(2)}%`,
-      )
+      // console.log(
+      //   `Filtering out vault ${vaultData.address}: TVL=${tvlInMillions.toFixed(2)}M, APY=${apyPercentage.toFixed(2)}%`,
+      // )
       return null
     }
 

package/src/pools.ts

@@ -128,24 +128,24 @@ export function usePools() {
     }
   }, [aaveError, morphoError])
 
-  console.log("[trails-sdk] === COMBINED POOLS DEBUG ===")
-  console.log("[trails-sdk] Cache valid:", isCacheValid)
-  console.log("[trails-sdk] Aave pools count:", aavePools?.length || 0)
-  console.log("[trails-sdk] Morpho pools count:", morphoPools?.length || 0)
-  console.log("[trails-sdk] Total pools count:", sortedPools.length)
-  console.log(
-    "[trails-sdk] Loading states - Aave:",
-    aaveLoading,
-    "Morpho:",
-    morphoLoading,
-  )
-  console.log(
-    "[trails-sdk] Error states - Aave:",
-    aaveError,
-    "Morpho:",
-    morphoError,
-  )
-  console.log("[trails-sdk] ==============================")
+  // console.log("[trails-sdk] === COMBINED POOLS DEBUG ===")
+  // console.log("[trails-sdk] Cache valid:", isCacheValid)
+  // console.log("[trails-sdk] Aave pools count:", aavePools?.length || 0)
+  // console.log("[trails-sdk] Morpho pools count:", morphoPools?.length || 0)
+  // console.log("[trails-sdk] Total pools count:", sortedPools.length)
+  // console.log(
+  //   "[trails-sdk] Loading states - Aave:",
+  //   aaveLoading,
+  //   "Morpho:",
+  //   morphoLoading,
+  // )
+  // console.log(
+  //   "[trails-sdk] Error states - Aave:",
+  //   aaveError,
+  //   "Morpho:",
+  //   morphoError,
+  // )
+  // console.log("[trails-sdk] ==============================")
 
   return {
     data: sortedPools,