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

package/package.json

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

package/src/builders/spoolBuilder.ts

@@ -90,15 +90,15 @@ const stakeHelper = async (
   builder: ScallopBuilder,
   txBlock: SuiTxBlockWithSpoolNormalMethods,
   stakeAccount: SuiAddressArg,
-  coinType: string,
   coinName: SupportStakeMarketCoins,
   amount: number,
   sender: string,
   isSCoin: boolean = 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);
@@ -106,9 +106,9 @@ const stakeHelper = async (
       txBlock.stake(stakeAccount, takeCoin, coinName);
     }
     txBlock.transferObjects([leftCoin], sender);
-    return true;
+    return totalAmount;
   } catch (e) {
-    return false;
+    return 0;
   }
 };
 
@@ -213,28 +213,24 @@ const generateSpoolQuickMethod: GenerateSpoolQuickMethod = ({
         stakeAccountId
       );
 
-      const marketCoinType =
-        builder.utils.parseMarketCoinType(stakeMarketCoinName);
-      const sCoinType = builder.utils.parseSCoinType(stakeMarketCoinName);
       if (typeof amountOrMarketCoin === 'number') {
         // try stake market coin
-        const stakeMarketCoinRes = await stakeHelper(
+        const stakedMarketCoinAmount = await stakeHelper(
           builder,
           txBlock,
           stakeAccountIds[0],
-          marketCoinType,
           stakeMarketCoinName,
           amountOrMarketCoin,
           sender
         );
 
+        amountOrMarketCoin -= stakedMarketCoinAmount;
         // no market coin, try sCoin
-        if (!stakeMarketCoinRes) {
+        if (amountOrMarketCoin > 0) {
           await stakeHelper(
             builder,
             txBlock,
             stakeAccountIds[0],
-            sCoinType,
             stakeMarketCoinName,
             amountOrMarketCoin,
             sender,

package/src/models/scallopClient.ts

@@ -991,12 +991,10 @@ export class ScallopClient {
             this.walletAddress
           ); // throw error no coins found
 
-          const mergedMarketCoin = marketCoins[0];
+          toDestroyMarketCoin = marketCoins[0];
           if (marketCoins.length > 1) {
-            txBlock.mergeCoins(mergedMarketCoin, marketCoins.slice(1));
+            txBlock.mergeCoins(toDestroyMarketCoin, marketCoins.slice(1));
           }
-
-          toDestroyMarketCoin = mergedMarketCoin;
         } catch (e: any) {
           // Ignore
           const errMsg = e.toString() as String;
@@ -1018,23 +1016,13 @@ export class ScallopClient {
               Number.MAX_SAFE_INTEGER,
               this.utils.parseSCoinType(sCoinName as SupportSCoin),
               this.walletAddress
-            ); // throw error on no coins found
-            const mergedSCoin = existSCoins[0];
-            if (existSCoins.length > 1) {
-              txBlock.mergeCoins(mergedSCoin, existSCoins.slice(1));
-            }
-
-            // merge existing sCoin to new sCoin
-            txBlock.mergeCoins(sCoin, [mergedSCoin]);
+            );
+            txBlock.mergeCoins(sCoin, existSCoins);
           } catch (e: any) {
             // ignore
-            const errMsg = e.toString() as String;
-            if (!errMsg.includes('No valid coins found for the transaction'))
-              throw e;
           }
           sCoins.push(sCoin);
         }
-
         // check for staked market coin in spool
         if (SUPPORT_SPOOLS.includes(sCoinName as SupportStakeMarketCoins)) {
           try {
@@ -1047,8 +1035,6 @@ export class ScallopClient {
             }
           } catch (e: any) {
             // ignore
-            const errMsg = e.toString();
-            if (!errMsg.includes('No stake account found')) throw e;
           }
         }