0xtrails 0.2.5 → 0.2.6

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),