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

package/dist/models/scallopBuilder.d.ts

@@ -49,36 +49,8 @@ export declare class ScallopBuilder {
      * @return Take coin and left coin.
      */
     selectCoin(txBlock: ScallopTxBlock | SuiKitTxBlock, assetCoinName: SupportAssetCoins, amount: number, sender: string): Promise<{
-        takeCoin: {
-            kind: "Input";
-            index: number;
-            type?: "object" | "pure" | undefined;
-            value?: any;
-        } | {
-            kind: "GasCoin";
-        } | {
-            kind: "Result";
-            index: number;
-        } | {
-            kind: "NestedResult";
-            index: number;
-            resultIndex: number;
-        };
-        leftCoin: {
-            kind: "Input";
-            index: number;
-            type?: "object" | "pure" | undefined;
-            value?: any;
-        } | {
-            kind: "GasCoin";
-        } | {
-            kind: "Result";
-            index: number;
-        } | {
-            kind: "NestedResult";
-            index: number;
-            resultIndex: number;
-        };
+        takeCoin: import("@scallop-io/sui-kit").TransactionObjectArgument;
+        leftCoin: import("@scallop-io/sui-kit").TransactionObjectArgument;
     }>;
     /**
      * Specifying the sender's amount of market coins to get coins args from transaction result.
@@ -90,36 +62,8 @@ export declare class ScallopBuilder {
      * @return Take coin and left coin.
      */
     selectMarketCoin(txBlock: ScallopTxBlock | SuiKitTxBlock, marketCoinName: SupportMarketCoins, amount: number, sender: string): Promise<{
-        takeCoin: {
-            kind: "Input";
-            index: number;
-            type?: "object" | "pure" | undefined;
-            value?: any;
-        } | {
-            kind: "GasCoin";
-        } | {
-            kind: "Result";
-            index: number;
-        } | {
-            kind: "NestedResult";
-            index: number;
-            resultIndex: number;
-        };
-        leftCoin: {
-            kind: "Input";
-            index: number;
-            type?: "object" | "pure" | undefined;
-            value?: any;
-        } | {
-            kind: "GasCoin";
-        } | {
-            kind: "Result";
-            index: number;
-        } | {
-            kind: "NestedResult";
-            index: number;
-            resultIndex: number;
-        };
+        takeCoin: import("@scallop-io/sui-kit").TransactionObjectArgument;
+        leftCoin: import("@scallop-io/sui-kit").TransactionObjectArgument;
     }>;
     /**
      * Execute Scallop txBlock using the `signAndSendTxn` methods in suikit.

package/dist/models/scallopClient.d.ts

@@ -4,8 +4,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, ScallopClientParams, SupportPoolCoins, SupportCollateralCoins, SupportAssetCoins, SupportStakeCoins, SupportStakeMarketCoins, ScallopTxBlock } from '../types';
 /**
  * @description
@@ -123,7 +123,7 @@ export declare class ScallopClient {
      * @return Transaction block response or transaction block.
      */
     depositCollateral(collateralCoinName: SupportCollateralCoins, amount: number): Promise<SuiTransactionBlockResponse>;
-    depositCollateral<S extends boolean>(collateralCoinName: SupportCollateralCoins, amount: number, sign?: S, obligationId?: SuiTxArg, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
+    depositCollateral<S extends boolean>(collateralCoinName: SupportCollateralCoins, amount: number, sign?: S, obligationId?: string, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
     /**
      * Withdraw collateral from the specific pool.
      *
@@ -158,7 +158,7 @@ export declare class ScallopClient {
      * @return Transaction block response or transaction block.
      */
     depositAndStake(stakeCoinName: SupportStakeCoins, amount: number): Promise<SuiTransactionBlockResponse>;
-    depositAndStake<S extends boolean>(stakeCoinName: SupportStakeCoins, amount: number, sign?: S, stakeAccountId?: SuiTxArg, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
+    depositAndStake<S extends boolean>(stakeCoinName: SupportStakeCoins, amount: number, sign?: S, stakeAccountId?: string, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
     /**
      * Withdraw asset from the specific pool, must return market coin.
      *
@@ -202,8 +202,8 @@ export declare class ScallopClient {
      * @param sign - Decide to directly sign the transaction or return the transaction block.
      * @return Transaction block response or transaction block.
      */
-    flashLoan(poolCoinName: SupportPoolCoins, amount: number, callback: (txBlock: ScallopTxBlock, coin: TransactionArgument) => TransactionArgument): Promise<SuiTransactionBlockResponse>;
-    flashLoan<S extends boolean>(poolCoinName: SupportPoolCoins, amount: number, callback: (txBlock: ScallopTxBlock, coin: TransactionArgument) => TransactionArgument, sign?: S, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
+    flashLoan(poolCoinName: SupportPoolCoins, amount: number, callback: (txBlock: ScallopTxBlock, coin: TransactionObjectArgument | string) => SuiObjectArg): Promise<SuiTransactionBlockResponse>;
+    flashLoan<S extends boolean>(poolCoinName: SupportPoolCoins, amount: number, callback: (txBlock: ScallopTxBlock, coin: TransactionObjectArgument | string) => SuiObjectArg, sign?: S, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
     /**
      * Create stake account.
      *
@@ -224,7 +224,7 @@ export declare class ScallopClient {
      * @return Transaction block response or transaction block.
      */
     stake(stakeMarketCoinName: SupportStakeMarketCoins, amount: number): Promise<SuiTransactionBlockResponse>;
-    stake<S extends boolean>(stakeMarketCoinName: SupportStakeMarketCoins, amount: number, sign?: S, stakeAccountId?: SuiTxArg, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
+    stake<S extends boolean>(stakeMarketCoinName: SupportStakeMarketCoins, amount: number, sign?: S, stakeAccountId?: string, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
     /**
      * Unstake market coin from the specific spool.
      *
@@ -236,7 +236,7 @@ export declare class ScallopClient {
      * @return Transaction block response or transaction block.
      */
     unstake(stakeMarketCoinName: SupportStakeMarketCoins, amount: number): Promise<SuiTransactionBlockResponse>;
-    unstake<S extends boolean>(stakeMarketCoinName: SupportStakeMarketCoins, amount: number, sign?: S, stakeAccountId?: SuiTxArg, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
+    unstake<S extends boolean>(stakeMarketCoinName: SupportStakeMarketCoins, amount: number, sign?: S, stakeAccountId?: string, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
     /**
      * Unstake market coin from the specific spool and withdraw asset from the corresponding pool.
      *
@@ -248,7 +248,7 @@ export declare class ScallopClient {
      * @return Transaction block response or transaction block.
      */
     unstakeAndWithdraw(stakeMarketCoinName: SupportStakeMarketCoins, amount: number): Promise<SuiTransactionBlockResponse>;
-    unstakeAndWithdraw<S extends boolean>(stakeMarketCoinName: SupportStakeMarketCoins, amount: number, sign?: S, stakeAccountId?: SuiTxArg, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
+    unstakeAndWithdraw<S extends boolean>(stakeMarketCoinName: SupportStakeMarketCoins, amount: number, sign?: S, stakeAccountId?: string, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
     /**
      * Claim reward coin from the specific spool.
      *
@@ -260,7 +260,7 @@ export declare class ScallopClient {
      * @return Transaction block response or transaction block.
      */
     claim(stakeMarketCoinName: SupportStakeMarketCoins): Promise<SuiTransactionBlockResponse>;
-    claim<S extends boolean>(stakeMarketCoinName: SupportStakeMarketCoins, sign?: S, stakeAccountId?: SuiTxArg, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
+    claim<S extends boolean>(stakeMarketCoinName: SupportStakeMarketCoins, sign?: S, stakeAccountId?: string, walletAddress?: string): Promise<ScallopClientFnReturnType<S>>;
     /**
      * Mint and get test coin.
      *

package/dist/models/scallopUtils.d.ts

@@ -1,3 +1,4 @@
+import { SuiAddressArg } from '@scallop-io/sui-kit';
 import type { ScallopUtilsParams, ScallopInstanceParams, SupportCoins, SupportAssetCoins, SupportMarketCoins, SupportStakeMarketCoins, CoinWrappedType } from '../types';
 /**
  * @description
@@ -64,6 +65,7 @@ export declare class ScallopUtils {
      */
     parseCoinNameFromType<T extends SupportAssetCoins>(coinType: string): T extends SupportAssetCoins ? T : SupportAssetCoins;
     parseCoinNameFromType<T extends SupportMarketCoins>(coinType: string): T extends SupportMarketCoins ? T : SupportMarketCoins;
+    parseCoinNameFromType<T extends SupportCoins>(coinType: string): T extends SupportCoins ? T : SupportCoins;
     /**
      * Convert marke coin name to coin name.
      *
@@ -116,7 +118,7 @@ export declare class ScallopUtils {
      * @param obligationId - The obligation id.
      * @return Asset coin Names.
      */
-    getObligationCoinNames(obligationId: string): Promise<SupportAssetCoins[]>;
+    getObligationCoinNames(obligationId: SuiAddressArg): Promise<SupportAssetCoins[]>;
     /**
      * Get asset coin price.
      *

package/dist/queries/coreQuery.d.ts

@@ -1,4 +1,5 @@
 import type { SuiObjectData } from '@mysten/sui.js/client';
+import type { SuiAddressArg } from '@scallop-io/sui-kit';
 import type { ScallopQuery } from '../models';
 import { Market, MarketPool, MarketCollateral, SupportAssetCoins, SupportPoolCoins, SupportCollateralCoins, ObligationQueryInterface, Obligation, SupportMarketCoins } from '../types';
 /**
@@ -92,7 +93,7 @@ export declare const getObligations: (query: ScallopQuery, ownerAddress?: string
  * @param obligationId - The obligation id.
  * @return Obligation data.
  */
-export declare const queryObligation: (query: ScallopQuery, obligationId: string) => Promise<ObligationQueryInterface>;
+export declare const queryObligation: (query: ScallopQuery, obligationId: SuiAddressArg) => Promise<ObligationQueryInterface>;
 /**
  * Query all owned coin amount.
  *

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

@@ -1,7 +1,7 @@
-import type { SuiTxBlock as SuiKitTxBlock, SuiTxArg } from '@scallop-io/sui-kit';
+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;
     market: string;
@@ -11,27 +11,27 @@ export type CoreIds = {
 };
 export type CoreNormalMethods = {
     openObligation: () => TransactionResult;
-    returnObligation: (obligation: SuiTxArg, obligationHotPotato: SuiTxArg) => void;
+    returnObligation: (obligation: SuiAddressArg, obligationHotPotato: SuiObjectArg) => void;
     openObligationEntry: () => void;
-    addCollateral: (obligation: SuiTxArg, coin: SuiTxArg, collateralCoinName: SupportCollateralCoins) => void;
-    takeCollateral: (obligation: SuiTxArg, obligationKey: SuiTxArg, amount: number, collateralCoinName: SupportCollateralCoins) => TransactionResult;
-    deposit: (coin: SuiTxArg, poolCoinName: SupportPoolCoins) => TransactionResult;
-    depositEntry: (coin: SuiTxArg, poolCoinName: SupportPoolCoins) => void;
-    withdraw: (marketCoin: SuiTxArg, poolCoinName: SupportPoolCoins) => TransactionResult;
-    withdrawEntry: (marketCoin: SuiTxArg, poolCoinName: SupportPoolCoins) => void;
-    borrow: (obligation: SuiTxArg, obligationKey: SuiTxArg, amount: number, poolCoinName: SupportPoolCoins) => TransactionResult;
-    borrowEntry: (obligation: SuiTxArg, obligationKey: SuiTxArg, amount: number, poolCoinName: SupportPoolCoins) => void;
-    repay: (obligation: SuiTxArg, coin: SuiTxArg, poolCoinName: SupportPoolCoins) => void;
-    borrowFlashLoan: (amount: number, poolCoinName: SupportPoolCoins) => TransactionResult;
-    repayFlashLoan: (coin: SuiTxArg, loan: SuiTxArg, poolCoinName: SupportPoolCoins) => void;
+    addCollateral: (obligation: SuiAddressArg, coin: SuiObjectArg, collateralCoinName: SupportCollateralCoins) => void;
+    takeCollateral: (obligation: SuiAddressArg, obligationKey: SuiAddressArg, amount: SuiTxArg, collateralCoinName: SupportCollateralCoins) => TransactionResult;
+    deposit: (coin: SuiObjectArg, poolCoinName: SupportPoolCoins) => TransactionResult;
+    depositEntry: (coin: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
+    withdraw: (marketCoin: SuiObjectArg, poolCoinName: SupportPoolCoins) => TransactionResult;
+    withdrawEntry: (marketCoin: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
+    borrow: (obligation: SuiAddressArg, obligationKey: SuiAddressArg, amount: SuiTxArg, poolCoinName: SupportPoolCoins) => TransactionResult;
+    borrowEntry: (obligation: SuiAddressArg, obligationKey: SuiAddressArg, amount: SuiTxArg, poolCoinName: SupportPoolCoins) => void;
+    repay: (obligation: SuiAddressArg, coin: SuiObjectArg, poolCoinName: SupportPoolCoins) => void;
+    borrowFlashLoan: (amount: SuiTxArg, poolCoinName: SupportPoolCoins) => TransactionResult;
+    repayFlashLoan: (coin: SuiObjectArg, loan: SuiAddressArg, poolCoinName: SupportPoolCoins) => void;
 };
 export type CoreQuickMethods = {
-    addCollateralQuick: (amount: number, collateralCoinName: SupportCollateralCoins, obligationId?: SuiTxArg) => Promise<void>;
-    takeCollateralQuick: (amount: number, collateralCoinName: SupportCollateralCoins, obligationId?: string, obligationKey?: string) => Promise<TransactionResult>;
-    borrowQuick: (amount: number, poolCoinName: SupportPoolCoins, obligationId?: string, obligationKey?: string) => Promise<TransactionResult>;
+    addCollateralQuick: (amount: number, collateralCoinName: SupportCollateralCoins, obligationId?: SuiAddressArg) => Promise<void>;
+    takeCollateralQuick: (amount: number, collateralCoinName: SupportCollateralCoins, obligationId?: SuiAddressArg, obligationKey?: SuiAddressArg) => Promise<TransactionResult>;
+    borrowQuick: (amount: number, poolCoinName: SupportPoolCoins, obligationId?: SuiAddressArg, obligationKey?: SuiAddressArg) => Promise<TransactionResult>;
     depositQuick: (amount: number, poolCoinName: SupportPoolCoins) => Promise<TransactionResult>;
     withdrawQuick: (amount: number, poolCoinName: SupportPoolCoins) => Promise<TransactionResult>;
-    repayQuick: (amount: number, poolCoinName: SupportPoolCoins, obligationId?: string) => Promise<void>;
+    repayQuick: (amount: number, poolCoinName: SupportPoolCoins, obligationId?: SuiAddressArg) => Promise<void>;
     updateAssetPricesQuick: (assetCoinNames?: SupportAssetCoins[]) => Promise<void>;
 };
 export type SuiTxBlockWithCoreNormalMethods = SuiKitTxBlock & CoreNormalMethods;

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

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

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

@@ -1,21 +1,20 @@
-import type { SuiTxBlock as SuiKitTxBlock, SuiTxArg } from '@scallop-io/sui-kit';
+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;
 };
 export type SpoolNormalMethods = {
     createStakeAccount: (stakeMarketCoinName: SupportStakeMarketCoins) => TransactionResult;
-    stake: (stakeAccount: SuiTxArg, coin: SuiTxArg, stakeMarketCoinName: SupportStakeMarketCoins) => void;
-    unstake: (stakeAccount: SuiTxArg, amount: number, stakeMarketCoinName: SupportStakeMarketCoins) => TransactionResult;
-    claim: (stakeAccount: SuiTxArg, stakeMarketCoinName: SupportStakeMarketCoins) => TransactionResult;
+    stake: (stakeAccount: SuiAddressArg, coin: SuiObjectArg, stakeMarketCoinName: SupportStakeMarketCoins) => void;
+    unstake: (stakeAccount: SuiAddressArg, amount: SuiTxArg, stakeMarketCoinName: SupportStakeMarketCoins) => TransactionResult;
+    claim: (stakeAccount: SuiAddressArg, stakeMarketCoinName: SupportStakeMarketCoins) => TransactionResult;
 };
 export type SpoolQuickMethods = {
-    stakeQuick(amountOrMarketCoin: number, stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiTxArg): Promise<void>;
-    stakeQuick(amountOrMarketCoin: TransactionResult, stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiTxArg): Promise<void>;
-    unstakeQuick(amount: number, stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiTxArg): Promise<TransactionResult>;
-    claimQuick(stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiTxArg): Promise<TransactionResult>;
+    stakeQuick(amountOrMarketCoin: SuiObjectArg | number, stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg): Promise<void>;
+    unstakeQuick(amount: number, stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg): Promise<TransactionResult[]>;
+    claimQuick(stakeMarketCoinName: SupportStakeMarketCoins, stakeAccountId?: SuiAddressArg): Promise<TransactionResult[]>;
 };
 export type SuiTxBlockWithSpoolNormalMethods = SuiKitTxBlock & SpoolNormalMethods;
 export type SpoolTxBlock = SuiTxBlockWithSpoolNormalMethods & SpoolQuickMethods;

package/dist/types/constant/enum.d.ts

@@ -14,3 +14,11 @@ 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;
+};
+export {};

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

@@ -115,7 +115,7 @@ export type MarketPool = {
     coinWrappedType: CoinWrappedType;
     coinDecimal: number;
     coinPrice: number;
-} & Required<Pick<ParsedMarketPoolData, 'reserveFactor' | 'borrowWeight' | 'marketCoinSupplyAmount' | 'minBorrowAmount'>> & CalculatedMarketPoolData;
+} & Required<Pick<ParsedMarketPoolData, 'highKink' | 'midKink' | 'reserveFactor' | 'borrowWeight' | 'marketCoinSupplyAmount' | 'minBorrowAmount'>> & CalculatedMarketPoolData;
 export type MarketCollateral = {
     coinName: SupportCollateralCoins;
     symbol: string;

package/dist/types/query/portfolio.d.ts

@@ -17,11 +17,21 @@ export type Lending = Required<Pick<MarketPool, 'coinName' | 'symbol' | 'coinTyp
     stakedAmount: number;
     stakedCoin: number;
     stakedValue: number;
+    unstakedMarketAmount: number;
+    unstakedMarketCoin: number;
+    unstakedAmount: number;
+    unstakedCoin: number;
+    unstakedValue: number;
     availableSupplyAmount: number;
+    availableSupplyCoin: number;
     availableWithdrawAmount: number;
+    availableWithdrawCoin: number;
     availableStakeAmount: number;
+    availableStakeCoin: number;
     availableUnstakeAmount: number;
+    availableUnstakeCoin: number;
     availableClaimAmount: number;
+    availableClaimCoin: number;
 };
 export type ObligationAccount = {
     obligationId: string;
@@ -36,34 +46,40 @@ export type ObligationAccount = {
     totalRiskLevel: number;
     totalDepositedPools: number;
     totalBorrowedPools: number;
-    collaterals: OptionalKeys<Record<SupportCollateralCoins, {
-        coinName: SupportCollateralCoins;
-        coinType: string;
-        symbol: string;
-        depositedAmount: number;
-        depositedCoin: number;
-        depositedValue: number;
-        borrowCapacityValue: number;
-        requiredCollateralValue: number;
-        availableDepositAmount: number;
-        availableDepositCoin: number;
-        availableWithdrawAmount: number;
-        availableWithdrawCoin: number;
-    }>>;
-    debts: OptionalKeys<Record<SupportPoolCoins, {
-        coinName: SupportPoolCoins;
-        coinType: string;
-        symbol: string;
-        borrowedAmount: number;
-        borrowedCoin: number;
-        borrowedValue: number;
-        borrowedValueWithWeight: number;
-        borrowIndex: number;
-        availableBorrowAmount: number;
-        availableBorrowCoin: number;
-        availableRepayAmount: number;
-        availableRepayCoin: number;
-    }>>;
+    collaterals: OptionalKeys<Record<SupportCollateralCoins, ObligationCollateral>>;
+    debts: OptionalKeys<Record<SupportPoolCoins, ObligationDebt>>;
+};
+export type ObligationCollateral = {
+    coinName: SupportCollateralCoins;
+    coinType: string;
+    symbol: string;
+    coinDecimal: number;
+    coinPrice: number;
+    depositedAmount: number;
+    depositedCoin: number;
+    depositedValue: number;
+    borrowCapacityValue: number;
+    requiredCollateralValue: number;
+    availableDepositAmount: number;
+    availableDepositCoin: number;
+    availableWithdrawAmount: number;
+    availableWithdrawCoin: number;
+};
+export type ObligationDebt = {
+    coinName: SupportPoolCoins;
+    coinType: string;
+    symbol: string;
+    coinDecimal: number;
+    coinPrice: number;
+    borrowedAmount: number;
+    borrowedCoin: number;
+    borrowedValue: number;
+    borrowedValueWithWeight: number;
+    borrowIndex: number;
+    availableBorrowAmount: number;
+    availableBorrowCoin: number;
+    availableRepayAmount: number;
+    availableRepayCoin: number;
 };
 export type TotalValueLocked = {
     supplyValue: number;

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

@@ -72,7 +72,7 @@ export type ParsedRewardPoolData = {
     spoolId: string;
 };
 export type CalculatedRewardPoolData = {
-    stakeApr: number;
+    rewardApr: number;
     totalRewardAmount: number;
     totalRewardCoin: number;
     totalRewardValue: number;

package/dist/utils/query.d.ts

@@ -1,3 +1,4 @@
+import BigNumber from 'bignumber.js';
 import type { ScallopUtils } from '../models';
 import type { OriginMarketPoolData, ParsedMarketPoolData, CalculatedMarketPoolData, OriginMarketCollateralData, ParsedMarketCollateralData, CalculatedMarketCollateralData, OriginStakePoolData, ParsedStakePoolData, CalculatedStakePoolData, OriginRewardPoolData, ParsedRewardPoolData, CalculatedRewardPoolData } from '../types';
 /**
@@ -32,3 +33,5 @@ export declare const calculateStakePoolData: (parsedStakePoolData: ParsedStakePo
  */
 export declare const parseOriginRewardPoolData: (originRewardPoolData: OriginRewardPoolData) => ParsedRewardPoolData;
 export declare const calculateRewardPoolData: (parsedStakePoolData: ParsedStakePoolData, parsedRewardPoolData: ParsedRewardPoolData, calculatedStakePoolData: CalculatedStakePoolData, rewardCoinPrice: number, rewardCoinDecimal: number) => CalculatedRewardPoolData;
+export declare const minBigNumber: (...args: BigNumber.Value[]) => BigNumber;
+export declare const maxBigNumber: (...args: BigNumber.Value[]) => BigNumber;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scallop-io/sui-scallop-sdk",
-  "version": "0.42.7",
+  "version": "0.44.0",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",
@@ -38,37 +38,43 @@
     "src"
   ],
   "dependencies": {
-    "@mysten/sui.js": "^0.42.0",
-    "@pythnetwork/price-service-client": "^1.8.0",
-    "@pythnetwork/pyth-sui-js": "^1.2.2",
-    "@scallop-io/sui-kit": "^0.42.0",
+    "@mysten/bcs": "^0.8.1",
+    "@mysten/sui.js": "^0.44.0",
+    "@noble/curves": "^1.2.0",
+    "@noble/hashes": "^1.3.2",
+    "@pythnetwork/price-service-client": "^1.8.1",
+    "@pythnetwork/pyth-sui-js": "^1.2.3",
+    "@scallop-io/sui-kit": "^0.44.0",
+    "@scure/bip39": "^1.2.1",
     "axios": "^1.5.1",
-    "bignumber.js": "^9.1.2"
+    "bignumber.js": "^9.1.2",
+    "superstruct": "^1.0.3",
+    "tweetnacl": "^1.0.3"
   },
   "devDependencies": {
-    "@commitlint/cli": "^17.7.2",
-    "@commitlint/config-conventional": "^17.7.0",
-    "@commitlint/prompt-cli": "^17.7.2",
-    "@types/node": "^20.8.2",
-    "@typescript-eslint/eslint-plugin": "^6.7.4",
-    "@typescript-eslint/parser": "^6.7.4",
+    "@commitlint/cli": "^18.0.0",
+    "@commitlint/config-conventional": "^18.0.0",
+    "@commitlint/prompt-cli": "^18.0.0",
+    "@types/node": "^20.8.7",
+    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@typescript-eslint/parser": "^6.8.0",
     "dotenv": "^16.3.1",
-    "eslint": "^8.50.0",
+    "eslint": "^8.52.0",
     "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
     "husky": "^8.0.3",
-    "lint-staged": "^14.0.1",
+    "lint-staged": "^15.0.2",
     "prettier": "^3.0.3",
     "standard-version": "^9.5.0",
     "tsconfig-paths": "^4.2.0",
     "tsup": "^7.2.0",
-    "typedoc": "^0.25.1",
+    "typedoc": "^0.25.2",
     "typescript": "^5.2.2",
     "vitest": "^0.34.6"
   },
   "peerDependencies": {
-    "@mysten/sui.js": "^0.42.0",
-    "@scallop-io/sui-kit": "^0.42.0"
+    "@mysten/sui.js": "^0.44.0",
+    "@scallop-io/sui-kit": "^0.44.0"
   },
   "lint-staged": {
     "**/*.ts": [

package/src/builders/coreBuilder.ts

@@ -3,7 +3,7 @@ import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui.js/utils';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import { getObligations } from '../queries';
 import { updateOracles } from './oracle';
-import type { SuiTxArg } from '@scallop-io/sui-kit';
+import type { SuiAddressArg } from '@scallop-io/sui-kit';
 import type { ScallopBuilder } from '../models';
 import type {
   CoreIds,
@@ -46,8 +46,8 @@ const requireObligationInfo = async (
   ...params: [
     builder: ScallopBuilder,
     txBlock: SuiKitTxBlock,
-    obligationId?: SuiTxArg | undefined,
-    obligationKey?: SuiTxArg | undefined,
+    obligationId?: SuiAddressArg,
+    obligationKey?: SuiAddressArg,
   ]
 ) => {
   const [builder, txBlock, obligationId, obligationKey] = params;
@@ -275,12 +275,12 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
         obligationKey
       );
       const updateCoinNames = await builder.utils.getObligationCoinNames(
-        obligationInfo.obligationId as string
+        obligationInfo.obligationId
       );
       await updateOracles(builder, txBlock, updateCoinNames);
       return txBlock.takeCollateral(
         obligationInfo.obligationId,
-        obligationInfo.obligationKey as SuiTxArg,
+        obligationInfo.obligationKey as SuiAddressArg,
         amount,
         collateralCoinName
       );
@@ -321,13 +321,13 @@ const generateCoreQuickMethod: GenerateCoreQuickMethod = ({
         obligationKey
       );
       const obligationCoinNames = await builder.utils.getObligationCoinNames(
-        obligationInfo.obligationId as string
+        obligationInfo.obligationId
       );
       const updateCoinNames = [...obligationCoinNames, poolCoinName];
       await updateOracles(builder, txBlock, updateCoinNames);
       return txBlock.borrow(
         obligationInfo.obligationId,
-        obligationInfo.obligationKey as SuiTxArg,
+        obligationInfo.obligationKey as SuiAddressArg,
         amount,
         poolCoinName
       );

package/src/builders/spoolBuilder.ts

@@ -3,7 +3,8 @@ import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui.js/utils';
 import { SuiTxBlock as SuiKitTxBlock } from '@scallop-io/sui-kit';
 import { rewardCoins } from '../constants/enum';
 import { getStakeAccounts } from '../queries/spoolQuery';
-import type { SuiTxArg } from '@scallop-io/sui-kit';
+import type { SuiAddressArg } from '@scallop-io/sui-kit';
+import type { TransactionResult } from '@mysten/sui.js/transactions';
 import type { ScallopBuilder } from '../models';
 import type {
   SpoolIds,
@@ -13,7 +14,6 @@ import type {
   SpoolTxBlock,
   SupportStakeMarketCoins,
   ScallopTxBlock,
-  TransactionResult,
 } from '../types';
 
 /**
@@ -48,7 +48,7 @@ const requireStakeAccountIds = async (
     builder: ScallopBuilder,
     txBlock: SuiKitTxBlock,
     stakeMarketCoinName: SupportStakeMarketCoins,
-    stakeAccountId?: SuiTxArg,
+    stakeAccountId?: SuiAddressArg,
   ]
 ) => {
   const [builder, txBlock, stakeMarketCoinName, stakeAccountId] = params;
@@ -79,7 +79,7 @@ const requireStakeAccounts = async (
     builder: ScallopBuilder,
     txBlock: SuiKitTxBlock,
     stakeMarketCoinName: SupportStakeMarketCoins,
-    stakeAccountId?: SuiTxArg,
+    stakeAccountId?: SuiAddressArg,
   ]
 ) => {
   const [builder, txBlock, stakeMarketCoinName, stakeAccountId] = params;

package/src/constants/enum.ts

@@ -4,6 +4,8 @@ import type {
   MarketCoins,
   StakeMarketCoins,
   RewardCoins,
+  AssetCoinIds,
+  WormholeCoinIds,
 } from '../types';
 
 export const coinDecimals: SupportCoinDecimals = {
@@ -58,3 +60,23 @@ export const rewardCoins: RewardCoins = {
   susdc: 'sui',
   susdt: 'sui',
 };
+
+export const coinIds: AssetCoinIds = {
+  sui: '0x0000000000000000000000000000000000000000000000000000000000000002',
+  eth: '0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5',
+  btc: '0x027792d9fed7f9844eb4839566001bb6f6cb4804f66aa2da6fe1ee242d896881',
+  usdc: '0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf',
+  usdt: '0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c',
+  apt: '0x3a5143bb1196e3bcdfab6203d1683ae29edd26294fc8bfeafe4aaa9d2704df37',
+  sol: '0xb7844e289a8410e50fb3ca48d69eb9cf29e27d223ef90353fe1bd8e27ff8f3f8',
+  cetus: '0x06864a6f921804860930db6ddbe2e16acdf8504495ea7481637a1c8b9a8fe54b',
+};
+
+export const wormholeCoinIds: WormholeCoinIds = {
+  eth: '0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5',
+  btc: '0x027792d9fed7f9844eb4839566001bb6f6cb4804f66aa2da6fe1ee242d896881',
+  usdc: '0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf',
+  usdt: '0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c',
+  apt: '0x3a5143bb1196e3bcdfab6203d1683ae29edd26294fc8bfeafe4aaa9d2704df37',
+  sol: '0xb7844e289a8410e50fb3ca48d69eb9cf29e27d223ef90353fe1bd8e27ff8f3f8',
+};