@scallop-io/sui-scallop-sdk 0.46.3 → 0.46.32

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.3",
+  "version": "0.46.32",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",
@@ -76,7 +76,8 @@
   },
   "peerDependencies": {
     "@mysten/sui.js": "0.49.1",
-    "@scallop-io/sui-kit": "^0.44.2"
+    "@scallop-io/sui-kit": "^0.44.2",
+    "bn.js": "^5.2.1"
   },
   "lint-staged": {
     "**/*.ts": [

package/src/builders/vescaBuilder.ts

@@ -219,11 +219,6 @@ const generateQuickVeScaMethod: GenerateVeScaQuickMethod = ({
           newUnlockAt,
           veSca?.unlockAt
         );
-      console.log(
-        new Date(newUnlockAt * 1000).toLocaleString('en-CA', {
-          hour12: true,
-        })
-      );
 
       const isInitialLock = !veSca?.unlockAt;
       const isLockExpired =

package/src/models/scallopIndexer.ts

@@ -18,6 +18,8 @@ import type {
   ScallopQueryParams,
   ScallopParams,
   ScallopInstanceParams,
+  BorrowIncentivePoolPoints,
+  SupportBorrowIncentiveRewardCoins,
 } from '../types';
 import { ScallopCache } from './scallopCache';
 
@@ -185,6 +187,20 @@ export class ScallopIndexer {
     if (response.status === 200) {
       return response.data.borrowIncentivePools.reduce(
         (borrowIncentivePools, borrowIncentivePool) => {
+          if (Array.isArray(borrowIncentivePool.points)) {
+            borrowIncentivePool.points = (
+              borrowIncentivePool.points as BorrowIncentivePoolPoints[]
+            ).reduce(
+              (prev, curr) => {
+                prev[curr.coinName] = curr;
+                return prev;
+              },
+              {} as Record<
+                SupportBorrowIncentiveRewardCoins,
+                BorrowIncentivePoolPoints
+              >
+            );
+          }
           borrowIncentivePools[borrowIncentivePool.coinName] =
             borrowIncentivePool;
           return borrowIncentivePools;

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.
@@ -47,41 +48,40 @@ export const queryBorrowIncentivePools = async (
 
   const borrowIncentivePools: BorrowIncentivePools = {};
 
+  const coinPrices = await query.utils.getCoinPrices(
+    [
+      ...new Set([
+        ...borrowIncentiveCoinNames,
+        ...SUPPORT_BORROW_INCENTIVE_REWARDS,
+      ]),
+    ] ?? []
+  );
+
   if (indexer) {
-    // TODO: Implement indexer query.
-    // const borrowIncentivePoolsIndexer =
-    //   await query.indexer.getBorrowIncentivePools();
-    // for (const borrowIncentivePool of Object.values(
-    //   borrowIncentivePoolsIndexer
-    // )) {
-    //   if (!borrowIncentiveCoinNames.includes(borrowIncentivePool.coinName))
-    //     continue;
-    //   borrowIncentivePool.coinPrice =
-    //     coinPrices[borrowIncentivePool.coinName] ||
-    //     borrowIncentivePool.coinPrice;
-    //   borrowIncentivePool.rewardCoinPrice =
-    //     coinPrices[rewardCoinName] || borrowIncentivePool.rewardCoinPrice;
-    //   borrowIncentivePools[borrowIncentivePool.coinName] = borrowIncentivePool;
-    // }
-    // return borrowIncentivePools;
+    const borrowIncentivePoolsIndexer =
+      await query.indexer.getBorrowIncentivePools();
+    for (const borrowIncentivePool of Object.values(
+      borrowIncentivePoolsIndexer
+    )) {
+      if (!borrowIncentiveCoinNames.includes(borrowIncentivePool.coinName))
+        continue;
+      borrowIncentivePool.coinPrice =
+        coinPrices[borrowIncentivePool.coinName] ||
+        borrowIncentivePool.coinPrice;
+      // borrowIncentivePool.rewardCoinPrice =
+      //   coinPrices[rewardCoinName] || borrowIncentivePool.rewardCoinPrice;
+      borrowIncentivePools[borrowIncentivePool.coinName] = borrowIncentivePool;
+    }
+    return borrowIncentivePools;
   }
 
   for (const pool of borrowIncentivePoolsQueryData.incentive_pools) {
     const borrowIncentivePoolPoints: OptionalKeys<
-      Record<'sui' | 'sca', BorrowIncentivePoolPoints>
+      Record<SupportBorrowIncentiveRewardCoins, BorrowIncentivePoolPoints>
     > = {};
     const parsedBorrowIncentivePoolData =
       parseOriginBorrowIncentivePoolData(pool);
 
-    const coinPrices = await query.utils.getCoinPrices(
-      [
-        ...new Set([
-          ...borrowIncentiveCoinNames,
-          ...SUPPORT_BORROW_INCENTIVE_REWARDS,
-        ]),
-      ] ?? []
-    );
-
     const poolCoinType = normalizeStructTag(pool.pool_type.name);
     const poolCoinName =
       query.utils.parseCoinNameFromType<SupportBorrowIncentiveCoins>(
@@ -133,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

@@ -280,17 +280,19 @@ export const getObligationAccounts = async (
   const obligations = await query.getObligations(ownerAddress);
 
   const obligationAccounts: ObligationAccounts = {};
-  for (const obligation of obligations) {
-    obligationAccounts[obligation.keyId] = await getObligationAccount(
-      query,
-      obligation.id,
-      ownerAddress,
-      indexer,
-      market,
-      coinPrices,
-      coinAmounts
-    );
-  }
+  await Promise.allSettled(
+    obligations.map(async (obligation) => {
+      obligationAccounts[obligation.keyId] = await getObligationAccount(
+        query,
+        obligation.id,
+        ownerAddress,
+        indexer,
+        market,
+        coinPrices,
+        coinAmounts
+      );
+    })
+  );
 
   return obligationAccounts;
 };

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(),