@scallop-io/sui-scallop-sdk 0.46.58-alpha.1 → 0.46.60

package/dist/index.js

@@ -5117,41 +5117,37 @@ var generateCoreQuickMethod = ({
         const sCoinName = builder.utils.parseSCoinName(poolCoinName);
         if (!sCoinName)
           throw new Error(`No sCoin for ${poolCoinName}`);
-        const { leftCoin, takeCoin, totalAmount } = await builder.selectSCoin(
-          txBlock,
-          sCoinName,
-          amount,
-          sender
-        );
+        const {
+          leftCoin,
+          takeCoin: sCoins2,
+          totalAmount
+        } = await builder.selectSCoin(txBlock, sCoinName, amount, sender);
         txBlock.transferObjects([leftCoin], sender);
-        const marketCoin = txBlock.burnSCoin(sCoinName, takeCoin);
-        const txResult = txBlock.withdraw(marketCoin, poolCoinName);
+        const marketCoins2 = txBlock.burnSCoin(sCoinName, sCoins2);
         amount -= totalAmount;
         try {
           if (amount > 0) {
-            const { leftCoin: leftCoin2, takeCoin: takeCoin2 } = await builder.selectMarketCoin(
+            const { leftCoin: leftCoin2, takeCoin: walletMarketCoins } = await builder.selectMarketCoin(
               txBlock,
               marketCoinName,
               amount,
               sender
             );
             txBlock.transferObjects([leftCoin2], sender);
-            txBlock.mergeCoins(txResult, [
-              txBlock.withdraw(takeCoin2, poolCoinName)
-            ]);
+            txBlock.mergeCoins(marketCoins2, [walletMarketCoins]);
           }
         } catch (e) {
         }
-        return txResult;
+        return txBlock.withdraw(marketCoins2, poolCoinName);
       } catch (e) {
-        const { leftCoin, takeCoin } = await builder.selectMarketCoin(
+        const { leftCoin, takeCoin: walletMarketCoins } = await builder.selectMarketCoin(
           txBlock,
           marketCoinName,
           amount,
           sender
         );
         txBlock.transferObjects([leftCoin], sender);
-        return txBlock.withdraw(takeCoin, poolCoinName);
+        return txBlock.withdraw(walletMarketCoins, poolCoinName);
       }
     },
     borrowQuick: async (amount, poolCoinName, obligationId, obligationKey) => {
@@ -7739,7 +7735,7 @@ var ScallopClient = class {
    * Function to migrate all market coin in user wallet into sCoin
    * @returns Transaction response
    */
-  async migrateAllMarketCoin(sign = true) {
+  async migrateAllMarketCoin(includeStakePool = true, sign = true) {
     const txBlock = this.builder.createTxBlock();
     txBlock.setSender(this.walletAddress);
     const toTransfer = [];
@@ -7775,16 +7771,18 @@ var ScallopClient = class {
           );
           sCoins2.push(sCoin);
         }
-        if (SUPPORT_SPOOLS.includes(sCoinName)) {
-          try {
-            const sCoin = await txBlock.unstakeQuick(
-              Number.MAX_SAFE_INTEGER,
-              sCoinName
-            );
-            if (sCoin) {
-              sCoins2.push(sCoin);
+        if (includeStakePool) {
+          if (SUPPORT_SPOOLS.includes(sCoinName)) {
+            try {
+              const sCoin = await txBlock.unstakeQuick(
+                Number.MAX_SAFE_INTEGER,
+                sCoinName
+              );
+              if (sCoin) {
+                sCoins2.push(sCoin);
+              }
+            } catch (e) {
             }
-          } catch (e) {
           }
         }
         if (sCoins2.length > 0) {