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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "0.46.37",
+  "version": "0.46.39",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/models/scallopQuery.ts

@@ -396,17 +396,18 @@ export class ScallopQuery {
   ) {
     stakeMarketCoinNames = stakeMarketCoinNames ?? [...SUPPORT_SPOOLS];
     const stakeRewardPools: 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;
   }
 

package/src/queries/borrowIncentiveQuery.ts

@@ -37,14 +37,6 @@ export const queryBorrowIncentivePools = async (
   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 as BorrowIncentivePoolsQueryInterface;
 
   const borrowIncentivePools: BorrowIncentivePools = {};
 
@@ -75,6 +67,15 @@ export const queryBorrowIncentivePools = async (
     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 as BorrowIncentivePoolsQueryInterface;
+
   for (const pool of borrowIncentivePoolsQueryData.incentive_pools) {
     const borrowIncentivePoolPoints: OptionalKeys<
       Record<SupportBorrowIncentiveRewardCoins, BorrowIncentivePoolPoints>

package/src/queries/coreQuery.ts

@@ -50,18 +50,6 @@ export const queryMarket = async (
   query: ScallopQuery,
   indexer: boolean = 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 txBlock = new SuiKitTxBlock();
-  // txBlock.moveCall(queryTarget, args);
-  const queryResult = await query.cache.queryInspectTxn(
-    { queryTarget, args }
-    // txBlock
-  );
-  const marketData = queryResult.events[0].parsedJson as MarketQueryInterface;
   const coinPrices = await query.utils.getCoinPrices();
 
   const pools: MarketPools = {};
@@ -86,6 +74,14 @@ export const queryMarket = async (
     };
   }
 
+  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 as MarketQueryInterface;
+
   for (const pool of marketData.pools) {
     const coinType = normalizeStructTag(pool.type.name);
     const poolCoinName =
@@ -236,19 +232,21 @@ export const getMarketPools = async (
     return marketPools;
   }
 
-  for (const poolCoinName of poolCoinNames) {
-    const marketPool = await getMarketPool(
-      query,
-      poolCoinName,
-      indexer,
-      marketObjectResponse.data,
-      coinPrices?.[poolCoinName]
-    );
+  await Promise.allSettled(
+    poolCoinNames.map(async (poolCoinName) => {
+      const marketPool = await getMarketPool(
+        query,
+        poolCoinName,
+        indexer,
+        marketObjectResponse.data,
+        coinPrices?.[poolCoinName]
+      );
 
-    if (marketPool) {
-      marketPools[poolCoinName] = marketPool;
-    }
-  }
+      if (marketPool) {
+        marketPools[poolCoinName] = marketPool;
+      }
+    })
+  );
 
   return marketPools;
 };
@@ -270,19 +268,6 @@ export const getMarketPool = async (
   marketObject?: SuiObjectData | null,
   coinPrice?: number
 ) => {
-  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: MarketPool | undefined;
   let balanceSheet: BalanceSheet | undefined;
   let borrowIndex: BorrowIndex | undefined;
@@ -299,6 +284,19 @@ export const getMarketPool = async (
     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 as any;
@@ -475,11 +473,12 @@ export const getMarketCollaterals = async (
 ) => {
   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: MarketCollaterals = {};
 
   if (indexer) {
@@ -496,19 +495,21 @@ export const getMarketCollaterals = async (
     return marketCollaterals;
   }
 
-  for (const collateralCoinName of collateralCoinNames) {
-    const marketCollateral = await getMarketCollateral(
-      query,
-      collateralCoinName,
-      indexer,
-      marketObjectResponse.data,
-      coinPrices?.[collateralCoinName]
-    );
+  await Promise.allSettled(
+    collateralCoinNames.map(async (collateralCoinName) => {
+      const marketCollateral = await getMarketCollateral(
+        query,
+        collateralCoinName,
+        indexer,
+        marketObjectResponse.data,
+        coinPrices?.[collateralCoinName]
+      );
 
-    if (marketCollateral) {
-      marketCollaterals[collateralCoinName] = marketCollateral;
-    }
-  }
+      if (marketCollateral) {
+        marketCollaterals[collateralCoinName] = marketCollateral;
+      }
+    })
+  );
 
   return marketCollaterals;
 };
@@ -530,6 +531,22 @@ export const getMarketCollateral = async (
   marketObject?: SuiObjectData | null,
   coinPrice?: number
 ) => {
+  if (indexer) {
+    const marketCollateralIndexer =
+      await query.indexer.getMarketCollateral(collateralCoinName);
+    marketCollateralIndexer.coinPrice =
+      coinPrice || marketCollateralIndexer.coinPrice;
+    marketCollateralIndexer.coinWrappedType = query.utils.getCoinWrappedType(
+      marketCollateralIndexer.coinName
+    );
+
+    return marketCollateralIndexer;
+  }
+
+  let marketCollateral: MarketCollateral | undefined;
+  let riskModel: RiskModel | undefined;
+  let collateralStat: CollateralStat | undefined;
+
   const marketId = query.address.get('core.market');
   marketObject =
     marketObject ||
@@ -545,22 +562,6 @@ export const getMarketCollateral = async (
       collateralCoinName
     ];
 
-  let marketCollateral: MarketCollateral | undefined;
-  let riskModel: RiskModel | undefined;
-  let collateralStat: CollateralStat | undefined;
-
-  if (indexer) {
-    const marketCollateralIndexer =
-      await query.indexer.getMarketCollateral(collateralCoinName);
-    marketCollateralIndexer.coinPrice =
-      coinPrice || marketCollateralIndexer.coinPrice;
-    marketCollateralIndexer.coinWrappedType = query.utils.getCoinWrappedType(
-      marketCollateralIndexer.coinName
-    );
-
-    return marketCollateralIndexer;
-  }
-
   if (marketObject) {
     if (marketObject.content && 'fields' in marketObject.content) {
       const fields = marketObject.content.fields as any;
@@ -698,15 +699,18 @@ export const getObligations = async (
   const keyObjects = await query.cache.queryGetObjects(keyObjectIds);
 
   const obligations: Obligation[] = [];
-  for (const keyObject of keyObjects) {
-    const keyId = keyObject.objectId;
-    if (keyObject.content && 'fields' in keyObject.content) {
-      const fields = keyObject.content.fields as any;
-      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 as any;
+        const obligationId = String(fields.ownership.fields.of);
+        const locked = await getObligationLocked(query, obligationId);
+        obligations.push({ id: obligationId, keyId, locked });
+      }
+    })
+  );
+
   return obligations;
 };
 
@@ -836,7 +840,7 @@ export const getMarketCoinAmounts = async (
   const owner = ownerAddress || query.suiKit.currentAddress();
   const marketCoins = {} as OptionalKeys<Record<SupportMarketCoins, number>>;
 
-  Promise.allSettled(
+  await Promise.allSettled(
     marketCoinNames.map(async (marketCoinName) => {
       const marketCoin = await getMarketCoinAmount(
         query,

package/src/queries/portfolioQuery.ts

@@ -49,36 +49,44 @@ export const getLendings = async (
     (SUPPORT_SPOOLS as readonly SupportMarketCoins[]).includes(marketCoinName)
   ) as SupportStakeMarketCoins[];
 
-  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: Lendings = {};
-  for (const poolCoinName of poolCoinNames) {
-    const stakeMarketCoinName = stakeMarketCoinNames.find(
-      (marketCoinName) =>
-        marketCoinName === query.utils.parseMarketCoinName(poolCoinName)
-    );
-    const marketCoinName = query.utils.parseMarketCoinName(poolCoinName);
-    lendings[poolCoinName] = await getLending(
-      query,
-      poolCoinName,
-      ownerAddress,
-      indexer,
-      marketPools?.[poolCoinName],
-      stakeMarketCoinName ? spools[stakeMarketCoinName] : undefined,
-      stakeMarketCoinName ? allStakeAccounts[stakeMarketCoinName] : undefined,
-      coinAmounts?.[poolCoinName],
-      marketCoinAmounts?.[marketCoinName],
-      coinPrices?.[poolCoinName] ?? 0
-    );
-  }
+  await Promise.allSettled(
+    poolCoinNames.map(async (poolCoinName) => {
+      const stakeMarketCoinName = stakeMarketCoinNames.find(
+        (marketCoinName) =>
+          marketCoinName === query.utils.parseMarketCoinName(poolCoinName)
+      );
+      const marketCoinName = query.utils.parseMarketCoinName(poolCoinName);
+      lendings[poolCoinName] = await getLending(
+        query,
+        poolCoinName,
+        ownerAddress,
+        indexer,
+        marketPools?.[poolCoinName],
+        stakeMarketCoinName ? spools[stakeMarketCoinName] : undefined,
+        stakeMarketCoinName ? allStakeAccounts[stakeMarketCoinName] : undefined,
+        coinAmounts?.[poolCoinName],
+        marketCoinAmounts?.[marketCoinName],
+        coinPrices?.[poolCoinName] ?? 0
+      );
+    })
+  );
 
   return lendings;
 };

package/src/queries/vescaQuery.ts

@@ -28,15 +28,13 @@ export const getVescaKeys = async (
   let hasNextPage = false;
   let nextCursor: string | null | undefined = null;
   do {
-    const paginatedKeyObjectsResponse = await query.suiKit
-      .client()
-      .getOwnedObjects({
-        owner,
-        filter: {
-          StructType: veScaKeyType,
-        },
-        cursor: nextCursor,
-      });
+    const paginatedKeyObjectsResponse = await query.cache.queryGetOwnedObjects({
+      owner,
+      filter: {
+        StructType: veScaKeyType,
+      },
+      cursor: nextCursor,
+    });
     keyObjectsResponse.push(...paginatedKeyObjectsResponse.data);
     if (
       paginatedKeyObjectsResponse.hasNextPage &&

package/src/utils/query.ts

@@ -173,19 +173,20 @@ export const calculateMarketPoolData = (
 export const parseOriginMarketCollateralData = (
   originMarketCollateralData: OriginMarketCollateralData
 ): ParsedMarketCollateralData => {
+  const divisor = 2 ** 32;
   return {
     coinType: normalizeStructTag(originMarketCollateralData.type.name),
     collateralFactor:
-      Number(originMarketCollateralData.collateralFactor.value) / 2 ** 32,
+      Number(originMarketCollateralData.collateralFactor.value) / divisor,
     liquidationFactor:
-      Number(originMarketCollateralData.liquidationFactor.value) / 2 ** 32,
+      Number(originMarketCollateralData.liquidationFactor.value) / divisor,
     liquidationDiscount:
-      Number(originMarketCollateralData.liquidationDiscount.value) / 2 ** 32,
+      Number(originMarketCollateralData.liquidationDiscount.value) / divisor,
     liquidationPanelty:
-      Number(originMarketCollateralData.liquidationPanelty.value) / 2 ** 32,
+      Number(originMarketCollateralData.liquidationPanelty.value) / divisor,
     liquidationReserveFactor:
       Number(originMarketCollateralData.liquidationReserveFactor.value) /
-      2 ** 32,
+      divisor,
     maxCollateralAmount: Number(originMarketCollateralData.maxCollateralAmount),
     totalCollateralAmount: Number(
       originMarketCollateralData.totalCollateralAmount