@scallop-io/sui-scallop-sdk 2.0.13-merge-split-ve-sca-alpha.2 → 2.0.13-merge-split-ve-sca-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "2.0.13-merge-split-ve-sca-alpha.2",
+  "version": "2.0.13-merge-split-ve-sca-alpha.4",
   "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,
           ]
         );
@@ -219,6 +223,8 @@ const generateBorrowIncentiveQuickMethod: GenerateBorrowIncentiveQuickMethod =
               txn.kind === 'MoveCall' &&
               (txn.target ===
                 `${OLD_BORROW_INCENTIVE_PROTOCOL_ID}::user::unstake` ||
+                txn.target ===
+                  `${builder.address.get('borrowIncentive.id')}::user::unstake_v2` ||
                 txn.target ===
                   `${builder.address.get('borrowIncentive.id')}::user::unstake`)
           );
@@ -249,6 +255,8 @@ const generateBorrowIncentiveQuickMethod: GenerateBorrowIncentiveQuickMethod =
               txn.kind === 'MoveCall' &&
               (txn.target ===
                 `${OLD_BORROW_INCENTIVE_PROTOCOL_ID}::user::unstake` ||
+                txn.target ===
+                  `${builder.address.get('borrowIncentive.id')}::user::unstake_v2` ||
                 txn.target ===
                   `${builder.address.get('borrowIncentive.id')}::user::unstake`)
           );

package/src/builders/vescaBuilder.ts

@@ -426,7 +426,16 @@ const generateQuickVeScaMethod: GenerateVeScaQuickMethod = ({
         veScaKey,
         builder.address.get('vesca.subsTable')
       );
-      if (isKeyInSubTable) {
+
+      const unstakeObligationBeforeStake =
+        !!txBlock.txBlock.blockData.transactions.find(
+          (txn) =>
+            txn.kind === 'MoveCall' &&
+            txn.target ===
+              `${builder.address.get('borrowIncentive.id')}::user::unstake_v2`
+        );
+
+      if (isKeyInSubTable && !unstakeObligationBeforeStake) {
         throw new Error(
           'Key cannot be in the subs table, please call unsubscribe vesca or unstake obligation first'
         );
@@ -455,9 +464,18 @@ const generateQuickVeScaMethod: GenerateVeScaQuickMethod = ({
         ),
       ]);
 
-      console.log({ isTargetInSubTable, isSourceInSubTable });
+      const unstakeObligationBeforeStake =
+        !!txBlock.txBlock.blockData.transactions.find(
+          (txn) =>
+            txn.kind === 'MoveCall' &&
+            txn.target ===
+              `${builder.address.get('borrowIncentive.id')}::user::unstake_v2`
+        );
 
-      if (isTargetInSubTable || isSourceInSubTable) {
+      if (
+        (isTargetInSubTable || isSourceInSubTable) &&
+        !unstakeObligationBeforeStake
+      ) {
         throw new Error(
           'Both target and source cannot be in the subs table. Please call unsubscribe vesca or unstake obligation first'
         );