@scallop-io/sui-scallop-sdk 1.3.2-alpha.3 → 1.3.3-alpha.1

package/src/queries/spoolQuery.ts

@@ -113,6 +113,10 @@ export const getSpool = async (
 ) => {
   const coinName = query.utils.parseCoinName<SupportStakeCoins>(marketCoinName);
   marketPool = marketPool || (await query.getMarketPool(coinName, indexer));
+  if (!marketPool) {
+    throw new Error('Failed to fetch marketPool');
+  }
+
   const poolId = query.address.get(`spool.pools.${marketCoinName}.id`);
   const rewardPoolId = query.address.get(
     `spool.pools.${marketCoinName}.rewardPoolId`
@@ -143,83 +147,83 @@ export const getSpool = async (
     }
   );
 
-  if (marketPool && spoolObjectResponse[0] && spoolObjectResponse[1]) {
-    const rewardCoinName = query.utils.getSpoolRewardCoinName(marketCoinName);
-    coinPrices =
-      coinPrices ||
-      (await query.utils.getCoinPrices([coinName, rewardCoinName]));
-
-    const spoolObject = spoolObjectResponse[0];
-    const rewardPoolObject = spoolObjectResponse[1];
-    if (spoolObject.content && 'fields' in spoolObject.content) {
-      const spoolFields = spoolObject.content.fields as any;
-      const parsedSpoolData = parseOriginSpoolData({
-        stakeType: spoolFields.stake_type,
-        maxDistributedPoint: spoolFields.max_distributed_point,
-        distributedPoint: spoolFields.distributed_point,
-        distributedPointPerPeriod: spoolFields.distributed_point_per_period,
-        pointDistributionTime: spoolFields.point_distribution_time,
-        maxStake: spoolFields.max_stakes,
-        stakes: spoolFields.stakes,
-        index: spoolFields.index,
-        createdAt: spoolFields.created_at,
-        lastUpdate: spoolFields.last_update,
+  if (!(spoolObjectResponse[0] && spoolObjectResponse[1])) {
+    throw new Error('Fail to fetch spoolObjectResponse!');
+  }
+
+  const rewardCoinName = query.utils.getSpoolRewardCoinName(marketCoinName);
+  coinPrices =
+    coinPrices || (await query.utils.getCoinPrices([coinName, rewardCoinName]));
+
+  const spoolObject = spoolObjectResponse[0];
+  const rewardPoolObject = spoolObjectResponse[1];
+  if (spoolObject.content && 'fields' in spoolObject.content) {
+    const spoolFields = spoolObject.content.fields as any;
+    const parsedSpoolData = parseOriginSpoolData({
+      stakeType: spoolFields.stake_type,
+      maxDistributedPoint: spoolFields.max_distributed_point,
+      distributedPoint: spoolFields.distributed_point,
+      distributedPointPerPeriod: spoolFields.distributed_point_per_period,
+      pointDistributionTime: spoolFields.point_distribution_time,
+      maxStake: spoolFields.max_stakes,
+      stakes: spoolFields.stakes,
+      index: spoolFields.index,
+      createdAt: spoolFields.created_at,
+      lastUpdate: spoolFields.last_update,
+    });
+
+    const marketCoinPrice =
+      (coinPrices?.[coinName] ?? 0) * marketPool.conversionRate;
+    const marketCoinDecimal = query.utils.getCoinDecimal(marketCoinName);
+    const calculatedSpoolData = calculateSpoolData(
+      parsedSpoolData,
+      marketCoinPrice,
+      marketCoinDecimal
+    );
+
+    if (rewardPoolObject.content && 'fields' in rewardPoolObject.content) {
+      const rewardPoolFields = rewardPoolObject.content.fields as any;
+      const parsedSpoolRewardPoolData = parseOriginSpoolRewardPoolData({
+        claimed_rewards: rewardPoolFields.claimed_rewards,
+        exchange_rate_numerator: rewardPoolFields.exchange_rate_numerator,
+        exchange_rate_denominator: rewardPoolFields.exchange_rate_denominator,
+        rewards: rewardPoolFields.rewards,
+        spool_id: rewardPoolFields.spool_id,
       });
 
-      const marketCoinPrice =
-        (coinPrices?.[coinName] ?? 0) * marketPool.conversionRate;
-      const marketCoinDecimal = query.utils.getCoinDecimal(marketCoinName);
-      const calculatedSpoolData = calculateSpoolData(
+      const rewardCoinPrice = coinPrices?.[rewardCoinName] ?? 0;
+      const rewardCoinDecimal = query.utils.getCoinDecimal(rewardCoinName);
+
+      const calculatedRewardPoolData = calculateSpoolRewardPoolData(
         parsedSpoolData,
-        marketCoinPrice,
-        marketCoinDecimal
+        parsedSpoolRewardPoolData,
+        calculatedSpoolData,
+        rewardCoinPrice,
+        rewardCoinDecimal
       );
 
-      if (rewardPoolObject.content && 'fields' in rewardPoolObject.content) {
-        const rewardPoolFields = rewardPoolObject.content.fields as any;
-        const parsedSpoolRewardPoolData = parseOriginSpoolRewardPoolData({
-          claimed_rewards: rewardPoolFields.claimed_rewards,
-          exchange_rate_numerator: rewardPoolFields.exchange_rate_numerator,
-          exchange_rate_denominator: rewardPoolFields.exchange_rate_denominator,
-          rewards: rewardPoolFields.rewards,
-          spool_id: rewardPoolFields.spool_id,
-        });
-
-        const rewardCoinPrice = coinPrices?.[rewardCoinName] ?? 0;
-        const rewardCoinDecimal = query.utils.getCoinDecimal(rewardCoinName);
-
-        const calculatedRewardPoolData = calculateSpoolRewardPoolData(
-          parsedSpoolData,
-          parsedSpoolRewardPoolData,
-          calculatedSpoolData,
-          rewardCoinPrice,
-          rewardCoinDecimal
-        );
-
-        spool = {
-          marketCoinName: marketCoinName,
-          symbol: query.utils.parseSymbol(marketCoinName),
-          coinType: query.utils.parseCoinType(coinName),
-          marketCoinType: query.utils.parseMarketCoinType(coinName),
-          rewardCoinType: isMarketCoin(rewardCoinName)
-            ? query.utils.parseMarketCoinType(rewardCoinName)
-            : query.utils.parseCoinType(rewardCoinName),
-          coinDecimal: query.utils.getCoinDecimal(coinName),
-          rewardCoinDecimal: query.utils.getCoinDecimal(rewardCoinName),
-          coinPrice: coinPrices?.[coinName] ?? 0,
-          marketCoinPrice: marketCoinPrice,
-          rewardCoinPrice: rewardCoinPrice,
-          maxPoint: parsedSpoolData.maxPoint,
-          distributedPoint: parsedSpoolData.distributedPoint,
-          maxStake: parsedSpoolData.maxStake,
-          ...calculatedSpoolData,
-          exchangeRateNumerator:
-            parsedSpoolRewardPoolData.exchangeRateNumerator,
-          exchangeRateDenominator:
-            parsedSpoolRewardPoolData.exchangeRateDenominator,
-          ...calculatedRewardPoolData,
-        };
-      }
+      spool = {
+        marketCoinName: marketCoinName,
+        symbol: query.utils.parseSymbol(marketCoinName),
+        coinType: query.utils.parseCoinType(coinName),
+        marketCoinType: query.utils.parseMarketCoinType(coinName),
+        rewardCoinType: isMarketCoin(rewardCoinName)
+          ? query.utils.parseMarketCoinType(rewardCoinName)
+          : query.utils.parseCoinType(rewardCoinName),
+        coinDecimal: query.utils.getCoinDecimal(coinName),
+        rewardCoinDecimal: query.utils.getCoinDecimal(rewardCoinName),
+        coinPrice: coinPrices?.[coinName] ?? 0,
+        marketCoinPrice: marketCoinPrice,
+        rewardCoinPrice: rewardCoinPrice,
+        maxPoint: parsedSpoolData.maxPoint,
+        distributedPoint: parsedSpoolData.distributedPoint,
+        maxStake: parsedSpoolData.maxStake,
+        ...calculatedSpoolData,
+        exchangeRateNumerator: parsedSpoolRewardPoolData.exchangeRateNumerator,
+        exchangeRateDenominator:
+          parsedSpoolRewardPoolData.exchangeRateDenominator,
+        ...calculatedRewardPoolData,
+      };
     }
   }
 
@@ -305,13 +309,6 @@ export const getStakeAccounts = async (
       {} as Record<string, SupportStakeMarketCoins>
     );
 
-  // const stakeObjectIds: string[] = stakeObjectsResponse
-  //   .map((ref: any) => ref?.data?.objectId)
-  //   .filter((id: any) => id !== undefined);
-  // const stakeObjects = await utils.cache.queryGetObjects(stakeObjectIds, {
-  //   showContent: true,
-  //   showType: true,
-  // });
   for (const stakeObject of stakeObjectsResponse.map((ref) => ref.data)) {
     const id = stakeObject?.objectId;
     const type = stakeObject?.type!;

package/src/queries/vescaQuery.ts

@@ -237,7 +237,7 @@ const getTotalVeScaTreasuryAmount = async (
   });
 
   const results = res.results;
-  if (results && results[1].returnValues) {
+  if (results && results[1]?.returnValues) {
     const value = Uint8Array.from(results[1].returnValues[0][0]);
     const type = results[1].returnValues[0][1];
     assert(type === 'u64', 'Result type is not u64');

package/src/types/query/core.ts

@@ -153,6 +153,7 @@ export type MarketCollateral = {
   coinWrappedType: CoinWrappedType;
   coinDecimal: number;
   coinPrice: number;
+  isIsolated: boolean;
 } & Required<
   Pick<
     ParsedMarketCollateralData,