@scallop-io/sui-scallop-sdk 0.46.42 → 0.46.44

package/dist/builders/coreBuilder.d.ts

@@ -1,7 +1,7 @@
 import { TransactionBlock } from '@mysten/sui.js/transactions';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from '../models';
-import type { CoreTxBlock, ScallopTxBlock } from '../types';
+import type { CoreTxBlock, ScallopTxBlock, SuiTxBlockWithSpool } from '../types';
 /**
  * Create an enhanced transaction block instance for interaction with core modules of the Scallop contract.
  *
@@ -9,4 +9,4 @@ import type { CoreTxBlock, ScallopTxBlock } from '../types';
  * @param initTxBlock - Scallop txBlock, txBlock created by SuiKit, or original transaction block.
  * @return Scallop core txBlock.
  */
-export declare const newCoreTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock) => CoreTxBlock;
+export declare const newCoreTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock | SuiTxBlockWithSpool) => CoreTxBlock;

package/dist/builders/sCoinBuilder.d.ts

@@ -1,4 +1,4 @@
 import { TransactionBlock, SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import { ScallopBuilder } from 'src/models';
-import { SCoinTxBlock, ScallopTxBlock } from 'src/types';
-export declare const newSCoinTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock) => SCoinTxBlock;
+import { BaseScallopTxBlock, SCoinTxBlock, ScallopTxBlock } from 'src/types';
+export declare const newSCoinTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock | BaseScallopTxBlock) => SCoinTxBlock;

package/dist/builders/spoolBuilder.d.ts

@@ -1,7 +1,7 @@
 import { TransactionBlock } from '@mysten/sui.js/transactions';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from '../models';
-import type { SpoolTxBlock, ScallopTxBlock } from '../types';
+import type { SpoolTxBlock, ScallopTxBlock, SuiTxBlockWithSCoin } from '../types';
 /**
  * Create an enhanced transaction block instance for interaction with spool modules of the Scallop contract.
  *
@@ -9,4 +9,4 @@ import type { SpoolTxBlock, ScallopTxBlock } from '../types';
  * @param initTxBlock - Scallop txBlock, txBlock created by SuiKit, or original transaction block.
  * @return Scallop spool txBlock.
  */
-export declare const newSpoolTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock) => SpoolTxBlock;
+export declare const newSpoolTxBlock: (builder: ScallopBuilder, initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock | SuiTxBlockWithSCoin) => SpoolTxBlock;

package/dist/index.js

@@ -3465,7 +3465,9 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
   const marketCoinPrice = (0, import_bignumber4.default)(coinPrice ?? 0).multipliedBy(
     marketPool?.conversionRate ?? 1
   );
-  const unstakedMarketAmount = (0, import_bignumber4.default)(marketCoinAmount);
+  const unstakedMarketAmount = (0, import_bignumber4.default)(marketCoinAmount).plus(
+    (0, import_bignumber4.default)(sCoinAmount)
+  );
   const unstakedMarketCoin = unstakedMarketAmount.shiftedBy(-1 * coinDecimal);
   const availableSupplyAmount = (0, import_bignumber4.default)(coinAmount);
   const availableSupplyCoin = availableSupplyAmount.shiftedBy(-1 * coinDecimal);
@@ -5747,6 +5749,22 @@ var requireStakeAccounts = async (...params) => {
   }) : stakeAccounts[stakeMarketCoinName];
   return specificStakeAccounts;
 };
+var stakeHelper = async (builder, txBlock, stakeAccount, coinType, coinName, amount, sender, isSCoin = false) => {
+  try {
+    const coins = await builder.utils.selectCoins(amount, coinType, sender);
+    const [takeCoin, leftCoin] = txBlock.takeAmountFromCoins(coins, amount);
+    if (isSCoin) {
+      const marketCoin = txBlock.burnSCoin(coinName, takeCoin);
+      txBlock.stake(stakeAccount, marketCoin, coinName);
+    } else {
+      txBlock.stake(stakeAccount, takeCoin, coinName);
+    }
+    txBlock.transferObjects([leftCoin], sender);
+    return true;
+  } catch (e) {
+    return false;
+  }
+};
 var generateSpoolNormalMethod = ({
   builder,
   txBlock
@@ -5820,18 +5838,29 @@ var generateSpoolQuickMethod = ({
         stakeAccountId
       );
       const marketCoinType = builder.utils.parseMarketCoinType(stakeMarketCoinName);
+      const sCoinType = builder.utils.parseSCoinType(stakeMarketCoinName);
       if (typeof amountOrMarketCoin === "number") {
-        const coins = await builder.utils.selectCoins(
-          amountOrMarketCoin,
+        const stakeMarketCoinRes = await stakeHelper(
+          builder,
+          txBlock,
+          stakeAccountIds[0],
           marketCoinType,
+          stakeMarketCoinName,
+          amountOrMarketCoin,
           sender
         );
-        const [takeCoin, leftCoin] = txBlock.takeAmountFromCoins(
-          coins,
-          amountOrMarketCoin
-        );
-        txBlock.stake(stakeAccountIds[0], takeCoin, stakeMarketCoinName);
-        txBlock.transferObjects([leftCoin], sender);
+        if (!stakeMarketCoinRes) {
+          await stakeHelper(
+            builder,
+            txBlock,
+            stakeAccountIds[0],
+            sCoinType,
+            stakeMarketCoinName,
+            amountOrMarketCoin,
+            sender,
+            true
+          );
+        }
       } else {
         txBlock.stake(
           stakeAccountIds[0],
@@ -5847,7 +5876,7 @@ var generateSpoolQuickMethod = ({
         stakeMarketCoinName,
         stakeAccountId
       );
-      const stakeMarketCoins2 = [];
+      const sCoins2 = [];
       for (const account of stakeAccounts) {
         if (account.staked === 0)
           continue;
@@ -5857,12 +5886,28 @@ var generateSpoolQuickMethod = ({
           amountToUnstake,
           stakeMarketCoinName
         );
-        stakeMarketCoins2.push(marketCoin);
+        const sCoin = txBlock.mintSCoin(stakeMarketCoinName, marketCoin);
+        sCoins2.push(sCoin);
         amount -= amountToUnstake;
         if (amount === 0)
           break;
       }
-      return stakeMarketCoins2;
+      const mergedSCoin = sCoins2[0];
+      if (sCoins2.length > 1) {
+        txBlock.mergeCoins(mergedSCoin, sCoins2.slice(1));
+      }
+      try {
+        const existingCoins = await builder.utils.selectCoins(
+          Number.MAX_SAFE_INTEGER,
+          builder.utils.parseSCoinType(stakeMarketCoinName),
+          requireSender(txBlock)
+        );
+        if (existingCoins.length > 0) {
+          txBlock.mergeCoins(mergedSCoin, existingCoins);
+        }
+      } catch (e) {
+      }
+      return mergedSCoin;
     },
     claimQuick: async (stakeMarketCoinName, stakeAccountId) => {
       const stakeAccountIds = await requireStakeAccountIds(
@@ -6732,9 +6777,9 @@ var newScallopTxBlock = (builder, initTxBlock) => {
     loyaltyTxBlock
   );
   const referralTxBlock = newReferralTxBlock(builder, borrowIncentiveTxBlock);
-  const spoolTxBlock = newSpoolTxBlock(builder, referralTxBlock);
-  const sCoinTxBlock = newSCoinTxBlock(builder, spoolTxBlock);
-  const coreTxBlock = newCoreTxBlock(builder, sCoinTxBlock);
+  const sCoinTxBlock = newSCoinTxBlock(builder, referralTxBlock);
+  const spoolTxBlock = newSpoolTxBlock(builder, sCoinTxBlock);
+  const coreTxBlock = newCoreTxBlock(builder, spoolTxBlock);
   return new Proxy(coreTxBlock, {
     get: (target, prop) => {
       if (prop in vescaTxBlock) {
@@ -7090,8 +7135,8 @@ var ScallopClient = class {
     const txBlock = this.builder.createTxBlock();
     const sender = walletAddress || this.walletAddress;
     txBlock.setSender(sender);
-    const marketCoin = await txBlock.depositQuick(amount, poolCoinName);
-    txBlock.transferObjects([marketCoin], sender);
+    const sCoin = await txBlock.depositQuick(amount, poolCoinName);
+    txBlock.transferObjects([sCoin], sender);
     if (sign) {
       return await this.suiKit.signAndSendTxn(
         txBlock
@@ -7107,7 +7152,7 @@ var ScallopClient = class {
     const stakeMarketCoinName = this.utils.parseMarketCoinName(stakeCoinName);
     const stakeAccounts = await this.query.getStakeAccounts(stakeMarketCoinName);
     const targetStakeAccount = stakeAccountId || stakeAccounts[0].id;
-    const marketCoin = await txBlock.depositQuick(amount, stakeCoinName);
+    const marketCoin = await txBlock.depositQuick(amount, stakeCoinName, false);
     if (targetStakeAccount) {
       await txBlock.stakeQuick(
         marketCoin,