@oydual31/more-vaults-sdk 1.1.10 → 1.1.12

package/dist/react/index.cjs

@@ -1771,6 +1771,54 @@ var FACTORY_ABI = [
     stateMutability: "view"
   }
 ];
+var OFT_FACTORY_ABI = [
+  {
+    name: "MoreVaultsOftAdapterFactory",
+    type: "function",
+    inputs: [],
+    outputs: [{ type: "address" }],
+    stateMutability: "view"
+  },
+  {
+    name: "MoreVaultsOftFactory",
+    type: "function",
+    inputs: [],
+    outputs: [{ type: "address" }],
+    stateMutability: "view"
+  },
+  {
+    name: "OFTs",
+    type: "function",
+    inputs: [{ name: "vault", type: "address" }],
+    outputs: [{ type: "address" }],
+    stateMutability: "view"
+  }
+];
+async function _getOftFromFactory(publicClient, vault, factoryFn) {
+  try {
+    const subFactoryAddr = await publicClient.readContract({
+      address: OMNI_FACTORY_ADDRESS,
+      abi: OFT_FACTORY_ABI,
+      functionName: factoryFn
+    });
+    const oft = await publicClient.readContract({
+      address: subFactoryAddr,
+      abi: OFT_FACTORY_ABI,
+      functionName: "OFTs",
+      args: [vault]
+    });
+    if (oft === "0x0000000000000000000000000000000000000000") return null;
+    return viem.getAddress(oft);
+  } catch {
+    return null;
+  }
+}
+function getHubShareOft(publicClient, vault) {
+  return _getOftFromFactory(publicClient, vault, "MoreVaultsOftAdapterFactory");
+}
+function getSpokeShareOft(publicClient, vault) {
+  return _getOftFromFactory(publicClient, vault, "MoreVaultsOftFactory");
+}
 async function getVaultTopology(publicClient, vault, factoryAddress = OMNI_FACTORY_ADDRESS) {
   try {
     const v = viem.getAddress(vault);
@@ -2350,24 +2398,6 @@ async function getAsyncRequestStatusLabel(publicClient, vault, guid) {
     result: 0n
   };
 }
-var FACTORY_COMPOSER_ABI = [
-  {
-    type: "function",
-    name: "vaultComposer",
-    inputs: [{ name: "_vault", type: "address" }],
-    outputs: [{ name: "", type: "address" }],
-    stateMutability: "view"
-  }
-];
-var COMPOSER_SHARE_OFT_ABI = [
-  {
-    type: "function",
-    name: "SHARE_OFT",
-    inputs: [],
-    outputs: [{ name: "", type: "address" }],
-    stateMutability: "view"
-  }
-];
 async function getUserPositionMultiChain(vault, user) {
   const v = viem.getAddress(vault);
   const u = viem.getAddress(user);
@@ -2391,19 +2421,7 @@ async function getUserPositionMultiChain(vault, user) {
   if (topo.spokeChainIds.length > 0) {
     let hubShareOft = null;
     try {
-      const composerAddress = await hubClient.readContract({
-        address: OMNI_FACTORY_ADDRESS,
-        abi: FACTORY_COMPOSER_ABI,
-        functionName: "vaultComposer",
-        args: [v]
-      });
-      if (composerAddress !== "0x0000000000000000000000000000000000000000") {
-        hubShareOft = await hubClient.readContract({
-          address: composerAddress,
-          abi: COMPOSER_SHARE_OFT_ABI,
-          functionName: "SHARE_OFT"
-        });
-      }
+      hubShareOft = await getHubShareOft(hubClient, v);
     } catch {
     }
     if (hubShareOft) {
@@ -2411,18 +2429,12 @@ async function getUserPositionMultiChain(vault, user) {
         try {
           const spokeEid = CHAIN_ID_TO_EID[spokeChainId];
           if (!spokeEid) return { chainId: spokeChainId, balance: 0n, rawBalance: 0n };
-          const spokeOftBytes32 = await hubClient.readContract({
-            address: hubShareOft,
-            abi: OFT_ABI,
-            functionName: "peers",
-            args: [spokeEid]
-          });
-          const spokeOft = viem.getAddress(`0x${spokeOftBytes32.slice(-40)}`);
-          if (spokeOft === "0x0000000000000000000000000000000000000000") {
-            return { chainId: spokeChainId, balance: 0n, rawBalance: 0n };
-          }
           const spokeClient = createChainClient(spokeChainId);
           if (!spokeClient) return { chainId: spokeChainId, balance: 0n, rawBalance: 0n };
+          const spokeOft = await getSpokeShareOft(spokeClient, v);
+          if (!spokeOft) {
+            return { chainId: spokeChainId, balance: 0n, rawBalance: 0n };
+          }
           const [rawBalance, spokeOftDecimals] = await spokeClient.multicall({
             contracts: [
               { address: spokeOft, abi: ERC20_ABI, functionName: "balanceOf", args: [u] },