@scallop-io/sui-scallop-sdk 0.44.5 → 0.44.6

package/dist/models/scallopQuery.d.ts

@@ -322,9 +322,10 @@ export declare class ScallopQuery {
      * borrowing and obligation information for specific pool.
      *
      * @param obligationId - The obligation id.
+     * @param ownerAddress - The owner address.
      * @return Borrowing and collateral information.
      */
-    getObligationAccount(obligationId: string): Promise<import("../types").ObligationAccount>;
+    getObligationAccount(obligationId: string, ownerAddress?: string): Promise<import("../types").ObligationAccount>;
     /**
      * Get total value locked.
      *

package/package.json

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

package/src/models/scallopQuery.ts

@@ -444,10 +444,14 @@ export class ScallopQuery {
    * borrowing and obligation information for specific pool.
    *
    * @param obligationId - The obligation id.
+   * @param ownerAddress - The owner address.
    * @return Borrowing and collateral information.
    */
-  public async getObligationAccount(obligationId: string) {
-    return await getObligationAccount(this, obligationId);
+  public async getObligationAccount(
+    obligationId: string,
+    ownerAddress?: string
+  ) {
+    return await getObligationAccount(this, obligationId, ownerAddress);
   }
 
   /**

package/src/queries/portfolioQuery.ts

@@ -321,18 +321,22 @@ export const getObligationAccount = async (
   let totalBorrowedValue = BigNumber(0);
   let totalBorrowedValueWithWeight = BigNumber(0);
 
-  for (const collateral of obligationQuery.collaterals) {
-    const collateralCoinName =
-      query.utils.parseCoinNameFromType<SupportCollateralCoins>(
-        collateral.type.name
-      );
-    const coinDecimal = query.utils.getCoinDecimal(collateralCoinName);
-    const marketCollateral = market.collaterals[collateralCoinName];
-    const coinPrice = coinPrices?.[collateralCoinName];
-    const coinAmount = coinAmounts?.[collateralCoinName] ?? 0;
+  for (const assetCoinName of assetCoinNames) {
+    const collateral = obligationQuery.collaterals.find((collateral) => {
+      const collateralCoinName =
+        query.utils.parseCoinNameFromType<SupportCollateralCoins>(
+          collateral.type.name
+        );
+      return assetCoinName === collateralCoinName;
+    });
+
+    const coinDecimal = query.utils.getCoinDecimal(assetCoinName);
+    const marketCollateral = market.collaterals[assetCoinName];
+    const coinPrice = coinPrices?.[assetCoinName];
+    const coinAmount = coinAmounts?.[assetCoinName] ?? 0;
 
     if (marketCollateral && coinPrice) {
-      const depositedAmount = BigNumber(collateral.amount);
+      const depositedAmount = BigNumber(collateral?.amount ?? 0);
       const depositedCoin = depositedAmount.shiftedBy(-1 * coinDecimal);
       const depositedValue = depositedCoin.multipliedBy(coinPrice);
       const borrowCapacityValue = depositedValue.multipliedBy(
@@ -357,10 +361,10 @@ export const getObligationAccount = async (
         totalDepositedPools++;
       }
 
-      collaterals[collateralCoinName] = {
-        coinName: collateralCoinName,
-        coinType: collateral.type.name,
-        symbol: query.utils.parseSymbol(collateralCoinName),
+      collaterals[assetCoinName] = {
+        coinName: assetCoinName,
+        coinType: query.utils.parseCoinType(assetCoinName),
+        symbol: query.utils.parseSymbol(assetCoinName),
         coinDecimal: coinDecimal,
         coinPrice: coinPrice,
         depositedAmount: depositedAmount.toNumber(),
@@ -376,18 +380,23 @@ export const getObligationAccount = async (
     }
   }
 
-  for (const debt of obligationQuery.debts) {
-    const poolCoinName = query.utils.parseCoinNameFromType<SupportPoolCoins>(
-      debt.type.name
-    );
-    const coinDecimal = query.utils.getCoinDecimal(poolCoinName);
-    const marketPool = market.pools[poolCoinName];
-    const coinPrice = coinPrices?.[poolCoinName];
+  for (const assetCoinName of assetCoinNames) {
+    const debt = obligationQuery.debts.find((debt) => {
+      const poolCoinName = query.utils.parseCoinNameFromType<SupportPoolCoins>(
+        debt.type.name
+      );
+      return assetCoinName === poolCoinName;
+    });
+
+    const coinDecimal = query.utils.getCoinDecimal(assetCoinName);
+    const marketPool = market.pools[assetCoinName];
+    const coinPrice = coinPrices?.[assetCoinName];
 
     if (marketPool && coinPrice) {
-      const increasedRate =
-        marketPool.borrowIndex / Number(debt.borrowIndex) - 1;
-      const borrowedAmount = BigNumber(debt.amount);
+      const increasedRate = debt?.borrowIndex
+        ? marketPool.borrowIndex / Number(debt.borrowIndex) - 1
+        : 0;
+      const borrowedAmount = BigNumber(debt?.amount ?? 0);
       const borrowedCoin = borrowedAmount.shiftedBy(-1 * coinDecimal);
       const availableRepayAmount = borrowedAmount.multipliedBy(
         increasedRate + 1
@@ -409,17 +418,17 @@ export const getObligationAccount = async (
         totalBorrowedPools++;
       }
 
-      debts[poolCoinName] = {
-        coinName: poolCoinName,
-        coinType: debt.type.name,
-        symbol: query.utils.parseSymbol(poolCoinName),
+      debts[assetCoinName] = {
+        coinName: assetCoinName,
+        coinType: query.utils.parseCoinType(assetCoinName),
+        symbol: query.utils.parseSymbol(assetCoinName),
         coinDecimal: coinDecimal,
         coinPrice: coinPrice,
         borrowedAmount: borrowedAmount.toNumber(),
         borrowedCoin: borrowedCoin.toNumber(),
         borrowedValue: borrowedValue.toNumber(),
         borrowedValueWithWeight: borrowedValueWithWeight.toNumber(),
-        borrowIndex: Number(debt.borrowIndex),
+        borrowIndex: Number(debt?.borrowIndex ?? 0),
         availableBorrowAmount: 0,
         availableBorrowCoin: 0,
         availableRepayAmount: availableRepayAmount.toNumber(),