@scallop-io/sui-scallop-sdk 2.0.5 → 2.0.7

package/package.json

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

package/src/builders/coreBuilder.ts

@@ -359,51 +359,28 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
     },
     withdrawQuick: async (amount, poolCoinName) => {
       const sender = requireSender(txBlock);
-      const marketCoinName = builder.utils.parseMarketCoinName(poolCoinName);
-
       const sCoinName = builder.utils.parseSCoinName(poolCoinName);
       if (!sCoinName) throw new Error(`No sCoin for ${poolCoinName}`);
 
-      // check if user has sCoin instead of marketCoin
-      const {
-        leftCoin,
-        takeCoin: sCoins,
-        totalAmount,
-      } = await builder.selectSCoin(txBlock, sCoinName, amount, sender);
-      if (totalAmount === 0) {
-        const { leftCoin, takeCoin: walletMarketCoins } =
-          await builder.selectMarketCoin(
-            txBlock,
-            marketCoinName,
-            amount,
-            sender
-          );
-        txBlock.transferObjects([leftCoin], sender);
-        return txBlock.withdraw(walletMarketCoins, poolCoinName);
-      }
-
-      txBlock.transferObjects([leftCoin], sender);
-      const marketCoins = txBlock.burnSCoin(sCoinName, sCoins);
+      // eslint-disable-next-line prefer-const
+      let { sCoin, marketCoin } = await builder.selectSCoinOrMarketCoin(
+        txBlock,
+        sCoinName,
+        amount,
+        sender
+      );
 
-      // check amount
-      amount -= totalAmount;
-      try {
-        if (amount > 0) {
-          // sCoin is not enough, try market coin
-          const { leftCoin, takeCoin: walletMarketCoins } =
-            await builder.selectMarketCoin(
-              txBlock,
-              marketCoinName,
-              amount,
-              sender
-            );
-          txBlock.transferObjects([leftCoin], sender);
-          txBlock.mergeCoins(marketCoins, [walletMarketCoins]);
+      if (sCoin) {
+        const newMarketCoin = txBlock.burnSCoin(sCoinName, sCoin);
+        if (marketCoin) {
+          txBlock.mergeCoins(marketCoin, [newMarketCoin]);
+        } else {
+          marketCoin = newMarketCoin;
         }
-      } catch (_e) {
-        // ignore
       }
-      return txBlock.withdraw(marketCoins, poolCoinName);
+
+      if (!marketCoin) throw new Error(`No market coin for ${poolCoinName}`);
+      return txBlock.withdraw(marketCoin, poolCoinName);
     },
     borrowQuick: async (amount, poolCoinName, obligationId, obligationKey) => {
       const obligationInfo = await requireObligationInfo(

package/src/builders/sCoinBuilder.ts

@@ -61,7 +61,7 @@ const generateSCoinQuickMethod: GenerateSCoinQuickMethod = ({
       );
 
       txBlock.transferObjects([leftCoin], sender);
-      return await txBlock.mintSCoin(marketCoinName, takeCoin);
+      return txBlock.mintSCoin(marketCoinName, takeCoin);
     },
     burnSCoinQuick: async (sCoinName, amount) => {
       const sender = requireSender(txBlock);
@@ -73,7 +73,7 @@ const generateSCoinQuickMethod: GenerateSCoinQuickMethod = ({
       );
 
       txBlock.transferObjects([leftCoin], sender);
-      return await txBlock.burnSCoin(sCoinName, takeCoin);
+      return txBlock.burnSCoin(sCoinName, takeCoin);
     },
   };
 };

package/src/models/scallopBuilder.ts

@@ -5,7 +5,10 @@ import { ScallopAddress } from './scallopAddress';
 import { ScallopQuery } from './scallopQuery';
 import { ScallopUtils } from './scallopUtils';
 import type { SuiTransactionBlockResponse } from '@mysten/sui/client';
-import type { Transaction } from '@mysten/sui/transactions';
+import type {
+  Transaction,
+  TransactionObjectArgument,
+} from '@mysten/sui/transactions';
 import type {
   SuiAmountsArg,
   SuiTxBlock as SuiKitTxBlock,
@@ -201,6 +204,79 @@ export class ScallopBuilder {
     };
   }
 
+  /**
+   * Select sCoin or market coin automatically. Prioritize sCoin first
+   */
+  public async selectSCoinOrMarketCoin(
+    txBlock: ScallopTxBlock | SuiKitTxBlock,
+    sCoinName: string,
+    amount: number,
+    sender: string = this.walletAddress
+  ) {
+    let totalAmount = amount;
+    const result = {
+      sCoins: [] as TransactionObjectArgument[],
+      marketCoins: [] as TransactionObjectArgument[],
+      leftCoins: [] as TransactionObjectArgument[],
+    };
+    try {
+      // try sCoin first
+      const {
+        leftCoin,
+        takeCoin,
+        totalAmount: sCoinAmount,
+      } = await this.selectSCoin(txBlock, sCoinName, totalAmount, sender);
+      result.leftCoins.push(leftCoin);
+      result.sCoins.push(takeCoin);
+      totalAmount -= sCoinAmount;
+
+      if (totalAmount > 0) {
+        // sCoin is not enough, try market coin
+        const { leftCoin, takeCoin: marketCoin } = await this.selectMarketCoin(
+          txBlock,
+          sCoinName,
+          amount,
+          sender
+        );
+        txBlock.transferObjects([leftCoin], sender);
+        result.marketCoins.push(marketCoin);
+      }
+    } catch (_e) {
+      // no sCoin, try market coin
+      const { takeCoin: marketCoin, leftCoin } = await this.selectMarketCoin(
+        txBlock,
+        sCoinName,
+        amount,
+        sender
+      );
+      result.leftCoins.push(leftCoin);
+      result.marketCoins.push(marketCoin);
+    }
+
+    txBlock.transferObjects(result.leftCoins, sender);
+
+    // merge sCoins and marketCoins
+    const mergedMarketCoins =
+      result.marketCoins.length > 0
+        ? result.marketCoins.length > 1
+          ? txBlock.mergeCoins(
+              result.marketCoins[0],
+              result.marketCoins.slice(1)
+            )
+          : result.marketCoins[0]
+        : undefined;
+    const mergedSCoins =
+      result.sCoins.length > 0
+        ? result.sCoins.length > 1
+          ? txBlock.mergeCoins(result.sCoins[0], result.sCoins.slice(1))
+          : result.sCoins[0]
+        : undefined;
+    return {
+      sCoin: mergedSCoins,
+      marketCoin: mergedMarketCoins,
+    };
+  }
+
   /**
    * Execute Scallop txBlock using the `signAndSendTxn` methods in suikit.
    *

package/src/models/scallopCache.ts

@@ -82,7 +82,7 @@ export class ScallopCache {
   private lastRefill: number;
 
   public constructor(
-    params: ScallopCacheParams,
+    params: ScallopCacheParams = {},
     instance?: ScallopCacheInstanceParams
   ) {
     this.params = params;

package/src/models/scallopConstants.ts

@@ -210,7 +210,7 @@ export class ScallopConstants {
     if (this.isEmptyObject(this._coinNameToOldMarketCoinTypeMap))
       this._coinNameToOldMarketCoinTypeMap = Object.fromEntries(
         Object.entries(this.poolAddresses)
-          .filter(([_, value]) => !!value && value.spool)
+          .filter(([_, value]) => !!value)
           .map(([_, value]) => [
             value!.coinName,
             this.parseToOldMarketCoin(value!.coinType),