chore: reduce rpc call

getnimbus · Jan 2, 2025 · dbcb3e2 · dbcb3e2
1 parent a177cd7
commit dbcb3e2
Show file tree

Hide file tree

Showing 6 changed files with 7,467 additions and 33 deletions.
diff --git a/package.json b/package.json
@@ -75,5 +75,6 @@
   },
   "peerDependencies": {
     "@mysten/sui": ">=1.8.0"
-  }
+  },
+  "packageManager": "[email protected]+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }
diff --git a/src/getVaultBalances.ts b/src/getVaultBalances.ts
@@ -27,6 +27,7 @@ import {
 } from "./utils/userHoldings.js";
 import { getMultiLatestPrices } from "./utils/prices.js";
 import { poolInfo } from "./common/maps.js";
+import { getAllReceipts } from "./sui-sdk/functions/getReceipts.js";
 
 export async function getXTokenVaultBalanceForActiveUsers(
   params: GetVaultBalanceForActiveUsersParams,
@@ -110,9 +111,15 @@ export async function getVaultBalance(
   address?: string,
   poolName?: PoolName,
   multiGet?: MultiGetVaultBalancesParams,
+  ignoreUsd?: boolean,
 ): Promise<VaultBalance> {
   if (address && poolName && !multiGet) {
-    const vaultBalance = await fetchUserVaultBalances(address, poolName, false);
+    const vaultBalance = await fetchUserVaultBalances(
+      address,
+      poolName,
+      false,
+      ignoreUsd,
+    );
 
     return vaultBalance;
   } else if (!address && !poolName && multiGet) {
@@ -201,12 +208,22 @@ export async function getDoubleAssetVaultBalance(
 
 export async function getAllVaultBalances(
   address: string,
+  ignoreUsd: boolean = false,
 ): Promise<Map<PoolName, AlphaFiVaultBalance>> {
-  await getMultiLatestPrices();
+  await getAllReceipts(address); // Cache all receipts
+  if (!ignoreUsd) {
+    await getMultiLatestPrices();
+  }
+
   const pools = Object.keys(poolInfo);
   const res = new Map<PoolName, AlphaFiVaultBalance>();
   const promises = pools.map(async (pool) => {
-    const result = await getVaultBalance(address, pool as PoolName);
+    const result = await getVaultBalance(
+      address,
+      pool as PoolName,
+      undefined,
+      ignoreUsd,
+    );
     res.set(pool as PoolName, result as AlphaFiVaultBalance);
   });
   await Promise.all(promises);

diff --git a/src/sui-sdk/functions/fetchUserVaultBalances.ts b/src/sui-sdk/functions/fetchUserVaultBalances.ts
@@ -18,6 +18,7 @@ export async function fetchUserVaultBalances(
   address: string,
   poolName: PoolName,
   ignoreCache: boolean,
+  ignoreUsd: boolean = false,
 ): Promise<AlphaFiVaultBalance | undefined> {
   const suiClient = getSuiClient();
 
@@ -32,11 +33,13 @@ export async function fetchUserVaultBalances(
       },
       ignoreCache,
     );
-    const lockedPortfolioAmountInUSD = await getAlphaPortfolioAmountInUSD(
-      "ALPHA",
-      { suiClient, address, isLocked: true },
-      ignoreCache,
-    );
+    const lockedPortfolioAmountInUSD = !ignoreUsd
+      ? await getAlphaPortfolioAmountInUSD(
+          "ALPHA",
+          { suiClient, address, isLocked: true },
+          ignoreCache,
+        )
+      : "0";
     const unlockedPortfolioAmount = await getAlphaPortfolioAmount(
       "ALPHA",
       {
@@ -46,11 +49,13 @@ export async function fetchUserVaultBalances(
       },
       ignoreCache,
     );
-    const unlockedPortfolioAmountInUSD = await getAlphaPortfolioAmountInUSD(
-      "ALPHA",
-      { suiClient, address, isLocked: false },
-      ignoreCache,
-    );
+    const unlockedPortfolioAmountInUSD = !ignoreUsd
+      ? await getAlphaPortfolioAmountInUSD(
+          "ALPHA",
+          { suiClient, address, isLocked: false },
+          ignoreCache,
+        )
+      : "0";
     const portfolioAmount = await getAlphaPortfolioAmount(
       "ALPHA",
       {
@@ -59,14 +64,16 @@ export async function fetchUserVaultBalances(
       },
       ignoreCache,
     );
-    const portfolioAmountInUSD = await getAlphaPortfolioAmountInUSD(
-      "ALPHA",
-      {
-        suiClient,
-        address,
-      },
-      ignoreCache,
-    );
+    const portfolioAmountInUSD = !ignoreUsd
+      ? await getAlphaPortfolioAmountInUSD(
+          "ALPHA",
+          {
+            suiClient,
+            address,
+          },
+          ignoreCache,
+        )
+      : "0";
     if (
       lockedPortfolioAmount !== undefined &&
       lockedPortfolioAmountInUSD !== undefined &&
@@ -91,11 +98,13 @@ export async function fetchUserVaultBalances(
       address,
       ignoreCache,
     );
-    const portfolioAmountInUSD = await getDoubleAssetPortfolioAmountInUSD(
-      poolName as PoolName,
-      address,
-      ignoreCache,
-    );
+    const portfolioAmountInUSD = !ignoreUsd
+      ? await getDoubleAssetPortfolioAmountInUSD(
+          poolName as PoolName,
+          address,
+          ignoreCache,
+        )
+      : "0";
     if (portfolioAmount !== undefined && portfolioAmountInUSD !== undefined) {
       const res: AlphaFiVaultBalance = {
         coinA: portfolioAmount[0].toString(),
@@ -110,11 +119,13 @@ export async function fetchUserVaultBalances(
       address,
       ignoreCache,
     );
-    const portfolioAmountInUSD = await getSingleAssetPortfolioAmountInUSD(
-      poolName as SingleAssetPoolNames,
-      address,
-      ignoreCache,
-    );
+    const portfolioAmountInUSD = !ignoreUsd
+      ? await getSingleAssetPortfolioAmountInUSD(
+          poolName as SingleAssetPoolNames,
+          address,
+          ignoreCache,
+        )
+      : "0";
     if (portfolioAmount !== undefined && portfolioAmountInUSD !== undefined) {
       const res: AlphaFiVaultBalance = {
         coin: portfolioAmount.toString(),

diff --git a/src/sui-sdk/functions/fetchUserVaults.ts b/src/sui-sdk/functions/fetchUserVaults.ts
@@ -4,11 +4,12 @@ import {
   doubleAssetPoolCoinMap,
   poolInfo,
 } from "../../common/maps.js";
-import { getReceipts } from "./getReceipts.js";
+import { getReceipts, getAllReceipts } from "./getReceipts.js";
 
 export async function fetchUserVaults(
   address: string,
 ): Promise<AlphaFiVault[]> {
+  await getAllReceipts(address); // Cache all receipts
   const vaultsArr: AlphaFiVault[] = [];
   await Promise.all(
     Object.keys(poolInfo).map(async (pool) => {

diff --git a/src/sui-sdk/functions/getReceipts.ts b/src/sui-sdk/functions/getReceipts.ts
@@ -202,6 +202,72 @@ export async function getReceipts(
   return cachedPromise;
 }
 
+export async function getAllReceipts(address: string): Promise<Receipt[]> {
+  const suiClient = getSuiClient();
+  const nfts: Receipt[] = [];
+  const allObjects: Receipt[] = [];
+  let currentCursor: string | null | undefined = null;
+
+  // Collect all objects first
+  while (true) {
+    const paginatedObjects: PaginatedObjectsResponse =
+      await suiClient.getOwnedObjects({
+        owner: address,
+        cursor: currentCursor,
+        filter: {
+          MatchAny: Object.keys(poolInfo).map((pool) => {
+            return {
+              StructType: poolInfo[pool].receiptType,
+            };
+          }),
+        },
+        options: {
+          showContent: true,
+        },
+      });
+
+    paginatedObjects.data.forEach((obj) => {
+      allObjects.push(obj.data as Receipt);
+    });
+
+    if (paginatedObjects.hasNextPage && paginatedObjects.nextCursor) {
+      currentCursor = paginatedObjects.nextCursor;
+    } else {
+      break;
+    }
+  }
+  // Group objects by content type
+  const groupedObjects: { [key: string]: Receipt[] } = {};
+
+  allObjects.forEach((o) => {
+    const contentType = o.content.type;
+    const poolName = Object.keys(poolInfo).find(
+      (pool) => poolInfo[pool].receiptType === contentType,
+    );
+
+    if (!poolName) {
+      return;
+    }
+
+    if (!groupedObjects[poolName]) {
+      groupedObjects[poolInfo[poolName].receiptName] = [];
+    }
+
+    if (poolName) {
+      groupedObjects[poolInfo[poolName].receiptName].push(o);
+      nfts.push(o);
+    }
+  });
+
+  // Store grouped objects in cache
+  Object.values(poolInfo).forEach((pool) => {
+    const receiptsCacheKey = `getReceipts-${pool.receiptName}-${address}`;
+    receiptsCache.set(receiptsCacheKey, groupedObjects[pool.receiptName] || []);
+  });
+
+  return nfts;
+}
+
 const poolCache = new SimpleCache<PoolType | AlphaPoolType>();
 const poolPromiseCache = new SimpleCache<Promise<PoolType | AlphaPoolType>>();