@scallop-io/sui-scallop-sdk 0.42.7 → 0.44.0

package/src/models/scallopClient.ts

@@ -6,8 +6,8 @@ import { ScallopUtils } from './scallopUtils';
 import { ScallopBuilder } from './scallopBuilder';
 import { ScallopQuery } from './scallopQuery';
 import type { SuiTransactionBlockResponse } from '@mysten/sui.js/client';
-import type { TransactionArgument } from '@mysten/sui.js/transactions';
-import type { SuiTxArg } from '@scallop-io/sui-kit';
+import type { TransactionObjectArgument } from '@mysten/sui.js/transactions';
+import type { SuiObjectArg } from '@scallop-io/sui-kit';
 import type {
   ScallopClientFnReturnType,
   ScallopInstanceParams,
@@ -237,14 +237,14 @@ export class ScallopClient {
     collateralCoinName: SupportCollateralCoins,
     amount: number,
     sign?: S,
-    obligationId?: SuiTxArg,
+    obligationId?: string,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>>;
   public async depositCollateral<S extends boolean>(
     collateralCoinName: SupportCollateralCoins,
     amount: number,
     sign: S = true as S,
-    obligationId?: SuiTxArg,
+    obligationId?: string,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
@@ -374,14 +374,14 @@ export class ScallopClient {
     stakeCoinName: SupportStakeCoins,
     amount: number,
     sign?: S,
-    stakeAccountId?: SuiTxArg,
+    stakeAccountId?: string,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>>;
   public async depositAndStake<S extends boolean>(
     stakeCoinName: SupportStakeCoins,
     amount: number,
     sign: S = true as S,
-    stakeAccountId?: SuiTxArg,
+    stakeAccountId?: string,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
@@ -543,16 +543,16 @@ export class ScallopClient {
     amount: number,
     callback: (
       txBlock: ScallopTxBlock,
-      coin: TransactionArgument
-    ) => TransactionArgument
+      coin: TransactionObjectArgument | string
+    ) => SuiObjectArg
   ): Promise<SuiTransactionBlockResponse>;
   public async flashLoan<S extends boolean>(
     poolCoinName: SupportPoolCoins,
     amount: number,
     callback: (
       txBlock: ScallopTxBlock,
-      coin: TransactionArgument
-    ) => TransactionArgument,
+      coin: TransactionObjectArgument | string
+    ) => SuiObjectArg,
     sign?: S,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>>;
@@ -561,8 +561,8 @@ export class ScallopClient {
     amount: number,
     callback: (
       txBlock: ScallopTxBlock,
-      coin: TransactionArgument
-    ) => TransactionArgument,
+      coin: TransactionObjectArgument | string
+    ) => SuiObjectArg,
     sign: S = true as S,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
@@ -637,14 +637,14 @@ export class ScallopClient {
     stakeMarketCoinName: SupportStakeMarketCoins,
     amount: number,
     sign?: S,
-    stakeAccountId?: SuiTxArg,
+    stakeAccountId?: string,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>>;
   public async stake<S extends boolean>(
     stakeMarketCoinName: SupportStakeMarketCoins,
     amount: number,
     sign: S = true as S,
-    stakeAccountId?: SuiTxArg,
+    stakeAccountId?: string,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
@@ -689,14 +689,14 @@ export class ScallopClient {
     stakeMarketCoinName: SupportStakeMarketCoins,
     amount: number,
     sign?: S,
-    stakeAccountId?: SuiTxArg,
+    stakeAccountId?: string,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>>;
   public async unstake<S extends boolean>(
     stakeMarketCoinName: SupportStakeMarketCoins,
     amount: number,
     sign: S = true as S,
-    stakeAccountId?: SuiTxArg,
+    stakeAccountId?: string,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
@@ -737,14 +737,14 @@ export class ScallopClient {
     stakeMarketCoinName: SupportStakeMarketCoins,
     amount: number,
     sign?: S,
-    stakeAccountId?: SuiTxArg,
+    stakeAccountId?: string,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>>;
   public async unstakeAndWithdraw<S extends boolean>(
     stakeMarketCoinName: SupportStakeMarketCoins,
     amount: number,
     sign: S = true as S,
-    stakeAccountId?: SuiTxArg,
+    stakeAccountId?: string,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();
@@ -791,13 +791,13 @@ export class ScallopClient {
   public async claim<S extends boolean>(
     stakeMarketCoinName: SupportStakeMarketCoins,
     sign?: S,
-    stakeAccountId?: SuiTxArg,
+    stakeAccountId?: string,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>>;
   public async claim<S extends boolean>(
     stakeMarketCoinName: SupportStakeMarketCoins,
     sign: S = true as S,
-    stakeAccountId?: SuiTxArg,
+    stakeAccountId?: string,
     walletAddress?: string
   ): Promise<ScallopClientFnReturnType<S>> {
     const txBlock = this.builder.createTxBlock();

package/src/models/scallopUtils.ts

@@ -1,5 +1,5 @@
 import { SUI_TYPE_ARG, normalizeStructTag } from '@mysten/sui.js/utils';
-import { SuiKit } from '@scallop-io/sui-kit';
+import { SuiAddressArg, SuiKit } from '@scallop-io/sui-kit';
 import { SuiPriceServiceConnection } from '@pythnetwork/pyth-sui-js';
 import { ScallopAddress } from './scallopAddress';
 import { ScallopQuery } from './scallopQuery';
@@ -10,6 +10,8 @@ import {
   SUPPORT_COLLATERALS,
   rewardCoins,
   coinDecimals,
+  wormholeCoinIds,
+  coinIds,
 } from '../constants';
 import { queryObligation } from '../queries';
 import { parseDataFromPythPriceFeed, isMarketCoin } from '../utils';
@@ -108,16 +110,22 @@ export class ScallopUtils {
    */
   public parseCoinType(coinName: SupportCoins) {
     coinName = isMarketCoin(coinName) ? this.parseCoinName(coinName) : coinName;
-    const coinPackageId = this._address.get(`core.coins.${coinName}.id`);
+    const coinPackageId =
+      this._address.get(`core.coins.${coinName}.id`) ??
+      coinIds[coinName] ??
+      undefined;
+    if (!coinPackageId) {
+      throw Error(`Coin ${coinName} is not supported`);
+    }
     if (coinName === 'sui')
       return normalizeStructTag(`${coinPackageId}::sui::SUI`);
     const wormHoleCoinIds = [
-      this._address.get('core.coins.usdc.id'),
-      this._address.get('core.coins.usdt.id'),
-      this._address.get('core.coins.eth.id'),
-      this._address.get('core.coins.btc.id'),
-      this._address.get('core.coins.sol.id'),
-      this._address.get('core.coins.apt.id'),
+      this._address.get('core.coins.usdc.id') ?? wormholeCoinIds.usdc,
+      this._address.get('core.coins.usdt.id') ?? wormholeCoinIds.usdt,
+      this._address.get('core.coins.eth.id') ?? wormholeCoinIds.eth,
+      this._address.get('core.coins.btc.id') ?? wormholeCoinIds.btc,
+      this._address.get('core.coins.sol.id') ?? wormholeCoinIds.sol,
+      this._address.get('core.coins.apt.id') ?? wormholeCoinIds.apt,
     ];
     if (wormHoleCoinIds.includes(coinPackageId)) {
       return `${coinPackageId}::coin::COIN`;
@@ -154,6 +162,9 @@ export class ScallopUtils {
   public parseCoinNameFromType<T extends SupportMarketCoins>(
     coinType: string
   ): T extends SupportMarketCoins ? T : SupportMarketCoins;
+  public parseCoinNameFromType<T extends SupportCoins>(
+    coinType: string
+  ): T extends SupportCoins ? T : SupportCoins;
   public parseCoinNameFromType(coinType: string) {
     coinType = normalizeStructTag(coinType);
     const coinTypeRegex = new RegExp(`((0x[^:]+::[^:]+::[^<>]+))(?![^<>]*<)`);
@@ -162,12 +173,24 @@ export class ScallopUtils {
     coinType = coinTypeMatch?.[1] || coinType;
 
     const wormHoleCoinTypeMap: Record<string, SupportAssetCoins> = {
-      [`${this._address.get('core.coins.usdc.id')}::coin::COIN`]: 'usdc',
-      [`${this._address.get('core.coins.usdt.id')}::coin::COIN`]: 'usdt',
-      [`${this._address.get('core.coins.eth.id')}::coin::COIN`]: 'eth',
-      [`${this._address.get('core.coins.btc.id')}::coin::COIN`]: 'btc',
-      [`${this._address.get('core.coins.sol.id')}::coin::COIN`]: 'sol',
-      [`${this._address.get('core.coins.apt.id')}::coin::COIN`]: 'apt',
+      [`${
+        this._address.get('core.coins.usdc.id') ?? wormholeCoinIds.usdc
+      }::coin::COIN`]: 'usdc',
+      [`${
+        this._address.get('core.coins.usdt.id') ?? wormholeCoinIds.usdt
+      }::coin::COIN`]: 'usdt',
+      [`${
+        this._address.get('core.coins.eth.id') ?? wormholeCoinIds.eth
+      }::coin::COIN`]: 'eth',
+      [`${
+        this._address.get('core.coins.btc.id') ?? wormholeCoinIds.btc
+      }::coin::COIN`]: 'btc',
+      [`${
+        this._address.get('core.coins.sol.id') ?? wormholeCoinIds.sol
+      }::coin::COIN`]: 'sol',
+      [`${
+        this._address.get('core.coins.apt.id') ?? wormholeCoinIds.apt
+      }::coin::COIN`]: 'apt',
     };
 
     const assetCoinName =
@@ -271,7 +294,7 @@ export class ScallopUtils {
    * @param obligationId - The obligation id.
    * @return Asset coin Names.
    */
-  public async getObligationCoinNames(obligationId: string) {
+  public async getObligationCoinNames(obligationId: SuiAddressArg) {
     const obligation = await queryObligation(this._query, obligationId);
     const collateralCoinTypes = obligation.collaterals.map((collateral) => {
       return `0x${collateral.type.name}`;

package/src/queries/coreQuery.ts

@@ -12,6 +12,7 @@ import {
   calculateMarketCollateralData,
 } from '../utils';
 import type { SuiObjectResponse, SuiObjectData } from '@mysten/sui.js/client';
+import type { SuiAddressArg } from '@scallop-io/sui-kit';
 import type { ScallopQuery } from '../models';
 import {
   Market,
@@ -98,6 +99,8 @@ export const queryMarket = async (query: ScallopQuery) => {
       coinWrappedType: query.utils.getCoinWrappedType(poolCoinName),
       coinDecimal: query.utils.getCoinDecimal(poolCoinName),
       coinPrice: coinPrice,
+      highKink: parsedMarketPoolData.highKink,
+      midKink: parsedMarketPoolData.midKink,
       reserveFactor: parsedMarketPoolData.reserveFactor,
       borrowWeight: parsedMarketPoolData.borrowWeight,
       marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
@@ -352,6 +355,8 @@ export const getMarketPool = async (
       coinWrappedType: query.utils.getCoinWrappedType(poolCoinName),
       coinDecimal: query.utils.getCoinDecimal(poolCoinName),
       coinPrice: coinPrice ?? 0,
+      highKink: parsedMarketPoolData.highKink,
+      midKink: parsedMarketPoolData.midKink,
       reserveFactor: parsedMarketPoolData.reserveFactor,
       borrowWeight: parsedMarketPoolData.borrowWeight,
       marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
@@ -599,7 +604,7 @@ export const getObligations = async (
  */
 export const queryObligation = async (
   query: ScallopQuery,
-  obligationId: string
+  obligationId: SuiAddressArg
 ) => {
   const packageId = query.address.get('core.packages.query.id');
   const queryTarget = `${packageId}::obligation_query::obligation_data`;

package/src/queries/portfolioQuery.ts

@@ -1,5 +1,6 @@
 import BigNumber from 'bignumber.js';
 import { SUPPORT_POOLS, SUPPORT_SPOOLS } from '../constants';
+import { minBigNumber } from 'src/utils';
 import type { ScallopQuery } from '../models';
 import type {
   Market,
@@ -133,7 +134,9 @@ export const getLending = async (
   let stakedCoin = BigNumber(0);
   let stakedValue = BigNumber(0);
   let availableUnstakeAmount = BigNumber(0);
+  let availableUnstakeCoin = BigNumber(0);
   let availableClaimAmount = BigNumber(0);
+  let availableClaimCoin = BigNumber(0);
 
   if (spool) {
     for (const stakeAccount of stakeAccounts) {
@@ -161,6 +164,7 @@ export const getLending = async (
       availableUnstakeAmount = availableUnstakeAmount.plus(
         accountStakedMarketCoinAmount
       );
+      availableUnstakeCoin = availableUnstakeAmount.shiftedBy(-1 * coinDecimal);
 
       const baseIndexRate = 1_000_000_000;
       const increasedPointRate = spool?.currentPointIndex
@@ -175,6 +179,7 @@ export const getLending = async (
           .multipliedBy(spool.exchangeRateNumerator)
           .dividedBy(spool.exchangeRateDenominator)
       );
+      availableClaimCoin = availableClaimAmount.shiftedBy(-1 * coinDecimal);
     }
   }
 
@@ -185,6 +190,20 @@ export const getLending = async (
   const suppliedCoin = suppliedAmount.shiftedBy(-1 * coinDecimal);
   const suppliedValue = suppliedCoin.multipliedBy(coinPrice ?? 0);
 
+  const unstakedMarketAmount = BigNumber(marketCoinAmount);
+  const unstakedMarketCoin = unstakedMarketAmount.shiftedBy(-1 * coinDecimal);
+
+  const availableSupplyAmount = BigNumber(coinAmount);
+  const availableSupplyCoin = availableSupplyAmount.shiftedBy(-1 * coinDecimal);
+  const availableWithdrawAmount = minBigNumber(
+    suppliedAmount,
+    marketPool?.supplyAmount ?? Infinity
+  ).plus(stakedAmount);
+  const availableWithdrawCoin = minBigNumber(
+    suppliedCoin,
+    marketPool?.supplyCoin ?? Infinity
+  ).plus(stakedCoin);
+
   const lending: Lending = {
     coinName: poolCoinName,
     symbol: query.utils.parseSymbol(poolCoinName),
@@ -194,7 +213,7 @@ export const getLending = async (
     coinPrice: coinPrice ?? 0,
     supplyApr: marketPool?.supplyApr ?? 0,
     supplyApy: marketPool?.supplyApy ?? 0,
-    rewardApr: spool?.stakeApr ?? 0,
+    rewardApr: spool?.rewardApr ?? 0,
     suppliedAmount: suppliedAmount.plus(stakedAmount).toNumber(),
     suppliedCoin: suppliedCoin.plus(stakedCoin).toNumber(),
     suppliedValue: suppliedValue.plus(stakedValue).toNumber(),
@@ -203,11 +222,21 @@ export const getLending = async (
     stakedAmount: stakedAmount.toNumber(),
     stakedCoin: stakedCoin.toNumber(),
     stakedValue: stakedValue.toNumber(),
-    availableSupplyAmount: coinAmount,
-    availableWithdrawAmount: 0,
-    availableStakeAmount: marketCoinAmount,
+    unstakedMarketAmount: unstakedMarketAmount.toNumber(),
+    unstakedMarketCoin: unstakedMarketCoin.toNumber(),
+    unstakedAmount: suppliedAmount.toNumber(),
+    unstakedCoin: suppliedCoin.toNumber(),
+    unstakedValue: suppliedValue.toNumber(),
+    availableSupplyAmount: availableSupplyAmount.toNumber(),
+    availableSupplyCoin: availableSupplyCoin.toNumber(),
+    availableWithdrawAmount: availableWithdrawAmount.toNumber(),
+    availableWithdrawCoin: availableWithdrawCoin.toNumber(),
+    availableStakeAmount: unstakedMarketAmount.toNumber(),
+    availableStakeCoin: unstakedMarketCoin.toNumber(),
     availableUnstakeAmount: availableUnstakeAmount.toNumber(),
+    availableUnstakeCoin: availableUnstakeCoin.toNumber(),
     availableClaimAmount: availableClaimAmount.toNumber(),
+    availableClaimCoin: availableClaimCoin.toNumber(),
   };
 
   return lending;
@@ -323,6 +352,8 @@ export const getObligationAccount = async (
         coinName: collateralCoinName,
         coinType: collateral.type.name,
         symbol: query.utils.parseSymbol(collateralCoinName),
+        coinDecimal: coinDecimal,
+        coinPrice: coinPrice,
         depositedAmount: depositedAmount.toNumber(),
         depositedCoin: depositedCoin.toNumber(),
         depositedValue: depositedValue.toNumber(),
@@ -373,6 +404,8 @@ export const getObligationAccount = async (
         coinName: poolCoinName,
         coinType: debt.type.name,
         symbol: query.utils.parseSymbol(poolCoinName),
+        coinDecimal: coinDecimal,
+        coinPrice: coinPrice,
         borrowedAmount: borrowedAmount.toNumber(),
         borrowedCoin: borrowedCoin.toNumber(),
         borrowedValue: borrowedValue.toNumber(),
@@ -449,8 +482,8 @@ export const getObligationAccount = async (
     if (marketCollateral) {
       const availableWithdrawAmount =
         obligationAccount.totalBorrowedValueWithWeight === 0
-          ? obligationCollateral.depositedAmount
-          : Math.min(
+          ? BigNumber(obligationCollateral.depositedAmount)
+          : minBigNumber(
               BigNumber(obligationAccount.totalAvailableCollateralValue)
                 .dividedBy(marketCollateral.collateralFactor)
                 .dividedBy(marketCollateral.coinPrice)
@@ -460,8 +493,11 @@ export const getObligationAccount = async (
               obligationCollateral.depositedAmount,
               marketCollateral.depositAmount
             );
-      obligationCollateral.availableWithdrawAmount = availableWithdrawAmount;
-      obligationCollateral.availableWithdrawCoin = availableWithdrawAmount;
+      obligationCollateral.availableWithdrawAmount =
+        availableWithdrawAmount.toNumber();
+      obligationCollateral.availableWithdrawCoin = availableWithdrawAmount
+        .shiftedBy(-1 * obligationCollateral.coinDecimal)
+        .toNumber();
     }
   }
   for (const [assetCoinName, obligationDebt] of Object.entries(
@@ -473,12 +509,11 @@ export const getObligationAccount = async (
         obligationDebt.availableRepayAmount
       )
         // Note: reduced chance of failure when calculations are inaccurate
-        .multipliedBy(1.01)
-        .toNumber();
+        .multipliedBy(1.01);
 
       const availableBorrowAmount =
         obligationAccount.totalAvailableCollateralValue !== 0
-          ? Math.min(
+          ? minBigNumber(
               BigNumber(obligationAccount.totalAvailableCollateralValue)
                 .dividedBy(
                   BigNumber(marketPool.coinPrice).multipliedBy(
@@ -490,9 +525,15 @@ export const getObligationAccount = async (
                 .toNumber(),
               marketPool.supplyAmount
             )
-          : 0;
-      obligationDebt.availableBorrowAmount = availableBorrowAmount;
-      obligationDebt.availableRepayAmount = availableRepayAmount;
+          : BigNumber(0);
+      obligationDebt.availableBorrowAmount = availableBorrowAmount.toNumber();
+      obligationDebt.availableBorrowCoin = availableBorrowAmount
+        .shiftedBy(-1 * obligationDebt.coinDecimal)
+        .toNumber();
+      obligationDebt.availableRepayAmount = availableRepayAmount.toNumber();
+      obligationDebt.availableRepayCoin = availableRepayAmount
+        .shiftedBy(-1 * obligationDebt.coinDecimal)
+        .toNumber();
     }
   }
 

package/src/types/builder/core.ts

@@ -1,14 +1,16 @@
 import type {
   SuiTxBlock as SuiKitTxBlock,
+  SuiAddressArg,
+  SuiObjectArg,
   SuiTxArg,
 } from '@scallop-io/sui-kit';
+import type { TransactionResult } from '@mysten/sui.js/transactions';
 import type { ScallopBuilder } from '../../models';
 import type {
   SupportCollateralCoins,
   SupportPoolCoins,
   SupportAssetCoins,
 } from '../constant';
-import type { TransactionResult } from './index';
 
 export type CoreIds = {
   protocolPkg: string;
@@ -21,55 +23,58 @@ export type CoreIds = {
 export type CoreNormalMethods = {
   openObligation: () => TransactionResult;
   returnObligation: (
-    obligation: SuiTxArg,
-    obligationHotPotato: SuiTxArg
+    obligation: SuiAddressArg,
+    obligationHotPotato: SuiObjectArg
   ) => void;
   openObligationEntry: () => void;
   addCollateral: (
-    obligation: SuiTxArg,
-    coin: SuiTxArg,
+    obligation: SuiAddressArg,
+    coin: SuiObjectArg,
     collateralCoinName: SupportCollateralCoins
   ) => void;
   takeCollateral: (
-    obligation: SuiTxArg,
-    obligationKey: SuiTxArg,
-    amount: number,
+    obligation: SuiAddressArg,
+    obligationKey: SuiAddressArg,
+    amount: SuiTxArg,
     collateralCoinName: SupportCollateralCoins
   ) => TransactionResult;
   deposit: (
-    coin: SuiTxArg,
+    coin: SuiObjectArg,
     poolCoinName: SupportPoolCoins
   ) => TransactionResult;
-  depositEntry: (coin: SuiTxArg, poolCoinName: SupportPoolCoins) => void;
+  depositEntry: (coin: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
   withdraw: (
-    marketCoin: SuiTxArg,
+    marketCoin: SuiObjectArg,
     poolCoinName: SupportPoolCoins
   ) => TransactionResult;
-  withdrawEntry: (marketCoin: SuiTxArg, poolCoinName: SupportPoolCoins) => void;
+  withdrawEntry: (
+    marketCoin: SuiObjectArg,
+    poolCoinName: SupportPoolCoins
+  ) => void;
   borrow: (
-    obligation: SuiTxArg,
-    obligationKey: SuiTxArg,
-    amount: number,
+    obligation: SuiAddressArg,
+    obligationKey: SuiAddressArg,
+    amount: SuiTxArg,
     poolCoinName: SupportPoolCoins
   ) => TransactionResult;
   borrowEntry: (
-    obligation: SuiTxArg,
-    obligationKey: SuiTxArg,
-    amount: number,
+    obligation: SuiAddressArg,
+    obligationKey: SuiAddressArg,
+    amount: SuiTxArg,
     poolCoinName: SupportPoolCoins
   ) => void;
   repay: (
-    obligation: SuiTxArg,
-    coin: SuiTxArg,
+    obligation: SuiAddressArg,
+    coin: SuiObjectArg,
     poolCoinName: SupportPoolCoins
   ) => void;
   borrowFlashLoan: (
-    amount: number,
+    amount: SuiTxArg,
     poolCoinName: SupportPoolCoins
   ) => TransactionResult;
   repayFlashLoan: (
-    coin: SuiTxArg,
-    loan: SuiTxArg,
+    coin: SuiObjectArg,
+    loan: SuiAddressArg,
     poolCoinName: SupportPoolCoins
   ) => void;
 };
@@ -78,19 +83,19 @@ export type CoreQuickMethods = {
   addCollateralQuick: (
     amount: number,
     collateralCoinName: SupportCollateralCoins,
-    obligationId?: SuiTxArg
+    obligationId?: SuiAddressArg
   ) => Promise<void>;
   takeCollateralQuick: (
     amount: number,
     collateralCoinName: SupportCollateralCoins,
-    obligationId?: string,
-    obligationKey?: string
+    obligationId?: SuiAddressArg,
+    obligationKey?: SuiAddressArg
   ) => Promise<TransactionResult>;
   borrowQuick: (
     amount: number,
     poolCoinName: SupportPoolCoins,
-    obligationId?: string,
-    obligationKey?: string
+    obligationId?: SuiAddressArg,
+    obligationKey?: SuiAddressArg
   ) => Promise<TransactionResult>;
   depositQuick: (
     amount: number,
@@ -103,7 +108,7 @@ export type CoreQuickMethods = {
   repayQuick: (
     amount: number,
     poolCoinName: SupportPoolCoins,
-    obligationId?: string
+    obligationId?: SuiAddressArg
   ) => Promise<void>;
   updateAssetPricesQuick: (
     assetCoinNames?: SupportAssetCoins[]

package/src/types/builder/index.ts

@@ -1,4 +1,3 @@
-import type { TransactionArgument } from '@mysten/sui.js/transactions';
 import type { CoreTxBlock } from './core';
 import type { SpoolTxBlock } from './spool';
 
@@ -6,4 +5,3 @@ export type * from './core';
 export type * from './spool';
 
 export type ScallopTxBlock = CoreTxBlock & SpoolTxBlock;
-export type TransactionResult = TransactionArgument & TransactionArgument[];

package/src/types/builder/spool.ts

@@ -1,10 +1,12 @@
 import type {
   SuiTxBlock as SuiKitTxBlock,
+  SuiAddressArg,
+  SuiObjectArg,
   SuiTxArg,
 } from '@scallop-io/sui-kit';
+import type { TransactionResult } from '@mysten/sui.js/transactions';
 import type { ScallopBuilder } from '../../models';
 import type { SupportStakeMarketCoins } from '../constant';
-import type { TransactionResult } from './index';
 
 export type SpoolIds = {
   spoolPkg: string;
@@ -15,41 +17,37 @@ export type SpoolNormalMethods = {
     stakeMarketCoinName: SupportStakeMarketCoins
   ) => TransactionResult;
   stake: (
-    stakeAccount: SuiTxArg,
-    coin: SuiTxArg,
+    stakeAccount: SuiAddressArg,
+    coin: SuiObjectArg,
     stakeMarketCoinName: SupportStakeMarketCoins
   ) => void;
   unstake: (
-    stakeAccount: SuiTxArg,
-    amount: number,
+    stakeAccount: SuiAddressArg,
+    amount: SuiTxArg,
     stakeMarketCoinName: SupportStakeMarketCoins
   ) => TransactionResult;
   claim: (
-    stakeAccount: SuiTxArg,
+    stakeAccount: SuiAddressArg,
     stakeMarketCoinName: SupportStakeMarketCoins
   ) => TransactionResult;
 };
 
 export type SpoolQuickMethods = {
   stakeQuick(
-    amountOrMarketCoin: number,
+    amountOrMarketCoin: SuiObjectArg | number,
     stakeMarketCoinName: SupportStakeMarketCoins,
-    stakeAccountId?: SuiTxArg
-  ): Promise<void>;
-  stakeQuick(
-    amountOrMarketCoin: TransactionResult,
-    stakeMarketCoinName: SupportStakeMarketCoins,
-    stakeAccountId?: SuiTxArg
+    stakeAccountId?: SuiAddressArg
   ): Promise<void>;
+
   unstakeQuick(
     amount: number,
     stakeMarketCoinName: SupportStakeMarketCoins,
-    stakeAccountId?: SuiTxArg
-  ): Promise<TransactionResult>;
+    stakeAccountId?: SuiAddressArg
+  ): Promise<TransactionResult[]>;
   claimQuick(
     stakeMarketCoinName: SupportStakeMarketCoins,
-    stakeAccountId?: SuiTxArg
-  ): Promise<TransactionResult>;
+    stakeAccountId?: SuiAddressArg
+  ): Promise<TransactionResult[]>;
 };
 
 export type SuiTxBlockWithSpoolNormalMethods = SuiKitTxBlock &

package/src/types/constant/enum.ts

@@ -25,3 +25,16 @@ export type StakeMarketCoins = {
 export type RewardCoins = {
   [key in SupportStakeMarketCoins]: SupportRewardCoins;
 };
+
+export type AssetCoinIds = {
+  [key in SupportAssetCoins]: string;
+};
+
+type PickFromUnion<T, K extends string> = K extends T ? K : never;
+
+export type WormholeCoinIds = {
+  [key in PickFromUnion<
+    SupportAssetCoins,
+    'eth' | 'btc' | 'usdc' | 'usdt' | 'apt' | 'sol'
+  >]: string;
+};

package/src/types/query/core.ts

@@ -123,6 +123,8 @@ export type MarketPool = {
 } & Required<
   Pick<
     ParsedMarketPoolData,
+    | 'highKink'
+    | 'midKink'
     | 'reserveFactor'
     | 'borrowWeight'
     | 'marketCoinSupplyAmount'