@scallop-io/sui-scallop-sdk 0.46.64 → 0.46.65

package/dist/index.js

@@ -2309,19 +2309,21 @@ var queryMarket = async (query, indexer = false) => {
   const collaterals = {};
   if (indexer) {
     const marketIndexer = await query.indexer.getMarket();
-    for (const pool of Object.values(marketIndexer.pools)) {
-      pool.coinPrice = coinPrices[pool.coinName] || pool.coinPrice;
-      pool.coinWrappedType = query.utils.getCoinWrappedType(pool.coinName);
-    }
-    for (const collateral of Object.values(marketIndexer.collaterals)) {
-      collateral.coinPrice = coinPrices[collateral.coinName] || collateral.coinPrice;
-      collateral.coinWrappedType = query.utils.getCoinWrappedType(
-        collateral.coinName
-      );
-    }
+    const updatePools = (item) => {
+      item.coinPrice = coinPrices[item.coinName] || item.coinPrice;
+      item.coinWrappedType = query.utils.getCoinWrappedType(item.coinName);
+      pools[item.coinName] = item;
+    };
+    const updateCollaterals = (item) => {
+      item.coinPrice = coinPrices[item.coinName] || item.coinPrice;
+      item.coinWrappedType = query.utils.getCoinWrappedType(item.coinName);
+      collaterals[item.coinName] = item;
+    };
+    Object.values(marketIndexer.pools).forEach(updatePools);
+    Object.values(marketIndexer.collaterals).forEach(updateCollaterals);
     return {
-      pools: marketIndexer.pools,
-      collaterals: marketIndexer.collaterals
+      pools,
+      collaterals
     };
   }
   const packageId = query.address.get("core.packages.query.id");
@@ -2431,8 +2433,7 @@ var queryMarket = async (query, indexer = false) => {
     data: marketData
   };
 };
-var getMarketPools = async (query, poolCoinNames, indexer = false) => {
-  poolCoinNames = poolCoinNames || [...SUPPORT_POOLS];
+var getMarketPools = async (query, poolCoinNames = [...SUPPORT_POOLS], indexer = false) => {
   const marketId = query.address.get("core.market");
   const marketObjectResponse = await query.cache.queryGetObject(marketId, {
     showContent: true
@@ -2441,15 +2442,16 @@ var getMarketPools = async (query, poolCoinNames, indexer = false) => {
   const marketPools = {};
   if (indexer) {
     const marketPoolsIndexer = await query.indexer.getMarketPools();
-    for (const marketPool of Object.values(marketPoolsIndexer)) {
+    const updateMarketPool = (marketPool) => {
       if (!poolCoinNames.includes(marketPool.coinName))
-        continue;
+        return;
       marketPool.coinPrice = coinPrices[marketPool.coinName] || marketPool.coinPrice;
       marketPool.coinWrappedType = query.utils.getCoinWrappedType(
         marketPool.coinName
       );
       marketPools[marketPool.coinName] = marketPool;
-    }
+    };
+    Object.values(marketPoolsIndexer).forEach(updateMarketPool);
     return marketPools;
   }
   await Promise.allSettled(
@@ -2474,6 +2476,7 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
   let borrowIndex;
   let interestModel;
   let borrowFeeRate;
+  coinPrice = coinPrice || (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
   if (indexer) {
     const marketPoolIndexer = await query.indexer.getMarketPool(poolCoinName);
     marketPoolIndexer.coinPrice = coinPrice || marketPoolIndexer.coinPrice;
@@ -2486,7 +2489,6 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
   marketObject = marketObject || (await query.cache.queryGetObject(marketId, {
     showContent: true
   }))?.data;
-  coinPrice = coinPrice || (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
   if (marketObject) {
     if (marketObject.content && "fields" in marketObject.content) {
       const fields = marketObject.content.fields;
@@ -2616,29 +2618,27 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
   }
   return marketPool;
 };
-var getMarketCollaterals = async (query, collateralCoinNames, indexer = false) => {
-  collateralCoinNames = collateralCoinNames || [...SUPPORT_COLLATERALS];
+var getMarketCollaterals = async (query, collateralCoinNames = [...SUPPORT_COLLATERALS], indexer = false) => {
   const marketId = query.address.get("core.market");
-  const [marketObjectResponse, coinPrices] = await Promise.all([
-    await query.cache.queryGetObject(marketId, {
-      showContent: true
-    }),
-    await query.utils.getCoinPrices(collateralCoinNames ?? [])
-  ]);
+  const coinPrices = await query.utils.getCoinPrices(collateralCoinNames ?? []);
   const marketCollaterals = {};
   if (indexer) {
     const marketCollateralsIndexer = await query.indexer.getMarketCollaterals();
-    for (const marketCollateral of Object.values(marketCollateralsIndexer)) {
+    const updateMarketCollateral = (marketCollateral) => {
       if (!collateralCoinNames.includes(marketCollateral.coinName))
-        continue;
+        return;
       marketCollateral.coinPrice = coinPrices[marketCollateral.coinName] || marketCollateral.coinPrice;
       marketCollateral.coinWrappedType = query.utils.getCoinWrappedType(
         marketCollateral.coinName
       );
       marketCollaterals[marketCollateral.coinName] = marketCollateral;
-    }
+    };
+    Object.values(marketCollateralsIndexer).forEach(updateMarketCollateral);
     return marketCollaterals;
   }
+  const marketObjectResponse = await query.cache.queryGetObject(marketId, {
+    showContent: true
+  });
   await Promise.allSettled(
     collateralCoinNames.map(async (collateralCoinName) => {
       const marketCollateral = await getMarketCollateral(
@@ -2656,6 +2656,7 @@ var getMarketCollaterals = async (query, collateralCoinNames, indexer = false) =
   return marketCollaterals;
 };
 var getMarketCollateral = async (query, collateralCoinName, indexer = false, marketObject, coinPrice) => {
+  coinPrice = coinPrice || (await query.utils.getCoinPrices([collateralCoinName]))?.[collateralCoinName];
   if (indexer) {
     const marketCollateralIndexer = await query.indexer.getMarketCollateral(collateralCoinName);
     marketCollateralIndexer.coinPrice = coinPrice || marketCollateralIndexer.coinPrice;
@@ -2671,7 +2672,6 @@ var getMarketCollateral = async (query, collateralCoinName, indexer = false, mar
   marketObject = marketObject || (await query.cache.queryGetObject(marketId, {
     showContent: true
   }))?.data;
-  coinPrice = coinPrice || (await query.utils.getCoinPrices([collateralCoinName]))?.[collateralCoinName];
   if (marketObject) {
     if (marketObject.content && "fields" in marketObject.content) {
       const fields = marketObject.content.fields;
@@ -2921,8 +2921,7 @@ var getFlashLoanFees = async (query, assetNames) => {
 
 // src/queries/spoolQuery.ts
 var import_utils5 = require("@mysten/sui.js/utils");
-var getSpools = async (query, stakeMarketCoinNames, indexer = false) => {
-  stakeMarketCoinNames = stakeMarketCoinNames || [...SUPPORT_SPOOLS];
+var getSpools = async (query, stakeMarketCoinNames = [...SUPPORT_SPOOLS], indexer = false) => {
   const stakeCoinNames = stakeMarketCoinNames.map(
     (stakeMarketCoinName) => query.utils.parseCoinName(stakeMarketCoinName)
   );
@@ -2937,9 +2936,9 @@ var getSpools = async (query, stakeMarketCoinNames, indexer = false) => {
   const spools = {};
   if (indexer) {
     const spoolsIndexer = await query.indexer.getSpools();
-    for (const spool of Object.values(spoolsIndexer)) {
+    const updateSpools = (spool) => {
       if (!stakeMarketCoinNames.includes(spool.marketCoinName))
-        continue;
+        return;
       const coinName = query.utils.parseCoinName(
         spool.marketCoinName
       );
@@ -2951,7 +2950,8 @@ var getSpools = async (query, stakeMarketCoinNames, indexer = false) => {
       spool.marketCoinPrice = (coinPrices[coinName] ?? 0) * (marketPool ? marketPool.conversionRate : 0) || spool.marketCoinPrice;
       spool.rewardCoinPrice = coinPrices[rewardCoinName] || spool.rewardCoinPrice;
       spools[spool.marketCoinName] = spool;
-    }
+    };
+    Object.values(spoolsIndexer).forEach(updateSpools);
     return spools;
   }
   for (const stakeMarketCoinName of stakeMarketCoinNames) {
@@ -2977,6 +2977,7 @@ var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPr
     `spool.pools.${marketCoinName}.rewardPoolId`
   );
   let spool = void 0;
+  coinPrices = coinPrices || await query.utils.getCoinPrices([coinName]);
   if (indexer) {
     const spoolIndexer = await query.indexer.getSpool(marketCoinName);
     const coinName2 = query.utils.parseCoinName(marketCoinName);
@@ -3305,10 +3306,9 @@ var getStakeRewardPool = async ({
 // src/queries/borrowIncentiveQuery.ts
 var import_utils7 = require("@mysten/sui.js/utils");
 var import_bignumber3 = __toESM(require("bignumber.js"));
-var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames, indexer = false) => {
-  borrowIncentiveCoinNames = borrowIncentiveCoinNames || [
-    ...SUPPORT_BORROW_INCENTIVE_POOLS
-  ];
+var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames = [
+  ...SUPPORT_BORROW_INCENTIVE_POOLS
+], indexer = false) => {
   const borrowIncentivePools = {};
   const coinPrices = await query.utils.getCoinPrices(
     [
@@ -3320,14 +3320,15 @@ var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames, indexer
   );
   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;
-    }
+    const updateBorrowIncentivePool = (pool) => {
+      if (!borrowIncentiveCoinNames.includes(pool.coinName))
+        return;
+      pool.coinPrice = coinPrices[pool.coinName] || pool.coinPrice;
+      borrowIncentivePools[pool.coinName] = pool;
+    };
+    Object.values(borrowIncentivePoolsIndexer).forEach(
+      updateBorrowIncentivePool
+    );
     return borrowIncentivePools;
   }
   const queryPkgId = query.address.get("borrowIncentive.query");