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

package/dist/index.js

@@ -2555,19 +2555,29 @@ var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames, indexer
   const queryResult = await query.cache.queryInspectTxn({ queryTarget, args });
   const borrowIncentivePoolsQueryData = queryResult.events[0].parsedJson;
   const borrowIncentivePools = {};
+  const coinPrices = await query.utils.getCoinPrices(
+    [
+      .../* @__PURE__ */ new Set([
+        ...borrowIncentiveCoinNames,
+        ...SUPPORT_BORROW_INCENTIVE_REWARDS
+      ])
+    ]
+  );
   if (indexer) {
+    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;
+      borrowIncentivePools[borrowIncentivePool.coinName] = borrowIncentivePool;
+    }
+    return borrowIncentivePools;
   }
   for (const pool of borrowIncentivePoolsQueryData.incentive_pools) {
     const borrowIncentivePoolPoints = {};
     const parsedBorrowIncentivePoolData = parseOriginBorrowIncentivePoolData(pool);
-    const coinPrices = await query.utils.getCoinPrices(
-      [
-        .../* @__PURE__ */ new Set([
-          ...borrowIncentiveCoinNames,
-          ...SUPPORT_BORROW_INCENTIVE_REWARDS
-        ])
-      ]
-    );
     const poolCoinType = (0, import_utils6.normalizeStructTag)(pool.pool_type.name);
     const poolCoinName = query.utils.parseCoinNameFromType(
       poolCoinType
@@ -2926,17 +2936,19 @@ var getObligationAccounts = async (query, ownerAddress, indexer = false) => {
   const coinAmounts = await query.getCoinAmounts(void 0, ownerAddress);
   const obligations = await query.getObligations(ownerAddress);
   const 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;
 };
 var getObligationAccount = async (query, obligationId, ownerAddress, indexer = false, market, coinPrices, coinAmounts) => {
@@ -3300,7 +3312,7 @@ var getVeScas = async (query, ownerAddress) => {
     }
   });
   await Promise.allSettled(tasks);
-  return veScas.filter(Boolean).sort((a, b) => a.currentVeScaBalance - b.currentVeScaBalance);
+  return veScas.filter(Boolean).sort((a, b) => b.currentVeScaBalance - a.currentVeScaBalance);
 };
 var getVeSca = async (query, veScaKeyId, ownerAddress) => {
   const tableId = query.address.get(`vesca.tableId`);
@@ -3523,6 +3535,15 @@ var ScallopIndexer = class {
     if (response.status === 200) {
       return response.data.borrowIncentivePools.reduce(
         (borrowIncentivePools, borrowIncentivePool) => {
+          if (Array.isArray(borrowIncentivePool.points)) {
+            borrowIncentivePool.points = borrowIncentivePool.points.reduce(
+              (prev, curr) => {
+                prev[curr.coinName] = curr;
+                return prev;
+              },
+              {}
+            );
+          }
           borrowIncentivePools[borrowIncentivePool.coinName] = borrowIncentivePool;
           return borrowIncentivePools;
         },
@@ -5180,11 +5201,6 @@ var generateQuickVeScaMethod = ({
           newUnlockAt,
           veSca?.unlockAt
         );
-      console.log(
-        new Date(newUnlockAt * 1e3).toLocaleString("en-CA", {
-          hour12: true
-        })
-      );
       const isInitialLock = !veSca?.unlockAt;
       const isLockExpired = !isInitialLock && veSca.unlockAt * 1e3 <= (/* @__PURE__ */ new Date()).getTime();
       if (isInitialLock || isLockExpired) {