fix: add finite check to boostValue

scallop-io · Mar 28, 2024 · 97640b5 · 97640b5
1 parent 259dcd5
commit 97640b5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/src/queries/borrowIncentiveQuery.ts b/src/queries/borrowIncentiveQuery.ts
@@ -142,6 +142,7 @@ export const queryBorrowIncentivePools = async (
       coinDecimal: poolCoinDecimal,
       coinPrice: poolCoinPrice,
       points: borrowIncentivePoolPoints,
+      staked: parsedBorrowIncentivePoolData.staked,
     };
   }
 

diff --git a/src/queries/portfolioQuery.ts b/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({

diff --git a/src/types/query/borrowIncentive.ts b/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>
   >;

diff --git a/src/utils/query.ts b/src/utils/query.ts
@@ -510,7 +510,7 @@ export const calculateBorrowIncentivePoolPointData = (
     .multipliedBy(rateYearFactor)
     .multipliedBy(rewardCoinPrice);
 
-  const weightScale = BigNumber('1000000000000');
+  const weightScale = BigNumber(1_000_000_000_000);
   const rewardRate = rewardValueForYear
     .multipliedBy(
       BigNumber(parsedBorrowIncentivePoolPointData.baseWeight).dividedBy(