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

package/src/constants/enum.ts

@@ -16,8 +16,9 @@ export const coinDecimals: types.SupportCoinDecimals = {
   hasui: 9,
   vsui: 9,
   sca: 9,
-  deep: 6,
-  fud: 5,
+  // TODO: enable for production
+  // deep: 6,
+  // fud: 5,
   susdc: 6,
   sweth: 8,
   ssbeth: 8,
@@ -32,8 +33,9 @@ export const coinDecimals: types.SupportCoinDecimals = {
   shasui: 9,
   svsui: 9,
   ssca: 9,
-  sdeep: 6,
-  sfud: 5,
+  // TODO: enable for production
+  // sdeep: 6,
+  // sfud: 5,
 };
 
 export const assetCoins: types.AssetCoins = {
@@ -51,8 +53,9 @@ export const assetCoins: types.AssetCoins = {
   hasui: 'hasui',
   vsui: 'vsui',
   sca: 'sca',
-  deep: 'deep',
-  fud: 'fud',
+  // TODO: enable for production
+  // deep: 'deep',
+  // fud: 'fud',
 };
 
 export const marketCoins: types.MarketCoins = {
@@ -70,8 +73,9 @@ export const marketCoins: types.MarketCoins = {
   shasui: 'shasui',
   svsui: 'svsui',
   ssca: 'ssca',
-  sdeep: 'sdeep',
-  sfud: 'sfud',
+  // TODO: enable for production
+  // sdeep: 'sdeep',
+  // sfud: 'sfud',
 };
 
 export const sCoins: types.SCoins = {
@@ -88,8 +92,9 @@ export const sCoins: types.SCoins = {
   ssca: 'ssca',
   swsol: 'swsol',
   swbtc: 'swbtc',
-  sfud: 'sfud',
-  sdeep: 'sdeep',
+  // TODO: enable for production
+  // sfud: 'sfud',
+  // sdeep: 'sdeep',
 };
 
 export const stakeMarketCoins: types.StakeMarketCoins = {
@@ -120,19 +125,6 @@ export const suiBridgeCoins: types.SuiBridgeCoins = {
   sbeth: 'sbeth',
 };
 
-export const borrowIncentiveRewardCoins: types.BorrowIncentiveRewardCoins = {
-  usdc: ['sui', 'sca'],
-  sui: ['sui', 'sca'],
-  wusdc: ['sui', 'sca'],
-  wusdt: ['sui', 'sca'],
-  sca: ['sui', 'sca'],
-  afsui: ['sui'],
-  hasui: ['sui'],
-  vsui: ['sui'],
-  weth: ['sui'],
-  sbeth: ['sui'],
-};
-
 export const coinIds: types.AssetCoinIds = {
   usdc: '0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7',
   sui: '0x0000000000000000000000000000000000000000000000000000000000000002',
@@ -151,8 +143,8 @@ export const coinIds: types.AssetCoinIds = {
     ? '0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524'
     : '0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6',
   // isolated assets
-  deep: '0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270',
-  fud: '0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1',
+  // deep: '0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270',
+  // fud: '0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1',
 };
 
 export const wormholeCoinIds: types.WormholeCoinIds = {
@@ -174,14 +166,24 @@ export const sCoinIds: types.SCoinIds = {
     '0x854950aa624b1df59fe64e630b2ba7c550642e9342267a33061d59fb31582da5::scallop_usdc::SCALLOP_USDC',
   ssbeth:
     '0xb14f82d8506d139eacef109688d1b71e7236bcce9b2c0ad526abcd6aa5be7de0::scallop_sb_eth::SCALLOP_SB_ETH',
-  ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
+  // prod values
+  // ssui: '0xaafc4f740de0dd0dde642a31148fb94517087052f19afb0f7bed1dc41a50c77b::scallop_sui::SCALLOP_SUI',
+  // swusdc:
+  //   '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
+  // swusdt:
+  //   '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
+  // ssca: '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
+
+  // test values
+  ssui: '0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI',
+  swusdt:
+    '0xac781d9f73058ff5e69f9bf8dde32f2e8c71c66d7fe8497fc83b2d9182254b22::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
+  swusdc:
+    '0xf5447c4305a486d8c8557559887c2c39449ddb5e748f15d33946d02a1663c158::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
+  ssca: '0x958428555e778e55918a59eb1c92c77f32b5c554fa3a5e56cd0815086b5072e7::scallop_sca::SCALLOP_SCA',
+
   scetus:
     '0xea346ce428f91ab007210443efcea5f5cdbbb3aae7e9affc0ca93f9203c31f0c::scallop_cetus::SCALLOP_CETUS',
-  ssca: '0x5ca17430c1d046fae9edeaa8fd76c7b4193a00d764a0ecfa9418d733ad27bc1e::scallop_sca::SCALLOP_SCA',
-  swusdc:
-    '0xad4d71551d31092230db1fd482008ea42867dbf27b286e9c70a79d2a6191d58d::scallop_wormhole_usdc::SCALLOP_WORMHOLE_USDC',
-  swusdt:
-    '0xe6e5a012ec20a49a3d1d57bd2b67140b96cd4d3400b9d79e541f7bdbab661f95::scallop_wormhole_usdt::SCALLOP_WORMHOLE_USDT',
   sweth:
     '0x67540ceb850d418679e69f1fb6b2093d6df78a2a699ffc733f7646096d552e9b::scallop_wormhole_eth::SCALLOP_WORMHOLE_ETH',
   safsui:
@@ -194,9 +196,9 @@ export const sCoinIds: types.SCoinIds = {
     '0x1392650f2eca9e3f6ffae3ff89e42a3590d7102b80e2b430f674730bc30d3259::scallop_wormhole_sol::SCALLOP_WORMHOLE_SOL',
   swbtc:
     '0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC',
-  sdeep:
-    '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP',
-  sfud: '0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD',
+  // sdeep:
+  //   '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP',
+  // sfud: '0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD',
 } as const;
 
 export const sCoinTypeToName = Object.entries(sCoinIds).reduce(
@@ -207,6 +209,14 @@ export const sCoinTypeToName = Object.entries(sCoinIds).reduce(
   {} as Record<string, types.SupportSCoin>
 );
 
+export const sCoinRawNameToName = Object.entries(sCoinIds).reduce(
+  (acc, [coinName, coinType]) => {
+    acc[coinType.split('::')[2].toLowerCase()] = coinName as types.SupportSCoin;
+    return acc;
+  },
+  {} as Record<string, types.SupportSCoin>
+);
+
 // TEST VERSION
 // export const sCoinIds: types.SCoinIds = {
 // ssui: '0xf569919046f19a0c40b519ecfbb6ca0319698cd5908716c29b62ef56541f298b::scallop_sui::SCALLOP_SUI',

package/src/constants/poolAddress.ts

@@ -91,12 +91,13 @@ export const POOL_ADDRESSES: Record<
     collateralPoolAddress:
       '0xff677a5d9e9dc8f08f0a8681ebfc7481d1c7d57bc441f2881974adcdd7b13c31',
   },
-  fud: {
-    lendingPoolAddress:
-      '0x14367ddca30e2860cb89ed4eaca20c7ece260c5d59dd9990d2c85a8321326acb',
-  },
-  deep: {
-    lendingPoolAddress:
-      '0xf4a67ffb43da1e1c61c049f188f19463ea8dbbf2d5ef4722d6df854ff1b1cc03',
-  },
+  // TODO: enable for production
+  // fud: {
+  //   lendingPoolAddress:
+  //     '0x14367ddca30e2860cb89ed4eaca20c7ece260c5d59dd9990d2c85a8321326acb',
+  // },
+  // deep: {
+  //   lendingPoolAddress:
+  //     '0xf4a67ffb43da1e1c61c049f188f19463ea8dbbf2d5ef4722d6df854ff1b1cc03',
+  // },
 };

package/src/constants/pyth.ts

@@ -22,6 +22,7 @@ export const PYTH_FEED_IDS: Record<SupportPoolCoins, string> = {
   hasui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
   vsui: '23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744',
   sca: '7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc',
-  deep: '29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff',
-  fud: '6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75',
+  // TODO: enable for production
+  // deep: '29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff',
+  // fud: '6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75',
 };

package/src/constants/tokenBucket.ts

@@ -1,2 +1,2 @@
 export const DEFAULT_TOKENS_PER_INTERVAL = 50;
-export const DEFAULT_INTERVAL_IN_MS = 300;
+export const DEFAULT_INTERVAL_IN_MS = 100;

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,
@@ -191,11 +192,11 @@ export class ScallopQuery {
    * @param indexer - Whether to use indexer.
    * @return Market data.
    */
-  public async queryMarket(
-    indexer: boolean = false,
-    args?: { coinPrices: CoinPrices }
-  ) {
-    return await queryMarket(this, indexer, args?.coinPrices);
+  public async queryMarket(args?: {
+    coinPrices?: CoinPrices;
+    indexer?: boolean;
+  }) {
+    return await queryMarket(this, args?.indexer, args?.coinPrices);
   }
 
   /**
@@ -211,12 +212,17 @@ export class ScallopQuery {
    */
   public async getMarketPools(
     poolCoinNames?: SupportPoolCoins[],
-    indexer: boolean = false,
     args?: {
       coinPrices?: CoinPrices;
+      indexer?: boolean;
     }
   ) {
-    return await getMarketPools(this, poolCoinNames, indexer, args?.coinPrices);
+    return await getMarketPools(
+      this,
+      poolCoinNames,
+      args?.indexer,
+      args?.coinPrices
+    );
   }
 
   /**
@@ -228,16 +234,16 @@ export class ScallopQuery {
    */
   public async getMarketPool(
     poolCoinName: SupportPoolCoins,
-    indexer: boolean = false,
     args?: {
       marketObject?: SuiObjectData | null;
       coinPrice?: number;
+      indexer?: boolean;
     }
   ) {
     return await getMarketPool(
       this,
       poolCoinName,
-      indexer,
+      args?.indexer,
       args?.marketObject,
       args?.coinPrice
     );
@@ -256,9 +262,9 @@ export class ScallopQuery {
    */
   public async getMarketCollaterals(
     collateralCoinNames?: SupportCollateralCoins[],
-    indexer: boolean = false
+    args?: { indexer?: boolean }
   ) {
-    return await getMarketCollaterals(this, collateralCoinNames, indexer);
+    return await getMarketCollaterals(this, collateralCoinNames, args?.indexer);
   }
 
   /**
@@ -270,9 +276,9 @@ export class ScallopQuery {
    */
   public async getMarketCollateral(
     collateralCoinName: SupportCollateralCoins,
-    indexer: boolean = false
+    args?: { indexer?: boolean }
   ) {
-    return await getMarketCollateral(this, collateralCoinName, indexer);
+    return await getMarketCollateral(this, collateralCoinName, args?.indexer);
   }
 
   /**
@@ -382,16 +388,16 @@ export class ScallopQuery {
    */
   public async getSpools(
     stakeMarketCoinNames?: SupportStakeMarketCoins[],
-    indexer: boolean = false,
     args?: {
       marketPools?: MarketPools;
       coinPrices?: CoinPrices;
+      indexer?: boolean;
     }
   ) {
     return await getSpools(
       this,
       stakeMarketCoinNames,
-      indexer,
+      args?.indexer,
       args?.marketPools,
       args?.coinPrices
     );
@@ -406,13 +412,16 @@ export class ScallopQuery {
    */
   public async getSpool(
     stakeMarketCoinName: SupportStakeMarketCoins,
-    indexer: boolean = false,
-    args?: { marketPool?: MarketPool; coinPrices?: CoinPrices }
+    args?: {
+      marketPool?: MarketPool;
+      coinPrices?: CoinPrices;
+      indexer?: boolean;
+    }
   ) {
     return await getSpool(
       this,
       stakeMarketCoinName,
-      indexer,
+      args?.indexer,
       args?.marketPool,
       args?.coinPrices
     );
@@ -536,13 +545,17 @@ export class ScallopQuery {
    */
   public async getBorrowIncentivePools(
     coinNames?: SupportBorrowIncentiveCoins[],
-    indexer: boolean = false,
-    args?: { coinPrices: CoinPrices }
+    args?: {
+      coinPrices: CoinPrices;
+      indexer?: boolean;
+      marketPools?: MarketPools;
+    }
   ) {
     return await getBorrowIncentivePools(
       this,
       coinNames,
-      indexer,
+      args?.indexer,
+      args?.marketPools,
       args?.coinPrices
     );
   }
@@ -572,9 +585,9 @@ export class ScallopQuery {
   public async getLendings(
     poolCoinNames?: SupportPoolCoins[],
     ownerAddress: string = this.walletAddress,
-    indexer: boolean = false
+    args?: { indexer?: boolean }
   ) {
-    return await getLendings(this, poolCoinNames, ownerAddress, indexer);
+    return await getLendings(this, poolCoinNames, ownerAddress, args?.indexer);
   }
 
   /**
@@ -588,9 +601,9 @@ export class ScallopQuery {
   public async getLending(
     poolCoinName: SupportPoolCoins,
     ownerAddress: string = this.walletAddress,
-    indexer: boolean = false
+    args?: { indexer?: boolean }
   ) {
-    return await getLending(this, poolCoinName, ownerAddress, indexer);
+    return await getLending(this, poolCoinName, ownerAddress, args?.indexer);
   }
 
   /**
@@ -605,9 +618,9 @@ export class ScallopQuery {
    */
   public async getObligationAccounts(
     ownerAddress: string = this.walletAddress,
-    indexer: boolean = false
+    args?: { indexer: boolean }
   ) {
-    return await getObligationAccounts(this, ownerAddress, indexer);
+    return await getObligationAccounts(this, ownerAddress, args?.indexer);
   }
 
   /**
@@ -624,13 +637,13 @@ export class ScallopQuery {
   public async getObligationAccount(
     obligationId: string,
     ownerAddress: string = this.walletAddress,
-    indexer: boolean = false
+    args?: { indexer?: boolean }
   ) {
     return await getObligationAccount(
       this,
       obligationId,
       ownerAddress,
-      indexer
+      args?.indexer
     );
   }
 
@@ -643,8 +656,8 @@ export class ScallopQuery {
    *
    * @return Total value locked.
    */
-  public async getTvl(indexer: boolean = false) {
-    return await getTotalValueLocked(this, indexer);
+  public async getTvl(args?: { indexer?: boolean }) {
+    return await getTotalValueLocked(this, args?.indexer);
   }
 
   /**
@@ -817,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);