@scallop-io/sui-scallop-sdk 2.2.6 → 2.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/models/scallopQuery.ts

@@ -30,7 +30,9 @@ import {
   getMarketCollateral,
   getMarketCollaterals,
   getMarketPools,
+  getObligationAccount,
   getObligationAccounts,
+  getObligationAccountsByIds,
   getObligations,
   getOnDemandAggObjectIds,
   getPoolAddresses,
@@ -108,6 +110,14 @@ class ScallopQuery implements ScallopQueryInterface {
       this,
       this.getObligationAccounts
     );
+    this.getObligationAccountsByIds = withIndexerFallback.call(
+      this,
+      this.getObligationAccountsByIds
+    );
+    this.getObligationAccountById = withIndexerFallback.call(
+      this,
+      this.getObligationAccountById
+    );
     this.getObligationAccount = withIndexerFallback.call(
       this,
       this.getObligationAccount
@@ -558,13 +568,13 @@ class ScallopQuery implements ScallopQueryInterface {
   }
 
   /**
-   * Get user all obligation accounts information.
+   * Get user all obligation accounts information from ownerAddress.
    *
    * @description
    * All collateral and borrowing information in all obligation accounts owned by the user.
    *
    * @param ownerAddress - The owner address.
-   * @param indexer - Whether to use indexer.
+   * @param args - Additional arguments.
    * @return All obligation accounts information.
    */
   async getObligationAccounts(
@@ -587,6 +597,68 @@ class ScallopQuery implements ScallopQueryInterface {
     );
   }
 
+  /**
+   * Get user all obligation accounts information from obligationIds.
+   *
+   * @description
+   * All collateral and borrowing information in all obligation accounts.
+   *
+   * @param obligationIds - Obligation IDs.
+   * @param args - Additional arguments.
+   * @return All obligation accounts information.
+   */
+  async getObligationAccountsByIds(
+    obligationIds: string[],
+    args?: {
+      market?: {
+        collaterals: MarketCollaterals;
+        pools: MarketPools;
+      };
+      coinPrices?: CoinPrices;
+      indexer?: boolean;
+    }
+  ) {
+    return await getObligationAccountsByIds(
+      this,
+      obligationIds,
+      args?.market,
+      args?.coinPrices,
+      args?.indexer
+    );
+  }
+
+  /**
+   * Get obligation account by id
+   *
+   * @description
+   * All collateral and borrowing information in obligation account.
+   *
+   * @param obligationId - Obligation ID.
+   * @param args - Additional arguments.
+   * @return All obligation accounts information.
+   */
+  async getObligationAccountById(
+    obligationId: string,
+    args?: {
+      market?: {
+        collaterals: MarketCollaterals;
+        pools: MarketPools;
+      };
+      coinPrices?: CoinPrices;
+      indexer?: boolean;
+    }
+  ) {
+    return await getObligationAccount(
+      this,
+      obligationId,
+      '',
+      args?.indexer,
+      args?.market,
+      args?.coinPrices,
+      {}
+    );
+  }
+
   /**
    * Get obligation account information for specific id.
    *
@@ -595,7 +667,7 @@ class ScallopQuery implements ScallopQueryInterface {
    *
    * @param obligationId - The obligation id.
    * @param ownerAddress - The owner address.
-   * @param indexer - Whether to use indexer.
+   * @param args - Additional arguments.
    * @return Borrowing and collateral information.
    */
   async getObligationAccount(

package/src/queries/portfolioQuery.ts

@@ -293,6 +293,8 @@ export const getLending = async (
  *
  * @param query - The Scallop query instance.
  * @param ownerAddress - The owner address.
+ * @param market - The market data.
+ * @param coinPrices - The coin prices data.
  * @param indexer - Whether to use indexer.
  * @return All obligation accounts data.
  */
@@ -338,12 +340,62 @@ export const getObligationAccounts = async (
   return obligationAccounts;
 };
 
+/**
+ * Get all obligation accounts data by ids.
+ *
+ * @param query - The Scallop query instance.
+ * @param obligationIds - Obligation account ids.
+ * @param market - The market data.
+ * @param coinPrices - The coin prices data.
+ * @param indexer - Whether to use indexer.
+ * @return All obligation accounts data.
+ */
+export const getObligationAccountsByIds = async (
+  query: ScallopQuery,
+  obligationIds: string[],
+  market?: {
+    pools: MarketPools;
+    collaterals: MarketCollaterals;
+  },
+  coinPrices?: CoinPrices,
+  indexer: boolean = false
+) => {
+  market = market ?? (await query.getMarketPools(undefined, { indexer }));
+  coinPrices =
+    coinPrices ??
+    (await query.getAllCoinPrices({
+      marketPools: market.pools,
+    }));
+
+  const obligationAccounts: ObligationAccount[] = [];
+  await Promise.allSettled(
+    obligationIds.map(async (obligationId) => {
+      const obligationAccount = await getObligationAccount(
+        query,
+        obligationId,
+        '',
+        indexer,
+        market,
+        coinPrices,
+        {}
+      );
+      if (obligationAccount) obligationAccounts.push(obligationAccount);
+    })
+  );
+
+  return obligationAccounts;
+};
+
 /**
  * Get obligation account data.
  *
  * @param query - The Scallop query instance.
  * @param obligation - The obligation id.
+ * @param ownerAddress - The owner address of the obligation.
  * @param indexer - Whether to use indexer.
+ * @param market - The market data.
+ * @param coinPrices - The coin prices data.
+ * @param coinAmounts - The coin amounts data.
  * @return Obligation account data.
  */
 export const getObligationAccount = async (
@@ -787,8 +839,6 @@ export const getTotalValueLocked = async (
   query: ScallopQuery,
   indexer: boolean = false
 ) => {
-  const market = await query.getMarketPools(undefined, { indexer });
-
   let supplyLendingValue = BigNumber(0);
   let supplyCollateralValue = BigNumber(0);
   let borrowValue = BigNumber(0);
@@ -811,6 +861,8 @@ export const getTotalValueLocked = async (
     return tvl;
   }
 
+  const market = await query.getMarketPools(undefined, { indexer });
+
   for (const pool of Object.values(market.pools)) {
     if (!pool) continue;
     supplyLendingValue = supplyLendingValue.plus(