@scallop-io/sui-scallop-sdk 0.46.47 → 0.46.48

package/dist/types/builder/spool.d.ts

@@ -14,7 +14,7 @@ export type SpoolNormalMethods = {
 };
 export type SpoolQuickMethods = {
     stakeQuick(amountOrMarketCoin: SuiObjectArg | number, stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg): Promise<void>;
-    unstakeQuick(amount: number, stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg): Promise<TransactionResult | undefined>;
+    unstakeQuick(amount: number, stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg, returnSCoin?: boolean): Promise<TransactionResult | undefined>;
     claimQuick(stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg): Promise<TransactionResult[]>;
 };
 export type SuiTxBlockWithSpoolNormalMethods = SuiKitTxBlock & SuiTxBlockWithSCoin & SpoolNormalMethods;

package/package.json

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

package/src/builders/spoolBuilder.ts

@@ -249,14 +249,19 @@ const generateSpoolQuickMethod: GenerateSpoolQuickMethod = ({
         );
       }
     },
-    unstakeQuick: async (amount, stakeMarketCoinName, stakeAccountId) => {
+    unstakeQuick: async (
+      amount,
+      stakeMarketCoinName,
+      stakeAccountId,
+      returnSCoin = true
+    ) => {
       const stakeAccounts = await requireStakeAccounts(
         builder,
         txBlock,
         stakeMarketCoinName,
         stakeAccountId
       );
-      const sCoins: TransactionResult[] = [];
+      const toTransfer: TransactionResult[] = [];
       for (const account of stakeAccounts) {
         if (account.staked === 0) continue;
         const amountToUnstake = Math.min(amount, account.staked);
@@ -267,33 +272,56 @@ const generateSpoolQuickMethod: GenerateSpoolQuickMethod = ({
         );
 
         // convert to new sCoin
-        const sCoin = txBlock.mintSCoin(stakeMarketCoinName, marketCoin);
-        sCoins.push(sCoin);
+        if (returnSCoin) {
+          const sCoin = txBlock.mintSCoin(stakeMarketCoinName, marketCoin);
+          toTransfer.push(sCoin);
+        } else {
+          toTransfer.push(marketCoin);
+        }
+
         amount -= amountToUnstake;
         if (amount === 0) break;
       }
 
-      if (sCoins.length > 0) {
-        const mergedSCoin = sCoins[0];
+      if (toTransfer.length > 0) {
+        const mergedCoin = toTransfer[0];
 
-        if (sCoins.length > 1) {
-          txBlock.mergeCoins(mergedSCoin, sCoins.slice(1));
+        if (toTransfer.length > 1) {
+          txBlock.mergeCoins(mergedCoin, toTransfer.slice(1));
         }
-        // check for existing sCoins
-        try {
-          const existingCoins = await builder.utils.selectCoins(
-            Number.MAX_SAFE_INTEGER,
-            builder.utils.parseSCoinType(stakeMarketCoinName),
-            requireSender(txBlock)
-          );
 
-          if (existingCoins.length > 0) {
-            txBlock.mergeCoins(mergedSCoin, existingCoins);
+        if (returnSCoin) {
+          // check for existing sCoins
+          try {
+            const existingCoins = await builder.utils.selectCoins(
+              Number.MAX_SAFE_INTEGER,
+              builder.utils.parseSCoinType(stakeMarketCoinName),
+              requireSender(txBlock)
+            );
+
+            if (existingCoins.length > 0) {
+              txBlock.mergeCoins(mergedCoin, existingCoins);
+            }
+          } catch (e) {
+            // ignore
+          }
+        } else {
+          // check for existing market coins
+          try {
+            const existingCoins = await builder.utils.selectCoins(
+              Number.MAX_SAFE_INTEGER,
+              builder.utils.parseMarketCoinType(stakeMarketCoinName),
+              requireSender(txBlock)
+            );
+
+            if (existingCoins.length > 0) {
+              txBlock.mergeCoins(mergedCoin, existingCoins);
+            }
+          } catch (e) {
+            // ignore
           }
-        } catch (e) {
-          // ignore
         }
-        return mergedSCoin;
+        return mergedCoin;
       }
     },
     claimQuick: async (stakeMarketCoinName, stakeAccountId) => {

package/src/types/builder/spool.ts

@@ -42,7 +42,8 @@ export type SpoolQuickMethods = {
   unstakeQuick(
     amount: number,
     stakeMarketCoinName: SupportStakeMarketCoins,
-    stakeAccountId?: SuiAddressArg
+    stakeAccountId?: SuiAddressArg,
+    returnSCoin?: boolean
   ): Promise<TransactionResult | undefined>;
   claimQuick(
     stakeMarketCoinName: SupportStakeMarketCoins,