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

package/dist/index.js

@@ -74,12 +74,12 @@ __export(src_exports, {
   UNLOCK_ROUND_DURATION: () => UNLOCK_ROUND_DURATION,
   USE_TEST_ADDRESS: () => USE_TEST_ADDRESS,
   assetCoins: () => assetCoins,
-  borrowIncentiveRewardCoins: () => borrowIncentiveRewardCoins,
   coinDecimals: () => coinDecimals,
   coinIds: () => coinIds,
   marketCoins: () => marketCoins,
   queryKeys: () => queryKeys,
   sCoinIds: () => sCoinIds,
+  sCoinRawNameToName: () => sCoinRawNameToName,
   sCoinTypeToName: () => sCoinTypeToName,
   sCoins: () => sCoins,
   spoolRewardCoins: () => spoolRewardCoins,
@@ -115,9 +115,10 @@ var COIN_GECKGO_IDS = {
   afsui: "sui",
   hasui: "sui",
   vsui: "sui",
-  sca: "scallop-2",
-  deep: "deepbook",
-  fud: "fud-the-pug"
+  sca: "scallop-2"
+  // TODO: enable for production
+  // deep: 'deepbook',
+  // fud: 'fud-the-pug',
 };
 
 // src/constants/common.ts
@@ -146,9 +147,10 @@ var SUPPORT_POOLS = [
   "afsui",
   "hasui",
   "vsui",
-  "sca",
-  "fud",
-  "deep"
+  "sca"
+  // TODO: enable for production
+  // 'fud',
+  // 'deep',
 ];
 var SUPPORT_COLLATERALS = [
   "usdc",
@@ -192,9 +194,10 @@ var SUPPORT_SCOIN = [
   "ssca",
   "scetus",
   "swsol",
-  "swbtc",
-  "sdeep",
-  "sfud"
+  "swbtc"
+  // TODO: enable for production
+  // 'sdeep',
+  // 'sfud',
 ];
 var SUPPORT_SUI_BRIDGE = ["sbeth"];
 var SUPPORT_WORMHOLE = [
@@ -218,7 +221,10 @@ var SUPPORT_BORROW_INCENTIVE_POOLS = [
   "sca",
   "usdc"
 ];
-var SUPPORT_BORROW_INCENTIVE_REWARDS = ["sui", "sca"];
+var SUPPORT_BORROW_INCENTIVE_REWARDS = [
+  ...SUPPORT_POOLS,
+  ...SUPPORT_SCOIN
+];
 var SUPPORT_ORACLES = ["supra", "switchboard", "pyth"];
 var SUPPORT_PACKAGES = [
   "coinDecimalsRegistry",
@@ -251,8 +257,9 @@ var coinDecimals = {
   hasui: 9,
   vsui: 9,
   sca: 9,
-  deep: 6,
-  fud: 5,
+  // TODO: enable for production
+  // deep: 6,
+  // fud: 5,
   susdc: 6,
   sweth: 8,
   ssbeth: 8,
@@ -266,9 +273,10 @@ var coinDecimals = {
   safsui: 9,
   shasui: 9,
   svsui: 9,
-  ssca: 9,
-  sdeep: 6,
-  sfud: 5
+  ssca: 9
+  // TODO: enable for production
+  // sdeep: 6,
+  // sfud: 5,
 };
 var assetCoins = {
   usdc: "usdc",
@@ -284,9 +292,10 @@ var assetCoins = {
   afsui: "afsui",
   hasui: "hasui",
   vsui: "vsui",
-  sca: "sca",
-  deep: "deep",
-  fud: "fud"
+  sca: "sca"
+  // TODO: enable for production
+  // deep: 'deep',
+  // fud: 'fud',
 };
 var marketCoins = {
   susdc: "susdc",
@@ -302,9 +311,10 @@ var marketCoins = {
   safsui: "safsui",
   shasui: "shasui",
   svsui: "svsui",
-  ssca: "ssca",
-  sdeep: "sdeep",
-  sfud: "sfud"
+  ssca: "ssca"
+  // TODO: enable for production
+  // sdeep: 'sdeep',
+  // sfud: 'sfud',
 };
 var sCoins = {
   susdc: "susdc",
@@ -319,9 +329,10 @@ var sCoins = {
   svsui: "svsui",
   ssca: "ssca",
   swsol: "swsol",
-  swbtc: "swbtc",
-  sfud: "sfud",
-  sdeep: "sdeep"
+  swbtc: "swbtc"
+  // TODO: enable for production
+  // sfud: 'sfud',
+  // sdeep: 'sdeep',
 };
 var stakeMarketCoins = {
   susdc: "susdc",
@@ -348,18 +359,6 @@ var spoolRewardCoins = {
 var suiBridgeCoins = {
   sbeth: "sbeth"
 };
-var 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"]
-};
 var coinIds = {
   usdc: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7",
   sui: "0x0000000000000000000000000000000000000000000000000000000000000002",
@@ -374,10 +373,10 @@ var coinIds = {
   afsui: "0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc",
   hasui: "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d",
   vsui: "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55",
-  sca: IS_VE_SCA_TEST ? "0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524" : "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6",
+  sca: IS_VE_SCA_TEST ? "0x6cd813061a3adf3602b76545f076205f0c8e7ec1d3b1eab9a1da7992c18c0524" : "0x7016aae72cfc67f2fadf55769c0a7dd54291a583b63051a5ed71081cce836ac6"
   // isolated assets
-  deep: "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270",
-  fud: "0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1"
+  // deep: '0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270',
+  // fud: '0x76cb819b01abed502bee8a702b4c2d547532c12f25001c9dea795a5e631c26f1',
 };
 var wormholeCoinIds = {
   weth: "0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5",
@@ -393,19 +392,28 @@ var voloCoinIds = {
 var sCoinIds = {
   susdc: "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: "0x00671b1fa2a124f5be8bdae8b91ee711462c5d9e31bda232e70fd9607b523c88::scallop_af_sui::SCALLOP_AF_SUI",
   shasui: "0x9a2376943f7d22f88087c259c5889925f332ca4347e669dc37d54c2bf651af3c::scallop_ha_sui::SCALLOP_HA_SUI",
   svsui: "0xe1a1cc6bcf0001a015eab84bcc6713393ce20535f55b8b6f35c142e057a25fbe::scallop_v_sui::SCALLOP_V_SUI",
   swsol: "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"
+  swbtc: "0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC"
+  // sdeep:
+  //   '0xeb7a05a3224837c5e5503575aed0be73c091d1ce5e43aa3c3e716e0ae614608f::scallop_deep::SCALLOP_DEEP',
+  // sfud: '0xe56d5167f427cbe597da9e8150ef5c337839aaf46891d62468dcf80bdd8e10d1::scallop_fud::SCALLOP_FUD',
 };
 var sCoinTypeToName = Object.entries(sCoinIds).reduce(
   (acc, [coinName, coinType]) => {
@@ -414,6 +422,13 @@ var sCoinTypeToName = Object.entries(sCoinIds).reduce(
   },
   {}
 );
+var sCoinRawNameToName = Object.entries(sCoinIds).reduce(
+  (acc, [coinName, coinType]) => {
+    acc[coinType.split("::")[2].toLowerCase()] = coinName;
+    return acc;
+  },
+  {}
+);
 
 // src/constants/flashloan.ts
 var FlashLoanFeeObjectMap = {
@@ -488,13 +503,16 @@ var POOL_ADDRESSES = {
   sca: {
     lendingPoolAddress: "0x6fc7d4211fc7018b6c75e7b908b88f2e0536443239804a3d32af547637bd28d7",
     collateralPoolAddress: "0xff677a5d9e9dc8f08f0a8681ebfc7481d1c7d57bc441f2881974adcdd7b13c31"
-  },
-  fud: {
-    lendingPoolAddress: "0x14367ddca30e2860cb89ed4eaca20c7ece260c5d59dd9990d2c85a8321326acb"
-  },
-  deep: {
-    lendingPoolAddress: "0xf4a67ffb43da1e1c61c049f188f19463ea8dbbf2d5ef4722d6df854ff1b1cc03"
   }
+  // TODO: enable for production
+  // fud: {
+  //   lendingPoolAddress:
+  //     '0x14367ddca30e2860cb89ed4eaca20c7ece260c5d59dd9990d2c85a8321326acb',
+  // },
+  // deep: {
+  //   lendingPoolAddress:
+  //     '0xf4a67ffb43da1e1c61c049f188f19463ea8dbbf2d5ef4722d6df854ff1b1cc03',
+  // },
 };
 
 // src/constants/pyth.ts
@@ -516,9 +534,10 @@ var PYTH_FEED_IDS = {
   afsui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
   hasui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
   vsui: "23d7315113f5b1d3ba7a83604c44b94d79f4fd69af77f804fc7f920a6dc65744",
-  sca: "7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc",
-  deep: "29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff",
-  fud: "6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75"
+  sca: "7e17f0ac105abe9214deb9944c30264f5986bf292869c6bd8e8da3ccd92d79bc"
+  // TODO: enable for production
+  // deep: '29bdd5248234e33bd93d3b81100b5fa32eaa5997843847e2c2cb16d7c6d9f7ff',
+  // fud: '6a4090703da959247727f2b490eb21aea95c8684ecfac675f432008830890c75',
 };
 
 // src/constants/queryKeys.ts
@@ -1044,7 +1063,7 @@ var TEST_ADDRESSES = {
 
 // src/constants/tokenBucket.ts
 var DEFAULT_TOKENS_PER_INTERVAL = 50;
-var DEFAULT_INTERVAL_IN_MS = 300;
+var DEFAULT_INTERVAL_IN_MS = 100;
 
 // src/constants/vesca.ts
 var UNLOCK_ROUND_DURATION = 60 * 60 * 24;
@@ -1645,7 +1664,7 @@ var TokenBucket = class {
     return false;
   }
 };
-var callWithRateLimit = async (tokenBucket, fn, retryDelayInMs = DEFAULT_INTERVAL_IN_MS, maxRetries = 30, backoffFactor = 1.25) => {
+var callWithRateLimit = async (tokenBucket, fn, retryDelayInMs = DEFAULT_INTERVAL_IN_MS, maxRetries = 15, backoffFactor = 2) => {
   let retries = 0;
   const tryRequest = async () => {
     if (tokenBucket.removeTokens(1)) {
@@ -1681,13 +1700,19 @@ var callWithRateLimit = async (tokenBucket, fn, retryDelayInMs = DEFAULT_INTERVA
 
 // src/utils/indexer.ts
 async function callMethodWithIndexerFallback(method, context, ...args) {
-  const indexer = args[args.length - 1];
-  if (indexer) {
+  const lastArgs = args[args.length - 1];
+  if (typeof lastArgs === "object" && lastArgs.indexer) {
     try {
       return await method.apply(context, args);
     } catch (e) {
       console.warn(`Indexer requests failed: ${e}. Retrying without indexer..`);
-      return await method.apply(context, [...args.slice(0, -1), false]);
+      return await method.apply(context, [
+        ...args.slice(0, -1),
+        {
+          ...lastArgs,
+          indexer: false
+        }
+      ]);
     }
   }
   return await method.apply(context, args);
@@ -2555,15 +2580,21 @@ var queryBorrowIncentivePools = async (address) => {
 };
 var getBorrowIncentivePools = async (query, borrowIncentiveCoinNames = [
   ...SUPPORT_BORROW_INCENTIVE_POOLS
-], indexer = false, coinPrices) => {
+], indexer = false, marketPools, coinPrices) => {
   const borrowIncentivePools = {};
-  coinPrices = coinPrices ?? await query.utils.getCoinPrices() ?? {};
+  marketPools = marketPools ?? await query.getMarketPools(void 0, { indexer, coinPrices });
+  coinPrices = coinPrices ?? await query.getAllCoinPrices({ marketPools });
   if (indexer) {
     const borrowIncentivePoolsIndexer = await query.indexer.getBorrowIncentivePools();
     const updateBorrowIncentivePool = (pool) => {
       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;
     };
     Object.values(borrowIncentivePoolsIndexer).forEach(
@@ -2589,12 +2620,15 @@ var getBorrowIncentivePools = async (query, borrowIncentiveCoinNames = [
     for (const [coinName, poolPoint] of Object.entries(
       parsedBorrowIncentivePoolData.poolPoints
     )) {
-      const rewardCoinType = (0, import_utils3.normalizeStructTag)(poolPoint.pointType);
-      const rewardCoinName = query.utils.parseCoinNameFromType(
+      const rewardCoinType = poolPoint.pointType;
+      let rewardCoinName = query.utils.parseCoinNameFromType(
         rewardCoinType
       );
-      const rewardCoinPrice = coinPrices?.[rewardCoinName] ?? 0;
+      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);
       const calculatedPoolPoint = calculateBorrowIncentivePoolPointData(
@@ -2740,7 +2774,7 @@ var supplyLimitZod = import_zod.z.object({
     value: import_zod.z.string()
   })
 });
-var supplyLimitKeyType = `0x6e641f0dca8aedab3101d047e96439178f16301bf0b57fe8745086ff1195eb3e::market_dynamic_keys::SupplyLimitKey`;
+var supplyLimitKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::SupplyLimitKey`;
 var getSupplyLimit = async (utils, poolName) => {
   try {
     const poolCoinType = utils.parseCoinType(poolName).slice(2);
@@ -2780,7 +2814,7 @@ var isolatedAssetZod = import_zod2.z.object({
     value: import_zod2.z.boolean()
   })
 });
-var isolatedAssetKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::IsolatedAssetKey`;
+var isolatedAssetKeyType = `0x6c23585e940a989588432509107e98bae06dbca4e333f26d0635d401b3c7c76d::market_dynamic_keys::IsolatedAssetKey`;
 var getIsolatedAssets = async (address) => {
   try {
     const marketObject = address.get("core.market");
@@ -2860,7 +2894,7 @@ var borrowLimitZod = import_zod3.z.object({
     value: import_zod3.z.string()
   })
 });
-var borrowLimitKeyType = `0xe7dbb371a9595631f7964b7ece42255ad0e738cc85fe6da26c7221b220f01af6::market_dynamic_keys::BorrowLimitKey`;
+var borrowLimitKeyType = `0xb784ea287d944e478a3ceaa071f8885072cce6b7224cf245914dc2f9963f460e::market_dynamic_keys::BorrowLimitKey`;
 var getBorrowLimit = async (utils, poolName) => {
   try {
     const poolCoinType = utils.parseCoinType(poolName).slice(2);
@@ -3027,7 +3061,7 @@ var getMarketPools = async (query, poolCoinNames = [...SUPPORT_POOLS], indexer =
   const marketObjectResponse = await query.cache.queryGetObject(marketId, {
     showContent: true
   });
-  coinPrices = await query.utils.getCoinPrices(poolCoinNames) ?? {};
+  coinPrices = coinPrices ?? await query.utils.getCoinPrices();
   const marketPools = {};
   if (indexer) {
     const marketPoolsIndexer = await query.indexer.getMarketPools();
@@ -3060,154 +3094,150 @@ var getMarketPools = async (query, poolCoinNames = [...SUPPORT_POOLS], indexer =
   return marketPools;
 };
 var getMarketPool = async (query, poolCoinName, indexer = false, marketObject, coinPrice) => {
-  try {
-    coinPrice = coinPrice || (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName];
-    if (indexer) {
-      const marketPoolIndexer = await query.indexer.getMarketPool(poolCoinName);
-      if (!marketPoolIndexer) {
-        return void 0;
+  coinPrice = coinPrice ?? (await query.utils.getCoinPrices())?.[poolCoinName];
+  if (indexer) {
+    const marketPoolIndexer = await query.indexer.getMarketPool(poolCoinName);
+    if (!marketPoolIndexer) {
+      return void 0;
+    }
+    marketPoolIndexer.coinPrice = coinPrice ?? marketPoolIndexer.coinPrice;
+    marketPoolIndexer.coinWrappedType = query.utils.getCoinWrappedType(
+      marketPoolIndexer.coinName
+    );
+    return marketPoolIndexer;
+  }
+  const marketId = query.address.get("core.market");
+  marketObject = marketObject || (await query.cache.queryGetObject(marketId, {
+    showContent: true
+  }))?.data;
+  if (!(marketObject && marketObject.content?.dataType === "moveObject"))
+    throw new Error(`Failed to fetch marketObject`);
+  const fields = marketObject.content.fields;
+  const coinType = query.utils.parseCoinType(poolCoinName);
+  const balanceSheetParentId = fields.vault.fields.balance_sheets.fields.table.fields.id.id;
+  const balanceSheetDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
+    parentId: balanceSheetParentId,
+    name: {
+      type: "0x1::type_name::TypeName",
+      value: {
+        name: coinType.substring(2)
       }
-      marketPoolIndexer.coinPrice = coinPrice ?? marketPoolIndexer.coinPrice;
-      marketPoolIndexer.coinWrappedType = query.utils.getCoinWrappedType(
-        marketPoolIndexer.coinName
-      );
-      return marketPoolIndexer;
     }
-    const marketId = query.address.get("core.market");
-    marketObject = marketObject || (await query.cache.queryGetObject(marketId, {
-      showContent: true
-    }))?.data;
-    if (!(marketObject && marketObject.content?.dataType === "moveObject"))
-      throw new Error(`Failed to fetch marketObject`);
-    const fields = marketObject.content.fields;
-    const coinType = query.utils.parseCoinType(poolCoinName);
-    const balanceSheetParentId = fields.vault.fields.balance_sheets.fields.table.fields.id.id;
-    const balanceSheetDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
-      parentId: balanceSheetParentId,
-      name: {
-        type: "0x1::type_name::TypeName",
-        value: {
-          name: coinType.substring(2)
-        }
+  });
+  const balanceSheetDynamicFieldObject = balanceSheetDynamicFieldObjectResponse?.data;
+  if (!(balanceSheetDynamicFieldObject && balanceSheetDynamicFieldObject.content && "fields" in balanceSheetDynamicFieldObject.content))
+    throw new Error(
+      `Failed to fetch balanceSheetDynamicFieldObject for ${poolCoinName}: ${balanceSheetDynamicFieldObjectResponse?.error?.code.toString()}`
+    );
+  const balanceSheet = balanceSheetDynamicFieldObject.content.fields.value.fields;
+  const borrowIndexParentId = fields.borrow_dynamics.fields.table.fields.id.id;
+  const borrowIndexDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
+    parentId: borrowIndexParentId,
+    name: {
+      type: "0x1::type_name::TypeName",
+      value: {
+        name: coinType.substring(2)
       }
-    });
-    const balanceSheetDynamicFieldObject = balanceSheetDynamicFieldObjectResponse?.data;
-    if (!(balanceSheetDynamicFieldObject && balanceSheetDynamicFieldObject.content && "fields" in balanceSheetDynamicFieldObject.content))
-      throw new Error(
-        `Failed to fetch balanceSheetDynamicFieldObject for ${poolCoinName}: ${balanceSheetDynamicFieldObjectResponse?.error?.code.toString()}`
-      );
-    const balanceSheet = balanceSheetDynamicFieldObject.content.fields.value.fields;
-    const borrowIndexParentId = fields.borrow_dynamics.fields.table.fields.id.id;
-    const borrowIndexDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
-      parentId: borrowIndexParentId,
-      name: {
-        type: "0x1::type_name::TypeName",
-        value: {
-          name: coinType.substring(2)
-        }
+    }
+  });
+  const borrowIndexDynamicFieldObject = borrowIndexDynamicFieldObjectResponse?.data;
+  if (!(borrowIndexDynamicFieldObject && borrowIndexDynamicFieldObject.content && "fields" in borrowIndexDynamicFieldObject.content))
+    throw new Error(
+      `Failed to fetch borrowIndexDynamicFieldObject for ${poolCoinName}`
+    );
+  const borrowIndex = borrowIndexDynamicFieldObject.content.fields.value.fields;
+  const interestModelParentId = fields.interest_models.fields.table.fields.id.id;
+  const interestModelDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
+    parentId: interestModelParentId,
+    name: {
+      type: "0x1::type_name::TypeName",
+      value: {
+        name: coinType.substring(2)
       }
-    });
-    const borrowIndexDynamicFieldObject = borrowIndexDynamicFieldObjectResponse?.data;
-    if (!(borrowIndexDynamicFieldObject && borrowIndexDynamicFieldObject.content && "fields" in borrowIndexDynamicFieldObject.content))
-      throw new Error(
-        `Failed to fetch borrowIndexDynamicFieldObject for ${poolCoinName}`
-      );
-    const borrowIndex = borrowIndexDynamicFieldObject.content.fields.value.fields;
-    const interestModelParentId = fields.interest_models.fields.table.fields.id.id;
-    const interestModelDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
-      parentId: interestModelParentId,
+    }
+  });
+  const interestModelDynamicFieldObject = interestModelDynamicFieldObjectResponse?.data;
+  if (!(interestModelDynamicFieldObject && interestModelDynamicFieldObject.content && "fields" in interestModelDynamicFieldObject.content))
+    throw new Error(
+      `Failed to fetch interestModelDynamicFieldObject for ${poolCoinName}: ${interestModelDynamicFieldObject}`
+    );
+  const interestModel = interestModelDynamicFieldObject.content.fields.value.fields;
+  const getBorrowFee = async () => {
+    const borrowFeeDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
+      parentId: marketId,
       name: {
-        type: "0x1::type_name::TypeName",
+        type: `${BORROW_FEE_PROTOCOL_ID}::market_dynamic_keys::BorrowFeeKey`,
         value: {
-          name: coinType.substring(2)
-        }
-      }
-    });
-    const interestModelDynamicFieldObject = interestModelDynamicFieldObjectResponse?.data;
-    if (!(interestModelDynamicFieldObject && interestModelDynamicFieldObject.content && "fields" in interestModelDynamicFieldObject.content))
-      throw new Error(
-        `Failed to fetch interestModelDynamicFieldObject for ${poolCoinName}: ${interestModelDynamicFieldObject}`
-      );
-    const interestModel = interestModelDynamicFieldObject.content.fields.value.fields;
-    const getBorrowFee = async () => {
-      const borrowFeeDynamicFieldObjectResponse = await query.cache.queryGetDynamicFieldObject({
-        parentId: marketId,
-        name: {
-          type: `${BORROW_FEE_PROTOCOL_ID}::market_dynamic_keys::BorrowFeeKey`,
-          value: {
-            type: {
-              name: coinType.substring(2)
-            }
+          type: {
+            name: coinType.substring(2)
           }
         }
-      });
-      const borrowFeeDynamicFieldObject = borrowFeeDynamicFieldObjectResponse?.data;
-      if (!(borrowFeeDynamicFieldObject && borrowFeeDynamicFieldObject.content && "fields" in borrowFeeDynamicFieldObject.content))
-        return { value: "0" };
-      return borrowFeeDynamicFieldObject.content.fields.value.fields;
-    };
-    const parsedMarketPoolData = parseOriginMarketPoolData({
-      type: interestModel.type.fields,
-      maxBorrowRate: interestModel.max_borrow_rate.fields,
-      interestRate: borrowIndex.interest_rate.fields,
-      interestRateScale: borrowIndex.interest_rate_scale,
-      borrowIndex: borrowIndex.borrow_index,
-      lastUpdated: borrowIndex.last_updated,
-      cash: balanceSheet.cash,
-      debt: balanceSheet.debt,
-      marketCoinSupply: balanceSheet.market_coin_supply,
-      reserve: balanceSheet.revenue,
-      reserveFactor: interestModel.revenue_factor.fields,
-      borrowWeight: interestModel.borrow_weight.fields,
-      borrowFeeRate: await getBorrowFee(),
-      baseBorrowRatePerSec: interestModel.base_borrow_rate_per_sec.fields,
-      borrowRateOnHighKink: interestModel.borrow_rate_on_high_kink.fields,
-      borrowRateOnMidKink: interestModel.borrow_rate_on_mid_kink.fields,
-      highKink: interestModel.high_kink.fields,
-      midKink: interestModel.mid_kink.fields,
-      minBorrowAmount: interestModel.min_borrow_amount
+      }
     });
-    const calculatedMarketPoolData = calculateMarketPoolData(
-      query.utils,
-      parsedMarketPoolData
-    );
-    const coinDecimal = query.utils.getCoinDecimal(poolCoinName);
-    const maxSupplyCoin = (0, import_bignumber3.default)(
-      await getSupplyLimit(query.utils, poolCoinName) ?? "0"
-    ).shiftedBy(-coinDecimal).toNumber();
-    const maxBorrowCoin = (0, import_bignumber3.default)(
-      await getBorrowLimit(query.utils, poolCoinName) ?? "0"
-    ).shiftedBy(-coinDecimal).toNumber();
-    return {
-      coinName: poolCoinName,
-      symbol: query.utils.parseSymbol(poolCoinName),
-      coinType: query.utils.parseCoinType(poolCoinName),
-      marketCoinType: query.utils.parseMarketCoinType(poolCoinName),
-      sCoinType: query.utils.parseSCoinType(
-        query.utils.parseMarketCoinName(poolCoinName)
-      ),
-      coinWrappedType: query.utils.getCoinWrappedType(poolCoinName),
-      coinDecimal,
-      coinPrice: coinPrice ?? 0,
-      highKink: parsedMarketPoolData.highKink,
-      midKink: parsedMarketPoolData.midKink,
-      reserveFactor: parsedMarketPoolData.reserveFactor,
-      borrowWeight: parsedMarketPoolData.borrowWeight,
-      borrowFee: parsedMarketPoolData.borrowFee,
-      marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
-      minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
-      maxSupplyCoin,
-      maxBorrowCoin,
-      isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
-      ...calculatedMarketPoolData
-    };
-  } catch (e) {
-    console.error(e.message);
-  }
+    const borrowFeeDynamicFieldObject = borrowFeeDynamicFieldObjectResponse?.data;
+    if (!(borrowFeeDynamicFieldObject && borrowFeeDynamicFieldObject.content && "fields" in borrowFeeDynamicFieldObject.content))
+      return { value: "0" };
+    return borrowFeeDynamicFieldObject.content.fields.value.fields;
+  };
+  const parsedMarketPoolData = parseOriginMarketPoolData({
+    type: interestModel.type.fields,
+    maxBorrowRate: interestModel.max_borrow_rate.fields,
+    interestRate: borrowIndex.interest_rate.fields,
+    interestRateScale: borrowIndex.interest_rate_scale,
+    borrowIndex: borrowIndex.borrow_index,
+    lastUpdated: borrowIndex.last_updated,
+    cash: balanceSheet.cash,
+    debt: balanceSheet.debt,
+    marketCoinSupply: balanceSheet.market_coin_supply,
+    reserve: balanceSheet.revenue,
+    reserveFactor: interestModel.revenue_factor.fields,
+    borrowWeight: interestModel.borrow_weight.fields,
+    borrowFeeRate: await getBorrowFee(),
+    baseBorrowRatePerSec: interestModel.base_borrow_rate_per_sec.fields,
+    borrowRateOnHighKink: interestModel.borrow_rate_on_high_kink.fields,
+    borrowRateOnMidKink: interestModel.borrow_rate_on_mid_kink.fields,
+    highKink: interestModel.high_kink.fields,
+    midKink: interestModel.mid_kink.fields,
+    minBorrowAmount: interestModel.min_borrow_amount
+  });
+  const calculatedMarketPoolData = calculateMarketPoolData(
+    query.utils,
+    parsedMarketPoolData
+  );
+  const coinDecimal = query.utils.getCoinDecimal(poolCoinName);
+  const maxSupplyCoin = (0, import_bignumber3.default)(
+    await getSupplyLimit(query.utils, poolCoinName) ?? "0"
+  ).shiftedBy(-coinDecimal).toNumber();
+  const maxBorrowCoin = (0, import_bignumber3.default)(
+    await getBorrowLimit(query.utils, poolCoinName) ?? "0"
+  ).shiftedBy(-coinDecimal).toNumber();
+  return {
+    coinName: poolCoinName,
+    symbol: query.utils.parseSymbol(poolCoinName),
+    coinType: query.utils.parseCoinType(poolCoinName),
+    marketCoinType: query.utils.parseMarketCoinType(poolCoinName),
+    sCoinType: query.utils.parseSCoinType(
+      query.utils.parseMarketCoinName(poolCoinName)
+    ),
+    coinWrappedType: query.utils.getCoinWrappedType(poolCoinName),
+    coinDecimal,
+    coinPrice: coinPrice ?? 0,
+    highKink: parsedMarketPoolData.highKink,
+    midKink: parsedMarketPoolData.midKink,
+    reserveFactor: parsedMarketPoolData.reserveFactor,
+    borrowWeight: parsedMarketPoolData.borrowWeight,
+    borrowFee: parsedMarketPoolData.borrowFee,
+    marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
+    minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
+    maxSupplyCoin,
+    maxBorrowCoin,
+    isIsolated: await isIsolatedAsset(query.utils, poolCoinName),
+    ...calculatedMarketPoolData
+  };
 };
 var getMarketCollaterals = async (query, collateralCoinNames = [...SUPPORT_COLLATERALS], indexer = false) => {
   const marketId = query.address.get("core.market");
-  const coinPrices = await query.utils.getCoinPrices(collateralCoinNames) ?? {};
+  const coinPrices = await query.utils.getCoinPrices() ?? {};
   const marketCollaterals = {};
   if (indexer) {
     const marketCollateralsIndexer = await query.indexer.getMarketCollaterals();
@@ -3243,7 +3273,7 @@ var getMarketCollaterals = async (query, collateralCoinNames = [...SUPPORT_COLLA
   return marketCollaterals;
 };
 var getMarketCollateral = async (query, collateralCoinName, indexer = false, marketObject, coinPrice) => {
-  coinPrice = coinPrice || (await query.utils.getCoinPrices([collateralCoinName]))?.[collateralCoinName];
+  coinPrice = coinPrice ?? (await query.utils.getCoinPrices())?.[collateralCoinName];
   if (indexer) {
     const marketCollateralIndexer = await query.indexer.getMarketCollateral(collateralCoinName);
     marketCollateralIndexer.coinPrice = coinPrice ?? marketCollateralIndexer.coinPrice;
@@ -3559,11 +3589,13 @@ var getLendings = async (query, poolCoinNames = [...SUPPORT_POOLS], ownerAddress
   const stakeMarketCoinNames = marketCoinNames.filter(
     (marketCoinName) => SUPPORT_SPOOLS.includes(marketCoinName)
   );
-  const coinPrices = await query.utils.getCoinPrices(poolCoinNames);
-  const marketPools = await query.getMarketPools(poolCoinNames, indexer, {
+  const coinPrices = await query.utils.getCoinPrices();
+  const marketPools = await query.getMarketPools(poolCoinNames, {
+    indexer,
     coinPrices
   });
-  const spools = await query.getSpools(stakeMarketCoinNames, indexer, {
+  const spools = await query.getSpools(stakeMarketCoinNames, {
+    indexer,
     marketPools,
     coinPrices
   });
@@ -3597,22 +3629,20 @@ var getLendings = async (query, poolCoinNames = [...SUPPORT_POOLS], ownerAddress
 };
 var getLending = async (query, poolCoinName, ownerAddress, indexer = false, marketPool, spool, stakeAccounts, coinAmount, marketCoinAmount, coinPrice, sCoinAmount) => {
   const marketCoinName = query.utils.parseMarketCoinName(poolCoinName);
-  coinPrice = coinPrice ?? (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName] ?? 0;
-  marketPool = marketPool ?? await query.getMarketPool(poolCoinName, indexer, {
+  coinPrice = coinPrice ?? (await query.utils.getCoinPrices())?.[poolCoinName] ?? 0;
+  marketPool = marketPool ?? await query.getMarketPool(poolCoinName, {
+    indexer,
     coinPrice
   });
   if (!marketPool)
     throw new Error(`Failed to fetch marketPool for ${poolCoinName}`);
-  spool = spool ?? SUPPORT_SPOOLS.includes(marketCoinName) ? await query.getSpool(
-    marketCoinName,
+  spool = spool ?? SUPPORT_SPOOLS.includes(marketCoinName) ? await query.getSpool(marketCoinName, {
     indexer,
-    {
-      marketPool,
-      coinPrices: {
-        [poolCoinName]: coinPrice
-      }
+    marketPool,
+    coinPrices: {
+      [poolCoinName]: coinPrice
     }
-  ) : void 0;
+  }) : void 0;
   stakeAccounts = stakeAccounts || SUPPORT_SPOOLS.includes(marketCoinName) ? await query.getStakeAccounts(
     marketCoinName,
     ownerAddress
@@ -3732,7 +3762,7 @@ var getLending = async (query, poolCoinName, ownerAddress, indexer = false, mark
 };
 var getObligationAccounts = async (query, ownerAddress, indexer = false) => {
   const coinPrices = await query.utils.getCoinPrices();
-  const market = await query.queryMarket(indexer, { coinPrices });
+  const market = await query.queryMarket({ indexer, coinPrices });
   const [coinAmounts, obligations] = await Promise.all([
     query.getCoinAmounts(void 0, ownerAddress),
     query.getObligations(ownerAddress)
@@ -3757,13 +3787,14 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
   const collateralAssetCoinNames = [
     ...SUPPORT_COLLATERALS
   ];
-  coinPrices = coinPrices ?? await query.utils.getCoinPrices(collateralAssetCoinNames);
-  market = market ?? await query.queryMarket(indexer, { coinPrices });
+  market = market ?? await query.queryMarket({ indexer });
+  coinPrices = coinPrices ?? await query.getAllCoinPrices({ marketPools: market.pools });
   coinAmounts = coinAmounts || await query.getCoinAmounts(collateralAssetCoinNames, ownerAddress);
   const [obligationQuery, borrowIncentivePools, borrowIncentiveAccounts] = await Promise.all([
     query.queryObligation(obligationId),
-    query.getBorrowIncentivePools(void 0, indexer, {
-      coinPrices
+    query.getBorrowIncentivePools(void 0, {
+      coinPrices,
+      indexer
     }),
     query.getBorrowIncentiveAccounts(obligationId)
   ]);
@@ -3899,44 +3930,47 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
     const borrowIncentivePool = borrowIncentivePools[coinName];
     if (borrowIncentivePool) {
       const rewards = [];
-      for (const rewardCoinName of SUPPORT_BORROW_INCENTIVE_REWARDS) {
-        const accountPoint = borrowIncentiveAccount.pointList[rewardCoinName];
-        const poolPoint = borrowIncentivePool.points[rewardCoinName];
-        if (accountPoint && poolPoint) {
-          let availableClaimAmount = (0, import_bignumber5.default)(0);
-          let availableClaimCoin = (0, import_bignumber5.default)(0);
-          const accountBorrowedAmount = (0, import_bignumber5.default)(accountPoint.weightedAmount);
-          const baseIndexRate = 1e9;
-          const increasedPointRate = poolPoint.currentPointIndex ? Math.max(
-            (0, import_bignumber5.default)(poolPoint.currentPointIndex - accountPoint.index).dividedBy(baseIndexRate).toNumber(),
-            0
-          ) : 1;
-          availableClaimAmount = availableClaimAmount.plus(
-            accountBorrowedAmount.multipliedBy(increasedPointRate).plus(accountPoint.points)
-          );
-          availableClaimCoin = availableClaimAmount.shiftedBy(
-            -1 * poolPoint.coinDecimal
-          );
-          const weightScale = (0, import_bignumber5.default)(1e12);
-          const boostValue = (0, import_bignumber5.default)(accountPoint.weightedAmount).div(
-            (0, import_bignumber5.default)(borrowIncentiveAccount.debtAmount).multipliedBy(poolPoint.baseWeight).dividedBy(weightScale)
-          ).isFinite() ? (0, import_bignumber5.default)(accountPoint.weightedAmount).div(
-            (0, import_bignumber5.default)(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
-            });
+      Object.entries(borrowIncentiveAccount.pointList).forEach(
+        ([key, accountPoint]) => {
+          const poolPoint = borrowIncentivePool.points[key];
+          if (accountPoint && poolPoint) {
+            let availableClaimAmount = (0, import_bignumber5.default)(0);
+            let availableClaimCoin = (0, import_bignumber5.default)(0);
+            const accountBorrowedAmount = (0, import_bignumber5.default)(
+              accountPoint.weightedAmount
+            );
+            const baseIndexRate = 1e9;
+            const increasedPointRate = poolPoint.currentPointIndex ? Math.max(
+              (0, import_bignumber5.default)(poolPoint.currentPointIndex - accountPoint.index).dividedBy(baseIndexRate).toNumber(),
+              0
+            ) : 1;
+            availableClaimAmount = availableClaimAmount.plus(
+              accountBorrowedAmount.multipliedBy(increasedPointRate).plus(accountPoint.points)
+            );
+            availableClaimCoin = availableClaimAmount.shiftedBy(
+              -1 * poolPoint.coinDecimal
+            );
+            const weightScale = (0, import_bignumber5.default)(1e12);
+            const boostValue = (0, import_bignumber5.default)(accountPoint.weightedAmount).div(
+              (0, import_bignumber5.default)(borrowIncentiveAccount.debtAmount).multipliedBy(poolPoint.baseWeight).dividedBy(weightScale)
+            ).isFinite() ? (0, import_bignumber5.default)(accountPoint.weightedAmount).div(
+              (0, import_bignumber5.default)(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((coinName2) => {
         const rewardApr = borrowIncentivePool.points[coinName2]?.rewardApr;
         return rewardApr !== Infinity && typeof rewardApr == "number" && rewardApr > 0;
@@ -4043,7 +4077,7 @@ var getObligationAccount = async (query, obligationId, ownerAddress, indexer = f
   return obligationAccount;
 };
 var getTotalValueLocked = async (query, indexer = false) => {
-  const market = await query.queryMarket(indexer);
+  const market = await query.queryMarket({ indexer });
   let supplyValue = (0, import_bignumber5.default)(0);
   let borrowValue = (0, import_bignumber5.default)(0);
   if (indexer) {
@@ -4080,6 +4114,7 @@ var getTotalValueLocked = async (query, indexer = false) => {
 };
 
 // src/queries/priceQuery.ts
+var import_bignumber6 = __toESM(require("bignumber.js"));
 var getPythPrice = async ({
   address
 }, assetCoinName, priceFeedObject) => {
@@ -4161,6 +4196,22 @@ var getPythPrices = async ({
     {}
   );
 };
+var getAllCoinPrices = async (query, marketPools, coinPrices) => {
+  coinPrices = coinPrices ?? await query.utils.getCoinPrices();
+  marketPools = marketPools ?? await query.getMarketPools(void 0, { coinPrices });
+  if (!marketPools) {
+    throw new Error(`Failed to fetch market pool for getAllCoinPrices`);
+  }
+  const sCoinPrices = {};
+  SUPPORT_SCOIN.forEach((sCoinName) => {
+    const coinName = query.utils.parseCoinName(sCoinName);
+    sCoinPrices[sCoinName] = (0, import_bignumber6.default)(coinPrices[coinName] ?? 0).multipliedBy(marketPools[coinName]?.conversionRate ?? 1).toNumber();
+  });
+  return {
+    ...coinPrices,
+    ...sCoinPrices
+  };
+};
 
 // src/queries/referralQuery.ts
 var queryVeScaKeyIdFromReferralBindings = async (address, refereeAddress) => {
@@ -4181,7 +4232,7 @@ var queryVeScaKeyIdFromReferralBindings = async (address, refereeAddress) => {
 // src/queries/sCoinQuery.ts
 var import_bcs = require("@mysten/sui/bcs");
 var import_assert = __toESM(require("assert"));
-var import_bignumber6 = __toESM(require("bignumber.js"));
+var import_bignumber7 = __toESM(require("bignumber.js"));
 var getSCoinTotalSupply = async ({
   utils
 }, sCoinName) => {
@@ -4202,7 +4253,7 @@ var getSCoinTotalSupply = async ({
     const value = Uint8Array.from(results[0].returnValues[0][0]);
     const type = results[0].returnValues[0][1];
     (0, import_assert.default)(type === "u64", "Result type is not u64");
-    return (0, import_bignumber6.default)(import_bcs.bcs.u64().parse(value)).shiftedBy(utils.getCoinDecimal(utils.parseCoinName(sCoinName))).toNumber();
+    return (0, import_bignumber7.default)(import_bcs.bcs.u64().parse(value)).shiftedBy(utils.getCoinDecimal(utils.parseCoinName(sCoinName))).toNumber();
   }
   return 0;
 };
@@ -4228,7 +4279,7 @@ var getSCoinAmount = async ({
     owner,
     coinType: sCoinType
   });
-  return (0, import_bignumber6.default)(amount).toNumber();
+  return (0, import_bignumber7.default)(amount).toNumber();
 };
 var isSupportStakeCoins = (value) => {
   return SUPPORT_SCOIN.includes(value);
@@ -4247,8 +4298,8 @@ var getSCoinSwapRate = async (query, fromSCoin, toSCoin, underlyingCoinPrice) =>
   const fromCoinName = query.utils.parseCoinName(fromSCoin);
   const toCoinName = query.utils.parseCoinName(toSCoin);
   const marketPools = await Promise.all([
-    query.getMarketPool(fromCoinName, false),
-    query.getMarketPool(toCoinName, false)
+    query.getMarketPool(fromCoinName),
+    query.getMarketPool(toCoinName)
   ]);
   if (marketPools.some((pool) => !pool))
     throw new Error("Failed to fetch the lendings data");
@@ -4258,7 +4309,7 @@ var getSCoinSwapRate = async (query, fromSCoin, toSCoin, underlyingCoinPrice) =>
   const ScoinAToARate = marketPools[0].conversionRate;
   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");
     }
@@ -4268,7 +4319,7 @@ var getSCoinSwapRate = async (query, fromSCoin, toSCoin, underlyingCoinPrice) =>
     return prices[fromCoinName] / prices[toCoinName];
   };
   const AtoBRate = underlyingCoinPrice ?? await calcAtoBRate();
-  return (0, import_bignumber6.default)(ScoinAToARate).multipliedBy(AtoBRate).multipliedBy(BtoSCoinBRate).toNumber();
+  return (0, import_bignumber7.default)(ScoinAToARate).multipliedBy(AtoBRate).multipliedBy(BtoSCoinBRate).toNumber();
 };
 
 // src/queries/spoolQuery.ts
@@ -4278,7 +4329,7 @@ var getSpools = async (query, stakeMarketCoinNames = [...SUPPORT_SPOOLS], indexe
     (stakeMarketCoinName) => query.utils.parseCoinName(stakeMarketCoinName)
   );
   coinPrices = coinPrices ?? await query.utils.getCoinPrices() ?? {};
-  marketPools = marketPools ?? await query.getMarketPools(stakeCoinNames, indexer);
+  marketPools = marketPools ?? await query.getMarketPools(stakeCoinNames, { indexer });
   if (!marketPools)
     throw new Error(`Fail to fetch marketPools for ${stakeCoinNames}`);
   const spools = {};
@@ -4319,7 +4370,7 @@ var getSpools = async (query, stakeMarketCoinNames = [...SUPPORT_SPOOLS], indexe
 };
 var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPrices) => {
   const coinName = query.utils.parseCoinName(marketCoinName);
-  marketPool = marketPool || await query.getMarketPool(coinName, indexer);
+  marketPool = marketPool || await query.getMarketPool(coinName, { indexer });
   if (!marketPool) {
     throw new Error(`Failed to fetch marketPool for ${marketCoinName}`);
   }
@@ -4328,7 +4379,7 @@ var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPr
     `spool.pools.${marketCoinName}.rewardPoolId`
   );
   let spool = void 0;
-  coinPrices = coinPrices || await query.utils.getCoinPrices([coinName]);
+  coinPrices = coinPrices || await query.utils.getCoinPrices();
   if (indexer) {
     const spoolIndexer = await query.indexer.getSpool(marketCoinName);
     const coinName2 = query.utils.parseCoinName(marketCoinName);
@@ -4348,7 +4399,7 @@ var getSpool = async (query, marketCoinName, indexer = false, marketPool, coinPr
     throw new Error("Fail to fetch spoolObjectResponse!");
   }
   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];
   if (spoolObject.content && "fields" in spoolObject.content) {
@@ -4592,7 +4643,7 @@ var getStakeRewardPool = async ({
 };
 
 // src/queries/vescaQuery.ts
-var import_bignumber7 = __toESM(require("bignumber.js"));
+var import_bignumber8 = __toESM(require("bignumber.js"));
 var import_sui_kit3 = require("@scallop-io/sui-kit");
 var import_bcs2 = require("@mysten/sui/bcs");
 var import_zod5 = require("zod");
@@ -4674,7 +4725,7 @@ var getVeSca = async (utils, veScaKey) => {
       0
     );
     const lockedScaAmount = String(dynamicFields.locked_sca_amount);
-    const lockedScaCoin = (0, import_bignumber7.default)(dynamicFields.locked_sca_amount).shiftedBy(-9).toNumber();
+    const lockedScaCoin = (0, import_bignumber8.default)(dynamicFields.locked_sca_amount).shiftedBy(-9).toNumber();
     const currentVeScaBalance = lockedScaCoin * (Math.floor(remainingLockPeriodInMilliseconds / 1e3) / MAX_LOCK_DURATION);
     vesca = {
       id: veScaDynamicFieldObject.objectId,
@@ -4684,7 +4735,7 @@ var getVeSca = async (utils, veScaKey) => {
       lockedScaAmount,
       lockedScaCoin,
       currentVeScaBalance,
-      unlockAt: (0, import_bignumber7.default)(dynamicFields.unlock_at * 1e3).toNumber()
+      unlockAt: (0, import_bignumber8.default)(dynamicFields.unlock_at * 1e3).toNumber()
     };
   }
   return vesca;
@@ -4746,10 +4797,10 @@ var getVeScaTreasuryInfo = async (utils) => {
   if (!veScaTreasury || veScaTreasury.data?.content?.dataType !== "moveObject")
     return null;
   const treasuryFields = veScaTreasury.data.content.fields;
-  const totalLockedSca = (0, import_bignumber7.default)(
+  const totalLockedSca = (0, import_bignumber8.default)(
     treasuryFields.unlock_schedule.fields.locked_sca_amount
   ).shiftedBy(-9).toNumber();
-  const totalVeSca = (0, import_bignumber7.default)(
+  const totalVeSca = (0, import_bignumber8.default)(
     await getTotalVeScaTreasuryAmount(utils, veScaTreasury.data) ?? 0
   ).shiftedBy(-9).toNumber();
   const averageLockingPeriod = totalLockedSca > 0 ? totalVeSca / totalLockedSca * 4 : 0;
@@ -4785,15 +4836,6 @@ var ScallopUtils = class {
     this.getSpoolRewardCoinName = (stakeMarketCoinName) => {
       return spoolRewardCoins[stakeMarketCoinName];
     };
-    /**
-     * Get reward type of borrow incentive pool.
-     *
-     * @param borrowIncentiveCoinName - Support borrow incentive coin.
-     * @return Borrow incentive reward coin name.
-     */
-    this.getBorrowIncentiveRewardCoinName = (borrowIncentiveCoinName) => {
-      return borrowIncentiveRewardCoins[borrowIncentiveCoinName];
-    };
     this.params = {
       pythEndpoints: params.pythEndpoints ?? PYTH_ENDPOINTS["mainnet"],
       ...params
@@ -4863,7 +4905,10 @@ var ScallopUtils = class {
    * @param coinName - Specific support coin name.
    * @return Coin type.
    */
-  parseCoinType(coinName) {
+  parseCoinType(coinName, useOldMarketCoin = false) {
+    if (sCoinIds[coinName] && !useOldMarketCoin) {
+      return sCoinIds[coinName];
+    }
     coinName = isMarketCoin(coinName) ? this.parseCoinName(coinName) : coinName;
     const coinPackageId = this.address.get(`core.coins.${coinName}.id`) || coinIds[coinName] || void 0;
     if (!coinPackageId) {
@@ -4918,6 +4963,15 @@ var ScallopUtils = class {
       return void 0;
     }
   }
+  /**
+   * 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
+   */
+  parseCoinNameFromSCoinName(coinName) {
+    return sCoinRawNameToName[coinName];
+  }
   /**
    * Convert sCoin name into sCoin type
    * @param sCoinName
@@ -4960,7 +5014,7 @@ var ScallopUtils = class {
    */
   parseMarketCoinType(coinName) {
     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}>`;
   }
   parseCoinNameFromType(coinType) {
@@ -4969,7 +5023,7 @@ var ScallopUtils = class {
     const coinTypeMatch = coinType.match(coinTypeRegex);
     const isMarketCoinType = coinType.includes("reserve::MarketCoin");
     coinType = coinTypeMatch?.[1] ?? coinType;
-    const wormHoleCoinTypeMap = {
+    const wormholeCoinTypeMap = {
       [`${this.address.get("core.coins.wusdc.id") ?? wormholeCoinIds.wusdc}::coin::COIN`]: "wusdc",
       [`${this.address.get("core.coins.wusdt.id") ?? wormholeCoinIds.wusdt}::coin::COIN`]: "wusdt",
       [`${this.address.get("core.coins.weth.id") ?? wormholeCoinIds.weth}::coin::COIN`]: "weth",
@@ -4989,7 +5043,7 @@ var ScallopUtils = class {
       },
       {}
     );
-    const assetCoinName = wormHoleCoinTypeMap[coinType] || voloCoinTypeMap[coinType] || suiBridgeTypeMap[coinType] || coinType.split("::")[2].toLowerCase();
+    const assetCoinName = wormholeCoinTypeMap[coinType] || voloCoinTypeMap[coinType] || suiBridgeTypeMap[coinType] || coinType.split("::")[2].toLowerCase();
     return isMarketCoinType ? this.parseMarketCoinName(assetCoinName) : assetCoinName;
   }
   /**
@@ -6100,11 +6154,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
         ]
       );
     },
-    claimBorrowIncentive: (obligationId, obligationKey, coinName, rewardCoinName) => {
-      const rewardCoinNames = builder.utils.getBorrowIncentiveRewardCoinName(coinName);
-      if (rewardCoinNames.includes(rewardCoinName) === false) {
-        throw new Error(`Invalid reward coin name ${rewardCoinName}`);
-      }
+    claimBorrowIncentive: (obligationId, obligationKey, rewardCoinName) => {
       const rewardType = builder.utils.parseCoinType(rewardCoinName);
       return txBlock.moveCall(
         `${borrowIncentiveIds.borrowIncentivePkg}::user::redeem_rewards`,
@@ -6197,7 +6247,7 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
         txBlock.unstakeObligation(obligationArg, obligationKeyArg);
       }
     },
-    claimBorrowIncentiveQuick: async (coinName, rewardCoinName, obligation, obligationKey) => {
+    claimBorrowIncentiveQuick: async (rewardCoinName, obligation, obligationKey) => {
       const { obligationId: obligationArg, obligationKey: obligationKeyArg } = await requireObligationInfo2(
         builder,
         txBlock,
@@ -6207,7 +6257,6 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
       return txBlock.claimBorrowIncentive(
         obligationArg,
         obligationKeyArg,
-        coinName,
         rewardCoinName
       );
     }
@@ -7103,8 +7152,8 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Market data.
    */
-  async queryMarket(indexer = false, args) {
-    return await queryMarket(this, indexer, args?.coinPrices);
+  async queryMarket(args) {
+    return await queryMarket(this, args?.indexer, args?.coinPrices);
   }
   /**
    * Get market pools.
@@ -7117,8 +7166,13 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Market pools data.
    */
-  async getMarketPools(poolCoinNames, indexer = false, args) {
-    return await getMarketPools(this, poolCoinNames, indexer, args?.coinPrices);
+  async getMarketPools(poolCoinNames, args) {
+    return await getMarketPools(
+      this,
+      poolCoinNames,
+      args?.indexer,
+      args?.coinPrices
+    );
   }
   /**
    * Get  market pool
@@ -7127,11 +7181,11 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Market pool data.
    */
-  async getMarketPool(poolCoinName, indexer = false, args) {
+  async getMarketPool(poolCoinName, args) {
     return await getMarketPool(
       this,
       poolCoinName,
-      indexer,
+      args?.indexer,
       args?.marketObject,
       args?.coinPrice
     );
@@ -7147,8 +7201,8 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Market collaterals data.
    */
-  async getMarketCollaterals(collateralCoinNames, indexer = false) {
-    return await getMarketCollaterals(this, collateralCoinNames, indexer);
+  async getMarketCollaterals(collateralCoinNames, args) {
+    return await getMarketCollaterals(this, collateralCoinNames, args?.indexer);
   }
   /**
    * Get market collateral
@@ -7157,8 +7211,8 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Market collateral data.
    */
-  async getMarketCollateral(collateralCoinName, indexer = false) {
-    return await getMarketCollateral(this, collateralCoinName, indexer);
+  async getMarketCollateral(collateralCoinName, args) {
+    return await getMarketCollateral(this, collateralCoinName, args?.indexer);
   }
   /**
    * Get obligations data.
@@ -7244,11 +7298,11 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Spools data.
    */
-  async getSpools(stakeMarketCoinNames, indexer = false, args) {
+  async getSpools(stakeMarketCoinNames, args) {
     return await getSpools(
       this,
       stakeMarketCoinNames,
-      indexer,
+      args?.indexer,
       args?.marketPools,
       args?.coinPrices
     );
@@ -7260,11 +7314,11 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Spool data.
    */
-  async getSpool(stakeMarketCoinName, indexer = false, args) {
+  async getSpool(stakeMarketCoinName, args) {
     return await getSpool(
       this,
       stakeMarketCoinName,
-      indexer,
+      args?.indexer,
       args?.marketPool,
       args?.coinPrices
     );
@@ -7367,11 +7421,12 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Borrow incentive pools data.
    */
-  async getBorrowIncentivePools(coinNames, indexer = false, args) {
+  async getBorrowIncentivePools(coinNames, args) {
     return await getBorrowIncentivePools(
       this,
       coinNames,
-      indexer,
+      args?.indexer,
+      args?.marketPools,
       args?.coinPrices
     );
   }
@@ -7393,8 +7448,8 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return All lending and spool infomation.
    */
-  async getLendings(poolCoinNames, ownerAddress = this.walletAddress, indexer = false) {
-    return await getLendings(this, poolCoinNames, ownerAddress, indexer);
+  async getLendings(poolCoinNames, ownerAddress = this.walletAddress, args) {
+    return await getLendings(this, poolCoinNames, ownerAddress, args?.indexer);
   }
   /**
    * Get user lending and spool information for specific pool.
@@ -7404,8 +7459,8 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Lending pool data.
    */
-  async getLending(poolCoinName, ownerAddress = this.walletAddress, indexer = false) {
-    return await getLending(this, poolCoinName, ownerAddress, indexer);
+  async getLending(poolCoinName, ownerAddress = this.walletAddress, args) {
+    return await getLending(this, poolCoinName, ownerAddress, args?.indexer);
   }
   /**
    * Get user all obligation accounts information.
@@ -7417,8 +7472,8 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return All obligation accounts information.
    */
-  async getObligationAccounts(ownerAddress = this.walletAddress, indexer = false) {
-    return await getObligationAccounts(this, ownerAddress, indexer);
+  async getObligationAccounts(ownerAddress = this.walletAddress, args) {
+    return await getObligationAccounts(this, ownerAddress, args?.indexer);
   }
   /**
    * Get obligation account information for specific id.
@@ -7431,12 +7486,12 @@ var ScallopQuery = class {
    * @param indexer - Whether to use indexer.
    * @return Borrowing and collateral information.
    */
-  async getObligationAccount(obligationId, ownerAddress = this.walletAddress, indexer = false) {
+  async getObligationAccount(obligationId, ownerAddress = this.walletAddress, args) {
     return await getObligationAccount(
       this,
       obligationId,
       ownerAddress,
-      indexer
+      args?.indexer
     );
   }
   /**
@@ -7448,8 +7503,8 @@ var ScallopQuery = class {
    *
    * @return Total value locked.
    */
-  async getTvl(indexer = false) {
-    return await getTotalValueLocked(this, indexer);
+  async getTvl(args) {
+    return await getTotalValueLocked(this, args?.indexer);
   }
   /**
    * Get veSca data.
@@ -7587,6 +7642,13 @@ var ScallopQuery = class {
   async getCoinPriceByIndexer(poolName) {
     return this.indexer.getCoinPrice(poolName);
   }
+  /**
+   * Get all coin prices, including sCoin
+   * @returns prices data
+   */
+  async getAllCoinPrices(args) {
+    return getAllCoinPrices(this, args?.marketPools, args?.coinPrices);
+  }
 };
 
 // src/models/scallopBuilder.ts
@@ -8236,30 +8298,46 @@ var ScallopClient = class {
     }
   }
   /**
-   * 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.
    * @param walletAddress - The wallet address of the owner.
    * @return Transaction block response or transaction block
    */
-  async claimBorrowIncentive(coinName, obligationId, obligationKeyId, sign = true, walletAddress) {
+  async claimBorrowIncentive(obligationId, obligationKeyId, sign = true, walletAddress) {
     const txBlock = this.builder.createTxBlock();
     const sender = walletAddress ?? this.walletAddress;
     txBlock.setSender(sender);
-    const rewardCoins = [];
-    for (const rewardCoinName of SUPPORT_BORROW_INCENTIVE_REWARDS) {
+    const rewardCoinsCollection = {};
+    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(
         txBlock
@@ -8569,12 +8647,12 @@ var Scallop = class {
   UNLOCK_ROUND_DURATION,
   USE_TEST_ADDRESS,
   assetCoins,
-  borrowIncentiveRewardCoins,
   coinDecimals,
   coinIds,
   marketCoins,
   queryKeys,
   sCoinIds,
+  sCoinRawNameToName,
   sCoinTypeToName,
   sCoins,
   spoolRewardCoins,