0xtrails 0.2.4 → 0.2.6

package/src/queryParams.ts

@@ -1,11 +1,12 @@
 import { useEffect, useState } from "react"
+import { logger } from "./logger.js"
 
 export function getQueryParam(key: string): string | null {
   try {
     if (typeof window === "undefined") return null
     return new URLSearchParams(window.location.search).get(key)
   } catch (error) {
-    console.error("Error getting query param", error)
+    logger.console.error("Error getting query param", error)
     return null
   }
 }

package/src/relayer.ts

@@ -1,4 +1,4 @@
-import { type Relayer, RpcRelayer } from "@0xsequence/relayer"
+import { Relayer } from "@0xsequence/relayer"
 import { useMemo } from "react"
 import { getChainInfo, getRpcUrl } from "./chains.js"
 import { Hex } from "ox"
@@ -123,15 +123,15 @@ function wrappedFetch(
 
 export function getBackupRelayer(
   chainId: number,
-): RpcRelayer.RpcRelayer | undefined {
+): Relayer.RpcRelayer | undefined {
   if (chainId === 42161) {
-    return new RpcRelayer.RpcRelayer(
+    return new Relayer.RpcRelayer(
       "https://a1b4a8c5d856.ngrok.app/",
       chainId,
       getRpcUrl(chainId)!,
     )
   } else if (chainId === 8453) {
-    return new RpcRelayer.RpcRelayer(
+    return new Relayer.RpcRelayer(
       "https://644a6aeb891e.ngrok.app/",
       chainId,
       getRpcUrl(chainId)!,
@@ -190,7 +190,7 @@ export function getRelayer(
     env: getSequenceEnv() as RelayerEnv,
   },
   chainId: number,
-): RpcRelayer.RpcRelayer {
+): Relayer.RpcRelayer {
   const chain = getChainInfo(chainId)
 
   if (!chain) {
@@ -204,7 +204,7 @@ export function getRelayer(
 
   const relayerUrl = getRelayerUrl(config, chainId)
 
-  const relayer = new RpcRelayer.RpcRelayer(
+  const relayer = new Relayer.RpcRelayer(
     relayerUrl,
     chainId,
     rpcUrl,
@@ -261,16 +261,16 @@ export function useRelayers(
     env: getSequenceEnv() as RelayerEnv,
   },
 ): {
-  relayers: Map<number, RpcRelayer.RpcRelayer>
-  getRelayer: (chainId: number) => RpcRelayer.RpcRelayer
-  getBackupRelayer: (chainId: number) => RpcRelayer.RpcRelayer | undefined
+  relayers: Map<number, Relayer.RpcRelayer>
+  getRelayer: (chainId: number) => Relayer.RpcRelayer
+  getBackupRelayer: (chainId: number) => Relayer.RpcRelayer | undefined
 } {
   const relayers = useMemo(() => {
-    const relayerMap = new Map<number, RpcRelayer.RpcRelayer>()
+    const relayerMap = new Map<number, Relayer.RpcRelayer>()
     return relayerMap
   }, [])
 
-  const getCachedRelayer = (chainId: number): RpcRelayer.RpcRelayer => {
+  const getCachedRelayer = (chainId: number): Relayer.RpcRelayer => {
     let relayer = relayers.get(chainId)
 
     if (!relayer) {

package/src/sequenceWallet.ts

@@ -18,7 +18,7 @@ import type { RelayerEnvConfig, RelayerEnv } from "./relayer.js"
 import { getRelayerUrl } from "./relayer.js"
 import { getSequenceProjectAccessKey, getSequenceEnv } from "./config.js"
 import { logger } from "./logger.js"
-import type { RpcRelayer, Relayer } from "@0xsequence/relayer"
+import type { Relayer } from "@0xsequence/relayer"
 
 export type FlatTransaction = {
   to: string
@@ -528,7 +528,7 @@ export class StaticSigner implements signers.SapientSigner {
 }
 
 export async function getFeeOptions(
-  relayer: RpcRelayer.RpcRelayer,
+  relayer: Relayer.RpcRelayer,
   wallet: string,
   chainId: number,
   calls: Payload.Call[],

package/src/tokens.ts

@@ -701,10 +701,11 @@ export function getCommonTokenImageUrl({
   contractAddress?: string | null
   chainId?: number | null
 }) {
-  if (!symbol || !contractAddress || !chainId) {
+  if (!contractAddress || !chainId) {
     return ""
   }
 
+  // If no symbol provided, try to look it up from contract address
   if (!symbol) {
     const token = commonTokens.find(
       (t) =>
@@ -721,6 +722,7 @@ export function getCommonTokenImageUrl({
   }
 
   const symbolKey = tokenImageSymbolMap[symbol] ?? symbol
+
   if (commonTokenImages[symbolKey]) {
     return commonTokenImages[symbolKey]
   }
@@ -970,6 +972,10 @@ export const tokenImageSymbolMap: Record<string, string> = {
   BAT: "BAT",
   ARB: "ARB",
   LINK: "LINK",
+
+  // vault tokens
+  aBasUSDC: "USDC",
+  steakUSDC: "USDC",
 }
 
 export const commonTokens: SupportedToken[] = [

package/src/trails.ts

@@ -1085,10 +1085,10 @@ export function useTrails(config: UseTrailsConfig): UseTrailsReturn {
       logger.console.log("[trails-sdk] Selected transactions to send", {
         selectedId,
         totalMetaTxns: metaTxns.length,
-        txnsToSendCount: txnsToSend.filter((tx) => tx).length,
+        txnsToSendCount: txnsToSend.filter((tx: MetaTxn) => tx).length,
         txnsToSend: txnsToSend
-          .filter((tx) => tx)
-          .map((tx) => ({
+          .filter((tx: MetaTxn) => tx)
+          .map((tx: MetaTxn) => ({
             id: tx?.id,
             chainId: tx?.chainId,
             walletAddress: tx?.walletAddress,

package/src/transactions.ts

@@ -9,6 +9,7 @@ import { bigintReplacer } from "./utils.js"
 import { getExplorerUrl } from "./explorer.js"
 import { SortOrder } from "@0xsequence/trails-api"
 import { getChainIndexerUrl } from "./indexerClient.js"
+import { abortControllerRegistry } from "./abortController.js"
 
 export type TransactionStateStatus =
   | "pending"
@@ -99,6 +100,7 @@ export type GetAccountTransactionHistoryParams = {
   pageSize?: number
   includeMetadata?: boolean
   page?: number
+  abortSignal?: AbortSignal
 }
 
 // Standalone function to calculate time difference between two transactions
@@ -189,8 +191,8 @@ export async function getAccountTransactionHistory({
   accountAddress,
   pageSize = 10,
   page = 1,
-
   includeMetadata = true,
+  abortSignal,
 }: GetAccountTransactionHistoryParams): Promise<TransactionHistoryResponse> {
   const accessKey = getSequenceProjectAccessKey()
 
@@ -198,26 +200,51 @@ export async function getAccountTransactionHistory({
     throw new Error("Sequence project access key is required")
   }
 
-  // Get the chain-specific indexer URL
-  const chainIndexerUrl = getChainIndexerUrl(chainId)
-  if (!chainIndexerUrl) {
-    throw new Error(`Unsupported chain ID: ${chainId}`)
-  }
+  // Create a unique ID for this operation
+  const operationId = `account-tx-history-${chainId}-${accountAddress}-${page}-${Date.now()}`
 
-  const endpoint = `${chainIndexerUrl}/rpc/Indexer/GetTransactionHistory`
+  // Create an abort controller for this specific operation
+  const operationAbortController = new AbortController()
 
-  const requestBody = {
-    filter: {
-      accountAddress: accountAddress.toLowerCase(),
-    },
-    includeMetadata,
-    page: {
-      page,
-      pageSize,
-    },
-  }
+  // Register this operation with the global registry
+  abortControllerRegistry.register(operationId, operationAbortController)
 
   try {
+    // Check if we should abort before starting
+    if (abortSignal?.aborted || operationAbortController.signal.aborted) {
+      logger.console.log(
+        "[trails-sdk] Aborting account transaction history fetch",
+      )
+      throw new Error("Operation aborted")
+    }
+
+    // Get the chain-specific indexer URL
+    const chainIndexerUrl = getChainIndexerUrl(chainId)
+    if (!chainIndexerUrl) {
+      throw new Error(`Unsupported chain ID: ${chainId}`)
+    }
+
+    const endpoint = `${chainIndexerUrl}/rpc/Indexer/GetTransactionHistory`
+
+    const requestBody = {
+      filter: {
+        accountAddress: accountAddress.toLowerCase(),
+      },
+      includeMetadata,
+      page: {
+        page,
+        pageSize,
+      },
+    }
+
+    // Check abort signal before making the request
+    if (abortSignal?.aborted || operationAbortController.signal.aborted) {
+      logger.console.log(
+        "[trails-sdk] Aborting account transaction history fetch before request",
+      )
+      throw new Error("Operation aborted")
+    }
+
     const response = await fetch(endpoint, {
       method: "POST",
       headers: {
@@ -225,6 +252,7 @@ export async function getAccountTransactionHistory({
         "X-Access-Key": accessKey,
       },
       body: JSON.stringify(requestBody, bigintReplacer, 2),
+      signal: abortSignal || operationAbortController.signal,
     })
 
     if (!response.ok) {
@@ -246,11 +274,21 @@ export async function getAccountTransactionHistory({
       transactions,
     }
   } catch (error) {
+    if (error instanceof Error && error.name === "AbortError") {
+      logger.console.log(
+        "[trails-sdk] Account transaction history fetch was aborted",
+      )
+      throw new Error("Operation aborted")
+    }
+
     logger.console.error(
       "[trails-sdk] Error fetching transaction history:",
       error,
     )
     throw error
+  } finally {
+    // Always unregister when operation completes or is aborted
+    abortControllerRegistry.unregister(operationId)
   }
 }
 
@@ -355,6 +393,7 @@ export type UseAccountTransactionHistoryParams = {
   pageSize?: number
   page?: number
   includeMetadata?: boolean
+  abortSignal?: AbortSignal
 }
 
 export type UseAccountTransactionHistoryReturn = {
@@ -369,6 +408,7 @@ export function useAccountTransactionHistory({
   pageSize = 10,
   page = 1,
   includeMetadata = true,
+  abortSignal,
 }: UseAccountTransactionHistoryParams): UseAccountTransactionHistoryReturn {
   const { data, isLoading, error } = useQuery({
     queryKey: [
@@ -379,17 +419,21 @@ export function useAccountTransactionHistory({
       page,
       includeMetadata,
     ],
-    queryFn: async () => {
+    queryFn: async ({ signal }) => {
       if (!chainId || !accountAddress) {
         return undefined
       }
 
+      // Use the React Query signal if no external abort signal is provided
+      const effectiveSignal = abortSignal || signal
+
       return await getAccountTransactionHistory({
         chainId,
         accountAddress,
         pageSize,
         page,
         includeMetadata,
+        abortSignal: effectiveSignal,
       })
     },
     enabled: Boolean(chainId && accountAddress),

package/src/wallets.ts

@@ -172,6 +172,7 @@ export const connectors = [
   zerionConnector,
   ambireConnector,
   rabbyConnector,
+  sequenceConnector,
 ]
 
 export const WALLET_CONFIGS: Record<string, WalletConfig> = {
@@ -282,6 +283,12 @@ export const WALLET_CONFIGS: Record<string, WalletConfig> = {
     connector: sequenceConnector,
     icon: SequenceLogo as string,
   },
+  "sequence-waas": {
+    id: "sequence-waas",
+    name: "Sequence WaaS",
+    connector: sequenceConnector,
+    icon: SequenceLogo as string,
+  },
 }
 
 export const topShownWallets = [
@@ -320,6 +327,7 @@ export const wagmiConnectorToWalletId = (wagmiConnector: any): string => {
   if (wagmiConnectorName.includes("okx")) return "okxwallet"
   if (wagmiConnectorName.includes("privy")) return "privy"
   if (wagmiConnectorName.includes("gemini")) return "gemini"
+  if (wagmiConnectorName.includes("waas")) return "sequence-waas"
   if (wagmiConnectorName.includes("sequence")) return "sequence"
   return wagmiConnector.id || "injected"
 }