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

package/dist/index.js

@@ -5869,14 +5869,14 @@ var generateSpoolQuickMethod = ({
         );
       }
     },
-    unstakeQuick: async (amount, stakeMarketCoinName, stakeAccountId) => {
+    unstakeQuick: async (amount, stakeMarketCoinName, stakeAccountId, returnSCoin = true) => {
       const stakeAccounts = await requireStakeAccounts(
         builder,
         txBlock,
         stakeMarketCoinName,
         stakeAccountId
       );
-      const sCoins2 = [];
+      const toTransfer = [];
       for (const account of stakeAccounts) {
         if (account.staked === 0)
           continue;
@@ -5886,28 +5886,48 @@ var generateSpoolQuickMethod = ({
           amountToUnstake,
           stakeMarketCoinName
         );
-        const sCoin = txBlock.mintSCoin(stakeMarketCoinName, marketCoin);
-        sCoins2.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 = sCoins2[0];
-      if (sCoins2.length > 1) {
-        txBlock.mergeCoins(mergedSCoin, sCoins2.slice(1));
-      }
-      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 (toTransfer.length > 0) {
+        const mergedCoin = toTransfer[0];
+        if (toTransfer.length > 1) {
+          txBlock.mergeCoins(mergedCoin, toTransfer.slice(1));
         }
-      } catch (e) {
+        if (returnSCoin) {
+          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) {
+          }
+        } else {
+          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) {
+          }
+        }
+        return mergedCoin;
       }
-      return mergedSCoin;
     },
     claimQuick: async (stakeMarketCoinName, stakeAccountId) => {
       const stakeAccountIds = await requireStakeAccountIds(
@@ -7330,8 +7350,10 @@ var ScallopClient = class {
       stakeAccountId
     );
     const stakeCoinName = this.utils.parseCoinName(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(
         txBlock
@@ -7446,6 +7468,7 @@ var ScallopClient = class {
     const toTransfer = [];
     await Promise.all(
       SUPPORT_SCOIN.map(async (sCoinName) => {
+        const sCoins2 = [];
         let toDestroyMarketCoin;
         try {
           const marketCoins2 = await this.utils.selectCoins(
@@ -7463,23 +7486,6 @@ var ScallopClient = class {
           if (!errMsg.includes("No valid coins found for the transaction"))
             throw e;
         }
-        if (SUPPORT_SPOOLS.includes(sCoinName)) {
-          try {
-            const stakedMarketCoin = await txBlock.unstakeQuick(
-              Number.MAX_SAFE_INTEGER,
-              sCoinName
-            );
-            if (toDestroyMarketCoin) {
-              txBlock.mergeCoins(toDestroyMarketCoin, [stakedMarketCoin]);
-            } else {
-              toDestroyMarketCoin = stakedMarketCoin;
-            }
-          } catch (e) {
-            const errMsg = e.toString();
-            if (!errMsg.includes("No stake account found"))
-              throw e;
-          }
-        }
         if (toDestroyMarketCoin) {
           const sCoin = txBlock.mintSCoin(
             sCoinName,
@@ -7501,7 +7507,29 @@ var ScallopClient = class {
             if (!errMsg.includes("No valid coins found for the transaction"))
               throw e;
           }
-          toTransfer.push(sCoin);
+          sCoins2.push(sCoin);
+        }
+        if (SUPPORT_SPOOLS.includes(sCoinName)) {
+          try {
+            const sCoin = await txBlock.unstakeQuick(
+              Number.MAX_SAFE_INTEGER,
+              sCoinName
+            );
+            if (sCoin) {
+              sCoins2.push(sCoin);
+            }
+          } catch (e) {
+            const errMsg = e.toString();
+            if (!errMsg.includes("No stake account found"))
+              throw e;
+          }
+        }
+        if (sCoins2.length > 0) {
+          const mergedSCoin = sCoins2[0];
+          if (sCoins2.length > 1) {
+            txBlock.mergeCoins(mergedSCoin, sCoins2.slice(1));
+          }
+          toTransfer.push(mergedSCoin);
         }
       })
     );