@scallop-io/sui-scallop-sdk 2.1.4 → 2.1.6

package/package.json

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

package/src/builders/vescaBuilder.ts

@@ -89,7 +89,11 @@ export const isInSubsTable = async (
         value: veScaKey,
       },
     });
-    return !!resp?.data;
+
+    if (!resp?.data) return false;
+
+    const contents = (resp.data.content as any).fields.value.fields.contents;
+    return Array.isArray(contents) && contents.length > 0;
   } catch (e) {
     console.error(e);
     return false;
@@ -463,17 +467,10 @@ const generateQuickVeScaMethod: GenerateVeScaQuickMethod = ({
     },
     mergeVeScaQuick: async (targetKey: string, sourceKey: string) => {
       // check targetKey and sourceKey
+      const table = builder.address.get('vesca.subsTableId');
       const [isTargetInSubTable, isSourceInSubTable] = await Promise.all([
-        isInSubsTable(
-          builder,
-          targetKey,
-          builder.address.get('vesca.subsTableId')
-        ),
-        isInSubsTable(
-          builder,
-          sourceKey,
-          builder.address.get('vesca.subsTableId')
-        ),
+        isInSubsTable(builder, targetKey, table),
+        isInSubsTable(builder, sourceKey, table),
       ]);
 
       const unstakeObligationBeforeStake =

package/src/models/scallopQuery.ts

@@ -776,8 +776,8 @@ class ScallopQuery implements ScallopQueryInterface {
   /**
    * Get list of isolated assets
    */
-  async getIsolatedAssets() {
-    return await getIsolatedAssets(this);
+  async getIsolatedAssets(useOnChainQuery: boolean = false) {
+    return await getIsolatedAssets(this, useOnChainQuery);
   }
 
   /**

package/src/queries/coreQuery.ts

@@ -247,6 +247,7 @@ const queryRequiredMarketObjects = async (
     borrowFeeKey?: string;
     supplyLimitKey?: string;
     borrowLimitKey?: string;
+    isolatedAssetKey?: string;
   };
 
   const keyCollections: Record<keyof KeyType, string[]> = {
@@ -258,6 +259,7 @@ const queryRequiredMarketObjects = async (
     borrowFeeKey: [],
     supplyLimitKey: [],
     borrowLimitKey: [],
+    isolatedAssetKey: [],
   };
 
   const taskMap = new Map<string, KeyType>();
@@ -274,6 +276,7 @@ const queryRequiredMarketObjects = async (
       borrowFeeKey: poolData?.borrowFeeKey,
       supplyLimitKey: poolData?.supplyLimitKey,
       borrowLimitKey: poolData?.borrowLimitKey,
+      isolatedAssetKey: poolData?.isolatedAssetKey,
     };
 
     // Add to key collections
@@ -311,6 +314,7 @@ const queryRequiredMarketObjects = async (
     borrowFeeKey: new Map<string, SuiObjectData>(),
     supplyLimitKey: new Map<string, SuiObjectData>(),
     borrowLimitKey: new Map<string, SuiObjectData>(),
+    isolatedAssetKey: new Map<string, SuiObjectData>(),
     isIsolated: new Map<string, boolean>(),
   } as Record<keyof KeyType, Map<string, SuiObjectData>>;
 
@@ -349,7 +353,10 @@ const queryRequiredMarketObjects = async (
       borrowLimitKey: task.borrowLimitKey
         ? resultMaps.borrowLimitKey.get(task.borrowLimitKey)
         : undefined,
-      isolatedAssetKey: utils.constants.poolAddresses[poolCoinName]?.isIsolated,
+      isolatedAssetKey: task.isolatedAssetKey
+        ? resultMaps.isolatedAssetKey.get(task.isolatedAssetKey)
+        : undefined,
+      isIsolated: utils.constants.poolAddresses[poolCoinName]?.isIsolated,
     };
   }
 
@@ -553,6 +560,7 @@ export const getMarketPool = async (
     borrowFeeKey: SuiObjectData;
     supplyLimitKey: SuiObjectData;
     borrowLimitKey: SuiObjectData;
+    isolatedAssetKey?: SuiObjectData;
     isIsolated: boolean;
   }
 ): Promise<