@scallop-io/sui-scallop-sdk 0.46.37 → 0.46.39

package/dist/index.mjs

@@ -1545,13 +1545,14 @@ var calculateMarketPoolData = (utils, parsedMarketPoolData) => {
   };
 };
 var parseOriginMarketCollateralData = (originMarketCollateralData) => {
+  const divisor = 2 ** 32;
   return {
     coinType: normalizeStructTag2(originMarketCollateralData.type.name),
-    collateralFactor: Number(originMarketCollateralData.collateralFactor.value) / 2 ** 32,
-    liquidationFactor: Number(originMarketCollateralData.liquidationFactor.value) / 2 ** 32,
-    liquidationDiscount: Number(originMarketCollateralData.liquidationDiscount.value) / 2 ** 32,
-    liquidationPanelty: Number(originMarketCollateralData.liquidationPanelty.value) / 2 ** 32,
-    liquidationReserveFactor: Number(originMarketCollateralData.liquidationReserveFactor.value) / 2 ** 32,
+    collateralFactor: Number(originMarketCollateralData.collateralFactor.value) / divisor,
+    liquidationFactor: Number(originMarketCollateralData.liquidationFactor.value) / divisor,
+    liquidationDiscount: Number(originMarketCollateralData.liquidationDiscount.value) / divisor,
+    liquidationPanelty: Number(originMarketCollateralData.liquidationPanelty.value) / divisor,
+    liquidationReserveFactor: Number(originMarketCollateralData.liquidationReserveFactor.value) / divisor,
     maxCollateralAmount: Number(originMarketCollateralData.maxCollateralAmount),
     totalCollateralAmount: Number(
       originMarketCollateralData.totalCollateralAmount
@@ -1893,15 +1894,6 @@ var findClosestUnlockRound = (unlockAtInSecondTimestamp) => {
 // src/queries/coreQuery.ts
 import BigNumber2 from "bignumber.js";
 var queryMarket = async (query, indexer = false) => {
-  const packageId = query.address.get("core.packages.query.id");
-  const marketId = query.address.get("core.market");
-  const queryTarget = `${packageId}::market_query::market_data`;
-  const args = [marketId];
-  const queryResult = await query.cache.queryInspectTxn(
-    { queryTarget, args }
-    // txBlock
-  );
-  const marketData = queryResult.events[0].parsedJson;
   const coinPrices = await query.utils.getCoinPrices();
   const pools = {};
   const collaterals = {};
@@ -1922,6 +1914,12 @@ var queryMarket = async (query, indexer = false) => {
       collaterals: marketIndexer.collaterals
     };
   }
+  const packageId = query.address.get("core.packages.query.id");
+  const marketId = query.address.get("core.market");
+  const queryTarget = `${packageId}::market_query::market_data`;
+  const args = [marketId];
+  const queryResult = await query.cache.queryInspectTxn({ queryTarget, args });
+  const marketData = queryResult.events[0].parsedJson;
   for (const pool of marketData.pools) {
     const coinType = normalizeStructTag3(pool.type.name);
     const poolCoinName = query.utils.parseCoinNameFromType(coinType);
@@ -2036,26 +2034,23 @@ var getMarketPools = async (query, poolCoinNames, indexer = false) => {
     }
     return marketPools;
   }
-  for (const poolCoinName of poolCoinNames) {
-    const marketPool = await getMarketPool(
-      query,
-      poolCoinName,
-      indexer,
-      marketObjectResponse.data,
-      coinPrices?.[poolCoinName]
-    );
-    if (marketPool) {
-      marketPools[poolCoinName] = marketPool;
-    }
-  }
+  await Promise.allSettled(
+    poolCoinNames.map(async (poolCoinName) => {
+      const marketPool = await getMarketPool(
+        query,
+        poolCoinName,
+        indexer,
+        marketObjectResponse.data,
+        coinPrices?.[poolCoinName]
+      );
+      if (marketPool) {
+        marketPools[poolCoinName] = marketPool;
+      }
+    })
+  );
   return marketPools;
 };
 var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, coinPrice) => {
-  const marketId = query.address.get("core.market");
-  marketObject = marketObject || (await query.cache.queryGetObject(marketId, {
-    showContent: true
-  })).data;
-  coinPrice = coinPrice || (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
   let marketPool;
   let balanceSheet;
   let borrowIndex;
@@ -2069,6 +2064,11 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
     );
     return marketPoolIndexer;
   }
+  const marketId = query.address.get("core.market");
+  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;
@@ -2185,10 +2185,12 @@ var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, c
 var getMarketCollaterals = async (query, collateralCoinNames, indexer = false) => {
   collateralCoinNames = collateralCoinNames || [...SUPPORT_COLLATERALS];
   const marketId = query.address.get("core.market");
-  const marketObjectResponse = await query.cache.queryGetObject(marketId, {
-    showContent: true
-  });
-  const coinPrices = await query.utils.getCoinPrices(collateralCoinNames ?? []);
+  const [marketObjectResponse, coinPrices] = await Promise.all([
+    query.cache.queryGetObject(marketId, {
+      showContent: true
+    }),
+    query.utils.getCoinPrices(collateralCoinNames ?? [])
+  ]);
   const marketCollaterals = {};
   if (indexer) {
     const marketCollateralsIndexer = await query.indexer.getMarketCollaterals();
@@ -2203,29 +2205,23 @@ var getMarketCollaterals = async (query, collateralCoinNames, indexer = false) =
     }
     return marketCollaterals;
   }
-  for (const collateralCoinName of collateralCoinNames) {
-    const marketCollateral = await getMarketCollateral(
-      query,
-      collateralCoinName,
-      indexer,
-      marketObjectResponse.data,
-      coinPrices?.[collateralCoinName]
-    );
-    if (marketCollateral) {
-      marketCollaterals[collateralCoinName] = marketCollateral;
-    }
-  }
+  await Promise.allSettled(
+    collateralCoinNames.map(async (collateralCoinName) => {
+      const marketCollateral = await getMarketCollateral(
+        query,
+        collateralCoinName,
+        indexer,
+        marketObjectResponse.data,
+        coinPrices?.[collateralCoinName]
+      );
+      if (marketCollateral) {
+        marketCollaterals[collateralCoinName] = marketCollateral;
+      }
+    })
+  );
   return marketCollaterals;
 };
 var getMarketCollateral = async (query, collateralCoinName, indexer = false, marketObject, coinPrice) => {
-  const marketId = query.address.get("core.market");
-  marketObject = marketObject || (await query.cache.queryGetObject(marketId, {
-    showContent: true
-  })).data;
-  coinPrice = coinPrice || (await query.utils.getCoinPrices([collateralCoinName]))?.[collateralCoinName];
-  let marketCollateral;
-  let riskModel;
-  let collateralStat;
   if (indexer) {
     const marketCollateralIndexer = await query.indexer.getMarketCollateral(collateralCoinName);
     marketCollateralIndexer.coinPrice = coinPrice || marketCollateralIndexer.coinPrice;
@@ -2234,6 +2230,14 @@ var getMarketCollateral = async (query, collateralCoinName, indexer = false, mar
     );
     return marketCollateralIndexer;
   }
+  let marketCollateral;
+  let riskModel;
+  let collateralStat;
+  const marketId = query.address.get("core.market");
+  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;
@@ -2328,15 +2332,17 @@ var getObligations = async (query, ownerAddress) => {
   const keyObjectIds = keyObjectsResponse.map((ref) => ref?.data?.objectId).filter((id) => id !== void 0);
   const keyObjects = await query.cache.queryGetObjects(keyObjectIds);
   const obligations = [];
-  for (const keyObject of keyObjects) {
-    const keyId = keyObject.objectId;
-    if (keyObject.content && "fields" in keyObject.content) {
-      const fields = keyObject.content.fields;
-      const obligationId = String(fields.ownership.fields.of);
-      const locked = await getObligationLocked(query, obligationId);
-      obligations.push({ id: obligationId, keyId, locked });
-    }
-  }
+  await Promise.allSettled(
+    keyObjects.map(async (keyObject) => {
+      const keyId = keyObject.objectId;
+      if (keyObject.content && "fields" in keyObject.content) {
+        const fields = keyObject.content.fields;
+        const obligationId = String(fields.ownership.fields.of);
+        const locked = await getObligationLocked(query, obligationId);
+        obligations.push({ id: obligationId, keyId, locked });
+      }
+    })
+  );
   return obligations;
 };
 var getObligationLocked = async (query, obligationId) => {
@@ -2389,7 +2395,7 @@ var getMarketCoinAmounts = async (query, marketCoinNames, ownerAddress) => {
   );
   const owner = ownerAddress || query.suiKit.currentAddress();
   const marketCoins2 = {};
-  Promise.allSettled(
+  await Promise.allSettled(
     marketCoinNames.map(async (marketCoinName) => {
       const marketCoin = await getMarketCoinAmount(
         query,
@@ -2790,12 +2796,6 @@ var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames, indexer
   borrowIncentiveCoinNames = borrowIncentiveCoinNames || [
     ...SUPPORT_BORROW_INCENTIVE_POOLS
   ];
-  const queryPkgId = query.address.get("borrowIncentive.query");
-  const incentivePoolsId = query.address.get("borrowIncentive.incentivePools");
-  const queryTarget = `${queryPkgId}::incentive_pools_query::incentive_pools_data`;
-  const args = [incentivePoolsId];
-  const queryResult = await query.cache.queryInspectTxn({ queryTarget, args });
-  const borrowIncentivePoolsQueryData = queryResult.events[0].parsedJson;
   const borrowIncentivePools = {};
   const coinPrices = await query.utils.getCoinPrices(
     [
@@ -2817,6 +2817,12 @@ var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames, indexer
     }
     return borrowIncentivePools;
   }
+  const queryPkgId = query.address.get("borrowIncentive.query");
+  const incentivePoolsId = query.address.get("borrowIncentive.incentivePools");
+  const queryTarget = `${queryPkgId}::incentive_pools_query::incentive_pools_data`;
+  const args = [incentivePoolsId];
+  const queryResult = await query.cache.queryInspectTxn({ queryTarget, args });
+  const borrowIncentivePoolsQueryData = queryResult.events[0].parsedJson;
   for (const pool of borrowIncentivePoolsQueryData.incentive_pools) {
     const borrowIncentivePoolPoints = {};
     const parsedBorrowIncentivePoolData = parseOriginBorrowIncentivePoolData(pool);
@@ -3026,34 +3032,42 @@ var getLendings = async (query, poolCoinNames, ownerAddress, indexer = false) =>
   const stakeMarketCoinNames = marketCoinNames.filter(
     (marketCoinName) => SUPPORT_SPOOLS.includes(marketCoinName)
   );
-  const marketPools = await query.getMarketPools(poolCoinNames, indexer);
-  const spools = await query.getSpools(stakeMarketCoinNames, indexer);
-  const coinAmounts = await query.getCoinAmounts(poolCoinNames, ownerAddress);
-  const marketCoinAmounts = await query.getMarketCoinAmounts(
-    marketCoinNames,
-    ownerAddress
-  );
-  const allStakeAccounts = await query.getAllStakeAccounts(ownerAddress);
-  const coinPrices = await query.utils.getCoinPrices(poolCoinNames);
+  const [
+    marketPools,
+    spools,
+    coinAmounts,
+    marketCoinAmounts,
+    allStakeAccounts,
+    coinPrices
+  ] = await Promise.all([
+    query.getMarketPools(poolCoinNames, indexer),
+    query.getSpools(stakeMarketCoinNames, indexer),
+    query.getCoinAmounts(poolCoinNames, ownerAddress),
+    query.getMarketCoinAmounts(marketCoinNames, ownerAddress),
+    query.getAllStakeAccounts(ownerAddress),
+    query.utils.getCoinPrices(poolCoinNames)
+  ]);
   const lendings = {};
-  for (const poolCoinName of poolCoinNames) {
-    const stakeMarketCoinName = stakeMarketCoinNames.find(
-      (marketCoinName2) => marketCoinName2 === query.utils.parseMarketCoinName(poolCoinName)
-    );
-    const marketCoinName = query.utils.parseMarketCoinName(poolCoinName);
-    lendings[poolCoinName] = await getLending(
-      query,
-      poolCoinName,
-      ownerAddress,
-      indexer,
-      marketPools?.[poolCoinName],
-      stakeMarketCoinName ? spools[stakeMarketCoinName] : void 0,
-      stakeMarketCoinName ? allStakeAccounts[stakeMarketCoinName] : void 0,
-      coinAmounts?.[poolCoinName],
-      marketCoinAmounts?.[marketCoinName],
-      coinPrices?.[poolCoinName] ?? 0
-    );
-  }
+  await Promise.allSettled(
+    poolCoinNames.map(async (poolCoinName) => {
+      const stakeMarketCoinName = stakeMarketCoinNames.find(
+        (marketCoinName2) => marketCoinName2 === query.utils.parseMarketCoinName(poolCoinName)
+      );
+      const marketCoinName = query.utils.parseMarketCoinName(poolCoinName);
+      lendings[poolCoinName] = await getLending(
+        query,
+        poolCoinName,
+        ownerAddress,
+        indexer,
+        marketPools?.[poolCoinName],
+        stakeMarketCoinName ? spools[stakeMarketCoinName] : void 0,
+        stakeMarketCoinName ? allStakeAccounts[stakeMarketCoinName] : void 0,
+        coinAmounts?.[poolCoinName],
+        marketCoinAmounts?.[marketCoinName],
+        coinPrices?.[poolCoinName] ?? 0
+      );
+    })
+  );
   return lendings;
 };
 var getLending = async (query, poolCoinName, ownerAddress, indexer = false, marketPool, spool, stakeAccounts, coinAmount, marketCoinAmount, coinPrice) => {
@@ -3530,7 +3544,7 @@ var getVescaKeys = async (query, ownerAddress) => {
   let hasNextPage = false;
   let nextCursor = null;
   do {
-    const paginatedKeyObjectsResponse = await query.suiKit.client().getOwnedObjects({
+    const paginatedKeyObjectsResponse = await query.cache.queryGetOwnedObjects({
       owner,
       filter: {
         StructType: veScaKeyType
@@ -4169,15 +4183,17 @@ var ScallopQuery = class {
   async getStakeRewardPools(stakeMarketCoinNames) {
     stakeMarketCoinNames = stakeMarketCoinNames ?? [...SUPPORT_SPOOLS];
     const stakeRewardPools = {};
-    for (const stakeMarketCoinName of stakeMarketCoinNames) {
-      const stakeRewardPool = await getStakeRewardPool(
-        this,
-        stakeMarketCoinName
-      );
-      if (stakeRewardPool) {
-        stakeRewardPools[stakeMarketCoinName] = stakeRewardPool;
-      }
-    }
+    await Promise.allSettled(
+      stakeMarketCoinNames.map(async (stakeMarketCoinName) => {
+        const stakeRewardPool = await getStakeRewardPool(
+          this,
+          stakeMarketCoinName
+        );
+        if (stakeRewardPool) {
+          stakeRewardPools[stakeMarketCoinName] = stakeRewardPool;
+        }
+      })
+    );
     return stakeRewardPools;
   }
   /**