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

package/dist/types/query/borrowIncentive.d.ts

@@ -20,6 +20,7 @@ export type BorrowIncentivePool = {
     coinType: string;
     coinDecimal: number;
     coinPrice: number;
+    staked: number;
     points: OptionalKeys<Record<SupportBorrowIncentiveRewardCoins, BorrowIncentivePoolPoints>>;
 };
 export type OriginBorrowIncentivePoolPointData = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "0.44.19",
+  "version": "0.44.21",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/constants/vesca.ts

@@ -1,5 +1,7 @@
+import { IS_VE_SCA_TEST } from './common';
+
 export const UNLOCK_ROUND_DURATION = 60 * 60 * 24; // 1 days in seconds
-export const MAX_LOCK_ROUNDS: number = 1460; // 4 years in days
+export const MAX_LOCK_ROUNDS: number = IS_VE_SCA_TEST ? 9 : 1460; // 4 years in days (or 9 days for testing)
 export const MAX_LOCK_DURATION: number =
   MAX_LOCK_ROUNDS * UNLOCK_ROUND_DURATION; // 4 years in seconds
 

package/src/queries/borrowIncentiveQuery.ts

@@ -142,6 +142,7 @@ export const queryBorrowIncentivePools = async (
       coinDecimal: poolCoinDecimal,
       coinPrice: poolCoinPrice,
       points: borrowIncentivePoolPoints,
+      staked: parsedBorrowIncentivePoolData.staked,
     };
   }
 

package/src/queries/portfolioQuery.ts

@@ -511,20 +511,22 @@ export const getObligationAccount = async (
           );
 
           // for veSCA
-          // console.log('poolPoint.weightedAmount', poolPoint.weightedAmount);
-          // console.log(
-          //   'borrowIncentiveAccount.amount',
-          //   borrowIncentiveAccount.debtAmount
-          // );
-          const weightScale = BigNumber('1000000000000');
-
+          const weightScale = BigNumber(1_000_000_000_000);
           const boostValue = BigNumber(accountPoint.weightedAmount)
             .div(
               BigNumber(borrowIncentiveAccount.debtAmount)
                 .multipliedBy(poolPoint.baseWeight)
                 .dividedBy(weightScale)
             )
-            .toNumber();
+            .isFinite()
+            ? BigNumber(accountPoint.weightedAmount)
+                .div(
+                  BigNumber(borrowIncentiveAccount.debtAmount)
+                    .multipliedBy(poolPoint.baseWeight)
+                    .dividedBy(weightScale)
+                )
+                .toNumber()
+            : 1;
 
           if (availableClaimAmount.isGreaterThan(0)) {
             rewards.push({

package/src/types/query/borrowIncentive.ts

@@ -54,6 +54,7 @@ export type BorrowIncentivePool = {
   coinType: string;
   coinDecimal: number;
   coinPrice: number;
+  staked: number;
   points: OptionalKeys<
     Record<SupportBorrowIncentiveRewardCoins, BorrowIncentivePoolPoints>
   >;

package/src/utils/query.ts

@@ -502,25 +502,30 @@ export const calculateBorrowIncentivePoolPointData = (
 
   // Calculate the reward rate
   const rateYearFactor = 365 * 24 * 60 * 60;
-  const rewardPerSec = BigNumber(distributedPointPerSec).dividedBy(
-    parsedBorrowIncentivePoolPointData.period
+  const rewardPerSec = BigNumber(distributedPointPerSec).shiftedBy(
+    -1 * rewardCoinDecimal
   );
 
   const rewardValueForYear = BigNumber(rewardPerSec)
-    .shiftedBy(-1 * rewardCoinDecimal)
     .multipliedBy(rateYearFactor)
     .multipliedBy(rewardCoinPrice);
 
-  const weightScale = BigNumber('1000000000000');
+  const weightScale = BigNumber(1_000_000_000_000);
   const rewardRate = rewardValueForYear
+    .multipliedBy(
+      BigNumber(parsedBorrowIncentivePoolPointData.baseWeight).dividedBy(
+        weightScale
+      )
+    )
     .dividedBy(weightedStakedValue)
-    .multipliedBy(parsedBorrowIncentivePoolPointData.baseWeight)
-    .dividedBy(weightScale)
     .isFinite()
     ? rewardValueForYear
+        .multipliedBy(
+          BigNumber(parsedBorrowIncentivePoolPointData.baseWeight).dividedBy(
+            weightScale
+          )
+        )
         .dividedBy(weightedStakedValue)
-        .multipliedBy(parsedBorrowIncentivePoolPointData.baseWeight)
-        .dividedBy(weightScale)
         .toNumber()
     : Infinity;
 

package/src/utils/util.ts

@@ -55,7 +55,12 @@ export const parseDataFromPythPriceFeed = (
   address: ScallopAddress
 ) => {
   const assetCoinNames = [
-    ...new Set([...SUPPORT_POOLS, ...SUPPORT_COLLATERALS]),
+    ...new Set([
+      ...SUPPORT_POOLS,
+      ...SUPPORT_COLLATERALS,
+      ...SUPPORT_SPOOLS_REWARDS,
+      ...SUPPORT_BORROW_INCENTIVE_REWARDS,
+    ]),
   ] as SupportAssetCoins[];
   const assetCoinName = assetCoinNames.find((assetCoinName) => {
     return (