@scallop-io/sui-scallop-sdk 0.46.46 → 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>;
+    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.46",
+  "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,32 +272,57 @@ 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;
       }
 
-      const mergedSCoin = sCoins[0];
-      if (sCoins.length > 1) {
-        txBlock.mergeCoins(mergedSCoin, sCoins.slice(1));
-      }
+      if (toTransfer.length > 0) {
+        const mergedCoin = toTransfer[0];
 
-      // check for existing sCoins
-      try {
-        const existingCoins = await builder.utils.selectCoins(
-          Number.MAX_SAFE_INTEGER,
-          builder.utils.parseSCoinType(stakeMarketCoinName),
-          requireSender(txBlock)
-        );
+        if (toTransfer.length > 1) {
+          txBlock.mergeCoins(mergedCoin, toTransfer.slice(1));
+        }
+
+        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(mergedSCoin, existingCoins);
+            if (existingCoins.length > 0) {
+              txBlock.mergeCoins(mergedCoin, existingCoins);
+            }
+          } catch (e) {
+            // ignore
+          }
         }
-      } catch (e) {
-        // ignore
+        return mergedCoin;
       }
-      return mergedSCoin;
     },
     claimQuick: async (stakeMarketCoinName, stakeAccountId) => {
       const stakeAccountIds = await requireStakeAccountIds(

package/src/models/scallopClient.ts

@@ -797,9 +797,10 @@ export class ScallopClient {
     );
     const stakeCoinName =
       this.utils.parseCoinName<SupportStakeCoins>(stakeMarketCoinName);
-    const coin = txBlock.withdraw(stakeMarketCoin, stakeCoinName);
-
-    txBlock.transferObjects([coin], sender);
+    if (stakeMarketCoin) {
+      const coin = txBlock.withdraw(stakeMarketCoin, stakeCoinName);
+      txBlock.transferObjects([coin], sender);
+    }
 
     if (sign) {
       return (await this.suiKit.signAndSendTxn(
@@ -976,6 +977,7 @@ export class ScallopClient {
          * First check marketCoin inside mini wallet
          * Then check stakedMarketCoin inside spool
          */
+        const sCoins: SuiObjectArg[] = [];
         let toDestroyMarketCoin: SuiObjectArg | undefined;
 
         // check market coin in mini wallet
@@ -999,26 +1001,6 @@ export class ScallopClient {
             throw e;
         }
 
-        // check for staked market coin in spool
-        if (SUPPORT_SPOOLS.includes(sCoinName as SupportStakeMarketCoins)) {
-          try {
-            const stakedMarketCoin = await txBlock.unstakeQuick(
-              Number.MAX_SAFE_INTEGER,
-              sCoinName as SupportStakeMarketCoins
-            );
-            // merge with takeMarketCoin
-            if (toDestroyMarketCoin) {
-              txBlock.mergeCoins(toDestroyMarketCoin, [stakedMarketCoin]);
-            } else {
-              toDestroyMarketCoin = stakedMarketCoin;
-            }
-          } catch (e: any) {
-            // ignore
-            const errMsg = e.toString();
-            if (!errMsg.includes('No stake account found')) throw e;
-          }
-        }
-
         // if market coin found, mint sCoin
         if (toDestroyMarketCoin) {
           // mint new sCoin
@@ -1047,7 +1029,33 @@ export class ScallopClient {
             if (!errMsg.includes('No valid coins found for the transaction'))
               throw e;
           }
-          toTransfer.push(sCoin);
+          sCoins.push(sCoin);
+        }
+
+        // check for staked market coin in spool
+        if (SUPPORT_SPOOLS.includes(sCoinName as SupportStakeMarketCoins)) {
+          try {
+            const sCoin = await txBlock.unstakeQuick(
+              Number.MAX_SAFE_INTEGER,
+              sCoinName as SupportStakeMarketCoins
+            );
+            if (sCoin) {
+              sCoins.push(sCoin);
+            }
+          } catch (e: any) {
+            // ignore
+            const errMsg = e.toString();
+            if (!errMsg.includes('No stake account found')) throw e;
+          }
+        }
+
+        if (sCoins.length > 0) {
+          const mergedSCoin = sCoins[0];
+          if (sCoins.length > 1) {
+            txBlock.mergeCoins(mergedSCoin, sCoins.slice(1));
+          }
+
+          toTransfer.push(mergedSCoin);
         }
       })
     );

package/src/types/builder/spool.ts

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