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

package/dist/models/scallopClient.d.ts

@@ -298,7 +298,7 @@ export declare class ScallopClient {
      * Function to migrate all market coin in user wallet into sCoin
      * @returns Transaction response
      */
-    migrateAllMarketCoin<S extends boolean>(sign?: S): Promise<ScallopClientFnReturnType<S>>;
+    migrateAllMarketCoin<S extends boolean>(includeStakePool?: boolean, sign?: S): Promise<ScallopClientFnReturnType<S>>;
     /**
      * Claim unlocked SCA from all veSCA accounts.
      */

package/package.json

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

package/src/builders/coreBuilder.ts

@@ -341,47 +341,44 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
       try {
         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: sCoins,
+          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 marketCoins = txBlock.burnSCoin(sCoinName, sCoins);
 
         // check amount
         amount -= totalAmount;
         try {
           if (amount > 0) {
             // sCoin is not enough, try market coin
-            const { leftCoin, takeCoin } = await builder.selectMarketCoin(
-              txBlock,
-              marketCoinName,
-              amount,
-              sender
-            );
+            const { leftCoin, takeCoin: walletMarketCoins } =
+              await builder.selectMarketCoin(
+                txBlock,
+                marketCoinName,
+                amount,
+                sender
+              );
             txBlock.transferObjects([leftCoin], sender);
-            txBlock.mergeCoins(txResult, [
-              txBlock.withdraw(takeCoin, poolCoinName),
-            ]);
+            txBlock.mergeCoins(marketCoins, [walletMarketCoins]);
           }
         } catch (e) {
           // ignore
         }
-        return txResult;
+        return txBlock.withdraw(marketCoins, poolCoinName);
       } catch (e) {
         // no sCoin found
-        const { leftCoin, takeCoin } = await builder.selectMarketCoin(
-          txBlock,
-          marketCoinName,
-          amount,
-          sender
-        );
+        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) => {

package/src/models/scallopClient.ts

@@ -989,6 +989,7 @@ export class ScallopClient {
    * @returns Transaction response
    */
   public async migrateAllMarketCoin<S extends boolean>(
+    includeStakePool: boolean = true,
     sign: S = true as S
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
@@ -1040,18 +1041,20 @@ export class ScallopClient {
           );
           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);
+        if (includeStakePool) {
+          // 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
             }
-          } catch (e: any) {
-            // ignore
           }
         }