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

package/dist/index.mjs

@@ -1401,7 +1401,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 = BigNumber(
     parsedBorrowIncentivePoolPointData.distributedPointPerPeriod
@@ -1423,9 +1423,6 @@ var calculateBorrowIncentivePoolPointData = (pasredBorrowIncentinvePoolData, par
   const currentTotalDistributedPoint = BigNumber(
     parsedBorrowIncentivePoolPointData.distributedPoint
   ).plus(accumulatedPoints);
-  const stakedAmount = BigNumber(pasredBorrowIncentinvePoolData.staked);
-  const stakedCoin = stakedAmount.shiftedBy(-1 * poolCoinDecimal);
-  const stakedValue = stakedCoin.multipliedBy(poolCoinPrice);
   const baseWeight = BigNumber(parsedBorrowIncentivePoolPointData.baseWeight);
   const weightedStakedAmount = BigNumber(
     parsedBorrowIncentivePoolPointData.weightedAmount
@@ -1454,9 +1451,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(),
@@ -2471,6 +2465,7 @@ var getStakeRewardPool = async (query, marketCoinName) => {
 
 // src/queries/borrowIncentiveQuery.ts
 import { normalizeStructTag as normalizeStructTag5 } from "@mysten/sui.js/utils";
+import BigNumber3 from "bignumber.js";
 var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames, indexer = false) => {
   borrowIncentiveCoinNames = borrowIncentiveCoinNames || [
     ...SUPPORT_BORROW_INCENTIVE_POOLS
@@ -2545,14 +2540,19 @@ var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames, indexer
         ...calculatedPoolPoint
       };
     }
+    const stakedAmount = BigNumber3(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;
@@ -2699,7 +2699,7 @@ var getPythPrices = async (query, assetCoinNames) => {
 };
 
 // src/queries/portfolioQuery.ts
-import BigNumber3 from "bignumber.js";
+import BigNumber4 from "bignumber.js";
 var getLendings = async (query, poolCoinNames, ownerAddress, indexer = false) => {
   poolCoinNames = poolCoinNames || [...SUPPORT_POOLS];
   const marketCoinNames = poolCoinNames.map(
@@ -2750,18 +2750,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 = BigNumber3(0);
-  let stakedMarketCoin = BigNumber3(0);
-  let stakedAmount = BigNumber3(0);
-  let stakedCoin = BigNumber3(0);
-  let stakedValue = BigNumber3(0);
-  let availableUnstakeAmount = BigNumber3(0);
-  let availableUnstakeCoin = BigNumber3(0);
-  let availableClaimAmount = BigNumber3(0);
-  let availableClaimCoin = BigNumber3(0);
+  let stakedMarketAmount = BigNumber4(0);
+  let stakedMarketCoin = BigNumber4(0);
+  let stakedAmount = BigNumber4(0);
+  let stakedCoin = BigNumber4(0);
+  let stakedValue = BigNumber4(0);
+  let availableUnstakeAmount = BigNumber4(0);
+  let availableUnstakeCoin = BigNumber4(0);
+  let availableClaimAmount = BigNumber4(0);
+  let availableClaimCoin = BigNumber4(0);
   if (spool) {
     for (const stakeAccount of stakeAccounts) {
-      const accountStakedMarketCoinAmount = BigNumber3(stakeAccount.staked);
+      const accountStakedMarketCoinAmount = BigNumber4(stakeAccount.staked);
       const accountStakedMarketCoin = accountStakedMarketCoinAmount.shiftedBy(
         -1 * spool.coinDecimal
       );
@@ -2788,7 +2788,7 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
         -1 * spool.coinDecimal
       );
       const baseIndexRate = 1e9;
-      const increasedPointRate = spool.currentPointIndex ? BigNumber3(spool.currentPointIndex - stakeAccount.index).dividedBy(
+      const increasedPointRate = spool.currentPointIndex ? BigNumber4(spool.currentPointIndex - stakeAccount.index).dividedBy(
         baseIndexRate
       ) : 1;
       availableClaimAmount = availableClaimAmount.plus(
@@ -2799,17 +2799,17 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
       );
     }
   }
-  const suppliedAmount = BigNumber3(marketCoinAmount).multipliedBy(
+  const suppliedAmount = BigNumber4(marketCoinAmount).multipliedBy(
     marketPool?.conversionRate ?? 1
   );
   const suppliedCoin = suppliedAmount.shiftedBy(-1 * coinDecimal);
   const suppliedValue = suppliedCoin.multipliedBy(coinPrice ?? 0);
-  const marketCoinPrice = BigNumber3(coinPrice ?? 0).multipliedBy(
+  const marketCoinPrice = BigNumber4(coinPrice ?? 0).multipliedBy(
     marketPool?.conversionRate ?? 1
   );
-  const unstakedMarketAmount = BigNumber3(marketCoinAmount);
+  const unstakedMarketAmount = BigNumber4(marketCoinAmount);
   const unstakedMarketCoin = unstakedMarketAmount.shiftedBy(-1 * coinDecimal);
-  const availableSupplyAmount = BigNumber3(coinAmount);
+  const availableSupplyAmount = BigNumber4(coinAmount);
   const availableSupplyCoin = availableSupplyAmount.shiftedBy(-1 * coinDecimal);
   const availableWithdrawAmount = minBigNumber(
     suppliedAmount,
@@ -2899,12 +2899,12 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
   const debts = {};
   const borrowIncentives = {};
   let totalDepositedPools = 0;
-  let totalDepositedValue = BigNumber3(0);
-  let totalBorrowCapacityValue = BigNumber3(0);
-  let totalRequiredCollateralValue = BigNumber3(0);
+  let totalDepositedValue = BigNumber4(0);
+  let totalBorrowCapacityValue = BigNumber4(0);
+  let totalRequiredCollateralValue = BigNumber4(0);
   let totalBorrowedPools = 0;
-  let totalBorrowedValue = BigNumber3(0);
-  let totalBorrowedValueWithWeight = BigNumber3(0);
+  let totalBorrowedValue = BigNumber4(0);
+  let totalBorrowedValueWithWeight = BigNumber4(0);
   for (const assetCoinName of collateralAssetCoinNames) {
     const collateral = obligationQuery.collaterals.find((collateral2) => {
       const collateralCoinName = query.utils.parseCoinNameFromType(
@@ -2917,7 +2917,7 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
     const coinPrice = coinPrices?.[assetCoinName];
     const coinAmount = coinAmounts?.[assetCoinName] ?? 0;
     if (marketCollateral && coinPrice) {
-      const depositedAmount = BigNumber3(collateral?.amount ?? 0);
+      const depositedAmount = BigNumber4(collateral?.amount ?? 0);
       const depositedCoin = depositedAmount.shiftedBy(-1 * coinDecimal);
       const depositedValue = depositedCoin.multipliedBy(coinPrice);
       const borrowCapacityValue = depositedValue.multipliedBy(
@@ -2926,11 +2926,11 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
       const requiredCollateralValue2 = depositedValue.multipliedBy(
         marketCollateral.liquidationFactor
       );
-      const poolSizeAmount = BigNumber3(marketCollateral.maxDepositAmount).minus(
+      const poolSizeAmount = BigNumber4(marketCollateral.maxDepositAmount).minus(
         marketCollateral.depositAmount
       );
       const availableDepositAmount = minBigNumber(
-        BigNumber3(coinAmount),
+        BigNumber4(coinAmount),
         poolSizeAmount
       );
       const availableDepositCoin = availableDepositAmount.shiftedBy(
@@ -2978,13 +2978,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 = BigNumber3(debt?.amount ?? 0);
+      const borrowedAmount = BigNumber4(debt?.amount ?? 0);
       const borrowedCoin = borrowedAmount.shiftedBy(-1 * coinDecimal);
       const requiredRepayAmount = borrowedAmount.multipliedBy(
         increasedRate + 1
       );
       const requiredRepayCoin = requiredRepayAmount.shiftedBy(-1 * coinDecimal);
-      const availableRepayAmount = BigNumber3(coinAmount);
+      const availableRepayAmount = BigNumber4(coinAmount);
       const availableRepayCoin = availableRepayAmount.shiftedBy(
         -1 * coinDecimal
       );
@@ -3030,26 +3030,27 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
         const accountPoint = borrowIncentiveAccount.pointList[rewardCoinName];
         const poolPoint = borrowIncentivePool.points[rewardCoinName];
         if (accountPoint && poolPoint) {
-          let availableClaimAmount = BigNumber3(0);
-          let availableClaimCoin = BigNumber3(0);
-          const accountBorrowedAmount = BigNumber3(accountPoint.weightedAmount);
+          let availableClaimAmount = BigNumber4(0);
+          let availableClaimCoin = BigNumber4(0);
+          const accountBorrowedAmount = BigNumber4(accountPoint.weightedAmount);
           const baseIndexRate = 1e9;
-          const increasedPointRate = poolPoint.currentPointIndex ? BigNumber3(
-            poolPoint.currentPointIndex - accountPoint.index
-          ).dividedBy(baseIndexRate) : 1;
+          const increasedPointRate = poolPoint.currentPointIndex ? Math.max(
+            BigNumber4(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 = BigNumber3(1e12);
-          const boostValue = BigNumber3(accountPoint.weightedAmount).div(
-            BigNumber3(borrowIncentiveAccount.debtAmount).multipliedBy(poolPoint.baseWeight).dividedBy(weightScale)
-          ).isFinite() ? BigNumber3(accountPoint.weightedAmount).div(
-            BigNumber3(borrowIncentiveAccount.debtAmount).multipliedBy(poolPoint.baseWeight).dividedBy(weightScale)
+          const weightScale = BigNumber4(1e12);
+          const boostValue = BigNumber4(accountPoint.weightedAmount).div(
+            BigNumber4(borrowIncentiveAccount.debtAmount).multipliedBy(poolPoint.baseWeight).dividedBy(weightScale)
+          ).isFinite() ? BigNumber4(accountPoint.weightedAmount).div(
+            BigNumber4(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,
@@ -3073,12 +3074,12 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
       };
     }
   }
-  let riskLevel = totalRequiredCollateralValue.isZero() ? BigNumber3(0) : totalBorrowedValueWithWeight.dividedBy(totalRequiredCollateralValue);
-  riskLevel = riskLevel.isLessThan(1) ? riskLevel : BigNumber3(1);
-  const accountBalanceValue = totalDepositedValue.minus(totalBorrowedValue).isGreaterThan(0) ? totalDepositedValue.minus(totalBorrowedValue) : BigNumber3(0);
-  const availableCollateralValue = totalBorrowCapacityValue.minus(totalBorrowedValueWithWeight).isGreaterThan(0) ? totalBorrowCapacityValue.minus(totalBorrowedValueWithWeight) : BigNumber3(0);
-  const requiredCollateralValue = totalBorrowedValueWithWeight.isGreaterThan(0) ? totalRequiredCollateralValue : BigNumber3(0);
-  const unhealthyCollateralValue = totalBorrowedValueWithWeight.minus(requiredCollateralValue).isGreaterThan(0) ? totalBorrowedValueWithWeight.minus(requiredCollateralValue) : BigNumber3(0);
+  let riskLevel = totalRequiredCollateralValue.isZero() ? BigNumber4(0) : totalBorrowedValueWithWeight.dividedBy(totalRequiredCollateralValue);
+  riskLevel = riskLevel.isLessThan(1) ? riskLevel : BigNumber4(1);
+  const accountBalanceValue = totalDepositedValue.minus(totalBorrowedValue).isGreaterThan(0) ? totalDepositedValue.minus(totalBorrowedValue) : BigNumber4(0);
+  const availableCollateralValue = totalBorrowCapacityValue.minus(totalBorrowedValueWithWeight).isGreaterThan(0) ? totalBorrowCapacityValue.minus(totalBorrowedValueWithWeight) : BigNumber4(0);
+  const requiredCollateralValue = totalBorrowedValueWithWeight.isGreaterThan(0) ? totalRequiredCollateralValue : BigNumber4(0);
+  const unhealthyCollateralValue = totalBorrowedValueWithWeight.minus(requiredCollateralValue).isGreaterThan(0) ? totalBorrowedValueWithWeight.minus(requiredCollateralValue) : BigNumber4(0);
   const obligationAccount = {
     obligationId,
     // Deposited collateral value (collateral balance)
@@ -3109,16 +3110,16 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
   )) {
     const marketCollateral = market.collaterals[collateralCoinName];
     if (marketCollateral) {
-      let estimatedAvailableWithdrawAmount = BigNumber3(
+      let estimatedAvailableWithdrawAmount = BigNumber4(
         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.
-        BigNumber3(obligationCollateral.depositedAmount)
+        BigNumber4(obligationCollateral.depositedAmount)
       ) : minBigNumber(
         estimatedAvailableWithdrawAmount.multipliedBy(
           estimatedFactor(
-            BigNumber3(obligationAccount.totalAvailableCollateralValue).dividedBy(marketCollateral.collateralFactor).toNumber(),
+            BigNumber4(obligationAccount.totalAvailableCollateralValue).dividedBy(marketCollateral.collateralFactor).toNumber(),
             3,
             "increase"
           )
@@ -3135,12 +3136,12 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
   )) {
     const marketPool = market.pools[poolCoinName];
     if (marketPool) {
-      const estimatedRequiredRepayAmount = BigNumber3(
+      const estimatedRequiredRepayAmount = BigNumber4(
         obligationDebt.requiredRepayAmount
       ).multipliedBy(
         estimatedFactor(obligationDebt.borrowedValue, 3, "decrease")
       );
-      let estimatedAvailableBorrowAmount = BigNumber3(
+      let estimatedAvailableBorrowAmount = BigNumber4(
         obligationAccount.totalAvailableCollateralValue
       ).dividedBy(marketPool.borrowWeight).shiftedBy(marketPool.coinDecimal).dividedBy(marketPool.coinPrice);
       estimatedAvailableBorrowAmount = obligationAccount.totalAvailableCollateralValue !== 0 ? minBigNumber(
@@ -3152,7 +3153,7 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
           )
         ).toNumber(),
         marketPool.supplyAmount
-      ) : BigNumber3(0);
+      ) : BigNumber4(0);
       obligationDebt.availableBorrowAmount = estimatedAvailableBorrowAmount.toNumber();
       obligationDebt.availableBorrowCoin = estimatedAvailableBorrowAmount.shiftedBy(-1 * obligationDebt.coinDecimal).toNumber();
       obligationDebt.requiredRepayAmount = estimatedRequiredRepayAmount.toNumber();
@@ -3163,8 +3164,8 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
 };
 var getTotalValueLocked = async (query, indexer = false) => {
   const market = await query.queryMarket(indexer);
-  let supplyValue = BigNumber3(0);
-  let borrowValue = BigNumber3(0);
+  let supplyValue = BigNumber4(0);
+  let borrowValue = BigNumber4(0);
   if (indexer) {
     const tvlIndexer = await query.indexer.getTotalValueLocked();
     const tvl2 = {
@@ -3179,15 +3180,15 @@ var getTotalValueLocked = async (query, indexer = false) => {
   }
   for (const pool of Object.values(market.pools)) {
     supplyValue = supplyValue.plus(
-      BigNumber3(pool.supplyCoin).multipliedBy(pool.coinPrice)
+      BigNumber4(pool.supplyCoin).multipliedBy(pool.coinPrice)
     );
     borrowValue = borrowValue.plus(
-      BigNumber3(pool.borrowCoin).multipliedBy(pool.coinPrice)
+      BigNumber4(pool.borrowCoin).multipliedBy(pool.coinPrice)
     );
   }
   for (const collateral of Object.values(market.collaterals)) {
     supplyValue = supplyValue.plus(
-      BigNumber3(collateral.depositCoin).multipliedBy(collateral.coinPrice)
+      BigNumber4(collateral.depositCoin).multipliedBy(collateral.coinPrice)
     );
   }
   const tvl = {
@@ -3199,7 +3200,7 @@ var getTotalValueLocked = async (query, indexer = false) => {
 };
 
 // src/queries/vescaQuery.ts
-import BigNumber4 from "bignumber.js";
+import BigNumber5 from "bignumber.js";
 import { SUI_CLOCK_OBJECT_ID, SuiTxBlock as SuiTxBlock2 } from "@scallop-io/sui-kit";
 import { bcs } from "@mysten/sui.js/bcs";
 var getVescaKeys = async (query, ownerAddress) => {
@@ -3260,7 +3261,7 @@ var getVeSca = async (query, veScaKeyId, ownerAddress) => {
       0
     );
     const lockedScaAmount = String(dynamicFields.locked_sca_amount);
-    const lockedScaCoin = BigNumber4(dynamicFields.locked_sca_amount).shiftedBy(-9).toNumber();
+    const lockedScaCoin = BigNumber5(dynamicFields.locked_sca_amount).shiftedBy(-9).toNumber();
     const currentVeScaBalance = lockedScaCoin * (Math.floor(remainingLockPeriodInMilliseconds / 1e3) / MAX_LOCK_DURATION);
     vesca = {
       id: veScaDynamicFieldObject.objectId,
@@ -3268,7 +3269,7 @@ var getVeSca = async (query, veScaKeyId, ownerAddress) => {
       lockedScaAmount,
       lockedScaCoin,
       currentVeScaBalance,
-      unlockAt: BigNumber4(dynamicFields.unlock_at * 1e3).toNumber()
+      unlockAt: BigNumber5(dynamicFields.unlock_at * 1e3).toNumber()
     };
   }
   return vesca;