@scallop-io/sui-scallop-sdk 2.0.8 → 2.0.9

package/package.json

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

package/src/models/scallopClient.ts

@@ -1092,12 +1092,12 @@ export class ScallopClient {
    */
   public async claimAllUnlockedSca(): Promise<SuiTransactionBlockResponse>;
   public async claimAllUnlockedSca<S extends boolean>(
-    walletAddress?: string,
-    sign?: S
+    sign?: S,
+    walletAddress?: string
   ): Promise<ScallopClientVeScaReturnType<S>>;
   public async claimAllUnlockedSca<S extends boolean>(
-    walletAddress?: string,
-    sign: S = true as S
+    sign: S = true as S,
+    walletAddress?: string
   ): Promise<ScallopClientVeScaReturnType<S>> {
     const sender = walletAddress ?? this.walletAddress;
     // get all veSca keys

package/src/models/scallopConstants.ts

@@ -42,6 +42,7 @@ export class ScallopConstants {
     oracles: new Set(),
     pythEndpoints: new Set(),
     deprecated: new Set(),
+    emerging: new Set(),
   };
 
   private _coinDecimals: Record<string, number | undefined> = {};

package/src/queries/coreQuery.ts

@@ -230,7 +230,6 @@ const queryRequiredMarketObjects = async (
     borrowFeeKey: query.constants.poolAddresses[t]?.borrowFeeKey,
     supplyLimitKey: query.constants.poolAddresses[t]?.supplyLimitKey,
     borrowLimitKey: query.constants.poolAddresses[t]?.borrowLimitKey,
-    isolatedAssetKey: query.constants.poolAddresses[t]?.isolatedAssetKey,
   }));
 
   // Query all objects for each key in parallel
@@ -243,7 +242,6 @@ const queryRequiredMarketObjects = async (
     borrowFeeObjects,
     supplyLimitObjects,
     borrowLimitObjects,
-    isolatedAssetObjects,
   ] = await Promise.all([
     queryMultipleObjects(
       query.cache,
@@ -277,15 +275,14 @@ const queryRequiredMarketObjects = async (
       query.cache,
       tasks.map((task) => task.borrowLimitKey).filter((t): t is string => !!t)
     ),
-    queryMultipleObjects(
-      query.cache,
-      tasks.map((task) => task.isolatedAssetKey).filter((t): t is string => !!t)
-    ),
   ]);
 
   // Map the results back to poolCoinNames
   const mapObjects = (
-    tasks: { poolCoinName: string; [key: string]: string | undefined }[],
+    tasks: {
+      poolCoinName: string;
+      [key: string]: string | undefined;
+    }[],
     fetchedObjects: SuiObjectData[],
     keyValue: string
   ) => {
@@ -338,11 +335,11 @@ const queryRequiredMarketObjects = async (
     borrowLimitObjects,
     'borrowLimitKey'
   );
-  const isolatedAssetMap = mapObjects(
-    tasks,
-    isolatedAssetObjects,
-    'isolatedAssetKey'
-  );
+  // const isolatedAssetMap = mapObjects(
+  //   tasks,
+  //   isolatedAssetObjects,
+  //   'isolatedAssetKey'
+  // );
   // Construct the final requiredObjects result
   const result = poolCoinNames.reduce(
     (acc, name) => {
@@ -355,7 +352,8 @@ const queryRequiredMarketObjects = async (
         borrowFeeKey: borrowFeeMap[name],
         supplyLimitKey: supplyLimitMap[name],
         borrowLimitKey: borrowLimitMap[name],
-        isolatedAssetKey: isolatedAssetMap[name],
+        isolatedAssetKey:
+          query.constants.poolAddresses[name]?.isolatedAssetKey ?? false,
       };
       return acc;
     },
@@ -370,7 +368,7 @@ const queryRequiredMarketObjects = async (
         borrowFeeKey: SuiObjectData;
         supplyLimitKey: SuiObjectData;
         borrowLimitKey: SuiObjectData;
-        isolatedAssetKey: SuiObjectData;
+        isolatedAssetKey: boolean;
       }
     >
   );
@@ -484,7 +482,7 @@ const parseMarketPoolObjects = ({
   borrowFeeKey?: SuiObjectData;
   supplyLimitKey?: SuiObjectData;
   borrowLimitKey?: SuiObjectData;
-  isolatedAssetKey: SuiObjectData;
+  isolatedAssetKey: boolean;
 }): OriginMarketPoolData & {
   parsedOriginMarketCollateral?: OriginMarketCollateralData;
 } => {
@@ -511,7 +509,7 @@ const parseMarketPoolObjects = ({
     _riskModel && _collateralStat
       ? {
           type: _interestModel.type.fields,
-          isIsolated: !!isolatedAssetKey,
+          isIsolated: isolatedAssetKey,
           collateralFactor: _riskModel.collateral_factor.fields,
           liquidationFactor: _riskModel.liquidation_factor.fields,
           liquidationPenalty: _riskModel.liquidation_penalty.fields,
@@ -572,7 +570,7 @@ export const getMarketPool = async (
     borrowFeeKey: SuiObjectData;
     supplyLimitKey: SuiObjectData;
     borrowLimitKey: SuiObjectData;
-    isolatedAssetKey: SuiObjectData;
+    isolatedAssetKey: boolean;
   }
 ): Promise<
   { marketPool: MarketPool; collateral?: MarketCollateral } | undefined

package/src/queries/isolatedAssetQuery.ts

@@ -90,7 +90,7 @@ export const isIsolatedAsset = async (
 ): Promise<boolean> => {
   const assetInPoolAddresses = utils.constants.poolAddresses[coinName];
   if (assetInPoolAddresses) {
-    return !!assetInPoolAddresses.isolatedAssetKey;
+    return assetInPoolAddresses.isolatedAssetKey;
   }
 
   const marketObject = utils.address.get('core.market');

package/src/queries/poolAddressesQuery.ts

@@ -1,4 +1,4 @@
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import { getFullnodeUrl, SuiClient, SuiParsedData } from '@mysten/sui/client';
 import { AddressesInterface, OptionalKeys, PoolAddress } from 'src/types';
 
 const RPC_PROVIDERS = [
@@ -62,6 +62,31 @@ const queryFlashloanFeeObjectIds = async (
   return flashloanFeeObjectIds;
 };
 
+type FetchDynamicObjectReturnType<T extends boolean> = T extends true
+  ? string | undefined
+  : (SuiParsedData & { dataType: 'moveObject' }) | null | undefined;
+
+const fetchDynamicObject = async <S extends boolean>(
+  parentId: string,
+  type: string,
+  value: any,
+  returnObjId: S = true as S
+): Promise<FetchDynamicObjectReturnType<S>> => {
+  const res = (
+    await tryRequest(async (client) => {
+      return await client.getDynamicFieldObject({
+        parentId,
+        name: {
+          type,
+          value,
+        },
+      });
+    })
+  ).data;
+  if (returnObjId) return res?.objectId as FetchDynamicObjectReturnType<S>;
+  else return res?.content as FetchDynamicObjectReturnType<S>;
+};
+
 export const getPoolAddresses = async (
   addressId: string,
   poolNames: string[] = []
@@ -133,23 +158,6 @@ export const getPoolAddresses = async (
   const SUPPLY_LIMIT_TYPE = `0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::SupplyLimitKey`;
   const BORROW_LIMIT_TYPE = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::BorrowLimitKey`; // prod
   const ISOLATED_ASSET_KEY = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::IsolatedAssetKey`;
-  const fetchDynamicObject = async (
-    parentId: string,
-    type: string,
-    value: any
-  ) => {
-    return (
-      await tryRequest(async (client) => {
-        return await client.getDynamicFieldObject({
-          parentId,
-          name: {
-            type,
-            value,
-          },
-        });
-      })
-    ).data?.objectId;
-  };
 
   // query flashloan fee objects first
   const flashloanFeeObjectIds = await tryRequest(async (client) => {
@@ -163,25 +171,50 @@ export const getPoolAddresses = async (
     coinTypesPairs.map(async ([coinName, coinType]) => {
       const coinTypeKey = coinType.slice(2);
       const addresses = await Promise.all([
-        fetchDynamicObject(balanceSheetParentId, ADDRESS_TYPE, {
-          name: coinTypeKey,
-        }),
-        fetchDynamicObject(collateralStatsParentId, ADDRESS_TYPE, {
-          name: coinTypeKey,
-        }),
-        fetchDynamicObject(borrowDynamicsParentid, ADDRESS_TYPE, {
-          name: coinTypeKey,
-        }),
-        fetchDynamicObject(interestModelParentId, ADDRESS_TYPE, {
-          name: coinTypeKey,
-        }),
-        fetchDynamicObject(riskModelParentId, ADDRESS_TYPE, {
-          name: coinTypeKey,
-        }),
-        fetchDynamicObject(marketId, BORROW_FEE_TYPE, coinTypeKey),
-        fetchDynamicObject(marketId, SUPPLY_LIMIT_TYPE, coinTypeKey),
-        fetchDynamicObject(marketId, BORROW_LIMIT_TYPE, coinTypeKey),
-        fetchDynamicObject(marketId, ISOLATED_ASSET_KEY, coinTypeKey),
+        fetchDynamicObject(
+          balanceSheetParentId,
+          ADDRESS_TYPE,
+          {
+            name: coinTypeKey,
+          },
+          true
+        ),
+        fetchDynamicObject(
+          collateralStatsParentId,
+          ADDRESS_TYPE,
+          {
+            name: coinTypeKey,
+          },
+          true
+        ),
+        fetchDynamicObject(
+          borrowDynamicsParentid,
+          ADDRESS_TYPE,
+          {
+            name: coinTypeKey,
+          },
+          true
+        ),
+        fetchDynamicObject(
+          interestModelParentId,
+          ADDRESS_TYPE,
+          {
+            name: coinTypeKey,
+          },
+          true
+        ),
+        fetchDynamicObject(
+          riskModelParentId,
+          ADDRESS_TYPE,
+          {
+            name: coinTypeKey,
+          },
+          true
+        ),
+        fetchDynamicObject(marketId, BORROW_FEE_TYPE, coinTypeKey, true),
+        fetchDynamicObject(marketId, SUPPLY_LIMIT_TYPE, coinTypeKey, true),
+        fetchDynamicObject(marketId, BORROW_LIMIT_TYPE, coinTypeKey, true),
+        fetchDynamicObject(marketId, ISOLATED_ASSET_KEY, coinTypeKey, false),
       ]);
 
       // @ts-ignore
@@ -263,7 +296,7 @@ export const getPoolAddresses = async (
         borrowFeeKey: addresses[5] ?? '',
         supplyLimitKey: addresses[6] ?? '',
         borrowLimitKey: addresses[7] ?? '',
-        isolatedAssetKey: addresses[8] ?? '',
+        isolatedAssetKey: (addresses[8]?.fields as any)?.value ?? false,
         ...spoolData,
         ...sCoinData,
         sCoinName,

package/src/types/constant/common.ts

@@ -22,7 +22,7 @@ export type PoolAddress = {
   sCoinSymbol?: string;
   sCoinMetadataId?: string;
   sCoinTreasury?: string;
-  isolatedAssetKey?: string;
+  isolatedAssetKey: boolean;
   spool?: string;
   spoolReward?: string;
   spoolName?: string;
@@ -42,6 +42,7 @@ export type Whitelist = {
   rewardsAsPoint: Set<string>;
   pythEndpoints: Set<string>;
   deprecated: Set<string>;
+  emerging: Set<string>;
 };
 
 export type CoinWrappedType =