@scallop-io/sui-scallop-sdk 2.1.3 → 2.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "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,19 +467,19 @@ 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),
       ]);
 
+      console.log({
+        targetKey,
+        sourceKey,
+        isTargetInSubTable,
+        isSourceInSubTable,
+      });
+
       const unstakeObligationBeforeStake =
         !!txBlock.txBlock.blockData.transactions.find(
           (txn) =>

package/src/models/scallopUtils.ts

@@ -388,8 +388,7 @@ class ScallopUtils implements ScallopUtilsInterface {
     });
 
     if (assetCoinName) {
-      const parsedPrice = feed.getEmaPriceUnchecked();
-
+      const parsedPrice = feed.getPriceUnchecked();
       return {
         coinName: assetCoinName,
         price: parsedPrice.getPriceAsNumberUnchecked(),