@scallop-io/sui-scallop-sdk 1.3.4-alpha.7 → 1.3.4

package/src/queries/isolatedAssetQuery.ts

@@ -18,8 +18,8 @@ const isolatedAssetZod = zod.object({
   }),
 });
 
-const ISOLATED_ASSET_KEY =
-  '0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::IsolatedAssetKey';
+const isolatedAssetKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::IsolatedAssetKey`; // prod
+// const isolatedAssetKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::IsolatedAssetKey`;
 
 /**
  * Return list of isolated assets coin types
@@ -42,7 +42,7 @@ export const getIsolatedAssets = async (
     ): dynamicField is DynamicFieldInfo & {
       name: DynamicFieldName & { value: { type: { name: string } } };
     } => {
-      return dynamicField.name.type === ISOLATED_ASSET_KEY;
+      return dynamicField.name.type === isolatedAssetKeyType;
     };
 
     do {
@@ -83,7 +83,6 @@ export const isIsolatedAsset = async (
 ): Promise<boolean> => {
   try {
     const marketObject = utils.address.get('core.market');
-
     // check if the coin type is in the list
     const cachedData = utils.address.cache.queryClient.getQueryData<string[]>([
       'getDynamicFields',
@@ -100,7 +99,7 @@ export const isIsolatedAsset = async (
     const object = await utils.cache.queryGetDynamicFieldObject({
       parentId: marketObject,
       name: {
-        type: ISOLATED_ASSET_KEY,
+        type: isolatedAssetKeyType,
         value: coinType,
       },
     });

package/src/queries/priceQuery.ts

@@ -77,10 +77,12 @@ export const getPythPrices = async (
       const pythPriceFeed = address.get(
         `core.coins.${assetCoinName}.oracle.pyth.feedObject`
       );
-      if (!prev[pythPriceFeed]) {
-        prev[pythPriceFeed] = [assetCoinName];
-      } else {
-        prev[pythPriceFeed].push(assetCoinName);
+      if (pythPriceFeed) {
+        if (!prev[pythPriceFeed]) {
+          prev[pythPriceFeed] = [assetCoinName];
+        } else {
+          prev[pythPriceFeed].push(assetCoinName);
+        }
       }
       return prev;
     },

package/src/queries/referralQuery.ts

@@ -10,7 +10,6 @@ export const queryVeScaKeyIdFromReferralBindings = async (
   refereeAddress: string
 ): Promise<string | null> => {
   const referralBindingTableId = address.get('referral.bindingTableId');
-
   const referralBindResponse = await address.cache.queryGetDynamicFieldObject({
     parentId: referralBindingTableId,
     name: {

package/src/queries/spoolQuery.ts

@@ -114,7 +114,7 @@ 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 for ${coinName}`);
+    throw new Error(`Failed to fetch marketPool for ${marketCoinName}`);
   }
 
   const poolId = query.address.get(`spool.pools.${marketCoinName}.id`);

package/src/queries/supplyLimitQuery.ts

@@ -1,5 +1,5 @@
-import { ScallopUtils } from '../models';
-import { SupportPoolCoins } from '../types';
+import { ScallopUtils } from 'src/models';
+import { SupportPoolCoins } from 'src/types';
 import { z as zod } from 'zod';
 
 const supplyLimitZod = zod.object({
@@ -17,9 +17,8 @@ const supplyLimitZod = zod.object({
   }),
 });
 
-const SUPPLY_LIMIT_KEY =
-  '0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::SupplyLimitKey';
-
+const supplyLimitKeyType = `0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::SupplyLimitKey`; // prod
+// const supplyLimitKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::SupplyLimitKey`;
 /**
  * Return supply limit of a pool (including the decimals)
  * @param utils
@@ -30,19 +29,24 @@ export const getSupplyLimit = async (
   utils: ScallopUtils,
   poolName: SupportPoolCoins
 ) => {
-  const poolCoinType = utils.parseCoinType(poolName).slice(2);
-  const marketObject = utils.address.get('core.market');
-  if (!marketObject) return null;
+  try {
+    const poolCoinType = utils.parseCoinType(poolName).slice(2);
+    const marketObject = utils.address.get('core.market');
+    if (!marketObject) return null;
 
-  const object = await utils.cache.queryGetDynamicFieldObject({
-    parentId: marketObject,
-    name: {
-      type: SUPPLY_LIMIT_KEY,
-      value: poolCoinType,
-    },
-  });
+    const object = await utils.cache.queryGetDynamicFieldObject({
+      parentId: marketObject,
+      name: {
+        type: supplyLimitKeyType,
+        value: poolCoinType,
+      },
+    });
 
-  const parsedData = supplyLimitZod.safeParse(object?.data?.content);
-  if (!parsedData.success) return null;
-  return parsedData.data.fields.value;
+    const parsedData = supplyLimitZod.safeParse(object?.data?.content);
+    if (!parsedData.success) return null;
+    return parsedData.data.fields.value;
+  } catch (e: any) {
+    console.error(`Error in getSupplyLimit for ${poolName}: ${e.message}`);
+    return '0';
+  }
 };

package/src/types/query/core.ts

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

package/src/types/utils.ts

@@ -20,7 +20,7 @@ export type PoolAddressInfo = {
   decimal: number;
   pythFeedId: string;
   lendingPoolAddress: string;
-  collateralPoolAddress: string;
+  collateralPoolAddress?: string;
   sCoinAddress: string | undefined;
   marketCoinAddress: string;
   coinAddress: string;