@scallop-io/sui-scallop-sdk 1.4.0 → 1.4.1-alpha.1

package/src/models/scallopClient.ts

@@ -4,7 +4,6 @@ import { DEFAULT_CACHE_OPTIONS } from 'src/constants/cache';
 import {
   ADDRESSES_ID,
   SUPPORT_BORROW_INCENTIVE_POOLS,
-  SUPPORT_BORROW_INCENTIVE_REWARDS,
   SUPPORT_SCOIN,
   SUPPORT_SPOOLS,
 } from '../constants';
@@ -28,7 +27,6 @@ import type {
   SupportAssetCoins,
   SupportStakeCoins,
   SupportStakeMarketCoins,
-  SupportBorrowIncentiveCoins,
   ScallopTxBlock,
   SupportSCoin,
   ScallopClientVeScaReturnType,
@@ -945,9 +943,9 @@ export class ScallopClient {
   }
 
   /**
-   * unstake market coin from the specific spool.
+   * Claim borrow incentive reward.
    *
-   * @param marketCoinName - Types of mak coin.
+   * @param poolName
    * @param amount - The amount of coins would deposit.
    * @param sign - Decide to directly sign the transaction or return the transaction block.
    * @param accountId - The stake account object.
@@ -955,7 +953,6 @@ export class ScallopClient {
    * @return Transaction block response or transaction block
    */
   public async claimBorrowIncentive<S extends boolean>(
-    coinName: SupportBorrowIncentiveCoins,
     obligationId: string,
     obligationKeyId: string,
     sign: S = true as S,
@@ -965,17 +962,37 @@ export class ScallopClient {
     const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
 
-    const rewardCoins = [];
-    for (const rewardCoinName of SUPPORT_BORROW_INCENTIVE_REWARDS) {
+    const rewardCoinsCollection: Record<string, TransactionResult[]> = {};
+    const obligationAccount =
+      await this.query.getObligationAccount(obligationId);
+    const rewardCoinNames = Object.values(obligationAccount.borrowIncentives)
+      .flatMap(({ rewards }) =>
+        rewards.filter(({ availableClaimAmount }) => availableClaimAmount > 0)
+      )
+      .flatMap(({ coinName }) => coinName);
+    for (const rewardCoinName of rewardCoinNames) {
       const rewardCoin = await txBlock.claimBorrowIncentiveQuick(
-        coinName,
         rewardCoinName,
         obligationId,
         obligationKeyId
       );
-      rewardCoins.push(rewardCoin);
+      if (!rewardCoinsCollection[rewardCoinName]) {
+        rewardCoinsCollection[rewardCoinName] = [rewardCoin];
+      } else {
+        rewardCoinsCollection[rewardCoinName].push(rewardCoin);
+      }
     }
-    txBlock.transferObjects(rewardCoins, sender);
+
+    txBlock.transferObjects(
+      Object.values(rewardCoinsCollection).map((rewardCoins) => {
+        const mergeDest = rewardCoins[0];
+        if (rewardCoins.length > 1) {
+          txBlock.mergeCoins(mergeDest, rewardCoins.slice(1));
+        }
+        return mergeDest;
+      }),
+      sender
+    );
 
     if (sign) {
       return (await this.suiKit.signAndSendTxn(

package/src/models/scallopQuery.ts

@@ -47,6 +47,7 @@ import {
   getSCoinAmounts,
   getSCoinSwapRate,
   getSCoinTotalSupply,
+  getAllCoinPrices,
 } from '../queries';
 import {
   ScallopQueryParams,
@@ -544,12 +545,17 @@ export class ScallopQuery {
    */
   public async getBorrowIncentivePools(
     coinNames?: SupportBorrowIncentiveCoins[],
-    args?: { coinPrices: CoinPrices; indexer?: boolean }
+    args?: {
+      coinPrices: CoinPrices;
+      indexer?: boolean;
+      marketPools?: MarketPools;
+    }
   ) {
     return await getBorrowIncentivePools(
       this,
       coinNames,
       args?.indexer,
+      args?.marketPools,
       args?.coinPrices
     );
   }
@@ -824,4 +830,15 @@ export class ScallopQuery {
   public async getCoinPriceByIndexer(poolName: SupportPoolCoins) {
     return this.indexer.getCoinPrice(poolName);
   }
+
+  /**
+   * Get all coin prices, including sCoin
+   * @returns prices data
+   */
+  public async getAllCoinPrices(args?: {
+    marketPools?: MarketPools;
+    coinPrices?: CoinPrices;
+  }) {
+    return getAllCoinPrices(this, args?.marketPools, args?.coinPrices);
+  }
 }

package/src/models/scallopUtils.ts

@@ -8,7 +8,6 @@ import {
   SUPPORT_POOLS,
   SUPPORT_COLLATERALS,
   spoolRewardCoins,
-  borrowIncentiveRewardCoins,
   coinDecimals,
   wormholeCoinIds,
   voloCoinIds,
@@ -21,6 +20,7 @@ import {
   COIN_GECKGO_IDS,
   POOL_ADDRESSES,
   sCoinTypeToName,
+  sCoinRawNameToName,
 } from '../constants';
 import { getPythPrices, queryObligation } from '../queries';
 import {
@@ -40,7 +40,6 @@ import type {
   SupportAssetCoins,
   SupportMarketCoins,
   SupportStakeMarketCoins,
-  SupportBorrowIncentiveCoins,
   CoinPrices,
   CoinWrappedType,
   SupportSCoin,
@@ -157,7 +156,14 @@ export class ScallopUtils {
    * @param coinName - Specific support coin name.
    * @return Coin type.
    */
-  public parseCoinType(coinName: SupportCoins) {
+  public parseCoinType(
+    coinName: SupportCoins,
+    useOldMarketCoin: boolean = false
+  ) {
+    // try parse scoin first
+    if (sCoinIds[coinName as SupportSCoin] && !useOldMarketCoin) {
+      return sCoinIds[coinName as SupportSCoin];
+    }
     coinName = isMarketCoin(coinName) ? this.parseCoinName(coinName) : coinName;
     const coinPackageId =
       this.address.get(`core.coins.${coinName}.id`) ||
@@ -225,6 +231,16 @@ export class ScallopUtils {
     }
   }
 
+  /**
+   * Convert sCoin name to coin name.
+   * This function will parse new sCoin name `scallop_...` to its old market coin name which is shorter
+   * e.g: `scallop_sui -> ssui
+   * @return sCoin name
+   */
+  public parseCoinNameFromSCoinName(coinName: string) {
+    return sCoinRawNameToName[coinName];
+  }
+
   /**
    * Convert sCoin name into sCoin type
    * @param sCoinName
@@ -272,7 +288,7 @@ export class ScallopUtils {
   public parseMarketCoinType(coinName: SupportCoins) {
     const protocolObjectId =
       this.address.get('core.object') ?? PROTOCOL_OBJECT_ID;
-    const coinType = this.parseCoinType(coinName);
+    const coinType = this.parseCoinType(coinName, true);
     return `${protocolObjectId}::reserve::MarketCoin<${coinType}>`;
   }
 
@@ -297,12 +313,13 @@ export class ScallopUtils {
   ): T extends SupportCoins ? T : SupportCoins;
   public parseCoinNameFromType(coinType: string) {
     coinType = normalizeStructTag(coinType);
+
     const coinTypeRegex = new RegExp(`((0x[^:]+::[^:]+::[^<>]+))(?![^<>]*<)`);
     const coinTypeMatch = coinType.match(coinTypeRegex);
     const isMarketCoinType = coinType.includes('reserve::MarketCoin');
     coinType = coinTypeMatch?.[1] ?? coinType;
 
-    const wormHoleCoinTypeMap: Record<string, SupportAssetCoins> = {
+    const wormholeCoinTypeMap: Record<string, SupportAssetCoins> = {
       [`${
         this.address.get('core.coins.wusdc.id') ?? wormholeCoinIds.wusdc
       }::coin::COIN`]: 'wusdc',
@@ -339,7 +356,7 @@ export class ScallopUtils {
     );
 
     const assetCoinName =
-      wormHoleCoinTypeMap[coinType] ||
+      wormholeCoinTypeMap[coinType] ||
       voloCoinTypeMap[coinType] ||
       suiBridgeTypeMap[coinType] ||
       (coinType.split('::')[2].toLowerCase() as SupportAssetCoins);
@@ -383,18 +400,6 @@ export class ScallopUtils {
     return spoolRewardCoins[stakeMarketCoinName];
   };
 
-  /**
-   * Get reward type of borrow incentive pool.
-   *
-   * @param borrowIncentiveCoinName - Support borrow incentive coin.
-   * @return Borrow incentive reward coin name.
-   */
-  public getBorrowIncentiveRewardCoinName = (
-    borrowIncentiveCoinName: SupportBorrowIncentiveCoins
-  ) => {
-    return borrowIncentiveRewardCoins[borrowIncentiveCoinName];
-  };
-
   /**
    * Get coin decimal.
    *

package/src/queries/borrowIncentiveQuery.ts

@@ -1,5 +1,9 @@
 import { normalizeStructTag } from '@mysten/sui/utils';
-import { SUPPORT_BORROW_INCENTIVE_POOLS } from '../constants';
+import {
+  sCoinRawNameToName,
+  SUPPORT_BORROW_INCENTIVE_POOLS,
+  SUPPORT_BORROW_INCENTIVE_REWARDS,
+} from '../constants';
 import {
   parseOriginBorrowIncentivePoolData,
   parseOriginBorrowIncentiveAccountData,
@@ -17,6 +21,7 @@ import type {
   OptionalKeys,
   BorrowIncentivePool,
   CoinPrices,
+  MarketPools,
 } from '../types';
 import BigNumber from 'bignumber.js';
 
@@ -55,11 +60,14 @@ export const getBorrowIncentivePools = async (
     ...SUPPORT_BORROW_INCENTIVE_POOLS,
   ],
   indexer: boolean = false,
+  marketPools?: MarketPools,
   coinPrices?: CoinPrices
 ) => {
   const borrowIncentivePools: BorrowIncentivePools = {};
-
-  coinPrices = coinPrices ?? (await query.utils.getCoinPrices()) ?? {};
+  marketPools =
+    marketPools ??
+    (await query.getMarketPools(undefined, { indexer, coinPrices }));
+  coinPrices = coinPrices ?? (await query.getAllCoinPrices({ marketPools }));
 
   if (indexer) {
     const borrowIncentivePoolsIndexer =
@@ -67,7 +75,13 @@ export const getBorrowIncentivePools = async (
 
     const updateBorrowIncentivePool = (pool: BorrowIncentivePool) => {
       if (!borrowIncentiveCoinNames.includes(pool.coinName)) return;
-      pool.coinPrice = coinPrices[pool.coinName] ?? pool.coinPrice;
+      pool.coinPrice = coinPrices[pool.coinName] || pool.coinPrice;
+      for (const sCoinName of SUPPORT_BORROW_INCENTIVE_REWARDS) {
+        if (pool.points[sCoinName]) {
+          pool.points[sCoinName].coinPrice =
+            coinPrices[sCoinName] ?? pool.points[sCoinName].coinPrice;
+        }
+      }
       borrowIncentivePools[pool.coinName] = pool;
     };
 
@@ -94,7 +108,6 @@ export const getBorrowIncentivePools = async (
       query.utils.parseCoinNameFromType<SupportBorrowIncentiveCoins>(
         poolCoinType
       );
-
     const poolCoinPrice = coinPrices?.[poolCoinName] ?? 0;
     const poolCoinDecimal = query.utils.getCoinDecimal(poolCoinName);
 
@@ -102,17 +115,21 @@ export const getBorrowIncentivePools = async (
     if (!borrowIncentiveCoinNames.includes(poolCoinName)) {
       continue;
     }
-    // pool points for borrow incentive reward ('sui' and 'sca')
+
+    // pool points for borrow incentive reward
     for (const [coinName, poolPoint] of Object.entries(
       parsedBorrowIncentivePoolData.poolPoints
     )) {
-      const rewardCoinType = normalizeStructTag(poolPoint.pointType);
-      const rewardCoinName =
-        query.utils.parseCoinNameFromType<SupportBorrowIncentiveRewardCoins>(
-          rewardCoinType
-        );
-      const rewardCoinPrice = coinPrices?.[rewardCoinName] ?? 0;
+      const rewardCoinType = poolPoint.pointType;
+      let rewardCoinName = query.utils.parseCoinNameFromType(
+        rewardCoinType
+      ) as SupportBorrowIncentiveRewardCoins;
+      // handle for scoin name
+      if (sCoinRawNameToName[rewardCoinName]) {
+        rewardCoinName = sCoinRawNameToName[rewardCoinName];
+      }
       const rewardCoinDecimal = query.utils.getCoinDecimal(rewardCoinName);
+      const rewardCoinPrice = coinPrices?.[rewardCoinName] ?? 0;
 
       const symbol = query.utils.parseSymbol(rewardCoinName);
       const coinDecimal = query.utils.getCoinDecimal(rewardCoinName);

package/src/queries/borrowLimitQuery.ts

@@ -17,8 +17,9 @@ const borrowLimitZod = zod.object({
   }),
 });
 
-const borrowLimitKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::BorrowLimitKey`; // prod
-// const borrowLimitKeyType = `0xb784ea287d944e478a3ceaa071f8885072cce6b7224cf245914dc2f9963f460e::market_dynamic_keys::BorrowLimitKey`;
+// TODO: enable for production
+// const borrowLimitKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::BorrowLimitKey`; // prod
+const borrowLimitKeyType = `0xb784ea287d944e478a3ceaa071f8885072cce6b7224cf245914dc2f9963f460e::market_dynamic_keys::BorrowLimitKey`;
 /**
  * Return supply limit of a pool (including the decimals)
  * @param utils

package/src/queries/coreQuery.ts

@@ -247,7 +247,7 @@ export const getMarketPools = async (
   const marketObjectResponse = await query.cache.queryGetObject(marketId, {
     showContent: true,
   });
-  coinPrices = (await query.utils.getCoinPrices(poolCoinNames)) ?? {};
+  coinPrices = coinPrices ?? (await query.utils.getCoinPrices());
 
   const marketPools: MarketPools = {};
 
@@ -305,9 +305,7 @@ export const getMarketPool = async (
   marketObject?: SuiObjectData | null,
   coinPrice?: number
 ): Promise<MarketPool | undefined> => {
-  coinPrice =
-    coinPrice ||
-    (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
+  coinPrice = coinPrice ?? (await query.utils.getCoinPrices())?.[poolCoinName];
 
   if (indexer) {
     const marketPoolIndexer = await query.indexer.getMarketPool(poolCoinName);
@@ -536,8 +534,7 @@ export const getMarketCollaterals = async (
   indexer: boolean = false
 ) => {
   const marketId = query.address.get('core.market');
-  const coinPrices =
-    (await query.utils.getCoinPrices(collateralCoinNames)) ?? {};
+  const coinPrices = (await query.utils.getCoinPrices()) ?? {};
   const marketCollaterals: MarketCollaterals = {};
 
   if (indexer) {
@@ -595,10 +592,7 @@ export const getMarketCollateral = async (
   coinPrice?: number
 ): Promise<MarketCollateral | undefined> => {
   coinPrice =
-    coinPrice ||
-    (await query.utils.getCoinPrices([collateralCoinName]))?.[
-      collateralCoinName
-    ];
+    coinPrice ?? (await query.utils.getCoinPrices())?.[collateralCoinName];
 
   if (indexer) {
     const marketCollateralIndexer =

package/src/queries/isolatedAssetQuery.ts

@@ -18,8 +18,9 @@ const isolatedAssetZod = zod.object({
   }),
 });
 
-const isolatedAssetKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::IsolatedAssetKey`; // prod
-// const isolatedAssetKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::IsolatedAssetKey`;
+// TODO: enable for production
+// const isolatedAssetKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::IsolatedAssetKey`; // prod
+const isolatedAssetKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::IsolatedAssetKey`;
 
 /**
  * Return list of isolated assets coin types

package/src/queries/portfolioQuery.ts

@@ -1,6 +1,5 @@
 import BigNumber from 'bignumber.js';
 import {
-  SUPPORT_BORROW_INCENTIVE_REWARDS,
   SUPPORT_COLLATERALS,
   SUPPORT_POOLS,
   SUPPORT_SPOOLS,
@@ -50,7 +49,7 @@ export const getLendings = async (
     (SUPPORT_SPOOLS as readonly SupportMarketCoins[]).includes(marketCoinName)
   ) as SupportStakeMarketCoins[];
 
-  const coinPrices = await query.utils.getCoinPrices(poolCoinNames);
+  const coinPrices = await query.utils.getCoinPrices();
   const marketPools = await query.getMarketPools(poolCoinNames, {
     indexer,
     coinPrices,
@@ -124,9 +123,7 @@ export const getLending = async (
 ) => {
   const marketCoinName = query.utils.parseMarketCoinName(poolCoinName);
   coinPrice =
-    coinPrice ??
-    (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName] ??
-    0;
+    coinPrice ?? (await query.utils.getCoinPrices())?.[poolCoinName] ?? 0;
 
   marketPool =
     marketPool ??
@@ -355,9 +352,9 @@ export const getObligationAccount = async (
   const collateralAssetCoinNames: SupportCollateralCoins[] = [
     ...SUPPORT_COLLATERALS,
   ];
+  market = market ?? (await query.queryMarket({ indexer }));
   coinPrices =
-    coinPrices ?? (await query.utils.getCoinPrices(collateralAssetCoinNames));
-  market = market ?? (await query.queryMarket({ indexer, coinPrices }));
+    coinPrices ?? (await query.getAllCoinPrices({ marketPools: market.pools }));
   coinAmounts =
     coinAmounts ||
     (await query.getCoinAmounts(collateralAssetCoinNames, ownerAddress));
@@ -526,64 +523,70 @@ export const getObligationAccount = async (
     const borrowIncentivePool = borrowIncentivePools[coinName];
     if (borrowIncentivePool) {
       const rewards: ObligationBorrowIcentiveReward[] = [];
-      for (const rewardCoinName of SUPPORT_BORROW_INCENTIVE_REWARDS) {
-        const accountPoint = borrowIncentiveAccount.pointList[rewardCoinName];
-        const poolPoint = borrowIncentivePool.points[rewardCoinName];
-
-        if (accountPoint && poolPoint) {
-          let availableClaimAmount = BigNumber(0);
-          let availableClaimCoin = BigNumber(0);
-          const accountBorrowedAmount = BigNumber(accountPoint.weightedAmount);
-          const baseIndexRate = 1_000_000_000;
-          const increasedPointRate = poolPoint.currentPointIndex
-            ? Math.max(
-                BigNumber(poolPoint.currentPointIndex - accountPoint.index)
-                  .dividedBy(baseIndexRate)
-                  .toNumber(),
-                0
-              )
-            : 1;
-          availableClaimAmount = availableClaimAmount.plus(
-            accountBorrowedAmount
-              .multipliedBy(increasedPointRate)
-              .plus(accountPoint.points)
-          );
-          availableClaimCoin = availableClaimAmount.shiftedBy(
-            -1 * poolPoint.coinDecimal
-          );
-
-          // for veSCA
-          const weightScale = BigNumber(1_000_000_000_000);
-          const boostValue = BigNumber(accountPoint.weightedAmount)
-            .div(
-              BigNumber(borrowIncentiveAccount.debtAmount)
-                .multipliedBy(poolPoint.baseWeight)
-                .dividedBy(weightScale)
-            )
-            .isFinite()
-            ? BigNumber(accountPoint.weightedAmount)
-                .div(
-                  BigNumber(borrowIncentiveAccount.debtAmount)
-                    .multipliedBy(poolPoint.baseWeight)
-                    .dividedBy(weightScale)
+      Object.entries(borrowIncentiveAccount.pointList).forEach(
+        ([key, accountPoint]) => {
+          const poolPoint =
+            borrowIncentivePool.points[
+              key as SupportBorrowIncentiveRewardCoins
+            ];
+
+          if (accountPoint && poolPoint) {
+            let availableClaimAmount = BigNumber(0);
+            let availableClaimCoin = BigNumber(0);
+            const accountBorrowedAmount = BigNumber(
+              accountPoint.weightedAmount
+            );
+            const baseIndexRate = 1_000_000_000;
+            const increasedPointRate = poolPoint.currentPointIndex
+              ? Math.max(
+                  BigNumber(poolPoint.currentPointIndex - accountPoint.index)
+                    .dividedBy(baseIndexRate)
+                    .toNumber(),
+                  0
                 )
-                .toNumber()
-            : 1;
-
-          if (availableClaimAmount.isGreaterThanOrEqualTo(0)) {
-            rewards.push({
-              coinName: poolPoint.coinName,
-              coinType: poolPoint.coinType,
-              symbol: poolPoint.symbol,
-              coinDecimal: poolPoint.coinDecimal,
-              coinPrice: poolPoint.coinPrice,
-              availableClaimAmount: availableClaimAmount.toNumber(),
-              availableClaimCoin: availableClaimCoin.toNumber(),
-              boostValue,
-            });
+              : 1;
+            availableClaimAmount = availableClaimAmount.plus(
+              accountBorrowedAmount
+                .multipliedBy(increasedPointRate)
+                .plus(accountPoint.points)
+            );
+            availableClaimCoin = availableClaimAmount.shiftedBy(
+              -1 * poolPoint.coinDecimal
+            );
+
+            // for veSCA
+            const weightScale = BigNumber(1_000_000_000_000);
+            const boostValue = BigNumber(accountPoint.weightedAmount)
+              .div(
+                BigNumber(borrowIncentiveAccount.debtAmount)
+                  .multipliedBy(poolPoint.baseWeight)
+                  .dividedBy(weightScale)
+              )
+              .isFinite()
+              ? BigNumber(accountPoint.weightedAmount)
+                  .div(
+                    BigNumber(borrowIncentiveAccount.debtAmount)
+                      .multipliedBy(poolPoint.baseWeight)
+                      .dividedBy(weightScale)
+                  )
+                  .toNumber()
+              : 1;
+
+            if (availableClaimAmount.isGreaterThanOrEqualTo(0)) {
+              rewards.push({
+                coinName: poolPoint.coinName,
+                coinType: poolPoint.coinType,
+                symbol: poolPoint.symbol,
+                coinDecimal: poolPoint.coinDecimal,
+                coinPrice: poolPoint.coinPrice,
+                availableClaimAmount: availableClaimAmount.toNumber(),
+                availableClaimCoin: availableClaimCoin.toNumber(),
+                boostValue,
+              });
+            }
           }
         }
-      }
+      );
 
       if (
         Object.keys(borrowIncentivePool.points).some((coinName: any) => {

package/src/queries/priceQuery.ts

@@ -1,6 +1,14 @@
 import { SuiObjectData } from '@mysten/sui/client';
-import type { ScallopAddress } from '../models';
-import type { SupportAssetCoins } from '../types';
+import type { ScallopAddress, ScallopQuery } from '../models';
+import type {
+  CoinPrices,
+  MarketPools,
+  OptionalKeys,
+  SupportAssetCoins,
+  SupportSCoin,
+} from '../types';
+import { SUPPORT_SCOIN } from 'src/constants/common';
+import BigNumber from 'bignumber.js';
 
 /**
  * Get price from pyth fee object.
@@ -126,3 +134,28 @@ export const getPythPrices = async (
     {} as Record<SupportAssetCoins, number>
   );
 };
+
+export const getAllCoinPrices = async (
+  query: ScallopQuery,
+  marketPools?: MarketPools,
+  coinPrices?: CoinPrices
+) => {
+  coinPrices = coinPrices ?? (await query.utils.getCoinPrices());
+  marketPools =
+    marketPools ?? (await query.getMarketPools(undefined, { coinPrices }));
+  if (!marketPools) {
+    throw new Error(`Failed to fetch market pool for getAllCoinPrices`);
+  }
+  const sCoinPrices: OptionalKeys<Record<SupportSCoin, number>> = {};
+  SUPPORT_SCOIN.forEach((sCoinName) => {
+    const coinName = query.utils.parseCoinName(sCoinName);
+    sCoinPrices[sCoinName] = BigNumber(coinPrices[coinName] ?? 0)
+      .multipliedBy(marketPools[coinName]?.conversionRate ?? 1)
+      .toNumber();
+  });
+
+  return {
+    ...coinPrices,
+    ...sCoinPrices,
+  };
+};

package/src/queries/sCoinQuery.ts

@@ -153,7 +153,7 @@ export const getSCoinSwapRate = async (
   const BtoSCoinBRate = 1 / marketPools[1]!.conversionRate;
 
   const calcAtoBRate = async () => {
-    const prices = await query.utils.getCoinPrices([fromCoinName, toCoinName]);
+    const prices = await query.utils.getCoinPrices();
     if (!prices[fromCoinName] || !prices[toCoinName]) {
       throw new Error('Failed to fetch the coin prices');
     }

package/src/queries/spoolQuery.ts

@@ -71,7 +71,6 @@ export const getSpools = async (
     };
     Object.values(spoolsIndexer).forEach(updateSpools);
 
-    // console.log(spools);
     return spools;
   }
 
@@ -122,7 +121,7 @@ export const getSpool = async (
     `spool.pools.${marketCoinName}.rewardPoolId`
   );
   let spool: Spool | undefined = undefined;
-  coinPrices = coinPrices || (await query.utils.getCoinPrices([coinName]));
+  coinPrices = coinPrices || (await query.utils.getCoinPrices());
 
   if (indexer) {
     const spoolIndexer = await query.indexer.getSpool(marketCoinName);
@@ -152,8 +151,7 @@ export const getSpool = async (
   }
 
   const rewardCoinName = query.utils.getSpoolRewardCoinName(marketCoinName);
-  coinPrices =
-    coinPrices || (await query.utils.getCoinPrices([coinName, rewardCoinName]));
+  coinPrices = coinPrices || (await query.utils.getCoinPrices());
 
   const spoolObject = spoolObjectResponse[0];
   const rewardPoolObject = spoolObjectResponse[1];

package/src/queries/supplyLimitQuery.ts

@@ -17,8 +17,9 @@ const supplyLimitZod = zod.object({
   }),
 });
 
-const supplyLimitKeyType = `0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::SupplyLimitKey`; // prod
-// const supplyLimitKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::SupplyLimitKey`;
+// TODO: enable for production
+// const supplyLimitKeyType = `0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::SupplyLimitKey`; // prod
+const supplyLimitKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::SupplyLimitKey`;
 /**
  * Return supply limit of a pool (including the decimals)
  * @param utils

package/src/test.ts

@@ -0,0 +1,20 @@
+// import { ScallopQuery } from './models';
+
+// const main = async () => {
+//   try {
+//     const query = new ScallopQuery({
+//       walletAddress:
+//         '0x61819c99588108d9f7710047e6ad8f2da598de8e98a26ea62bd7ad9847f5329c',
+//     });
+//     await query.init();
+
+//     const res = await query.getAllCoinPrices();
+//     console.dir(res, { depth: null });
+//   } catch (e) {
+//     console.error(e);
+//   } finally {
+//     process.exit(0);
+//   }
+// };
+
+// main();