@scallop-io/sui-scallop-sdk 1.3.4-alpha.6 → 1.3.4-isolated-asset.2

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,9 @@ const supplyLimitZod = zod.object({
   }),
 });
 
-const SUPPLY_LIMIT_KEY =
-  '0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::SupplyLimitKey';
-
+// const supplyLimitKeyType = `0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::SupplyLimitKey`;
+// TODO: use prod value
+const supplyLimitKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::SupplyLimitKey`;
 /**
  * Return supply limit of a pool (including the decimals)
  * @param utils
@@ -30,19 +30,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;