@oydual31/more-vaults-sdk 0.2.1 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oydual31/more-vaults-sdk",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "TypeScript SDK for MoreVaults protocol — viem/wagmi and ethers.js",
   "type": "module",
   "exports": {

package/src/react/useVaultTopology.ts

@@ -2,7 +2,7 @@ import { usePublicClient, useChainId } from 'wagmi'
 import { useQuery } from '@tanstack/react-query'
 import { asSdkClient } from '../viem/wagmiCompat.js'
 import {
-  getVaultTopology,
+  discoverVaultTopology,
   isOnHubChain,
   getAllVaultChainIds,
   OMNI_FACTORY_ADDRESS,
@@ -28,14 +28,14 @@ interface UseVaultTopologyReturn {
 }
 
 /**
- * Resolve the cross-chain topology of a vault from the current wallet chain.
+ * Resolve the cross-chain topology of a vault with automatic multi-chain discovery.
  *
- * Returns the hub chain, all spoke chains, and whether the user needs to
- * switch networks to interact with the hub.
- *
- * Since MoreVaults uses CREATE3, the vault address is the same on all chains.
+ * Uses `discoverVaultTopology` internally: if the wallet's current chain doesn't
+ * know the vault, it iterates all supported chains via public RPCs until the hub
+ * is found. Works even without a connected wallet.
  *
  * @example
+ * // Works regardless of which chain the wallet is on (or if disconnected)
  * const { topology, needsNetworkSwitch, allChainIds } = useVaultTopology('0xVAULT')
  *
  * if (needsNetworkSwitch) {
@@ -50,9 +50,14 @@ export function useVaultTopology(
   const publicClient = usePublicClient()
 
   const { data: topology, isLoading } = useQuery<VaultTopology>({
-    queryKey: ['vaultTopology', vault, currentChainId, factoryAddress],
-    queryFn: () => getVaultTopology(asSdkClient(publicClient), vault!, factoryAddress),
-    enabled: !!vault && !!publicClient,
+    // Key does NOT include currentChainId — topology is chain-independent
+    queryKey: ['vaultTopology', vault, factoryAddress],
+    queryFn: () => discoverVaultTopology(
+      vault!,
+      publicClient ? asSdkClient(publicClient) : null,
+      factoryAddress,
+    ),
+    enabled: !!vault,
     staleTime: 5 * 60 * 1000, // topology rarely changes — 5 min cache
   })
 

package/src/viem/index.ts

@@ -118,6 +118,7 @@ export type {
 export {
   getVaultTopology,
   getFullVaultTopology,
+  discoverVaultTopology,
   isOnHubChain,
   getAllVaultChainIds,
   OMNI_FACTORY_ADDRESS,

package/src/viem/topology.ts

@@ -1,5 +1,6 @@
 import { type Address, type PublicClient, getAddress } from 'viem'
-import { EID_TO_CHAIN_ID, CHAIN_ID_TO_EID } from './chains'
+import { EID_TO_CHAIN_ID, CHAIN_ID_TO_EID, CHAIN_IDS } from './chains'
+import { createChainClient } from './spokeRoutes'
 
 // MoreVaults OMNI factory — same address on every supported chain (CREATE3)
 export const OMNI_FACTORY_ADDRESS: Address = '0x7bDB8B17604b03125eFAED33cA0c55FBf856BB0C'
@@ -170,6 +171,89 @@ export async function getFullVaultTopology(
   return topo
 }
 
+/** All mainnet chain IDs where the OMNI_FACTORY is deployed */
+const DISCOVERY_CHAIN_IDS = Object.values(CHAIN_IDS).filter(
+  id => id !== 545, // exclude testnet
+) as number[]
+
+/**
+ * Discover a vault's topology across all supported chains.
+ *
+ * Unlike `getVaultTopology` (which queries a single chain), this function
+ * automatically iterates all supported chains when the initial query returns
+ * `role: "local"`. This handles the case where the caller doesn't know which
+ * chain the vault is deployed on, or when no wallet is connected.
+ *
+ * If a `publicClient` is provided, it's tried first. If that returns "local",
+ * every other supported chain is probed via `createChainClient` (public RPCs).
+ * If no `publicClient` is provided, all chains are probed.
+ *
+ * Once a hub is found, `getFullVaultTopology` is called to get the complete
+ * spoke list.
+ *
+ * @param vault          Vault address (same on all chains via CREATE3)
+ * @param publicClient   Optional — client for the "preferred" chain to try first
+ * @param factoryAddress MoreVaults factory (defaults to OMNI_FACTORY_ADDRESS)
+ *
+ * @example
+ * // No wallet connected — discovers that 0x8f74... is hub on Base
+ * const topo = await discoverVaultTopology('0x8f740...')
+ * // { role: 'hub', hubChainId: 8453, spokeChainIds: [1, 42161] }
+ */
+export async function discoverVaultTopology(
+  vault: Address,
+  publicClient?: PublicClient | null,
+  factoryAddress: Address = OMNI_FACTORY_ADDRESS,
+): Promise<VaultTopology> {
+  const v = getAddress(vault)
+
+  // 1. Try the provided client first (fast path — avoids extra RPC calls)
+  let triedChainId: number | undefined
+  if (publicClient) {
+    try {
+      const topo = await getVaultTopology(publicClient, v, factoryAddress)
+      if (topo.role !== 'local') {
+        // Found hub or spoke — if spoke, resolve full topology from hub
+        if (topo.role === 'spoke') {
+          const hubClient = createChainClient(topo.hubChainId)
+          if (hubClient) {
+            try {
+              return await getFullVaultTopology(hubClient, v, factoryAddress)
+            } catch { /* fall through to return partial */ }
+          }
+        }
+        return topo
+      }
+      triedChainId = publicClient.chain?.id
+    } catch { /* client failed — continue with discovery */ }
+  }
+
+  // 2. Iterate all supported chains
+  for (const chainId of DISCOVERY_CHAIN_IDS) {
+    if (chainId === triedChainId) continue
+    const client = createChainClient(chainId)
+    if (!client) continue
+
+    try {
+      const topo = await getVaultTopology(client, v, factoryAddress)
+      if (topo.role === 'hub') return topo
+      if (topo.role === 'spoke') {
+        // Found spoke — get full topology from hub
+        const hubClient = createChainClient(topo.hubChainId)
+        if (hubClient) {
+          try {
+            return await getFullVaultTopology(hubClient, v, factoryAddress)
+          } catch { return topo }
+        }
+        return topo
+      }
+    } catch { /* this chain doesn't have the factory or vault — skip */ }
+  }
+
+  // 3. Not found on any chain — return local with chainId 0
+  return { role: 'local', hubChainId: 0, spokeChainIds: [] }
+}
+
 /**
  * Check if a wallet is connected to the hub chain for a given vault.
  * Useful for showing a "Switch to Base" prompt before deposit.