@scallop-io/sui-scallop-sdk 0.46.52 → 0.46.53

package/dist/index.js

@@ -5769,10 +5769,9 @@ var requireStakeAccounts = async (...params) => {
   }) : stakeAccounts[stakeMarketCoinName];
   return specificStakeAccounts;
 };
-var stakeHelper = async (builder, txBlock, stakeAccount, coinType, coinName, amount, sender, isSCoin = false) => {
+var stakeHelper = async (builder, txBlock, stakeAccount, coinName, amount, sender, isSCoin = false) => {
   try {
-    const coins = await builder.utils.selectCoins(amount, coinType, sender);
-    const [takeCoin, leftCoin] = txBlock.takeAmountFromCoins(coins, amount);
+    const { takeCoin, leftCoin, totalAmount } = isSCoin ? await builder.selectSCoin(txBlock, coinName, amount, sender) : await builder.selectMarketCoin(txBlock, coinName, amount, sender);
     if (isSCoin) {
       const marketCoin = txBlock.burnSCoin(coinName, takeCoin);
       txBlock.stake(stakeAccount, marketCoin, coinName);
@@ -5780,9 +5779,9 @@ var stakeHelper = async (builder, txBlock, stakeAccount, coinType, coinName, amo
       txBlock.stake(stakeAccount, takeCoin, coinName);
     }
     txBlock.transferObjects([leftCoin], sender);
-    return true;
+    return totalAmount;
   } catch (e) {
-    return false;
+    return 0;
   }
 };
 var generateSpoolNormalMethod = ({
@@ -5857,24 +5856,21 @@ var generateSpoolQuickMethod = ({
         stakeMarketCoinName,
         stakeAccountId
       );
-      const marketCoinType = builder.utils.parseMarketCoinType(stakeMarketCoinName);
-      const sCoinType = builder.utils.parseSCoinType(stakeMarketCoinName);
       if (typeof amountOrMarketCoin === "number") {
-        const stakeMarketCoinRes = await stakeHelper(
+        const stakedMarketCoinAmount = await stakeHelper(
           builder,
           txBlock,
           stakeAccountIds[0],
-          marketCoinType,
           stakeMarketCoinName,
           amountOrMarketCoin,
           sender
         );
-        if (!stakeMarketCoinRes) {
+        amountOrMarketCoin -= stakedMarketCoinAmount;
+        if (amountOrMarketCoin > 0) {
           await stakeHelper(
             builder,
             txBlock,
             stakeAccountIds[0],
-            sCoinType,
             stakeMarketCoinName,
             amountOrMarketCoin,
             sender,
@@ -7499,11 +7495,10 @@ var ScallopClient = class {
             this.utils.parseMarketCoinType(sCoinName),
             this.walletAddress
           );
-          const mergedMarketCoin = marketCoins2[0];
+          toDestroyMarketCoin = marketCoins2[0];
           if (marketCoins2.length > 1) {
-            txBlock.mergeCoins(mergedMarketCoin, marketCoins2.slice(1));
+            txBlock.mergeCoins(toDestroyMarketCoin, marketCoins2.slice(1));
           }
-          toDestroyMarketCoin = mergedMarketCoin;
         } catch (e) {
           const errMsg = e.toString();
           if (!errMsg.includes("No valid coins found for the transaction"))
@@ -7520,15 +7515,8 @@ var ScallopClient = class {
               this.utils.parseSCoinType(sCoinName),
               this.walletAddress
             );
-            const mergedSCoin = existSCoins[0];
-            if (existSCoins.length > 1) {
-              txBlock.mergeCoins(mergedSCoin, existSCoins.slice(1));
-            }
-            txBlock.mergeCoins(sCoin, [mergedSCoin]);
+            txBlock.mergeCoins(sCoin, existSCoins);
           } catch (e) {
-            const errMsg = e.toString();
-            if (!errMsg.includes("No valid coins found for the transaction"))
-              throw e;
           }
           sCoins2.push(sCoin);
         }
@@ -7542,9 +7530,6 @@ var ScallopClient = class {
               sCoins2.push(sCoin);
             }
           } catch (e) {
-            const errMsg = e.toString();
-            if (!errMsg.includes("No stake account found"))
-              throw e;
           }
         }
         if (sCoins2.length > 0) {