@scallop-io/sui-scallop-sdk 1.3.2-alpha.2 → 1.3.2

package/package.json

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

package/src/builders/spoolBuilder.ts

@@ -213,6 +213,10 @@ const generateSpoolQuickMethod: GenerateSpoolQuickMethod = ({
         stakeAccountId
       );
 
+      if (stakeAccountIds.length === 0) {
+        throw new Error(`No stakeAccountIds found for user ${sender}`);
+      }
+
       if (typeof amountOrMarketCoin === 'number') {
         // try stake market coin
         const stakedMarketCoinAmount = await stakeHelper(

package/src/constants/queryKeys.ts

@@ -77,10 +77,7 @@ export const queryKeys = {
       'getDynamicFieldObject',
       {
         parentId: input?.parentId,
-        name: {
-          type: input?.name?.type,
-          value: input?.name?.value,
-        },
+        name: JSON.stringify(input?.name ?? undefined),
       },
     ],
     getTotalVeScaTreasuryAmount: (

package/src/models/scallopClient.ts

@@ -276,7 +276,7 @@ export class ScallopClient {
     txBlock.setSender(sender);
 
     const obligations = await this.query.getObligations(sender);
-    const specificObligationId = obligationId || obligations?.[0]?.id;
+    const specificObligationId = obligationId || obligations[0]?.id;
     if (specificObligationId) {
       await txBlock.addCollateralQuick(
         amount,
@@ -416,7 +416,7 @@ export class ScallopClient {
       this.utils.parseMarketCoinName<SupportStakeMarketCoins>(stakeCoinName);
     const stakeAccounts =
       await this.query.getStakeAccounts(stakeMarketCoinName);
-    const targetStakeAccount = stakeAccountId || stakeAccounts[0].id;
+    const targetStakeAccount = stakeAccountId || stakeAccounts[0]?.id;
 
     const marketCoin = await txBlock.depositQuick(amount, stakeCoinName, false);
     if (targetStakeAccount) {
@@ -696,7 +696,7 @@ export class ScallopClient {
 
     const stakeAccounts =
       await this.query.getStakeAccounts(stakeMarketCoinName);
-    const targetStakeAccount = stakeAccountId || stakeAccounts[0].id;
+    const targetStakeAccount = stakeAccountId || stakeAccounts[0]?.id;
     if (targetStakeAccount) {
       await txBlock.stakeQuick(amount, stakeMarketCoinName, targetStakeAccount);
     } else {
@@ -1034,7 +1034,7 @@ export class ScallopClient {
             toDestroyMarketCoin
           );
 
-          // check if current sCoin
+          // Merge with existing sCoin
           await this.utils.mergeSimilarCoins(
             txBlock,
             sCoin,

package/src/models/scallopUtils.ts

@@ -566,10 +566,12 @@ export class ScallopUtils {
               const feed = await this.cache.queryClient.fetchQuery({
                 queryKey: queryKeys.oracle.getPythLatestPriceFeed(priceId),
                 queryFn: async () => {
-                  return await pythConnection.getLatestPriceFeeds([priceId]);
+                  return (
+                    (await pythConnection.getLatestPriceFeeds([priceId])) ?? []
+                  );
                 },
               });
-              if (feed) {
+              if (feed[0]) {
                 const data = parseDataFromPythPriceFeed(feed[0], this.address);
                 this._priceMap.set(coinName as SupportAssetCoins, {
                   price: data.price,

package/src/queries/coreQuery.ts

@@ -38,7 +38,7 @@ import {
 } from '../types';
 import BigNumber from 'bignumber.js';
 import { getSupplyLimit } from './supplyLimit';
-import { isIsolatedAsset } from './isolatedAsset';
+// import { isIsolatedAsset } from './isolatedAsset';
 
 /**
  * Query market data.
@@ -89,7 +89,7 @@ export const queryMarket = async (
   const args = [marketId];
 
   const queryResult = await query.cache.queryInspectTxn({ queryTarget, args });
-  const marketData = queryResult?.events[0].parsedJson as
+  const marketData = queryResult?.events[0]?.parsedJson as
     | MarketQueryInterface
     | undefined;
 
@@ -156,7 +156,8 @@ export const queryMarket = async (
       borrowFee: parsedMarketPoolData.borrowFee,
       marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
       minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
-      isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
+      // isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
+      isIsolated: false,
       maxSupplyCoin,
       ...calculatedMarketPoolData,
     };
@@ -494,7 +495,8 @@ export const getMarketPool = async (
       marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
       minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
       maxSupplyCoin,
-      isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
+      // isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
+      isIsolated: false,
       ...calculatedMarketPoolData,
     };
   }

package/src/queries/sCoinQuery.ts

@@ -33,7 +33,7 @@ export const getSCoinTotalSupply = async (
     typeArgs,
   });
   const results = queryResults?.results;
-  if (results && results[0].returnValues) {
+  if (results && results[0]?.returnValues) {
     const value = Uint8Array.from(results[0].returnValues[0][0]);
     const type = results[0].returnValues[0][1]; // should be u64
     assert(type === 'u64', 'Result type is not u64');

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('Fail 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');