@scallop-io/sui-scallop-sdk 2.0.13-merge-split-ve-sca-alpha.1 → 2.0.13-merge-split-ve-sca-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "2.0.13-merge-split-ve-sca-alpha.1",
+  "version": "2.0.13-merge-split-ve-sca-alpha.3",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

package/src/builders/borrowIncentiveBuilder.ts

@@ -122,7 +122,7 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
       stakeObligationWithVesca: (obligationId, obligationKey, veScaKey) => {
         builder.moveCall(
           txBlock,
-          `${borrowIncentiveIds.borrowIncentivePkg}::user::stake_with_ve_sca`,
+          `${borrowIncentiveIds.borrowIncentivePkg}::user::stake_with_ve_sca_v2`,
           [
             borrowIncentiveIds.config,
             borrowIncentiveIds.incentivePools,
@@ -134,6 +134,8 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
             veScaIds.treasury,
             veScaIds.table,
             veScaKey,
+            builder.address.get('vesca.subsTable'),
+            builder.address.get('vesca.subsWhitelist'),
             clockObjectRef,
           ],
           []
@@ -142,13 +144,15 @@ const generateBorrowIncentiveNormalMethod: GenerateBorrowIncentiveNormalMethod =
       unstakeObligation: (obligationId, obligationKey) => {
         builder.moveCall(
           txBlock,
-          `${borrowIncentiveIds.borrowIncentivePkg}::user::unstake`,
+          `${borrowIncentiveIds.borrowIncentivePkg}::user::unstake_v2`,
           [
             borrowIncentiveIds.config,
             borrowIncentiveIds.incentivePools,
             borrowIncentiveIds.incentiveAccounts,
             obligationKey,
             obligationId,
+            builder.address.get('vesca.subsTable'),
+            builder.address.get('vesca.subsWhitelist'),
             clockObjectRef,
           ]
         );
@@ -220,7 +224,7 @@ const generateBorrowIncentiveQuickMethod: GenerateBorrowIncentiveQuickMethod =
               (txn.target ===
                 `${OLD_BORROW_INCENTIVE_PROTOCOL_ID}::user::unstake` ||
                 txn.target ===
-                  `${builder.address.get('borrowIncentive.id')}::user::unstake`)
+                  `${builder.address.get('borrowIncentive.id')}::user::unstake_v2`)
           );
 
         if (!obligationLocked || unstakeObligationBeforeStake) {
@@ -250,7 +254,7 @@ const generateBorrowIncentiveQuickMethod: GenerateBorrowIncentiveQuickMethod =
               (txn.target ===
                 `${OLD_BORROW_INCENTIVE_PROTOCOL_ID}::user::unstake` ||
                 txn.target ===
-                  `${builder.address.get('borrowIncentive.id')}::user::unstake`)
+                  `${builder.address.get('borrowIncentive.id')}::user::unstake_v2`)
           );
 
         if (!obligationLocked || unstakeObligationBeforeStake) {

package/src/builders/vescaBuilder.ts

@@ -75,14 +75,14 @@ export const isInSubsTable = async (
 ) => {
   const [builder, veScaKey, tableId] = params;
   try {
-    const _resp = await builder.cache.queryGetDynamicFieldObject({
+    const resp = await builder.cache.queryGetDynamicFieldObject({
       parentId: tableId,
       name: {
         type: '0x2::object::ID',
         value: veScaKey,
       },
     });
-    return true;
+    return !!resp?.data;
   } catch (e) {
     console.error(e);
     return false;
@@ -433,9 +433,8 @@ const generateQuickVeScaMethod: GenerateVeScaQuickMethod = ({
       }
 
       const newVeScaKey = txBlock.splitVeSca(veScaKey, splitAmount);
-      // txBlock.addMergeSplitSub(newVeScaKey);
       if (transferVeScaKey) {
-        txBlock.transferObjects(newVeScaKey, requireSender(txBlock));
+        txBlock.transferObjects([newVeScaKey], requireSender(txBlock));
         return;
       } else {
         return newVeScaKey as QuickMethodReturnType<S>;
@@ -447,15 +446,17 @@ const generateQuickVeScaMethod: GenerateVeScaQuickMethod = ({
         isInSubsTable(
           builder,
           targetKey,
-          builder.address.get('vesca.subsTable')
+          builder.address.get('vesca.subsTableId')
         ),
         isInSubsTable(
           builder,
           sourceKey,
-          builder.address.get('vesca.subsTable')
+          builder.address.get('vesca.subsTableId')
         ),
       ]);
 
+      console.log({ isTargetInSubTable, isSourceInSubTable });
+
       if (isTargetInSubTable || isSourceInSubTable) {
         throw new Error(
           'Both target and source cannot be in the subs table. Please call unsubscribe vesca or unstake obligation first'