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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "0.46.3",
+  "version": "0.46.31",
   "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

@@ -47,23 +47,31 @@ 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) {
@@ -73,15 +81,6 @@ export const queryBorrowIncentivePools = async (
     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>(

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;
 };