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

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

@@ -20,7 +20,9 @@ export type BorrowIncentivePool = {
     coinType: string;
     coinDecimal: number;
     coinPrice: number;
-    staked: number;
+    stakedAmount: number;
+    stakedCoin: number;
+    stakedValue: number;
     points: OptionalKeys<Record<SupportBorrowIncentiveRewardCoins, BorrowIncentivePoolPoints>>;
 };
 export type OriginBorrowIncentivePoolPointData = {
@@ -66,9 +68,6 @@ export type ParsedBorrowIncentivePoolData = {
     createdAt: number;
 };
 export type CalculatedBorrowIncentivePoolPointData = {
-    stakedAmount: number;
-    stakedCoin: number;
-    stakedValue: number;
     baseWeight: number;
     weightedStakedAmount: number;
     weightedStakedCoin: number;

package/dist/utils/query.d.ts

@@ -41,7 +41,7 @@ export declare const parseOriginBorrowIncentivesPoolPointData: (originBorrowInce
  * @return Parsed borrow incentive pool data
  */
 export declare const parseOriginBorrowIncentivePoolData: (originBorrowIncentivePoolData: OriginBorrowIncentivePoolData) => ParsedBorrowIncentivePoolData;
-export declare const calculateBorrowIncentivePoolPointData: (pasredBorrowIncentinvePoolData: ParsedBorrowIncentivePoolData, parsedBorrowIncentivePoolPointData: ParsedBorrowIncentivePoolPointData, rewardCoinPrice: number, rewardCoinDecimal: number, poolCoinPrice: number, poolCoinDecimal: number) => CalculatedBorrowIncentivePoolPointData;
+export declare const calculateBorrowIncentivePoolPointData: (parsedBorrowIncentivePoolData: ParsedBorrowIncentivePoolData, parsedBorrowIncentivePoolPointData: ParsedBorrowIncentivePoolPointData, rewardCoinPrice: number, rewardCoinDecimal: number, poolCoinPrice: number, poolCoinDecimal: number) => CalculatedBorrowIncentivePoolPointData;
 export declare const parseOriginBorrowIncentiveAccountPoolPointData: (originBorrowIncentiveAccountPoolPointData: OriginBorrowIncentiveAccountPoolData) => ParsedBorrowIncentiveAccountPoolData;
 /**
  *  Parse origin borrow incentive account data to a more readable format.

package/package.json

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

package/src/constants/common.ts

@@ -18,8 +18,8 @@ export const PROTOCOL_OBJECT_ID = IS_VE_SCA_TEST
 //   '0x87ddec2984645dbbe2403a509cc6edf393a43acdba9b77d45da2bcbefcf733c1' as const;
 
 export const BORROW_FEE_PROTOCOL_ID = IS_VE_SCA_TEST
-  ? ('0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778' as const)
-  : ('0xc38f849e81cfe46d4e4320f508ea7dda42934a329d5a6571bb4c3cb6ea63f5da' as const); // test environment
+  ? ('0xc9f859f98ca352a11b97a038c4b4162bee437b8df8caa047990fe9cb03d4f778' as const) // test environment
+  : ('0xc38f849e81cfe46d4e4320f508ea7dda42934a329d5a6571bb4c3cb6ea63f5da' as const);
 // export const BORROW_FEE_PROTOCOL_ID =
 //   '0x87ddec2984645dbbe2403a509cc6edf393a43acdba9b77d45da2bcbefcf733c1' as const;
 

package/src/queries/borrowIncentiveQuery.ts

@@ -19,6 +19,7 @@ import type {
   BorrowIncentivePoolPoints,
   OptionalKeys,
 } from '../types';
+import BigNumber from 'bignumber.js';
 
 /**
  * Query borrow incentive pools data.
@@ -76,7 +77,7 @@ export const queryBorrowIncentivePools = async (
 
   for (const pool of borrowIncentivePoolsQueryData.incentive_pools) {
     const borrowIncentivePoolPoints: OptionalKeys<
-      Record<'sui' | 'sca', BorrowIncentivePoolPoints>
+      Record<SupportBorrowIncentiveRewardCoins, BorrowIncentivePoolPoints>
     > = {};
     const parsedBorrowIncentivePoolData =
       parseOriginBorrowIncentivePoolData(pool);
@@ -132,14 +133,20 @@ export const queryBorrowIncentivePools = async (
         };
     }
 
+    const stakedAmount = BigNumber(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,
+      stakedAmount: stakedAmount.toNumber(),
+      stakedCoin: stakedCoin.toNumber(),
+      stakedValue: stakedValue.toNumber(),
       points: borrowIncentivePoolPoints,
-      staked: parsedBorrowIncentivePoolData.staked,
     };
   }
 

package/src/queries/portfolioQuery.ts

@@ -486,7 +486,6 @@ export const getObligationAccount = async (
   )) {
     const coinName = poolCoinName as SupportBorrowIncentiveCoins;
     const borrowIncentivePool = borrowIncentivePools[coinName];
-
     if (borrowIncentivePool) {
       const rewards: ObligationBorrowIcentiveReward[] = [];
       for (const rewardCoinName of SUPPORT_BORROW_INCENTIVE_REWARDS) {
@@ -499,9 +498,12 @@ export const getObligationAccount = async (
           const accountBorrowedAmount = BigNumber(accountPoint.weightedAmount);
           const baseIndexRate = 1_000_000_000;
           const increasedPointRate = poolPoint.currentPointIndex
-            ? BigNumber(
-                poolPoint.currentPointIndex - accountPoint.index
-              ).dividedBy(baseIndexRate)
+            ? Math.max(
+                BigNumber(poolPoint.currentPointIndex - accountPoint.index)
+                  .dividedBy(baseIndexRate)
+                  .toNumber(),
+                0
+              )
             : 1;
           availableClaimAmount = availableClaimAmount.plus(
             accountBorrowedAmount
@@ -530,7 +532,7 @@ export const getObligationAccount = async (
                 .toNumber()
             : 1;
 
-          if (availableClaimAmount.isGreaterThan(0)) {
+          if (availableClaimAmount.isGreaterThanOrEqualTo(0)) {
             rewards.push({
               coinName: poolPoint.coinName,
               coinType: poolPoint.coinType,

package/src/types/query/borrowIncentive.ts

@@ -36,7 +36,9 @@ export type BorrowIncentivePool = {
   coinType: string;
   coinDecimal: number;
   coinPrice: number;
-  staked: number;
+  stakedAmount: number;
+  stakedCoin: number;
+  stakedValue: number;
   points: OptionalKeys<
     Record<SupportBorrowIncentiveRewardCoins, BorrowIncentivePoolPoints>
   >;
@@ -94,9 +96,6 @@ export type ParsedBorrowIncentivePoolData = {
 };
 
 export type CalculatedBorrowIncentivePoolPointData = {
-  stakedAmount: number;
-  stakedCoin: number;
-  stakedValue: number;
   baseWeight: number;
   weightedStakedAmount: number;
   weightedStakedCoin: number;

package/src/utils/query.ts

@@ -447,7 +447,7 @@ export const parseOriginBorrowIncentivePoolData = (
 };
 
 export const calculateBorrowIncentivePoolPointData = (
-  pasredBorrowIncentinvePoolData: ParsedBorrowIncentivePoolData,
+  parsedBorrowIncentivePoolData: ParsedBorrowIncentivePoolData,
   parsedBorrowIncentivePoolPointData: ParsedBorrowIncentivePoolPointData,
   rewardCoinPrice: number,
   rewardCoinDecimal: number,
@@ -488,11 +488,6 @@ export const calculateBorrowIncentivePoolPointData = (
     parsedBorrowIncentivePoolPointData.distributedPoint
   ).plus(accumulatedPoints);
 
-  // pure staked amount
-  const stakedAmount = BigNumber(pasredBorrowIncentinvePoolData.staked);
-
-  const stakedCoin = stakedAmount.shiftedBy(-1 * poolCoinDecimal);
-  const stakedValue = stakedCoin.multipliedBy(poolCoinPrice);
   const baseWeight = BigNumber(parsedBorrowIncentivePoolPointData.baseWeight);
 
   // staked amount applied with weight
@@ -539,9 +534,6 @@ export const calculateBorrowIncentivePoolPointData = (
     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(),