@scallop-io/sui-scallop-sdk 1.3.5-alpha.1 → 1.3.5-alpha.2

package/dist/index.mjs

@@ -2501,7 +2501,6 @@ var getBorrowIncentivePools = async (query, borrowIncentiveCoinNames = [
   const borrowIncentivePools = {};
   marketPools = marketPools ?? await query.getMarketPools(void 0, false, { coinPrices });
   coinPrices = coinPrices ?? await query.getAllCoinPrices({ marketPools });
-  console.log({ coinPrices });
   if (indexer) {
     const borrowIncentivePoolsIndexer = await query.indexer.getBorrowIncentivePools();
     const updateBorrowIncentivePool = (pool) => {
@@ -3709,8 +3708,8 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
   const collateralAssetCoinNames = [
     ...SUPPORT_COLLATERALS
   ];
-  coinPrices = coinPrices ?? await query.utils.getCoinPrices();
-  market = market ?? await query.queryMarket(indexer, { coinPrices });
+  market = market ?? await query.queryMarket(indexer);
+  coinPrices = coinPrices ?? await query.getAllCoinPrices({ marketPools: market.pools });
   coinAmounts = coinAmounts || await query.getCoinAmounts(collateralAssetCoinNames, ownerAddress);
   const [obligationQuery, borrowIncentivePools, borrowIncentiveAccounts] = await Promise.all([
     query.queryObligation(obligationId),
@@ -3851,44 +3850,47 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
     const borrowIncentivePool = borrowIncentivePools[coinName];
     if (borrowIncentivePool) {
       const rewards = [];
-      for (const rewardCoinName of SUPPORT_BORROW_INCENTIVE_REWARDS) {
-        const accountPoint = borrowIncentiveAccount.pointList[rewardCoinName];
-        const poolPoint = borrowIncentivePool.points[rewardCoinName];
-        if (accountPoint && poolPoint) {
-          let availableClaimAmount = BigNumber5(0);
-          let availableClaimCoin = BigNumber5(0);
-          const accountBorrowedAmount = BigNumber5(accountPoint.weightedAmount);
-          const baseIndexRate = 1e9;
-          const increasedPointRate = poolPoint.currentPointIndex ? Math.max(
-            BigNumber5(poolPoint.currentPointIndex - accountPoint.index).dividedBy(baseIndexRate).toNumber(),
-            0
-          ) : 1;
-          availableClaimAmount = availableClaimAmount.plus(
-            accountBorrowedAmount.multipliedBy(increasedPointRate).plus(accountPoint.points)
-          );
-          availableClaimCoin = availableClaimAmount.shiftedBy(
-            -1 * poolPoint.coinDecimal
-          );
-          const weightScale = BigNumber5(1e12);
-          const boostValue = BigNumber5(accountPoint.weightedAmount).div(
-            BigNumber5(borrowIncentiveAccount.debtAmount).multipliedBy(poolPoint.baseWeight).dividedBy(weightScale)
-          ).isFinite() ? BigNumber5(accountPoint.weightedAmount).div(
-            BigNumber5(borrowIncentiveAccount.debtAmount).multipliedBy(poolPoint.baseWeight).dividedBy(weightScale)
-          ).toNumber() : 1;
-          if (availableClaimAmount.isGreaterThanOrEqualTo(0)) {
-            rewards.push({
-              coinName: poolPoint.coinName,
-              coinType: poolPoint.coinType,
-              symbol: poolPoint.symbol,
-              coinDecimal: poolPoint.coinDecimal,
-              coinPrice: poolPoint.coinPrice,
-              availableClaimAmount: availableClaimAmount.toNumber(),
-              availableClaimCoin: availableClaimCoin.toNumber(),
-              boostValue
-            });
+      Object.entries(borrowIncentiveAccount.pointList).forEach(
+        ([key, accountPoint]) => {
+          const poolPoint = borrowIncentivePool.points[key];
+          if (accountPoint && poolPoint) {
+            let availableClaimAmount = BigNumber5(0);
+            let availableClaimCoin = BigNumber5(0);
+            const accountBorrowedAmount = BigNumber5(
+              accountPoint.weightedAmount
+            );
+            const baseIndexRate = 1e9;
+            const increasedPointRate = poolPoint.currentPointIndex ? Math.max(
+              BigNumber5(poolPoint.currentPointIndex - accountPoint.index).dividedBy(baseIndexRate).toNumber(),
+              0
+            ) : 1;
+            availableClaimAmount = availableClaimAmount.plus(
+              accountBorrowedAmount.multipliedBy(increasedPointRate).plus(accountPoint.points)
+            );
+            availableClaimCoin = availableClaimAmount.shiftedBy(
+              -1 * poolPoint.coinDecimal
+            );
+            const weightScale = BigNumber5(1e12);
+            const boostValue = BigNumber5(accountPoint.weightedAmount).div(
+              BigNumber5(borrowIncentiveAccount.debtAmount).multipliedBy(poolPoint.baseWeight).dividedBy(weightScale)
+            ).isFinite() ? BigNumber5(accountPoint.weightedAmount).div(
+              BigNumber5(borrowIncentiveAccount.debtAmount).multipliedBy(poolPoint.baseWeight).dividedBy(weightScale)
+            ).toNumber() : 1;
+            if (availableClaimAmount.isGreaterThanOrEqualTo(0)) {
+              rewards.push({
+                coinName: poolPoint.coinName,
+                coinType: poolPoint.coinType,
+                symbol: poolPoint.symbol,
+                coinDecimal: poolPoint.coinDecimal,
+                coinPrice: poolPoint.coinPrice,
+                availableClaimAmount: availableClaimAmount.toNumber(),
+                availableClaimCoin: availableClaimCoin.toNumber(),
+                boostValue
+              });
+            }
           }
         }
-      }
+      );
       if (Object.keys(borrowIncentivePool.points).some((coinName2) => {
         const rewardApr = borrowIncentivePool.points[coinName2]?.rewardApr;
         return rewardApr !== Infinity && typeof rewardApr == "number" && rewardApr > 0;