@spacesops/wdk-react-native-core 1.0.0-beta.72 → 1.0.0-beta.73

package/dist/hooks/useTransactions.js

@@ -6,11 +6,13 @@
  */
 import { useQuery } from '@tanstack/react-query';
 import { useShallow } from 'zustand/react/shallow';
+import { AddressService } from '../services/addressService';
 import { TransactionService } from '../services/transactionService';
 import { getWalletStore } from '../store/walletStore';
 import { getWorkletStore } from '../store/workletStore';
 import { isIndexerConfigured } from '../store/indexerConfigStore';
 import { resolveWalletId } from '../utils/storeHelpers';
+import { logWarn } from '../utils/logger';
 import { DEFAULT_QUERY_GC_TIME_MS, DEFAULT_QUERY_STALE_TIME_MS, } from '../utils/constants';
 export const transactionQueryKeys = {
     all: ['transactions'],
@@ -19,9 +21,12 @@ export const transactionQueryKeys = {
 function resolveTokenConfigs(tokenConfigs) {
     return typeof tokenConfigs === 'function' ? tokenConfigs() : tokenConfigs;
 }
-function addressesFingerprint(addresses, accountIndex) {
+function addressesFingerprint(addresses, accountIndex, tokenConfigs) {
     const parts = [];
-    for (const network of Object.keys(addresses).sort()) {
+    for (const network of Object.keys(tokenConfigs).sort()) {
+        if (!tokenConfigs[network]?.indexerBlockchain) {
+            continue;
+        }
         const address = addresses[network]?.[accountIndex];
         if (address) {
             parts.push(`${network}:${address.toLowerCase()}`);
@@ -29,13 +34,33 @@ function addressesFingerprint(addresses, accountIndex) {
     }
     return parts.join('|');
 }
+async function ensureIndexerAddresses(walletId, accountIndex, tokenConfigs) {
+    for (const [network, networkTokens] of Object.entries(tokenConfigs)) {
+        if (!networkTokens.indexerBlockchain) {
+            continue;
+        }
+        const walletStore = getWalletStore();
+        const cached = walletStore.getState().addresses[walletId]?.[network]?.[accountIndex];
+        if (cached) {
+            continue;
+        }
+        try {
+            await AddressService.getAddress(network, accountIndex, walletId);
+        }
+        catch (error) {
+            logWarn(`[useWalletTransactions] Could not resolve ${network} address for wallet ${walletId}:`, error);
+        }
+    }
+}
 async function fetchWalletTransactionsForAccount(walletId, accountIndex, tokenConfigs) {
+    const configs = resolveTokenConfigs(tokenConfigs);
+    await ensureIndexerAddresses(walletId, accountIndex, configs);
     const walletStore = getWalletStore();
     const addresses = walletStore.getState().addresses[walletId] ?? {};
     return TransactionService.resolveWalletTransactions({
         addresses,
         accountIndex,
-        tokenConfigs: resolveTokenConfigs(tokenConfigs),
+        tokenConfigs: configs,
     });
 }
 /**
@@ -46,16 +71,18 @@ export function useWalletTransactions(accountIndex, tokenConfigs, options) {
     const walletStore = getWalletStore();
     const isInitialized = workletStore.getState().isInitialized;
     const walletId = resolveWalletId(options?.walletId);
+    const tokenConfigsObj = resolveTokenConfigs(tokenConfigs);
     const addresses = walletStore(useShallow((state) => state.addresses[walletId] ?? {}));
-    const addressKey = addressesFingerprint(addresses, accountIndex);
+    const addressKey = addressesFingerprint(addresses, accountIndex, tokenConfigsObj);
     const indexerReady = isIndexerConfigured();
+    const hasIndexerNetworks = Object.values(tokenConfigsObj).some((networkTokens) => Boolean(networkTokens?.indexerBlockchain));
     return useQuery({
         queryKey: [...transactionQueryKeys.byWallet(walletId, accountIndex), addressKey],
         queryFn: () => fetchWalletTransactionsForAccount(walletId, accountIndex, tokenConfigs),
         enabled: (options?.enabled !== false) &&
             isInitialized &&
             indexerReady &&
-            addressKey.length > 0,
+            hasIndexerNetworks,
         staleTime: options?.staleTime ?? DEFAULT_QUERY_STALE_TIME_MS,
         gcTime: DEFAULT_QUERY_GC_TIME_MS,
         refetchInterval: options?.refetchInterval,

package/dist/hooks/useTransactions.js.map

@@ -1 +1 @@
-{"version":3,"file":"useTransactions.js","sourceRoot":"","sources":["../../src/hooks/useTransactions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useTransactions.js","sourceRoot":"","sources":["../../src/hooks/useTransactions.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spacesops/wdk-react-native-core",
-  "version": "1.0.0-beta.72",
+  "version": "1.0.0-beta.73",
   "description": "Core functionality for React Native wallets - wallet management, balance fetching, and worklet operations",
   "type": "module",
   "main": "./dist/index.js",

package/src/hooks/useTransactions.ts

@@ -8,16 +8,18 @@
 import { useQuery } from '@tanstack/react-query'
 import { useShallow } from 'zustand/react/shallow'
 
+import { AddressService } from '../services/addressService'
 import { TransactionService } from '../services/transactionService'
 import { getWalletStore } from '../store/walletStore'
 import { getWorkletStore } from '../store/workletStore'
 import { isIndexerConfigured } from '../store/indexerConfigStore'
 import { resolveWalletId } from '../utils/storeHelpers'
+import { logWarn } from '../utils/logger'
 import {
   DEFAULT_QUERY_GC_TIME_MS,
   DEFAULT_QUERY_STALE_TIME_MS,
 } from '../utils/constants'
-import type { TokenConfigProvider, WalletTransaction } from '../types'
+import type { TokenConfigProvider, TokenConfigs, WalletTransaction } from '../types'
 
 export interface WalletTransactionsQueryOptions {
   enabled?: boolean
@@ -38,10 +40,14 @@ function resolveTokenConfigs(tokenConfigs: TokenConfigProvider) {
 
 function addressesFingerprint(
   addresses: Record<string, Record<number, string>>,
-  accountIndex: number
+  accountIndex: number,
+  tokenConfigs: TokenConfigs
 ): string {
   const parts: string[] = []
-  for (const network of Object.keys(addresses).sort()) {
+  for (const network of Object.keys(tokenConfigs).sort()) {
+    if (!tokenConfigs[network]?.indexerBlockchain) {
+      continue
+    }
     const address = addresses[network]?.[accountIndex]
     if (address) {
       parts.push(`${network}:${address.toLowerCase()}`)
@@ -50,18 +56,48 @@ function addressesFingerprint(
   return parts.join('|')
 }
 
+async function ensureIndexerAddresses(
+  walletId: string,
+  accountIndex: number,
+  tokenConfigs: TokenConfigs
+): Promise<void> {
+  for (const [network, networkTokens] of Object.entries(tokenConfigs)) {
+    if (!networkTokens.indexerBlockchain) {
+      continue
+    }
+
+    const walletStore = getWalletStore()
+    const cached = walletStore.getState().addresses[walletId]?.[network]?.[accountIndex]
+    if (cached) {
+      continue
+    }
+
+    try {
+      await AddressService.getAddress(network, accountIndex, walletId)
+    } catch (error) {
+      logWarn(
+        `[useWalletTransactions] Could not resolve ${network} address for wallet ${walletId}:`,
+        error
+      )
+    }
+  }
+}
+
 async function fetchWalletTransactionsForAccount(
   walletId: string,
   accountIndex: number,
   tokenConfigs: TokenConfigProvider
 ): Promise<WalletTransaction[]> {
+  const configs = resolveTokenConfigs(tokenConfigs)
+  await ensureIndexerAddresses(walletId, accountIndex, configs)
+
   const walletStore = getWalletStore()
   const addresses = walletStore.getState().addresses[walletId] ?? {}
 
   return TransactionService.resolveWalletTransactions({
     addresses,
     accountIndex,
-    tokenConfigs: resolveTokenConfigs(tokenConfigs),
+    tokenConfigs: configs,
   })
 }
 
@@ -77,11 +113,15 @@ export function useWalletTransactions(
   const walletStore = getWalletStore()
   const isInitialized = workletStore.getState().isInitialized
   const walletId = resolveWalletId(options?.walletId)
+  const tokenConfigsObj = resolveTokenConfigs(tokenConfigs)
   const addresses = walletStore(
     useShallow((state) => state.addresses[walletId] ?? {})
   )
-  const addressKey = addressesFingerprint(addresses, accountIndex)
+  const addressKey = addressesFingerprint(addresses, accountIndex, tokenConfigsObj)
   const indexerReady = isIndexerConfigured()
+  const hasIndexerNetworks = Object.values(tokenConfigsObj).some(
+    (networkTokens) => Boolean(networkTokens?.indexerBlockchain)
+  )
 
   return useQuery({
     queryKey: [...transactionQueryKeys.byWallet(walletId, accountIndex), addressKey],
@@ -90,7 +130,7 @@ export function useWalletTransactions(
       (options?.enabled !== false) &&
       isInitialized &&
       indexerReady &&
-      addressKey.length > 0,
+      hasIndexerNetworks,
     staleTime: options?.staleTime ?? DEFAULT_QUERY_STALE_TIME_MS,
     gcTime: DEFAULT_QUERY_GC_TIME_MS,
     refetchInterval: options?.refetchInterval,