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

package/dist/models/scallopUtils.d.ts

@@ -64,6 +64,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.
      *

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.42.8",
   "description": "Typescript sdk for interacting with Scallop contract on SUI",
   "keywords": [
     "sui",

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',
+};

package/src/models/scallopUtils.ts

@@ -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 =

package/src/queries/coreQuery.ts

@@ -98,6 +98,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 +354,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,

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/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'

package/src/types/query/portfolio.ts

@@ -32,11 +32,21 @@ export type Lending = Required<
   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 = {
@@ -53,43 +63,43 @@ export type ObligationAccount = {
   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;
-      }
-    >
+    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 = {

package/src/types/query/spool.ts

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

package/src/utils/query.ts

@@ -346,7 +346,7 @@ export const calculateRewardPoolData = (
     .shiftedBy(-1 * rewardCoinDecimal)
     .multipliedBy(rateYearFactor)
     .multipliedBy(rewardCoinPrice);
-  const stakeRate = rewardValueForYear
+  const rewardRate = rewardValueForYear
     .dividedBy(calculatedStakePoolData.stakedValue)
     .isFinite()
     ? rewardValueForYear
@@ -355,7 +355,7 @@ export const calculateRewardPoolData = (
     : Infinity;
 
   return {
-    stakeApr: stakeRate,
+    rewardApr: rewardRate,
     totalRewardAmount: totalRewardAmount.toNumber(),
     totalRewardCoin: totalRewardCoin.toNumber(),
     totalRewardValue: totalRewardValue.toNumber(),
@@ -370,3 +370,19 @@ export const calculateRewardPoolData = (
     exchangeRateDenominator: parsedRewardPoolData.exchangeRateDenominator,
   };
 };
+
+export const minBigNumber = (...args: BigNumber.Value[]) => {
+  return BigNumber(
+    args.reduce((min, current) =>
+      new BigNumber(current).lt(min) ? current : min
+    )
+  );
+};
+
+export const maxBigNumber = (...args: BigNumber.Value[]) => {
+  return BigNumber(
+    args.reduce((max, current) =>
+      new BigNumber(current).gt(max) ? current : max
+    )
+  );
+};