@scallop-io/sui-scallop-sdk 0.46.31 → 0.46.33

package/dist/index.js

@@ -1474,7 +1474,7 @@ var parseOriginBorrowIncentivePoolData = (originBorrowIncentivePoolData) => {
     )
   };
 };
-var calculateBorrowIncentivePoolPointData = (pasredBorrowIncentinvePoolData, parsedBorrowIncentivePoolPointData, rewardCoinPrice, rewardCoinDecimal, poolCoinPrice, poolCoinDecimal) => {
+var calculateBorrowIncentivePoolPointData = (parsedBorrowIncentivePoolData, parsedBorrowIncentivePoolPointData, rewardCoinPrice, rewardCoinDecimal, poolCoinPrice, poolCoinDecimal) => {
   const baseIndexRate = 1e9;
   const distributedPointPerSec = (0, import_bignumber.default)(
     parsedBorrowIncentivePoolPointData.distributedPointPerPeriod
@@ -1496,9 +1496,6 @@ var calculateBorrowIncentivePoolPointData = (pasredBorrowIncentinvePoolData, par
   const currentTotalDistributedPoint = (0, import_bignumber.default)(
     parsedBorrowIncentivePoolPointData.distributedPoint
   ).plus(accumulatedPoints);
-  const stakedAmount = (0, import_bignumber.default)(pasredBorrowIncentinvePoolData.staked);
-  const stakedCoin = stakedAmount.shiftedBy(-1 * poolCoinDecimal);
-  const stakedValue = stakedCoin.multipliedBy(poolCoinPrice);
   const baseWeight = (0, import_bignumber.default)(parsedBorrowIncentivePoolPointData.baseWeight);
   const weightedStakedAmount = (0, import_bignumber.default)(
     parsedBorrowIncentivePoolPointData.weightedAmount
@@ -1527,9 +1524,6 @@ var calculateBorrowIncentivePoolPointData = (pasredBorrowIncentinvePoolData, par
     accumulatedPoints: accumulatedPoints.toNumber(),
     currentPointIndex: currentPointIndex.toNumber(),
     currentTotalDistributedPoint: currentTotalDistributedPoint.toNumber(),
-    stakedAmount: stakedAmount.toNumber(),
-    stakedCoin: stakedCoin.toNumber(),
-    stakedValue: stakedValue.toNumber(),
     baseWeight: baseWeight.toNumber(),
     weightedStakedAmount: weightedStakedAmount.toNumber(),
     weightedStakedCoin: weightedStakedCoin.toNumber(),
@@ -2544,6 +2538,7 @@ var getStakeRewardPool = async (query, marketCoinName) => {
 
 // src/queries/borrowIncentiveQuery.ts
 var import_utils6 = require("@mysten/sui.js/utils");
+var import_bignumber3 = __toESM(require("bignumber.js"));
 var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames, indexer = false) => {
   borrowIncentiveCoinNames = borrowIncentiveCoinNames || [
     ...SUPPORT_BORROW_INCENTIVE_POOLS
@@ -2618,14 +2613,19 @@ var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames, indexer
         ...calculatedPoolPoint
       };
     }
+    const stakedAmount = (0, import_bignumber3.default)(parsedBorrowIncentivePoolData.staked);
+    const stakedCoin = stakedAmount.shiftedBy(-1 * poolCoinDecimal);
+    const stakedValue = stakedCoin.multipliedBy(poolCoinPrice);
     borrowIncentivePools[poolCoinName] = {
       coinName: poolCoinName,
       symbol: query.utils.parseSymbol(poolCoinName),
       coinType: poolCoinType,
       coinDecimal: poolCoinDecimal,
       coinPrice: poolCoinPrice,
-      points: borrowIncentivePoolPoints,
-      staked: parsedBorrowIncentivePoolData.staked
+      stakedAmount: stakedAmount.toNumber(),
+      stakedCoin: stakedCoin.toNumber(),
+      stakedValue: stakedValue.toNumber(),
+      points: borrowIncentivePoolPoints
     };
   }
   return borrowIncentivePools;
@@ -2772,7 +2772,7 @@ var getPythPrices = async (query, assetCoinNames) => {
 };
 
 // src/queries/portfolioQuery.ts
-var import_bignumber3 = __toESM(require("bignumber.js"));
+var import_bignumber4 = __toESM(require("bignumber.js"));
 var getLendings = async (query, poolCoinNames, ownerAddress, indexer = false) => {
   poolCoinNames = poolCoinNames || [...SUPPORT_POOLS];
   const marketCoinNames = poolCoinNames.map(
@@ -2823,18 +2823,18 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
   marketCoinAmount = marketCoinAmount || await query.getMarketCoinAmount(marketCoinName, ownerAddress);
   coinPrice = coinPrice || (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
   const coinDecimal = query.utils.getCoinDecimal(poolCoinName);
-  let stakedMarketAmount = (0, import_bignumber3.default)(0);
-  let stakedMarketCoin = (0, import_bignumber3.default)(0);
-  let stakedAmount = (0, import_bignumber3.default)(0);
-  let stakedCoin = (0, import_bignumber3.default)(0);
-  let stakedValue = (0, import_bignumber3.default)(0);
-  let availableUnstakeAmount = (0, import_bignumber3.default)(0);
-  let availableUnstakeCoin = (0, import_bignumber3.default)(0);
-  let availableClaimAmount = (0, import_bignumber3.default)(0);
-  let availableClaimCoin = (0, import_bignumber3.default)(0);
+  let stakedMarketAmount = (0, import_bignumber4.default)(0);
+  let stakedMarketCoin = (0, import_bignumber4.default)(0);
+  let stakedAmount = (0, import_bignumber4.default)(0);
+  let stakedCoin = (0, import_bignumber4.default)(0);
+  let stakedValue = (0, import_bignumber4.default)(0);
+  let availableUnstakeAmount = (0, import_bignumber4.default)(0);
+  let availableUnstakeCoin = (0, import_bignumber4.default)(0);
+  let availableClaimAmount = (0, import_bignumber4.default)(0);
+  let availableClaimCoin = (0, import_bignumber4.default)(0);
   if (spool) {
     for (const stakeAccount of stakeAccounts) {
-      const accountStakedMarketCoinAmount = (0, import_bignumber3.default)(stakeAccount.staked);
+      const accountStakedMarketCoinAmount = (0, import_bignumber4.default)(stakeAccount.staked);
       const accountStakedMarketCoin = accountStakedMarketCoinAmount.shiftedBy(
         -1 * spool.coinDecimal
       );
@@ -2861,7 +2861,7 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
         -1 * spool.coinDecimal
       );
       const baseIndexRate = 1e9;
-      const increasedPointRate = spool.currentPointIndex ? (0, import_bignumber3.default)(spool.currentPointIndex - stakeAccount.index).dividedBy(
+      const increasedPointRate = spool.currentPointIndex ? (0, import_bignumber4.default)(spool.currentPointIndex - stakeAccount.index).dividedBy(
         baseIndexRate
       ) : 1;
       availableClaimAmount = availableClaimAmount.plus(
@@ -2872,17 +2872,17 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
       );
     }
   }
-  const suppliedAmount = (0, import_bignumber3.default)(marketCoinAmount).multipliedBy(
+  const suppliedAmount = (0, import_bignumber4.default)(marketCoinAmount).multipliedBy(
     marketPool?.conversionRate ?? 1
   );
   const suppliedCoin = suppliedAmount.shiftedBy(-1 * coinDecimal);
   const suppliedValue = suppliedCoin.multipliedBy(coinPrice ?? 0);
-  const marketCoinPrice = (0, import_bignumber3.default)(coinPrice ?? 0).multipliedBy(
+  const marketCoinPrice = (0, import_bignumber4.default)(coinPrice ?? 0).multipliedBy(
     marketPool?.conversionRate ?? 1
   );
-  const unstakedMarketAmount = (0, import_bignumber3.default)(marketCoinAmount);
+  const unstakedMarketAmount = (0, import_bignumber4.default)(marketCoinAmount);
   const unstakedMarketCoin = unstakedMarketAmount.shiftedBy(-1 * coinDecimal);
-  const availableSupplyAmount = (0, import_bignumber3.default)(coinAmount);
+  const availableSupplyAmount = (0, import_bignumber4.default)(coinAmount);
   const availableSupplyCoin = availableSupplyAmount.shiftedBy(-1 * coinDecimal);
   const availableWithdrawAmount = minBigNumber(
     suppliedAmount,
@@ -2972,12 +2972,12 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
   const debts = {};
   const borrowIncentives = {};
   let totalDepositedPools = 0;
-  let totalDepositedValue = (0, import_bignumber3.default)(0);
-  let totalBorrowCapacityValue = (0, import_bignumber3.default)(0);
-  let totalRequiredCollateralValue = (0, import_bignumber3.default)(0);
+  let totalDepositedValue = (0, import_bignumber4.default)(0);
+  let totalBorrowCapacityValue = (0, import_bignumber4.default)(0);
+  let totalRequiredCollateralValue = (0, import_bignumber4.default)(0);
   let totalBorrowedPools = 0;
-  let totalBorrowedValue = (0, import_bignumber3.default)(0);
-  let totalBorrowedValueWithWeight = (0, import_bignumber3.default)(0);
+  let totalBorrowedValue = (0, import_bignumber4.default)(0);
+  let totalBorrowedValueWithWeight = (0, import_bignumber4.default)(0);
   for (const assetCoinName of collateralAssetCoinNames) {
     const collateral = obligationQuery.collaterals.find((collateral2) => {
       const collateralCoinName = query.utils.parseCoinNameFromType(
@@ -2990,7 +2990,7 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
     const coinPrice = coinPrices?.[assetCoinName];
     const coinAmount = coinAmounts?.[assetCoinName] ?? 0;
     if (marketCollateral && coinPrice) {
-      const depositedAmount = (0, import_bignumber3.default)(collateral?.amount ?? 0);
+      const depositedAmount = (0, import_bignumber4.default)(collateral?.amount ?? 0);
       const depositedCoin = depositedAmount.shiftedBy(-1 * coinDecimal);
       const depositedValue = depositedCoin.multipliedBy(coinPrice);
       const borrowCapacityValue = depositedValue.multipliedBy(
@@ -2999,11 +2999,11 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
       const requiredCollateralValue2 = depositedValue.multipliedBy(
         marketCollateral.liquidationFactor
       );
-      const poolSizeAmount = (0, import_bignumber3.default)(marketCollateral.maxDepositAmount).minus(
+      const poolSizeAmount = (0, import_bignumber4.default)(marketCollateral.maxDepositAmount).minus(
         marketCollateral.depositAmount
       );
       const availableDepositAmount = minBigNumber(
-        (0, import_bignumber3.default)(coinAmount),
+        (0, import_bignumber4.default)(coinAmount),
         poolSizeAmount
       );
       const availableDepositCoin = availableDepositAmount.shiftedBy(
@@ -3051,13 +3051,13 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
     const coinAmount = coinAmounts?.[assetCoinName] ?? 0;
     if (marketPool && coinPrice) {
       const increasedRate = debt?.borrowIndex ? marketPool.borrowIndex / Number(debt.borrowIndex) - 1 : 0;
-      const borrowedAmount = (0, import_bignumber3.default)(debt?.amount ?? 0);
+      const borrowedAmount = (0, import_bignumber4.default)(debt?.amount ?? 0);
       const borrowedCoin = borrowedAmount.shiftedBy(-1 * coinDecimal);
       const requiredRepayAmount = borrowedAmount.multipliedBy(
         increasedRate + 1
       );
       const requiredRepayCoin = requiredRepayAmount.shiftedBy(-1 * coinDecimal);
-      const availableRepayAmount = (0, import_bignumber3.default)(coinAmount);
+      const availableRepayAmount = (0, import_bignumber4.default)(coinAmount);
       const availableRepayCoin = availableRepayAmount.shiftedBy(
         -1 * coinDecimal
       );
@@ -3103,26 +3103,27 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
         const accountPoint = borrowIncentiveAccount.pointList[rewardCoinName];
         const poolPoint = borrowIncentivePool.points[rewardCoinName];
         if (accountPoint && poolPoint) {
-          let availableClaimAmount = (0, import_bignumber3.default)(0);
-          let availableClaimCoin = (0, import_bignumber3.default)(0);
-          const accountBorrowedAmount = (0, import_bignumber3.default)(accountPoint.weightedAmount);
+          let availableClaimAmount = (0, import_bignumber4.default)(0);
+          let availableClaimCoin = (0, import_bignumber4.default)(0);
+          const accountBorrowedAmount = (0, import_bignumber4.default)(accountPoint.weightedAmount);
           const baseIndexRate = 1e9;
-          const increasedPointRate = poolPoint.currentPointIndex ? (0, import_bignumber3.default)(
-            poolPoint.currentPointIndex - accountPoint.index
-          ).dividedBy(baseIndexRate) : 1;
+          const increasedPointRate = poolPoint.currentPointIndex ? Math.max(
+            (0, import_bignumber4.default)(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 = (0, import_bignumber3.default)(1e12);
-          const boostValue = (0, import_bignumber3.default)(accountPoint.weightedAmount).div(
-            (0, import_bignumber3.default)(borrowIncentiveAccount.debtAmount).multipliedBy(poolPoint.baseWeight).dividedBy(weightScale)
-          ).isFinite() ? (0, import_bignumber3.default)(accountPoint.weightedAmount).div(
-            (0, import_bignumber3.default)(borrowIncentiveAccount.debtAmount).multipliedBy(poolPoint.baseWeight).dividedBy(weightScale)
+          const weightScale = (0, import_bignumber4.default)(1e12);
+          const boostValue = (0, import_bignumber4.default)(accountPoint.weightedAmount).div(
+            (0, import_bignumber4.default)(borrowIncentiveAccount.debtAmount).multipliedBy(poolPoint.baseWeight).dividedBy(weightScale)
+          ).isFinite() ? (0, import_bignumber4.default)(accountPoint.weightedAmount).div(
+            (0, import_bignumber4.default)(borrowIncentiveAccount.debtAmount).multipliedBy(poolPoint.baseWeight).dividedBy(weightScale)
           ).toNumber() : 1;
-          if (availableClaimAmount.isGreaterThan(0)) {
+          if (availableClaimAmount.isGreaterThanOrEqualTo(0)) {
             rewards.push({
               coinName: poolPoint.coinName,
               coinType: poolPoint.coinType,
@@ -3146,12 +3147,12 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
       };
     }
   }
-  let riskLevel = totalRequiredCollateralValue.isZero() ? (0, import_bignumber3.default)(0) : totalBorrowedValueWithWeight.dividedBy(totalRequiredCollateralValue);
-  riskLevel = riskLevel.isLessThan(1) ? riskLevel : (0, import_bignumber3.default)(1);
-  const accountBalanceValue = totalDepositedValue.minus(totalBorrowedValue).isGreaterThan(0) ? totalDepositedValue.minus(totalBorrowedValue) : (0, import_bignumber3.default)(0);
-  const availableCollateralValue = totalBorrowCapacityValue.minus(totalBorrowedValueWithWeight).isGreaterThan(0) ? totalBorrowCapacityValue.minus(totalBorrowedValueWithWeight) : (0, import_bignumber3.default)(0);
-  const requiredCollateralValue = totalBorrowedValueWithWeight.isGreaterThan(0) ? totalRequiredCollateralValue : (0, import_bignumber3.default)(0);
-  const unhealthyCollateralValue = totalBorrowedValueWithWeight.minus(requiredCollateralValue).isGreaterThan(0) ? totalBorrowedValueWithWeight.minus(requiredCollateralValue) : (0, import_bignumber3.default)(0);
+  let riskLevel = totalRequiredCollateralValue.isZero() ? (0, import_bignumber4.default)(0) : totalBorrowedValueWithWeight.dividedBy(totalRequiredCollateralValue);
+  riskLevel = riskLevel.isLessThan(1) ? riskLevel : (0, import_bignumber4.default)(1);
+  const accountBalanceValue = totalDepositedValue.minus(totalBorrowedValue).isGreaterThan(0) ? totalDepositedValue.minus(totalBorrowedValue) : (0, import_bignumber4.default)(0);
+  const availableCollateralValue = totalBorrowCapacityValue.minus(totalBorrowedValueWithWeight).isGreaterThan(0) ? totalBorrowCapacityValue.minus(totalBorrowedValueWithWeight) : (0, import_bignumber4.default)(0);
+  const requiredCollateralValue = totalBorrowedValueWithWeight.isGreaterThan(0) ? totalRequiredCollateralValue : (0, import_bignumber4.default)(0);
+  const unhealthyCollateralValue = totalBorrowedValueWithWeight.minus(requiredCollateralValue).isGreaterThan(0) ? totalBorrowedValueWithWeight.minus(requiredCollateralValue) : (0, import_bignumber4.default)(0);
   const obligationAccount = {
     obligationId,
     // Deposited collateral value (collateral balance)
@@ -3182,16 +3183,16 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
   )) {
     const marketCollateral = market.collaterals[collateralCoinName];
     if (marketCollateral) {
-      let estimatedAvailableWithdrawAmount = (0, import_bignumber3.default)(
+      let estimatedAvailableWithdrawAmount = (0, import_bignumber4.default)(
         obligationAccount.totalAvailableCollateralValue
       ).dividedBy(marketCollateral.collateralFactor).dividedBy(marketCollateral.coinPrice).shiftedBy(marketCollateral.coinDecimal);
       estimatedAvailableWithdrawAmount = obligationAccount.totalBorrowedValueWithWeight === 0 ? (
         // Note: when there is no debt record, there is no need to estimate and the deposited amount is directly used as available withdraw.
-        (0, import_bignumber3.default)(obligationCollateral.depositedAmount)
+        (0, import_bignumber4.default)(obligationCollateral.depositedAmount)
       ) : minBigNumber(
         estimatedAvailableWithdrawAmount.multipliedBy(
           estimatedFactor(
-            (0, import_bignumber3.default)(obligationAccount.totalAvailableCollateralValue).dividedBy(marketCollateral.collateralFactor).toNumber(),
+            (0, import_bignumber4.default)(obligationAccount.totalAvailableCollateralValue).dividedBy(marketCollateral.collateralFactor).toNumber(),
             3,
             "increase"
           )
@@ -3208,12 +3209,12 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
   )) {
     const marketPool = market.pools[poolCoinName];
     if (marketPool) {
-      const estimatedRequiredRepayAmount = (0, import_bignumber3.default)(
+      const estimatedRequiredRepayAmount = (0, import_bignumber4.default)(
         obligationDebt.requiredRepayAmount
       ).multipliedBy(
         estimatedFactor(obligationDebt.borrowedValue, 3, "decrease")
       );
-      let estimatedAvailableBorrowAmount = (0, import_bignumber3.default)(
+      let estimatedAvailableBorrowAmount = (0, import_bignumber4.default)(
         obligationAccount.totalAvailableCollateralValue
       ).dividedBy(marketPool.borrowWeight).shiftedBy(marketPool.coinDecimal).dividedBy(marketPool.coinPrice);
       estimatedAvailableBorrowAmount = obligationAccount.totalAvailableCollateralValue !== 0 ? minBigNumber(
@@ -3225,7 +3226,7 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
           )
         ).toNumber(),
         marketPool.supplyAmount
-      ) : (0, import_bignumber3.default)(0);
+      ) : (0, import_bignumber4.default)(0);
       obligationDebt.availableBorrowAmount = estimatedAvailableBorrowAmount.toNumber();
       obligationDebt.availableBorrowCoin = estimatedAvailableBorrowAmount.shiftedBy(-1 * obligationDebt.coinDecimal).toNumber();
       obligationDebt.requiredRepayAmount = estimatedRequiredRepayAmount.toNumber();
@@ -3236,8 +3237,8 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
 };
 var getTotalValueLocked = async (query, indexer = false) => {
   const market = await query.queryMarket(indexer);
-  let supplyValue = (0, import_bignumber3.default)(0);
-  let borrowValue = (0, import_bignumber3.default)(0);
+  let supplyValue = (0, import_bignumber4.default)(0);
+  let borrowValue = (0, import_bignumber4.default)(0);
   if (indexer) {
     const tvlIndexer = await query.indexer.getTotalValueLocked();
     const tvl2 = {
@@ -3252,15 +3253,15 @@ var getTotalValueLocked = async (query, indexer = false) => {
   }
   for (const pool of Object.values(market.pools)) {
     supplyValue = supplyValue.plus(
-      (0, import_bignumber3.default)(pool.supplyCoin).multipliedBy(pool.coinPrice)
+      (0, import_bignumber4.default)(pool.supplyCoin).multipliedBy(pool.coinPrice)
     );
     borrowValue = borrowValue.plus(
-      (0, import_bignumber3.default)(pool.borrowCoin).multipliedBy(pool.coinPrice)
+      (0, import_bignumber4.default)(pool.borrowCoin).multipliedBy(pool.coinPrice)
     );
   }
   for (const collateral of Object.values(market.collaterals)) {
     supplyValue = supplyValue.plus(
-      (0, import_bignumber3.default)(collateral.depositCoin).multipliedBy(collateral.coinPrice)
+      (0, import_bignumber4.default)(collateral.depositCoin).multipliedBy(collateral.coinPrice)
     );
   }
   const tvl = {
@@ -3272,7 +3273,7 @@ var getTotalValueLocked = async (query, indexer = false) => {
 };
 
 // src/queries/vescaQuery.ts
-var import_bignumber4 = __toESM(require("bignumber.js"));
+var import_bignumber5 = __toESM(require("bignumber.js"));
 var import_sui_kit2 = require("@scallop-io/sui-kit");
 var import_bcs = require("@mysten/sui.js/bcs");
 var getVescaKeys = async (query, ownerAddress) => {
@@ -3333,7 +3334,7 @@ var getVeSca = async (query, veScaKeyId, ownerAddress) => {
       0
     );
     const lockedScaAmount = String(dynamicFields.locked_sca_amount);
-    const lockedScaCoin = (0, import_bignumber4.default)(dynamicFields.locked_sca_amount).shiftedBy(-9).toNumber();
+    const lockedScaCoin = (0, import_bignumber5.default)(dynamicFields.locked_sca_amount).shiftedBy(-9).toNumber();
     const currentVeScaBalance = lockedScaCoin * (Math.floor(remainingLockPeriodInMilliseconds / 1e3) / MAX_LOCK_DURATION);
     vesca = {
       id: veScaDynamicFieldObject.objectId,
@@ -3341,7 +3342,7 @@ var getVeSca = async (query, veScaKeyId, ownerAddress) => {
       lockedScaAmount,
       lockedScaCoin,
       currentVeScaBalance,
-      unlockAt: (0, import_bignumber4.default)(dynamicFields.unlock_at * 1e3).toNumber()
+      unlockAt: (0, import_bignumber5.default)(dynamicFields.unlock_at * 1e3).toNumber()
     };
   }
   return vesca;