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

package/dist/index.mjs

@@ -2311,16 +2311,19 @@ var getObligationAccount = async (query, obligationId, ownerAddress, market, coi
   let totalBorrowedPools = 0;
   let totalBorrowedValue = BigNumber3(0);
   let totalBorrowedValueWithWeight = BigNumber3(0);
-  for (const collateral of obligationQuery.collaterals) {
-    const collateralCoinName = query.utils.parseCoinNameFromType(
-      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((collateral2) => {
+      const collateralCoinName = query.utils.parseCoinNameFromType(
+        collateral2.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 = BigNumber3(collateral.amount);
+      const depositedAmount = BigNumber3(collateral?.amount ?? 0);
       const depositedCoin = depositedAmount.shiftedBy(-1 * coinDecimal);
       const depositedValue = depositedCoin.multipliedBy(coinPrice);
       const borrowCapacityValue = depositedValue.multipliedBy(
@@ -2341,10 +2344,10 @@ var getObligationAccount = async (query, obligationId, ownerAddress, market, coi
       if (depositedAmount.isGreaterThan(0)) {
         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,
         coinPrice,
         depositedAmount: depositedAmount.toNumber(),
@@ -2359,16 +2362,19 @@ var getObligationAccount = async (query, obligationId, ownerAddress, market, coi
       };
     }
   }
-  for (const debt of obligationQuery.debts) {
-    const poolCoinName = query.utils.parseCoinNameFromType(
-      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((debt2) => {
+      const poolCoinName = query.utils.parseCoinNameFromType(
+        debt2.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 = BigNumber3(debt.amount);
+      const increasedRate = debt?.borrowIndex ? marketPool.borrowIndex / Number(debt.borrowIndex) - 1 : 0;
+      const borrowedAmount = BigNumber3(debt?.amount ?? 0);
       const borrowedCoin = borrowedAmount.shiftedBy(-1 * coinDecimal);
       const availableRepayAmount = borrowedAmount.multipliedBy(
         increasedRate + 1
@@ -2387,17 +2393,17 @@ var getObligationAccount = async (query, obligationId, ownerAddress, market, coi
       if (borrowedAmount.isGreaterThan(0)) {
         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,
         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(),
@@ -2848,10 +2854,11 @@ var ScallopQuery = class {
    * borrowing and obligation information for specific pool.
    *
    * @param obligationId - The obligation id.
+   * @param ownerAddress - The owner address.
    * @return Borrowing and collateral information.
    */
-  async getObligationAccount(obligationId) {
-    return await getObligationAccount(this, obligationId);
+  async getObligationAccount(obligationId, ownerAddress) {
+    return await getObligationAccount(this, obligationId, ownerAddress);
   }
   /**
    * Get total value locked.