@scallop-io/sui-scallop-sdk 0.44.18 → 0.44.19

package/src/utils/query.ts

@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { normalizeStructTag } from '@mysten/sui.js/utils';
+import { normalizeStructTag, parseStructTag } from '@mysten/sui.js/utils';
 import type { ScallopUtils } from '../models';
 import type {
   OriginMarketPoolData,
@@ -16,14 +16,16 @@ import type {
   CalculatedSpoolRewardPoolData,
   OriginBorrowIncentivePoolData,
   ParsedBorrowIncentivePoolData,
-  CalculatedBorrowIncentivePoolData,
-  OriginBorrowIncentiveRewardPoolData,
-  ParsedBorrowIncentiveRewardPoolData,
-  CalculatedBorrowIncentiveRewardPoolData,
   OriginBorrowIncentiveAccountData,
   ParsedBorrowIncentiveAccountData,
   SupportPoolCoins,
   SupportCollateralCoins,
+  OriginBorrowIncentivePoolPointData,
+  ParsedBorrowIncentivePoolPointData,
+  CalculatedBorrowIncentivePoolPointData,
+  OriginBorrowIncentiveAccountPoolData,
+  ParsedBorrowIncentiveAccountPoolData,
+  SupportBorrowIncentiveRewardCoins,
 } from '../types';
 
 /**
@@ -385,6 +387,28 @@ export const calculateSpoolRewardPoolData = (
   };
 };
 
+export const parseOriginBorrowIncentivesPoolPointData = (
+  originBorrowIncentivePoolPointData: OriginBorrowIncentivePoolPointData
+): ParsedBorrowIncentivePoolPointData => {
+  return {
+    pointType: normalizeStructTag(
+      originBorrowIncentivePoolPointData.point_type.name
+    ),
+    distributedPointPerPeriod: Number(
+      originBorrowIncentivePoolPointData.distributed_point_per_period
+    ),
+    period: Number(originBorrowIncentivePoolPointData.point_distribution_time),
+    distributedPoint: Number(
+      originBorrowIncentivePoolPointData.distributed_point
+    ),
+    points: Number(originBorrowIncentivePoolPointData.points),
+    index: Number(originBorrowIncentivePoolPointData.index),
+    baseWeight: Number(originBorrowIncentivePoolPointData.base_weight),
+    weightedAmount: Number(originBorrowIncentivePoolPointData.weighted_amount),
+    lastUpdate: Number(originBorrowIncentivePoolPointData.last_update),
+  };
+};
+
 /**
  *  Parse origin borrow incentive pool data to a more readable format.
  *
@@ -396,174 +420,230 @@ export const parseOriginBorrowIncentivePoolData = (
 ): ParsedBorrowIncentivePoolData => {
   return {
     poolType: normalizeStructTag(originBorrowIncentivePoolData.pool_type.name),
-    maxPoint: Number(originBorrowIncentivePoolData.max_distributed_point),
-    distributedPoint: Number(originBorrowIncentivePoolData.distributed_point),
-    pointPerPeriod: Number(
-      originBorrowIncentivePoolData.distributed_point_per_period
-    ),
-    period: Number(originBorrowIncentivePoolData.point_distribution_time),
-    maxStake: Number(originBorrowIncentivePoolData.max_stakes),
+    minStakes: Number(originBorrowIncentivePoolData.min_stakes),
+    maxStakes: Number(originBorrowIncentivePoolData.max_stakes),
     staked: Number(originBorrowIncentivePoolData.stakes),
-    index: Number(originBorrowIncentivePoolData.index),
     createdAt: Number(originBorrowIncentivePoolData.created_at),
-    lastUpdate: Number(originBorrowIncentivePoolData.last_update),
+    poolPoints: originBorrowIncentivePoolData.points.reduce(
+      (acc, point) => {
+        const parsed = parseOriginBorrowIncentivesPoolPointData(point);
+        const name = parseStructTag(
+          parsed.pointType
+        ).name.toLowerCase() as SupportBorrowIncentiveRewardCoins;
+        acc[name] = parsed;
+        return acc;
+      },
+      {} as Record<
+        SupportBorrowIncentiveRewardCoins,
+        ParsedBorrowIncentivePoolPointData
+      >
+    ),
   };
 };
 
-export const calculateBorrowIncentivePoolData = (
-  parsedBorrowIncentivePoolData: ParsedBorrowIncentivePoolData,
-  borrowIncentiveCoinPrice: number,
-  borrowIncentiveCoinDecimal: number
-): CalculatedBorrowIncentivePoolData => {
+export const calculateBorrowIncentivePoolPointData = (
+  pasredBorrowIncentinvePoolData: ParsedBorrowIncentivePoolData,
+  parsedBorrowIncentivePoolPointData: ParsedBorrowIncentivePoolPointData,
+  rewardCoinPrice: number,
+  rewardCoinDecimal: number,
+  poolCoinPrice: number,
+  poolCoinDecimal: number
+): CalculatedBorrowIncentivePoolPointData => {
   const baseIndexRate = 1_000_000_000;
 
   const distributedPointPerSec = BigNumber(
-    parsedBorrowIncentivePoolData.pointPerPeriod
-  ).dividedBy(parsedBorrowIncentivePoolData.period);
-
-  const pointPerSec = BigNumber(
-    parsedBorrowIncentivePoolData.pointPerPeriod
-  ).dividedBy(parsedBorrowIncentivePoolData.period);
-  const remainingPeriod = BigNumber(parsedBorrowIncentivePoolData.maxPoint)
-    .minus(parsedBorrowIncentivePoolData.distributedPoint)
-    .dividedBy(pointPerSec);
-  const startDate = parsedBorrowIncentivePoolData.createdAt;
-  const endDate = remainingPeriod
-    .plus(parsedBorrowIncentivePoolData.lastUpdate)
-    .integerValue()
-    .toNumber();
+    parsedBorrowIncentivePoolPointData.distributedPointPerPeriod
+  ).dividedBy(parsedBorrowIncentivePoolPointData.period);
 
   const timeDelta = BigNumber(
     Math.floor(new Date().getTime() / 1000) -
-      parsedBorrowIncentivePoolData.lastUpdate
+      parsedBorrowIncentivePoolPointData.lastUpdate
   )
-    .dividedBy(parsedBorrowIncentivePoolData.period)
+    .dividedBy(parsedBorrowIncentivePoolPointData.period)
     .toFixed(0);
-  const remainingPoints = BigNumber(
-    parsedBorrowIncentivePoolData.maxPoint
-  ).minus(parsedBorrowIncentivePoolData.distributedPoint);
   const accumulatedPoints = BigNumber.minimum(
     BigNumber(timeDelta).multipliedBy(
-      parsedBorrowIncentivePoolData.pointPerPeriod
+      parsedBorrowIncentivePoolPointData.distributedPointPerPeriod
     ),
-    remainingPoints
+    BigNumber(parsedBorrowIncentivePoolPointData.points)
   );
 
-  const currentPointIndex = BigNumber(parsedBorrowIncentivePoolData.index).plus(
-    accumulatedPoints.dividedBy(parsedBorrowIncentivePoolData.staked).isFinite()
+  const currentPointIndex = BigNumber(
+    parsedBorrowIncentivePoolPointData.index
+  ).plus(
+    accumulatedPoints
+      .dividedBy(parsedBorrowIncentivePoolPointData.weightedAmount)
+      .isFinite()
       ? BigNumber(baseIndexRate)
           .multipliedBy(accumulatedPoints)
-          .dividedBy(parsedBorrowIncentivePoolData.staked)
+          .dividedBy(parsedBorrowIncentivePoolPointData.weightedAmount)
       : 0
   );
   const currentTotalDistributedPoint = BigNumber(
-    parsedBorrowIncentivePoolData.distributedPoint
+    parsedBorrowIncentivePoolPointData.distributedPoint
   ).plus(accumulatedPoints);
 
-  const stakedAmount = BigNumber(parsedBorrowIncentivePoolData.staked);
-  const stakedCoin = stakedAmount.shiftedBy(-1 * borrowIncentiveCoinDecimal);
-  const stakedValue = stakedCoin.multipliedBy(borrowIncentiveCoinPrice);
-
-  return {
-    distributedPointPerSec: distributedPointPerSec.toNumber(),
-    accumulatedPoints: accumulatedPoints.toNumber(),
-    currentPointIndex: currentPointIndex.toNumber(),
-    currentTotalDistributedPoint: currentTotalDistributedPoint.toNumber(),
-    startDate: new Date(startDate * 1000),
-    endDate: new Date(endDate * 1000),
-    stakedAmount: stakedAmount.toNumber(),
-    stakedCoin: stakedCoin.toNumber(),
-    stakedValue: stakedValue.toNumber(),
-  };
-};
-
-/**
- *  Parse origin borrow incentive reward pool data to a more readable format.
- *
- * @param originBorrowIncentiveRewardPoolData - Origin borrow incentive reward pool data
- * @return Parsed borrow incentive reward pool data
- */
-export const parseOriginBorrowIncentiveRewardPoolData = (
-  originBorrowIncentiveRewardPoolData: OriginBorrowIncentiveRewardPoolData
-): ParsedBorrowIncentiveRewardPoolData => {
-  return {
-    rewardType: normalizeStructTag(
-      originBorrowIncentiveRewardPoolData.reward_type.name
-    ),
-    claimedRewards: Number(originBorrowIncentiveRewardPoolData.claimed_rewards),
-    exchangeRateNumerator: Number(
-      originBorrowIncentiveRewardPoolData.exchange_rate_numerator
-    ),
-    exchangeRateDenominator: Number(
-      originBorrowIncentiveRewardPoolData.exchange_rate_denominator
-    ),
-    remainingRewards: Number(
-      originBorrowIncentiveRewardPoolData.remaining_reward
-    ),
-  };
-};
+  // pure staked amount
+  const stakedAmount = BigNumber(pasredBorrowIncentinvePoolData.staked);
 
-export const calculateBorrowIncentiveRewardPoolData = (
-  parsedBorrowIncentivePoolData: ParsedBorrowIncentivePoolData,
-  parsedBorrowIncentiveRewardPoolData: ParsedBorrowIncentiveRewardPoolData,
-  calculatedBorrowIncentivePoolData: CalculatedBorrowIncentivePoolData,
-  rewardCoinPrice: number,
-  rewardCoinDecimal: number
-): CalculatedBorrowIncentiveRewardPoolData => {
-  const rateYearFactor = 365 * 24 * 60 * 60;
+  const stakedCoin = stakedAmount.shiftedBy(-1 * poolCoinDecimal);
+  const stakedValue = stakedCoin.multipliedBy(poolCoinPrice);
+  const baseWeight = BigNumber(parsedBorrowIncentivePoolPointData.baseWeight);
 
-  const rewardPerSec = BigNumber(
-    calculatedBorrowIncentivePoolData.distributedPointPerSec
-  )
-    .multipliedBy(parsedBorrowIncentiveRewardPoolData.exchangeRateNumerator)
-    .dividedBy(parsedBorrowIncentiveRewardPoolData.exchangeRateDenominator);
-  const totalRewardAmount = BigNumber(parsedBorrowIncentivePoolData.maxPoint)
-    .multipliedBy(parsedBorrowIncentiveRewardPoolData.exchangeRateNumerator)
-    .dividedBy(parsedBorrowIncentiveRewardPoolData.exchangeRateDenominator);
-  const totalRewardCoin = totalRewardAmount.shiftedBy(-1 * rewardCoinDecimal);
-  const totalRewardValue = totalRewardCoin.multipliedBy(rewardCoinPrice);
-  const remaindRewardAmount = BigNumber(
-    parsedBorrowIncentiveRewardPoolData.remainingRewards
+  // staked amount applied with weight
+  const weightedStakedAmount = BigNumber(
+    parsedBorrowIncentivePoolPointData.weightedAmount
   );
-  const remaindRewardCoin = remaindRewardAmount.shiftedBy(
-    -1 * rewardCoinDecimal
-  );
-  const remaindRewardValue = remaindRewardCoin.multipliedBy(rewardCoinPrice);
-  const claimedRewardAmount = BigNumber(
-    parsedBorrowIncentiveRewardPoolData.claimedRewards
+
+  const weightedStakedCoin = weightedStakedAmount.shiftedBy(
+    -1 * poolCoinDecimal
   );
-  const claimedRewardCoin = claimedRewardAmount.shiftedBy(
-    -1 * rewardCoinDecimal
+  const weightedStakedValue = weightedStakedCoin.multipliedBy(poolCoinPrice);
+
+  // Calculate the reward rate
+  const rateYearFactor = 365 * 24 * 60 * 60;
+  const rewardPerSec = BigNumber(distributedPointPerSec).dividedBy(
+    parsedBorrowIncentivePoolPointData.period
   );
-  const claimedRewardValue = claimedRewardCoin.multipliedBy(rewardCoinPrice);
 
   const rewardValueForYear = BigNumber(rewardPerSec)
     .shiftedBy(-1 * rewardCoinDecimal)
     .multipliedBy(rateYearFactor)
     .multipliedBy(rewardCoinPrice);
+
+  const weightScale = BigNumber('1000000000000');
   const rewardRate = rewardValueForYear
-    .dividedBy(calculatedBorrowIncentivePoolData.stakedValue)
+    .dividedBy(weightedStakedValue)
+    .multipliedBy(parsedBorrowIncentivePoolPointData.baseWeight)
+    .dividedBy(weightScale)
     .isFinite()
     ? rewardValueForYear
-        .dividedBy(calculatedBorrowIncentivePoolData.stakedValue)
+        .dividedBy(weightedStakedValue)
+        .multipliedBy(parsedBorrowIncentivePoolPointData.baseWeight)
+        .dividedBy(weightScale)
         .toNumber()
     : Infinity;
 
   return {
+    distributedPointPerSec: distributedPointPerSec.toNumber(),
+    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(),
+    weightedStakedValue: weightedStakedValue.toNumber(),
     rewardApr: rewardRate,
-    totalRewardAmount: totalRewardAmount.toNumber(),
-    totalRewardCoin: totalRewardCoin.toNumber(),
-    totalRewardValue: totalRewardValue.toNumber(),
-    remaindRewardAmount: remaindRewardAmount.toNumber(),
-    remaindRewardCoin: remaindRewardCoin.toNumber(),
-    remaindRewardValue: remaindRewardValue.toNumber(),
-    claimedRewardAmount: claimedRewardAmount.toNumber(),
-    claimedRewardCoin: claimedRewardCoin.toNumber(),
-    claimedRewardValue: claimedRewardValue.toNumber(),
     rewardPerSec: rewardPerSec.toNumber(),
   };
 };
 
+// /**
+//  *  Parse origin borrow incentive reward pool data to a more readable format.
+//  *
+//  * @param originBorrowIncentiveRewardPoolData - Origin borrow incentive reward pool data
+//  * @return Parsed borrow incentive reward pool data
+//  */
+// export const parseOriginBorrowIncentiveRewardPoolData = (
+//   originBorrowIncentiveRewardPoolData: OriginBorrowIncentiveRewardPoolData
+// ): ParsedBorrowIncentiveRewardPoolData => {
+//   return {
+//     rewardType: normalizeStructTag(
+//       originBorrowIncentiveRewardPoolData.reward_type.name
+//     ),
+//     claimedRewards: Number(originBorrowIncentiveRewardPoolData.claimed_rewards),
+//     exchangeRateNumerator: Number(
+//       originBorrowIncentiveRewardPoolData.exchange_rate_numerator
+//     ),
+//     exchangeRateDenominator: Number(
+//       originBorrowIncentiveRewardPoolData.exchange_rate_denominator
+//     ),
+//     remainingRewards: Number(
+//       originBorrowIncentiveRewardPoolData.remaining_reward
+//     ),
+//   };
+// };
+
+// export const calculateBorrowIncentiveRewardPoolData = (
+//   parsedBorrowIncentivePoolData: ParsedBorrowIncentivePoolData,
+//   parsedBorrowIncentiveRewardPoolData: ParsedBorrowIncentiveRewardPoolData,
+//   calculatedBorrowIncentivePoolData: CalculatedBorrowIncentivePoolData,
+//   rewardCoinPrice: number,
+//   rewardCoinDecimal: number
+// ): CalculatedBorrowIncentiveRewardPoolData => {
+//   const rateYearFactor = 365 * 24 * 60 * 60;
+
+//   const rewardPerSec = BigNumber(
+//     calculatedBorrowIncentivePoolData.distributedPointPerSec
+//   )
+//     .multipliedBy(parsedBorrowIncentiveRewardPoolData.exchangeRateNumerator)
+//     .dividedBy(parsedBorrowIncentiveRewardPoolData.exchangeRateDenominator);
+//   const totalRewardAmount = BigNumber(parsedBorrowIncentivePoolData.maxPoint)
+//     .multipliedBy(parsedBorrowIncentiveRewardPoolData.exchangeRateNumerator)
+//     .dividedBy(parsedBorrowIncentiveRewardPoolData.exchangeRateDenominator);
+//   const totalRewardCoin = totalRewardAmount.shiftedBy(-1 * rewardCoinDecimal);
+//   const totalRewardValue = totalRewardCoin.multipliedBy(rewardCoinPrice);
+//   const remaindRewardAmount = BigNumber(
+//     parsedBorrowIncentiveRewardPoolData.remainingRewards
+//   );
+//   const remaindRewardCoin = remaindRewardAmount.shiftedBy(
+//     -1 * rewardCoinDecimal
+//   );
+//   const remaindRewardValue = remaindRewardCoin.multipliedBy(rewardCoinPrice);
+//   const claimedRewardAmount = BigNumber(
+//     parsedBorrowIncentiveRewardPoolData.claimedRewards
+//   );
+//   const claimedRewardCoin = claimedRewardAmount.shiftedBy(
+//     -1 * rewardCoinDecimal
+//   );
+//   const claimedRewardValue = claimedRewardCoin.multipliedBy(rewardCoinPrice);
+
+//   const rewardValueForYear = BigNumber(rewardPerSec)
+//     .shiftedBy(-1 * rewardCoinDecimal)
+//     .multipliedBy(rateYearFactor)
+//     .multipliedBy(rewardCoinPrice);
+//   const rewardRate = rewardValueForYear
+//     .dividedBy(calculatedBorrowIncentivePoolData.stakedValue)
+//     .isFinite()
+//     ? rewardValueForYear
+//         .dividedBy(calculatedBorrowIncentivePoolData.stakedValue)
+//         .toNumber()
+//     : Infinity;
+
+//   return {
+//     rewardApr: rewardRate,
+//     totalRewardAmount: totalRewardAmount.toNumber(),
+//     totalRewardCoin: totalRewardCoin.toNumber(),
+//     totalRewardValue: totalRewardValue.toNumber(),
+//     remaindRewardAmount: remaindRewardAmount.toNumber(),
+//     remaindRewardCoin: remaindRewardCoin.toNumber(),
+//     remaindRewardValue: remaindRewardValue.toNumber(),
+//     claimedRewardAmount: claimedRewardAmount.toNumber(),
+//     claimedRewardCoin: claimedRewardCoin.toNumber(),
+//     claimedRewardValue: claimedRewardValue.toNumber(),
+//     rewardPerSec: rewardPerSec.toNumber(),
+//   };
+// };
+
+export const parseOriginBorrowIncentiveAccountPoolPointData = (
+  originBorrowIncentiveAccountPoolPointData: OriginBorrowIncentiveAccountPoolData
+): ParsedBorrowIncentiveAccountPoolData => {
+  return {
+    pointType: normalizeStructTag(
+      originBorrowIncentiveAccountPoolPointData.point_type.name
+    ),
+    weightedAmount: Number(
+      originBorrowIncentiveAccountPoolPointData.weighted_amount
+    ),
+    points: Number(originBorrowIncentiveAccountPoolPointData.points),
+    totalPoints: Number(originBorrowIncentiveAccountPoolPointData.total_points),
+    index: Number(originBorrowIncentiveAccountPoolPointData.index),
+  };
+};
+
 /**
  *  Parse origin borrow incentive account data to a more readable format.
  *
@@ -577,10 +657,21 @@ export const parseOriginBorrowIncentiveAccountData = (
     poolType: normalizeStructTag(
       originBorrowIncentiveAccountData.pool_type.name
     ),
-    amount: Number(originBorrowIncentiveAccountData.amount),
-    index: Number(originBorrowIncentiveAccountData.index),
-    points: Number(originBorrowIncentiveAccountData.points),
-    totalPoints: Number(originBorrowIncentiveAccountData.total_points),
+    debtAmount: Number(originBorrowIncentiveAccountData.debt_amount),
+    pointList: originBorrowIncentiveAccountData.points_list.reduce(
+      (acc, point) => {
+        const parsed = parseOriginBorrowIncentiveAccountPoolPointData(point);
+        const name = parseStructTag(
+          parsed.pointType
+        ).name.toLowerCase() as SupportBorrowIncentiveRewardCoins;
+        acc[name] = parsed;
+        return acc;
+      },
+      {} as Record<
+        SupportBorrowIncentiveRewardCoins,
+        ParsedBorrowIncentiveAccountPoolData
+      >
+    ),
   };
 };
 

package/src/utils/util.ts

@@ -3,6 +3,8 @@ import {
   SUPPORT_POOLS,
   SUPPORT_COLLATERALS,
   SUPPORT_SPOOLS_REWARDS,
+  MAX_LOCK_DURATION,
+  SUPPORT_BORROW_INCENTIVE_REWARDS,
 } from '../constants';
 import type { ScallopAddress } from '../models';
 import type {
@@ -22,6 +24,7 @@ export const isMarketCoin = (
         ...SUPPORT_POOLS,
         ...SUPPORT_COLLATERALS,
         ...SUPPORT_SPOOLS_REWARDS,
+        ...SUPPORT_BORROW_INCENTIVE_REWARDS,
       ]),
     ].includes(assetCoinName)
   );
@@ -71,3 +74,28 @@ export const parseDataFromPythPriceFeed = (
     throw new Error('Invalid feed id');
   }
 };
+
+/**
+ * Find the closest unlock round timestamp (12AM) to the given unlock at timestamp in seconds.
+ *
+ * @param unlockAtInSecondTimestamp - Unlock at in seconds timestamp to find the closest round.
+ * @returns Closest round (12AM) in seconds timestamp.
+ */
+export const findClosestUnlockRound = (unlockAtInSecondTimestamp: number) => {
+  const unlockDate = new Date(unlockAtInSecondTimestamp * 1000);
+  const closestTwelveAM = new Date(unlockAtInSecondTimestamp * 1000);
+
+  closestTwelveAM.setUTCHours(0, 0, 0, 0); // Set the time to the next 12 AM UTC
+
+  // If the current time is past 12 AM, set the date to the next day
+  if (unlockDate.getUTCHours() >= 0) {
+    closestTwelveAM.setUTCDate(closestTwelveAM.getUTCDate() + 1);
+  }
+
+  const now = new Date().getTime();
+  // check if unlock period > 4 years
+  if (closestTwelveAM.getTime() - now > MAX_LOCK_DURATION * 1000) {
+    closestTwelveAM.setUTCDate(closestTwelveAM.getUTCDate() - 1);
+  }
+  return Math.floor(closestTwelveAM.getTime() / 1000);
+};