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

package/dist/types/builder/core.d.ts

@@ -2,7 +2,7 @@ import type { SuiTxBlock as SuiKitTxBlock, SuiAddressArg, SuiObjectArg, SuiTxArg
 import type { TransactionArgument, TransactionResult } from '@mysten/sui.js/transactions';
 import type { ScallopBuilder } from '../../models';
 import type { SupportCollateralCoins, SupportPoolCoins, SupportAssetCoins } from '../constant';
-import { ScallopTxBlockWithoutCoreTxBlock } from '.';
+import { SuiTxBlockWithSpool } from '.';
 export type CoreIds = {
     protocolPkg: string;
     market: string;
@@ -43,7 +43,7 @@ export type CoreQuickMethods = {
     repayQuick: (amount: number, poolCoinName: SupportPoolCoins, obligationId?: SuiAddressArg) => Promise<void>;
     updateAssetPricesQuick: (assetCoinNames?: SupportAssetCoins[]) => Promise<void>;
 };
-export type SuiTxBlockWithCoreNormalMethods = SuiKitTxBlock & ScallopTxBlockWithoutCoreTxBlock & CoreNormalMethods;
+export type SuiTxBlockWithCoreNormalMethods = SuiKitTxBlock & SuiTxBlockWithSpool & CoreNormalMethods;
 export type CoreTxBlock = SuiTxBlockWithCoreNormalMethods & CoreQuickMethods;
 export type GenerateCoreNormalMethod = (params: {
     builder: ScallopBuilder;

package/dist/types/builder/index.d.ts

@@ -12,6 +12,6 @@ export type * from './vesca';
 export type * from './loyaltyProgram';
 export type * from './sCoin';
 export type BaseScallopTxBlock = ReferralTxBlock & LoyaltyProgramTxBlock & BorrowIncentiveTxBlock & VeScaTxBlock;
-export type ScallopTxBlockWithoutSCoinTxBlock = SpoolTxBlock & BaseScallopTxBlock;
-export type ScallopTxBlockWithoutCoreTxBlock = SCoinTxBlock & ScallopTxBlockWithoutSCoinTxBlock;
-export type ScallopTxBlock = CoreTxBlock & ScallopTxBlockWithoutCoreTxBlock;
+export type SuiTxBlockWithSCoin = BaseScallopTxBlock & SCoinTxBlock;
+export type SuiTxBlockWithSpool = SuiTxBlockWithSCoin & SpoolTxBlock;
+export type ScallopTxBlock = SuiTxBlockWithSpool & CoreTxBlock;

package/dist/types/builder/sCoin.d.ts

@@ -1,7 +1,7 @@
 import { SuiObjectArg, SuiTxBlock as SuiKitTxBlock, TransactionResult } from '@scallop-io/sui-kit';
 import { SupportSCoin } from '../constant';
 import { ScallopBuilder } from 'src/models';
-import { ScallopTxBlockWithoutSCoinTxBlock } from '.';
+import { BaseScallopTxBlock } from '.';
 export type sCoinPkgIds = {
     pkgId: string;
 };
@@ -25,7 +25,7 @@ export type sCoinQuickMethods = {
     mintSCoinQuick: (marketCoinName: SupportSCoin, amount: number) => Promise<TransactionResult>;
     burnSCoinQuick: (sCoinName: SupportSCoin, amount: number) => Promise<TransactionResult>;
 };
-export type SuiTxBlockWithSCoinNormalMethods = SuiKitTxBlock & ScallopTxBlockWithoutSCoinTxBlock & sCoinNormalMethods;
+export type SuiTxBlockWithSCoinNormalMethods = SuiKitTxBlock & BaseScallopTxBlock & sCoinNormalMethods;
 export type SCoinTxBlock = SuiTxBlockWithSCoinNormalMethods & sCoinQuickMethods;
 export type GenerateSCoinNormalMethod = (params: {
     builder: ScallopBuilder;

package/dist/types/builder/spool.d.ts

@@ -2,7 +2,7 @@ import type { SuiTxBlock as SuiKitTxBlock, SuiAddressArg, SuiObjectArg, SuiTxArg
 import type { TransactionResult } from '@mysten/sui.js/transactions';
 import type { ScallopBuilder } from '../../models';
 import type { SupportStakeMarketCoins } from '../constant';
-import { BaseScallopTxBlock } from '.';
+import { SuiTxBlockWithSCoin } from '.';
 export type SpoolIds = {
     spoolPkg: string;
 };
@@ -14,10 +14,10 @@ export type SpoolNormalMethods = {
 };
 export type SpoolQuickMethods = {
     stakeQuick(amountOrMarketCoin: SuiObjectArg | number, stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg): Promise<void>;
-    unstakeQuick(amount: number, stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg): Promise<TransactionResult[]>;
+    unstakeQuick(amount: number, stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg): Promise<TransactionResult>;
     claimQuick(stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg): Promise<TransactionResult[]>;
 };
-export type SuiTxBlockWithSpoolNormalMethods = SuiKitTxBlock & BaseScallopTxBlock & SpoolNormalMethods;
+export type SuiTxBlockWithSpoolNormalMethods = SuiKitTxBlock & SuiTxBlockWithSCoin & SpoolNormalMethods;
 export type SpoolTxBlock = SuiTxBlockWithSpoolNormalMethods & SpoolQuickMethods;
 export type GenerateSpoolNormalMethod = (params: {
     builder: ScallopBuilder;

package/package.json

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

package/src/builders/coreBuilder.ts

@@ -14,6 +14,7 @@ import type {
   CoreTxBlock,
   ScallopTxBlock,
   NestedResult,
+  SuiTxBlockWithSpool,
 } from '../types';
 
 /**
@@ -473,7 +474,11 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
  */
 export const newCoreTxBlock = (
   builder: ScallopBuilder,
-  initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock
+  initTxBlock?:
+    | ScallopTxBlock
+    | SuiKitTxBlock
+    | TransactionBlock
+    | SuiTxBlockWithSpool
 ) => {
   const txBlock =
     initTxBlock instanceof TransactionBlock

package/src/builders/index.ts

@@ -28,9 +28,9 @@ export const newScallopTxBlock = (
     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) => {

package/src/builders/sCoinBuilder.ts

@@ -4,6 +4,7 @@ import {
 } from '@scallop-io/sui-kit';
 import { ScallopBuilder } from 'src/models';
 import {
+  BaseScallopTxBlock,
   GenerateSCoinNormalMethod,
   GenerateSCoinQuickMethod,
   SCoinTxBlock,
@@ -79,7 +80,11 @@ const generateSCoinQuickMethod: GenerateSCoinQuickMethod = ({
 
 export const newSCoinTxBlock = (
   builder: ScallopBuilder,
-  initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock
+  initTxBlock?:
+    | ScallopTxBlock
+    | SuiKitTxBlock
+    | TransactionBlock
+    | BaseScallopTxBlock
 ) => {
   const txBlock =
     initTxBlock instanceof TransactionBlock

package/src/builders/spoolBuilder.ts

@@ -15,6 +15,7 @@ import type {
   SpoolTxBlock,
   SupportStakeMarketCoins,
   ScallopTxBlock,
+  SuiTxBlockWithSCoin,
 } from '../types';
 
 /**
@@ -85,6 +86,32 @@ const requireStakeAccounts = async (
   return specificStakeAccounts;
 };
 
+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);
+    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;
+  }
+};
+
 /**
  * Generate spool normal methods.
  *
@@ -188,18 +215,32 @@ const generateSpoolQuickMethod: GenerateSpoolQuickMethod = ({
 
       const marketCoinType =
         builder.utils.parseMarketCoinType(stakeMarketCoinName);
+      const sCoinType = builder.utils.parseSCoinType(stakeMarketCoinName);
       if (typeof amountOrMarketCoin === 'number') {
-        const coins = await builder.utils.selectCoins(
-          amountOrMarketCoin,
+        // try stake market coin
+        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);
+
+        // no market coin, try sCoin
+        if (!stakeMarketCoinRes) {
+          await stakeHelper(
+            builder,
+            txBlock,
+            stakeAccountIds[0],
+            sCoinType,
+            stakeMarketCoinName,
+            amountOrMarketCoin,
+            sender,
+            true
+          );
+        }
       } else {
         txBlock.stake(
           stakeAccountIds[0],
@@ -215,7 +256,7 @@ const generateSpoolQuickMethod: GenerateSpoolQuickMethod = ({
         stakeMarketCoinName,
         stakeAccountId
       );
-      const stakeMarketCoins: TransactionResult[] = [];
+      const sCoins: TransactionResult[] = [];
       for (const account of stakeAccounts) {
         if (account.staked === 0) continue;
         const amountToUnstake = Math.min(amount, account.staked);
@@ -224,11 +265,34 @@ const generateSpoolQuickMethod: GenerateSpoolQuickMethod = ({
           amountToUnstake,
           stakeMarketCoinName
         );
-        stakeMarketCoins.push(marketCoin);
+
+        // convert to new sCoin
+        const sCoin = txBlock.mintSCoin(stakeMarketCoinName, marketCoin);
+        sCoins.push(sCoin);
         amount -= amountToUnstake;
         if (amount === 0) break;
       }
-      return stakeMarketCoins;
+
+      const mergedSCoin = sCoins[0];
+      if (sCoins.length > 1) {
+        txBlock.mergeCoins(mergedSCoin, sCoins.slice(1));
+      }
+
+      // check for existing sCoins
+      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) {
+        // ignore
+      }
+      return mergedSCoin;
     },
     claimQuick: async (stakeMarketCoinName, stakeAccountId) => {
       const stakeAccountIds = await requireStakeAccountIds(
@@ -256,7 +320,11 @@ const generateSpoolQuickMethod: GenerateSpoolQuickMethod = ({
  */
 export const newSpoolTxBlock = (
   builder: ScallopBuilder,
-  initTxBlock?: ScallopTxBlock | SuiKitTxBlock | TransactionBlock
+  initTxBlock?:
+    | ScallopTxBlock
+    | SuiKitTxBlock
+    | TransactionBlock
+    | SuiTxBlockWithSCoin
 ) => {
   const txBlock =
     initTxBlock instanceof TransactionBlock

package/src/models/scallopClient.ts

@@ -364,8 +364,8 @@ export class ScallopClient {
     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(
@@ -414,7 +414,7 @@ export class ScallopClient {
       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,

package/src/queries/portfolioQuery.ts

@@ -219,7 +219,9 @@ export const getLending = async (
   const marketCoinPrice = BigNumber(coinPrice ?? 0).multipliedBy(
     marketPool?.conversionRate ?? 1
   );
-  const unstakedMarketAmount = BigNumber(marketCoinAmount);
+  const unstakedMarketAmount = BigNumber(marketCoinAmount).plus(
+    BigNumber(sCoinAmount)
+  );
   const unstakedMarketCoin = unstakedMarketAmount.shiftedBy(-1 * coinDecimal);
 
   const availableSupplyAmount = BigNumber(coinAmount);

package/src/types/builder/core.ts

@@ -14,7 +14,7 @@ import type {
   SupportPoolCoins,
   SupportAssetCoins,
 } from '../constant';
-import { ScallopTxBlockWithoutCoreTxBlock } from '.';
+import { SuiTxBlockWithSpool } from '.';
 
 export type CoreIds = {
   protocolPkg: string;
@@ -143,7 +143,7 @@ export type CoreQuickMethods = {
 };
 
 export type SuiTxBlockWithCoreNormalMethods = SuiKitTxBlock &
-  ScallopTxBlockWithoutCoreTxBlock &
+  SuiTxBlockWithSpool &
   CoreNormalMethods;
 
 export type CoreTxBlock = SuiTxBlockWithCoreNormalMethods & CoreQuickMethods;

package/src/types/builder/index.ts

@@ -18,10 +18,6 @@ export type BaseScallopTxBlock = ReferralTxBlock &
   BorrowIncentiveTxBlock &
   VeScaTxBlock;
 
-export type ScallopTxBlockWithoutSCoinTxBlock = SpoolTxBlock &
-  BaseScallopTxBlock;
-
-export type ScallopTxBlockWithoutCoreTxBlock = SCoinTxBlock &
-  ScallopTxBlockWithoutSCoinTxBlock;
-
-export type ScallopTxBlock = CoreTxBlock & ScallopTxBlockWithoutCoreTxBlock;
+export type SuiTxBlockWithSCoin = BaseScallopTxBlock & SCoinTxBlock;
+export type SuiTxBlockWithSpool = SuiTxBlockWithSCoin & SpoolTxBlock;
+export type ScallopTxBlock = SuiTxBlockWithSpool & CoreTxBlock;

package/src/types/builder/sCoin.ts

@@ -5,7 +5,7 @@ import {
 } from '@scallop-io/sui-kit';
 import { SupportSCoin } from '../constant';
 import { ScallopBuilder } from 'src/models';
-import { ScallopTxBlockWithoutSCoinTxBlock } from '.';
+import { BaseScallopTxBlock } from '.';
 
 export type sCoinPkgIds = {
   pkgId: string;
@@ -46,7 +46,7 @@ export type sCoinQuickMethods = {
 };
 
 export type SuiTxBlockWithSCoinNormalMethods = SuiKitTxBlock &
-  ScallopTxBlockWithoutSCoinTxBlock &
+  BaseScallopTxBlock &
   sCoinNormalMethods;
 export type SCoinTxBlock = SuiTxBlockWithSCoinNormalMethods & sCoinQuickMethods;
 

package/src/types/builder/spool.ts

@@ -7,7 +7,7 @@ import type {
 import type { TransactionResult } from '@mysten/sui.js/transactions';
 import type { ScallopBuilder } from '../../models';
 import type { SupportStakeMarketCoins } from '../constant';
-import { BaseScallopTxBlock } from '.';
+import { SuiTxBlockWithSCoin } from '.';
 
 export type SpoolIds = {
   spoolPkg: string;
@@ -43,7 +43,7 @@ export type SpoolQuickMethods = {
     amount: number,
     stakeMarketCoinName: SupportStakeMarketCoins,
     stakeAccountId?: SuiAddressArg
-  ): Promise<TransactionResult[]>;
+  ): Promise<TransactionResult>;
   claimQuick(
     stakeMarketCoinName: SupportStakeMarketCoins,
     stakeAccountId?: SuiAddressArg
@@ -51,7 +51,7 @@ export type SpoolQuickMethods = {
 };
 
 export type SuiTxBlockWithSpoolNormalMethods = SuiKitTxBlock &
-  BaseScallopTxBlock &
+  SuiTxBlockWithSCoin &
   SpoolNormalMethods;
 
 export type SpoolTxBlock = SuiTxBlockWithSpoolNormalMethods & SpoolQuickMethods;