@scallop-io/sui-scallop-sdk 2.0.9-emerging-asset-alpha.1 → 2.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "2.0.9-emerging-asset-alpha.1",
+  "version": "2.0.10",
   "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/queries/coreQuery.ts

@@ -352,8 +352,7 @@ const queryRequiredMarketObjects = async (
         borrowFeeKey: borrowFeeMap[name],
         supplyLimitKey: supplyLimitMap[name],
         borrowLimitKey: borrowLimitMap[name],
-        isolatedAssetKey:
-          query.constants.poolAddresses[name]?.isolatedAssetKey ?? false,
+        isIsolated: query.constants.poolAddresses[name]?.isIsolated ?? false,
       };
       return acc;
     },
@@ -368,7 +367,7 @@ const queryRequiredMarketObjects = async (
         borrowFeeKey: SuiObjectData;
         supplyLimitKey: SuiObjectData;
         borrowLimitKey: SuiObjectData;
-        isolatedAssetKey: boolean;
+        isIsolated: boolean;
       }
     >
   );
@@ -472,7 +471,7 @@ const parseMarketPoolObjects = ({
   borrowFeeKey,
   supplyLimitKey,
   borrowLimitKey,
-  isolatedAssetKey,
+  isIsolated,
 }: {
   balanceSheet: SuiObjectData;
   borrowDynamic: SuiObjectData;
@@ -482,7 +481,7 @@ const parseMarketPoolObjects = ({
   borrowFeeKey?: SuiObjectData;
   supplyLimitKey?: SuiObjectData;
   borrowLimitKey?: SuiObjectData;
-  isolatedAssetKey: boolean;
+  isIsolated: boolean;
 }): OriginMarketPoolData & {
   parsedOriginMarketCollateral?: OriginMarketCollateralData;
 } => {
@@ -509,7 +508,7 @@ const parseMarketPoolObjects = ({
     _riskModel && _collateralStat
       ? {
           type: _interestModel.type.fields,
-          isIsolated: isolatedAssetKey,
+          isIsolated: isIsolated,
           collateralFactor: _riskModel.collateral_factor.fields,
           liquidationFactor: _riskModel.liquidation_factor.fields,
           liquidationPenalty: _riskModel.liquidation_penalty.fields,
@@ -541,7 +540,7 @@ const parseMarketPoolObjects = ({
     highKink: _interestModel.high_kink.fields,
     midKink: _interestModel.mid_kink.fields,
     minBorrowAmount: _interestModel.min_borrow_amount,
-    isIsolated: !!isolatedAssetKey,
+    isIsolated,
     supplyLimit: _supplyLimit,
     borrowLimit: _borrowLimit,
     parsedOriginMarketCollateral,
@@ -570,7 +569,7 @@ export const getMarketPool = async (
     borrowFeeKey: SuiObjectData;
     supplyLimitKey: SuiObjectData;
     borrowLimitKey: SuiObjectData;
-    isolatedAssetKey: boolean;
+    isIsolated: 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.isIsolated;
   }
 
   const marketObject = utils.address.get('core.market');

package/src/queries/poolAddressesQuery.ts

@@ -296,7 +296,8 @@ export const getPoolAddresses = async (
         borrowFeeKey: addresses[5] ?? '',
         supplyLimitKey: addresses[6] ?? '',
         borrowLimitKey: addresses[7] ?? '',
-        isolatedAssetKey: (addresses[8]?.fields as any)?.value ?? false,
+        isolatedAssetKey: (addresses[8]?.fields as any)?.id.id ?? '',
+        isIsolated: (addresses[8]?.fields as any)?.value ?? false,
         ...spoolData,
         ...sCoinData,
         sCoinName,

package/src/types/constant/common.ts

@@ -4,6 +4,7 @@ export type PoolAddress = {
   coinType: string;
   coinMetadataId: string;
   decimals: number;
+  isIsolated: boolean;
   // optional keys
   pythFeed?: string;
   pythFeedObjectId?: string;
@@ -22,7 +23,7 @@ export type PoolAddress = {
   sCoinSymbol?: string;
   sCoinMetadataId?: string;
   sCoinTreasury?: string;
-  isolatedAssetKey: boolean;
+  isolatedAssetKey: string;
   spool?: string;
   spoolReward?: string;
   spoolName?: string;