@scallop-io/sui-scallop-sdk 0.44.3 → 0.44.5

package/dist/index.js

@@ -32,6 +32,7 @@ var src_exports = {};
 __export(src_exports, {
   ADDRESSES_ID: () => ADDRESSES_ID,
   API_BASE_URL: () => API_BASE_URL,
+  BORROW_FEE_PROTOCOL_ID: () => BORROW_FEE_PROTOCOL_ID,
   PROTOCOL_OBJECT_ID: () => PROTOCOL_OBJECT_ID,
   SUPPORT_BORROW_INCENTIVE_POOLS: () => SUPPORT_BORROW_INCENTIVE_POOLS,
   SUPPORT_BORROW_INCENTIVE_REWARDS: () => SUPPORT_BORROW_INCENTIVE_REWARDS,
@@ -63,6 +64,7 @@ module.exports = __toCommonJS(src_exports);
 var API_BASE_URL = "https://sui.api.scallop.io";
 var ADDRESSES_ID = "6462a088a7ace142bb6d7e9b";
 var PROTOCOL_OBJECT_ID = "0xefe8b36d5b2e43728cc323298626b83177803521d195cfb11e15b910e892fddf";
+var BORROW_FEE_PROTOCOL_ID = "0xc38f849e81cfe46d4e4320f508ea7dda42934a329d5a6571bb4c3cb6ea63f5da";
 var SUPPORT_POOLS = [
   "eth",
   "btc",
@@ -208,6 +210,7 @@ var EMPTY_ADDRESSES = {
   core: {
     version: "",
     versionCap: "",
+    object: "",
     market: "",
     adminCap: "",
     coinDecimalsRegistry: "",
@@ -385,6 +388,7 @@ var EMPTY_ADDRESSES = {
   spool: {
     id: "",
     adminCap: "",
+    object: "",
     pools: {
       ssui: {
         id: "",
@@ -399,6 +403,7 @@ var EMPTY_ADDRESSES = {
   borrowIncentive: {
     id: "",
     adminCap: "",
+    object: "",
     query: "",
     incentivePools: "",
     incentiveAccounts: ""
@@ -705,11 +710,11 @@ var ScallopAddress = class {
 };
 
 // src/models/scallopClient.ts
-var import_utils17 = require("@mysten/sui.js/utils");
+var import_utils19 = require("@mysten/sui.js/utils");
 var import_sui_kit9 = require("@scallop-io/sui-kit");
 
 // src/models/scallopUtils.ts
-var import_utils7 = require("@mysten/sui.js/utils");
+var import_utils9 = require("@mysten/sui.js/utils");
 var import_sui_kit4 = require("@scallop-io/sui-kit");
 var import_pyth_sui_js = require("@pythnetwork/pyth-sui-js");
 
@@ -717,6 +722,7 @@ var import_pyth_sui_js = require("@pythnetwork/pyth-sui-js");
 var import_sui_kit3 = require("@scallop-io/sui-kit");
 
 // src/queries/coreQuery.ts
+var import_utils2 = require("@mysten/sui.js/utils");
 var import_sui_kit = require("@scallop-io/sui-kit");
 var import_bignumber2 = __toESM(require("bignumber.js"));
 
@@ -734,7 +740,7 @@ var import_bignumber = __toESM(require("bignumber.js"));
 var import_utils = require("@mysten/sui.js/utils");
 var parseOriginMarketPoolData = (originMarketPoolData) => {
   return {
-    coinType: "0x" + originMarketPoolData.type.name,
+    coinType: (0, import_utils.normalizeStructTag)(originMarketPoolData.type.name),
     // Parse origin data required for basic calculations.
     maxBorrowRate: Number(originMarketPoolData.maxBorrowRate.value) / 2 ** 32,
     borrowRate: Number(originMarketPoolData.interestRate.value) / 2 ** 32,
@@ -747,6 +753,7 @@ var parseOriginMarketPoolData = (originMarketPoolData) => {
     reserveAmount: Number(originMarketPoolData.reserve),
     reserveFactor: Number(originMarketPoolData.reserveFactor.value) / 2 ** 32,
     borrowWeight: Number(originMarketPoolData.borrowWeight.value) / 2 ** 32,
+    borrowFee: Number(originMarketPoolData.borrowFeeRate.value) / 2 ** 32,
     // Parse origin data required for additional display.
     baseBorrowRate: Number(originMarketPoolData.baseBorrowRatePerSec.value) / 2 ** 32,
     borrowRateOnHighKink: Number(originMarketPoolData.borrowRateOnHighKink.value) / 2 ** 32,
@@ -828,7 +835,7 @@ var calculateMarketPoolData = (utils, parsedMarketPoolData) => {
 };
 var parseOriginMarketCollateralData = (originMarketCollateralData) => {
   return {
-    coinType: "0x" + originMarketCollateralData.type.name,
+    coinType: (0, import_utils.normalizeStructTag)(originMarketCollateralData.type.name),
     collateralFactor: Number(originMarketCollateralData.collateralFactor.value) / 2 ** 32,
     liquidationFactor: Number(originMarketCollateralData.liquidationFactor.value) / 2 ** 32,
     liquidationDiscount: Number(originMarketCollateralData.liquidationDiscount.value) / 2 ** 32,
@@ -860,7 +867,7 @@ var calculateMarketCollateralData = (utils, parsedMarketCollateralData) => {
 };
 var parseOriginSpoolData = (originSpoolData) => {
   return {
-    stakeType: "0x" + originSpoolData.stakeType.fields.name,
+    stakeType: (0, import_utils.normalizeStructTag)(originSpoolData.stakeType.fields.name),
     maxPoint: Number(originSpoolData.maxDistributedPoint),
     distributedPoint: Number(originSpoolData.distributedPoint),
     pointPerPeriod: Number(originSpoolData.distributedPointPerPeriod),
@@ -917,12 +924,14 @@ var calculateSpoolData = (parsedSpoolData, stakeMarketCoinPrice, stakeMarketCoin
 var parseOriginSpoolRewardPoolData = (originSpoolRewardPoolData) => {
   return {
     claimedRewards: Number(originSpoolRewardPoolData.claimed_rewards),
-    exchangeRateNumerator: Number(
-      originSpoolRewardPoolData.exchange_rate_numerator
-    ),
     exchangeRateDenominator: Number(
       originSpoolRewardPoolData.exchange_rate_denominator
     ),
+    exchangeRateNumerator: Number(
+      originSpoolRewardPoolData.exchange_rate_numerator
+    ),
+    feeRateDenominator: Number(originSpoolRewardPoolData.fee_rate_denominator),
+    feeRateNumerator: Number(originSpoolRewardPoolData.fee_rate_numerator),
     rewards: Number(originSpoolRewardPoolData.rewards),
     spoolId: String(originSpoolRewardPoolData.spool_id)
   };
@@ -947,6 +956,7 @@ var calculateSpoolRewardPoolData = (parsedSpoolData, parsedSpoolRewardPoolData,
   const claimedRewardValue = claimedRewardCoin.multipliedBy(rewardCoinPrice);
   const rewardValueForYear = (0, import_bignumber.default)(rewardPerSec).shiftedBy(-1 * rewardCoinDecimal).multipliedBy(rateYearFactor).multipliedBy(rewardCoinPrice);
   const rewardRate = rewardValueForYear.dividedBy(calculatedSpoolData.stakedValue).isFinite() ? rewardValueForYear.dividedBy(calculatedSpoolData.stakedValue).toNumber() : Infinity;
+  const rewardFeeRate = (0, import_bignumber.default)(parsedSpoolRewardPoolData.feeRateNumerator).dividedBy(parsedSpoolRewardPoolData.feeRateDenominator).toNumber();
   return {
     rewardApr: rewardRate,
     totalRewardAmount: totalRewardAmount.toNumber(),
@@ -958,7 +968,8 @@ var calculateSpoolRewardPoolData = (parsedSpoolData, parsedSpoolRewardPoolData,
     claimedRewardAmount: claimedRewardAmount.toNumber(),
     claimedRewardCoin: claimedRewardCoin.toNumber(),
     claimedRewardValue: claimedRewardValue.toNumber(),
-    rewardPerSec: rewardPerSec.toNumber()
+    rewardPerSec: rewardPerSec.toNumber(),
+    rewardFee: rewardFeeRate
   };
 };
 var parseOriginBorrowIncentivePoolData = (originBorrowIncentivePoolData) => {
@@ -1033,6 +1044,12 @@ var parseOriginBorrowIncentiveRewardPoolData = (originBorrowIncentiveRewardPoolD
     exchangeRateDenominator: Number(
       originBorrowIncentiveRewardPoolData.exchange_rate_denominator
     ),
+    rewardsFeeRateNumerator: Number(
+      originBorrowIncentiveRewardPoolData.rewards_fee_rate_numerator
+    ),
+    rewardsFeeRateDenominator: Number(
+      originBorrowIncentiveRewardPoolData.rewards_fee_rate_denominator
+    ),
     remainingRewards: Number(
       originBorrowIncentiveRewardPoolData.remaining_reward
     )
@@ -1062,6 +1079,9 @@ var calculateBorrowIncentiveRewardPoolData = (parsedBorrowIncentivePoolData, par
   const claimedRewardValue = claimedRewardCoin.multipliedBy(rewardCoinPrice);
   const rewardValueForYear = (0, import_bignumber.default)(rewardPerSec).shiftedBy(-1 * rewardCoinDecimal).multipliedBy(rateYearFactor).multipliedBy(rewardCoinPrice);
   const rewardRate = rewardValueForYear.dividedBy(calculatedBorrowIncentivePoolData.stakedValue).isFinite() ? rewardValueForYear.dividedBy(calculatedBorrowIncentivePoolData.stakedValue).toNumber() : Infinity;
+  const rewardFeeRate = (0, import_bignumber.default)(
+    parsedBorrowIncentiveRewardPoolData.rewardsFeeRateNumerator
+  ).dividedBy(parsedBorrowIncentiveRewardPoolData.rewardsFeeRateDenominator).toNumber();
   return {
     rewardApr: rewardRate,
     totalRewardAmount: totalRewardAmount.toNumber(),
@@ -1073,7 +1093,8 @@ var calculateBorrowIncentiveRewardPoolData = (parsedBorrowIncentivePoolData, par
     claimedRewardAmount: claimedRewardAmount.toNumber(),
     claimedRewardCoin: claimedRewardCoin.toNumber(),
     claimedRewardValue: claimedRewardValue.toNumber(),
-    rewardPerSec: rewardPerSec.toNumber()
+    rewardPerSec: rewardPerSec.toNumber(),
+    rewardFee: rewardFeeRate
   };
 };
 var parseOriginBorrowIncentiveAccountData = (originBorrowIncentiveAccountData) => {
@@ -1149,7 +1170,7 @@ var queryMarket = async (query) => {
   const pools = {};
   const collaterals = {};
   for (const pool of marketData.pools) {
-    const coinType = "0x" + pool.type.name;
+    const coinType = (0, import_utils2.normalizeStructTag)(pool.type.name);
     const poolCoinName = query.utils.parseCoinNameFromType(coinType);
     const coinPrice = (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName] ?? 0;
     if (!SUPPORT_POOLS.includes(poolCoinName)) {
@@ -1168,6 +1189,7 @@ var queryMarket = async (query) => {
       reserve: pool.reserve,
       reserveFactor: pool.reserveFactor,
       borrowWeight: pool.borrowWeight,
+      borrowFeeRate: pool.borrowFeeRate,
       baseBorrowRatePerSec: pool.baseBorrowRatePerSec,
       borrowRateOnHighKink: pool.borrowRateOnHighKink,
       borrowRateOnMidKink: pool.borrowRateOnMidKink,
@@ -1191,13 +1213,14 @@ var queryMarket = async (query) => {
       midKink: parsedMarketPoolData.midKink,
       reserveFactor: parsedMarketPoolData.reserveFactor,
       borrowWeight: parsedMarketPoolData.borrowWeight,
+      borrowFee: parsedMarketPoolData.borrowFee,
       marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
       minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
       ...calculatedMarketPoolData
     };
   }
   for (const collateral of marketData.collaterals) {
-    const coinType = "0x" + collateral.type.name;
+    const coinType = (0, import_utils2.normalizeStructTag)(collateral.type.name);
     const collateralCoinName = query.utils.parseCoinNameFromType(coinType);
     const coinPrice = (await query.utils.getCoinPrices([collateralCoinName]))?.[collateralCoinName] ?? 0;
     if (!SUPPORT_COLLATERALS.includes(collateralCoinName)) {
@@ -1275,6 +1298,7 @@ var getMarketPool = async (query, poolCoinName, marketObject, coinPrice) => {
   let balanceSheet;
   let borrowIndex;
   let interestModel;
+  let borrowFeeRate;
   if (marketObject) {
     if (marketObject.content && "fields" in marketObject.content) {
       const fields = marketObject.content.fields;
@@ -1324,9 +1348,25 @@ var getMarketPool = async (query, poolCoinName, marketObject, coinPrice) => {
         const dynamicFields = interestModelDynamicFieldObject.content.fields;
         interestModel = dynamicFields.value.fields;
       }
+      const borrowFeeDynamicFieldObjectResponse = await query.suiKit.client().getDynamicFieldObject({
+        parentId: marketId,
+        name: {
+          type: `${BORROW_FEE_PROTOCOL_ID}::market_dynamic_keys::BorrowFeeKey`,
+          value: {
+            type: {
+              name: coinType.substring(2)
+            }
+          }
+        }
+      });
+      const borrowFeeDynamicFieldObject = borrowFeeDynamicFieldObjectResponse.data;
+      if (borrowFeeDynamicFieldObject && borrowFeeDynamicFieldObject.content && "fields" in borrowFeeDynamicFieldObject.content) {
+        const dynamicFields = borrowFeeDynamicFieldObject.content.fields;
+        borrowFeeRate = dynamicFields.value.fields;
+      }
     }
   }
-  if (balanceSheet && borrowIndex && interestModel) {
+  if (balanceSheet && borrowIndex && interestModel && borrowFeeRate) {
     const parsedMarketPoolData = parseOriginMarketPoolData({
       type: interestModel.type.fields,
       maxBorrowRate: interestModel.max_borrow_rate.fields,
@@ -1340,6 +1380,7 @@ var getMarketPool = async (query, poolCoinName, marketObject, coinPrice) => {
       reserve: balanceSheet.revenue,
       reserveFactor: interestModel.revenue_factor.fields,
       borrowWeight: interestModel.borrow_weight.fields,
+      borrowFeeRate,
       baseBorrowRatePerSec: interestModel.base_borrow_rate_per_sec.fields,
       borrowRateOnHighKink: interestModel.borrow_rate_on_high_kink.fields,
       borrowRateOnMidKink: interestModel.borrow_rate_on_mid_kink.fields,
@@ -1364,6 +1405,7 @@ var getMarketPool = async (query, poolCoinName, marketObject, coinPrice) => {
       midKink: parsedMarketPoolData.midKink,
       reserveFactor: parsedMarketPoolData.reserveFactor,
       borrowWeight: parsedMarketPoolData.borrowWeight,
+      borrowFee: parsedMarketPoolData.borrowFee,
       marketCoinSupplyAmount: parsedMarketPoolData.marketCoinSupplyAmount,
       minBorrowAmount: parsedMarketPoolData.minBorrowAmount,
       ...calculatedMarketPoolData
@@ -1478,6 +1520,7 @@ var getMarketCollateral = async (query, collateralCoinName, marketObject, coinPr
 };
 var getObligations = async (query, ownerAddress) => {
   const owner = ownerAddress || query.suiKit.currentAddress();
+  const protocolObjectId = query.address.get("core.object") || PROTOCOL_OBJECT_ID;
   const keyObjectsResponse = [];
   let hasNextPage = false;
   let nextCursor = null;
@@ -1485,7 +1528,7 @@ var getObligations = async (query, ownerAddress) => {
     const paginatedKeyObjectsResponse = await query.suiKit.client().getOwnedObjects({
       owner,
       filter: {
-        StructType: `${PROTOCOL_OBJECT_ID}::obligation::ObligationKey`
+        StructType: `${protocolObjectId}::obligation::ObligationKey`
       },
       cursor: nextCursor
     });
@@ -1698,7 +1741,7 @@ var getMarketCoinAmount = async (query, marketCoinName, ownerAddress) => {
 };
 
 // src/queries/spoolQuery.ts
-var import_utils3 = require("@mysten/sui.js/utils");
+var import_utils4 = require("@mysten/sui.js/utils");
 var getSpools = async (query, stakeMarketCoinNames) => {
   stakeMarketCoinNames = stakeMarketCoinNames || [...SUPPORT_SPOOLS];
   const stakeCoinNames = stakeMarketCoinNames.map(
@@ -1722,6 +1765,7 @@ var getSpools = async (query, stakeMarketCoinNames) => {
 var getSpool = async (query, marketCoinName, marketPool) => {
   const coinName = query.utils.parseCoinName(marketCoinName);
   marketPool = marketPool || await query.getMarketPool(coinName);
+  const spoolPkgId = query.address.get(`spool.id`);
   const poolId = query.address.get(`spool.pools.${marketCoinName}.id`);
   const rewardPoolId = query.address.get(
     `spool.pools.${marketCoinName}.rewardPoolId`
@@ -1733,6 +1777,13 @@ var getSpool = async (query, marketCoinName, marketPool) => {
       showContent: true
     }
   });
+  const spoolRewardFeeDynamicFieldsResponse = await query.suiKit.client().getDynamicFieldObject({
+    parentId: rewardPoolId,
+    name: {
+      type: `${spoolPkgId}::rewards_pool::RewardsPoolFeeKey`,
+      value: { dummy_field: false }
+    }
+  });
   if (marketPool && spoolObjectResponse[0].data && spoolObjectResponse[1].data) {
     const rewardCoinName = query.utils.getSpoolRewardCoinName(marketCoinName);
     const coinPrices = await query.utils.getCoinPrices([
@@ -1741,19 +1792,20 @@ var getSpool = async (query, marketCoinName, marketPool) => {
     ]);
     const spoolObject = spoolObjectResponse[0].data;
     const rewardPoolObject = spoolObjectResponse[1].data;
+    const rewardFeeObject = spoolRewardFeeDynamicFieldsResponse.data;
     if (spoolObject.content && "fields" in spoolObject.content) {
-      const fields = spoolObject.content.fields;
+      const spoolFields = spoolObject.content.fields;
       const parsedSpoolData = parseOriginSpoolData({
-        stakeType: fields.stake_type,
-        maxDistributedPoint: fields.max_distributed_point,
-        distributedPoint: fields.distributed_point,
-        distributedPointPerPeriod: fields.distributed_point_per_period,
-        pointDistributionTime: fields.point_distribution_time,
-        maxStake: fields.max_stakes,
-        stakes: fields.stakes,
-        index: fields.index,
-        createdAt: fields.created_at,
-        lastUpdate: fields.last_update
+        stakeType: spoolFields.stake_type,
+        maxDistributedPoint: spoolFields.max_distributed_point,
+        distributedPoint: spoolFields.distributed_point,
+        distributedPointPerPeriod: spoolFields.distributed_point_per_period,
+        pointDistributionTime: spoolFields.point_distribution_time,
+        maxStake: spoolFields.max_stakes,
+        stakes: spoolFields.stakes,
+        index: spoolFields.index,
+        createdAt: spoolFields.created_at,
+        lastUpdate: spoolFields.last_update
       });
       const marketCoinPrice = (coinPrices?.[coinName] ?? 0) * marketPool.conversionRate;
       const marketCoinDecimal = query.utils.getCoinDecimal(marketCoinName);
@@ -1762,14 +1814,17 @@ var getSpool = async (query, marketCoinName, marketPool) => {
         marketCoinPrice,
         marketCoinDecimal
       );
-      if (rewardPoolObject.content && "fields" in rewardPoolObject.content) {
-        const fields2 = rewardPoolObject.content.fields;
+      if (rewardPoolObject.content && rewardFeeObject?.content && "fields" in rewardPoolObject.content && "fields" in rewardFeeObject.content) {
+        const rewardPoolFields = rewardPoolObject.content.fields;
+        const rewardFeeFields = rewardFeeObject.content.fields.value.fields;
         const parsedSpoolRewardPoolData = parseOriginSpoolRewardPoolData({
-          claimed_rewards: fields2.claimed_rewards,
-          exchange_rate_numerator: fields2.exchange_rate_numerator,
-          exchange_rate_denominator: fields2.exchange_rate_denominator,
-          rewards: fields2.rewards,
-          spool_id: fields2.spool_id
+          claimed_rewards: rewardPoolFields.claimed_rewards,
+          exchange_rate_numerator: rewardPoolFields.exchange_rate_numerator,
+          exchange_rate_denominator: rewardPoolFields.exchange_rate_denominator,
+          fee_rate_numerator: rewardFeeFields.fee_rate_numerator,
+          fee_rate_denominator: rewardFeeFields.fee_rate_denominator,
+          rewards: rewardPoolFields.rewards,
+          spool_id: rewardPoolFields.spool_id
         });
         const rewardCoinPrice = coinPrices?.[rewardCoinName] ?? 0;
         const rewardCoinDecimal = query.utils.getCoinDecimal(rewardCoinName);
@@ -1806,8 +1861,8 @@ var getSpool = async (query, marketCoinName, marketPool) => {
 };
 var getStakeAccounts = async (query, ownerAddress) => {
   const owner = ownerAddress || query.suiKit.currentAddress();
-  const spoolPkgId = query.address.get("spool.id");
-  const stakeAccountType = `${spoolPkgId}::spool_account::SpoolAccount`;
+  const spoolObjectId = query.address.get("spool.object");
+  const stakeAccountType = `${spoolObjectId}::spool_account::SpoolAccount`;
   const stakeObjectsResponse = [];
   let hasNextPage = false;
   let nextCursor = null;
@@ -1836,7 +1891,7 @@ var getStakeAccounts = async (query, ownerAddress) => {
     (types, stakeMarketCoinName) => {
       const stakeCoinName = query.utils.parseCoinName(stakeMarketCoinName);
       const marketCoinType = query.utils.parseMarketCoinType(stakeCoinName);
-      types[stakeMarketCoinName] = `${spoolPkgId}::spool_account::SpoolAccount<${marketCoinType}>`;
+      types[stakeMarketCoinName] = `${spoolObjectId}::spool_account::SpoolAccount<${marketCoinType}>`;
       return types;
     },
     {}
@@ -1854,34 +1909,34 @@ var getStakeAccounts = async (query, ownerAddress) => {
       const index = Number(fields.index);
       const points = Number(fields.points);
       const totalPoints = Number(fields.total_points);
-      if ((0, import_utils3.normalizeStructTag)(type) === stakeMarketCoinTypes.ssui) {
+      if ((0, import_utils4.normalizeStructTag)(type) === stakeMarketCoinTypes.ssui) {
         stakeAccounts.ssui.push({
           id,
-          type,
+          type: (0, import_utils4.normalizeStructTag)(type),
           stakePoolId,
-          stakeType,
+          stakeType: (0, import_utils4.normalizeStructTag)(stakeType),
           staked,
           index,
           points,
           totalPoints
         });
-      } else if ((0, import_utils3.normalizeStructTag)(type) === stakeMarketCoinTypes.susdc) {
+      } else if ((0, import_utils4.normalizeStructTag)(type) === stakeMarketCoinTypes.susdc) {
         stakeAccounts.susdc.push({
           id,
-          type,
+          type: (0, import_utils4.normalizeStructTag)(type),
           stakePoolId,
-          stakeType,
+          stakeType: (0, import_utils4.normalizeStructTag)(stakeType),
           staked,
           index,
           points,
           totalPoints
         });
-      } else if ((0, import_utils3.normalizeStructTag)(type) === stakeMarketCoinTypes.susdt) {
+      } else if ((0, import_utils4.normalizeStructTag)(type) === stakeMarketCoinTypes.susdt) {
         stakeAccounts.susdt.push({
           id,
-          type,
+          type: (0, import_utils4.normalizeStructTag)(type),
           stakePoolId,
-          stakeType,
+          stakeType: (0, import_utils4.normalizeStructTag)(stakeType),
           staked,
           index,
           points,
@@ -1920,13 +1975,13 @@ var getStakePool = async (query, marketCoinName) => {
       const lastUpdate = Number(fields.last_update);
       stakePool = {
         id,
-        type,
+        type: (0, import_utils4.normalizeStructTag)(type),
         maxPoint,
         distributedPoint,
         pointPerPeriod,
         period,
         maxStake,
-        stakeType,
+        stakeType: (0, import_utils4.normalizeStructTag)(stakeType),
         totalStaked,
         index,
         createdAt,
@@ -1937,6 +1992,7 @@ var getStakePool = async (query, marketCoinName) => {
   return stakePool;
 };
 var getStakeRewardPool = async (query, marketCoinName) => {
+  const spoolPkgId = query.address.get("spool.id");
   const poolId = query.address.get(
     `spool.pools.${marketCoinName}.rewardPoolId`
   );
@@ -1948,23 +2004,38 @@ var getStakeRewardPool = async (query, marketCoinName) => {
       showType: true
     }
   });
-  if (stakeRewardPoolObjectResponse.data) {
+  const stakeRewardFeeDynamicFieldsResponse = await query.suiKit.client().getDynamicFieldObject({
+    parentId: poolId,
+    name: {
+      type: `${spoolPkgId}::rewards_pool::RewardsPoolFeeKey`,
+      value: { dummy_field: false }
+    }
+  });
+  if (stakeRewardPoolObjectResponse.data && stakeRewardFeeDynamicFieldsResponse.data) {
     const stakeRewardPoolObject = stakeRewardPoolObjectResponse.data;
+    const stakeRewardFeeDynamicFieldObject = stakeRewardFeeDynamicFieldsResponse.data;
     const id = stakeRewardPoolObject.objectId;
     const type = stakeRewardPoolObject.type;
-    if (stakeRewardPoolObject.content && "fields" in stakeRewardPoolObject.content) {
-      const fields = stakeRewardPoolObject.content.fields;
-      const stakePoolId = String(fields.spool_id);
-      const ratioNumerator = Number(fields.exchange_rate_numerator);
-      const ratioDenominator = Number(fields.exchange_rate_denominator);
-      const rewards = Number(fields.rewards);
-      const claimedRewards = Number(fields.claimed_rewards);
+    if (stakeRewardPoolObject.content && stakeRewardFeeDynamicFieldObject.content && "fields" in stakeRewardPoolObject.content && "fields" in stakeRewardFeeDynamicFieldObject.content) {
+      const rewardPoolFields = stakeRewardPoolObject.content.fields;
+      const rewardFeeFields = stakeRewardFeeDynamicFieldObject.content.fields.value.fields;
+      const stakePoolId = String(rewardPoolFields.spool_id);
+      const ratioNumerator = Number(rewardPoolFields.exchange_rate_numerator);
+      const ratioDenominator = Number(
+        rewardPoolFields.exchange_rate_denominator
+      );
+      const rewards = Number(rewardPoolFields.rewards);
+      const claimedRewards = Number(rewardPoolFields.claimed_rewards);
+      const feeRateNumerator = Number(rewardFeeFields.fee_rate_numerator);
+      const feeRateDenominator = Number(rewardFeeFields.fee_rate_denominator);
       stakeRewardPool = {
         id,
-        type,
+        type: (0, import_utils4.normalizeStructTag)(type),
         stakePoolId,
         ratioNumerator,
         ratioDenominator,
+        feeRateNumerator,
+        feeRateDenominator,
         rewards,
         claimedRewards
       };
@@ -1974,6 +2045,7 @@ var getStakeRewardPool = async (query, marketCoinName) => {
 };
 
 // src/queries/borrowIncentiveQuery.ts
+var import_utils6 = require("@mysten/sui.js/utils");
 var import_sui_kit2 = require("@scallop-io/sui-kit");
 var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames) => {
   borrowIncentiveCoinNames = borrowIncentiveCoinNames || [
@@ -1992,7 +2064,7 @@ var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames) => {
   const rewardCoinType = parsedBorrowIncentiveRewardPoolData.rewardType;
   const borrowIncentivePools = {};
   for (const pool of borrowIncentivePoolsQueryData.incentive_pools) {
-    const coinType = "0x" + pool.pool_type.name;
+    const coinType = (0, import_utils6.normalizeStructTag)(pool.pool_type.name);
     const coinName = query.utils.parseCoinNameFromType(coinType);
     const rewardCoinName = query.utils.parseCoinNameFromType(rewardCoinType);
     if (!borrowIncentiveCoinNames.includes(coinName)) {
@@ -2190,15 +2262,19 @@ var getLending = async (query, poolCoinName, ownerAddress, marketPool, spool, st
       availableUnstakeAmount = availableUnstakeAmount.plus(
         accountStakedMarketCoinAmount
       );
-      availableUnstakeCoin = availableUnstakeAmount.shiftedBy(-1 * coinDecimal);
+      availableUnstakeCoin = availableUnstakeAmount.shiftedBy(
+        -1 * spool.coinDecimal
+      );
       const baseIndexRate = 1e9;
       const increasedPointRate = spool?.currentPointIndex ? (0, import_bignumber3.default)(spool.currentPointIndex - stakeAccount.index).dividedBy(
         baseIndexRate
       ) : 1;
       availableClaimAmount = availableClaimAmount.plus(
-        (0, import_bignumber3.default)(stakeAccount.staked).multipliedBy(increasedPointRate).plus(stakeAccount.points).multipliedBy(spool.exchangeRateNumerator).dividedBy(spool.exchangeRateDenominator)
+        accountStakedMarketCoinAmount.multipliedBy(increasedPointRate).plus(stakeAccount.points).multipliedBy(spool.exchangeRateNumerator).dividedBy(spool.exchangeRateDenominator)
+      );
+      availableClaimCoin = availableClaimAmount.shiftedBy(
+        -1 * spool.rewardCoinDecimal
       );
-      availableClaimCoin = availableClaimAmount.shiftedBy(-1 * coinDecimal);
     }
   }
   const suppliedAmount = (0, import_bignumber3.default)(marketCoinAmount).multipliedBy(
@@ -2283,10 +2359,13 @@ var getObligationAccount = async (query, obligationId, ownerAddress, market, coi
     ])
   ];
   const obligationQuery = await query.queryObligation(obligationId);
+  const borrowIncentivePools = await query.getBorrowIncentivePools();
+  const borrowIncentiveAccounts = await query.getBorrowIncentiveAccounts(obligationId);
   coinPrices = coinPrices || await query.utils.getCoinPrices(assetCoinNames);
   coinAmounts = coinAmounts || await query.getCoinAmounts(assetCoinNames, ownerAddress);
   const collaterals = {};
   const debts = {};
+  const borrowIncentives = {};
   let totalDepositedPools = 0;
   let totalDepositedValue = (0, import_bignumber3.default)(0);
   let totalBorrowCapacityValue = (0, import_bignumber3.default)(0);
@@ -2388,6 +2467,41 @@ var getObligationAccount = async (query, obligationId, ownerAddress, market, coi
       };
     }
   }
+  for (const [poolCoinName, borrowIncentiveAccount] of Object.entries(
+    borrowIncentiveAccounts
+  )) {
+    const coinName = poolCoinName;
+    const borrowIncentivePool = borrowIncentivePools[coinName];
+    let availableClaimAmount = (0, import_bignumber3.default)(0);
+    let availableClaimCoin = (0, import_bignumber3.default)(0);
+    if (borrowIncentivePool) {
+      const accountBorrowedAmount = (0, import_bignumber3.default)(borrowIncentiveAccount.amount);
+      const baseIndexRate = 1e9;
+      const increasedPointRate = borrowIncentivePool.currentPointIndex ? (0, import_bignumber3.default)(
+        borrowIncentivePool.currentPointIndex - borrowIncentiveAccount.index
+      ).dividedBy(baseIndexRate) : 1;
+      availableClaimAmount = availableClaimAmount.plus(
+        accountBorrowedAmount.multipliedBy(increasedPointRate).plus(borrowIncentiveAccount.points).multipliedBy(borrowIncentivePool.exchangeRateNumerator).dividedBy(borrowIncentivePool.exchangeRateDenominator)
+      );
+      availableClaimCoin = availableClaimAmount.shiftedBy(
+        -1 * borrowIncentivePool.rewardCoinDecimal
+      );
+      if (availableClaimAmount.isGreaterThan(0)) {
+        borrowIncentives[coinName] = {
+          coinName: borrowIncentivePool.coinName,
+          coinType: borrowIncentivePool.coinType,
+          rewardCoinType: borrowIncentivePool.rewardCoinType,
+          symbol: borrowIncentivePool.symbol,
+          coinDecimal: borrowIncentivePool.coinDecimal,
+          rewardCoinDecimal: borrowIncentivePool.rewardCoinDecimal,
+          coinPrice: borrowIncentivePool.coinPrice,
+          rewardCoinPrice: borrowIncentivePool.rewardCoinPrice,
+          availableClaimAmount: availableClaimAmount.toNumber(),
+          availableClaimCoin: availableClaimCoin.toNumber()
+        };
+      }
+    }
+  }
   let riskLevel = totalRequiredCollateralValue.isZero() && totalBorrowedValueWithWeight.isZero() ? (0, import_bignumber3.default)(0) : totalBorrowedValueWithWeight.dividedBy(totalRequiredCollateralValue);
   riskLevel = riskLevel.isFinite() ? riskLevel.isLessThan(1) ? riskLevel : (0, import_bignumber3.default)(1) : (0, import_bignumber3.default)(1);
   const accountBalanceValue = totalDepositedValue.minus(totalBorrowedValue).isGreaterThan(0) ? totalDepositedValue.minus(totalBorrowedValue) : (0, import_bignumber3.default)(0);
@@ -2416,7 +2530,8 @@ var getObligationAccount = async (query, obligationId, ownerAddress, market, coi
     totalDepositedPools,
     totalBorrowedPools,
     collaterals,
-    debts
+    debts,
+    borrowIncentives
   };
   for (const [collateralCoinName, obligationCollateral] of Object.entries(
     obligationAccount.collaterals
@@ -2432,10 +2547,10 @@ var getObligationAccount = async (query, obligationId, ownerAddress, market, coi
       obligationCollateral.availableWithdrawCoin = availableWithdrawAmount.shiftedBy(-1 * obligationCollateral.coinDecimal).toNumber();
     }
   }
-  for (const [assetCoinName, obligationDebt] of Object.entries(
+  for (const [poolCoinName, obligationDebt] of Object.entries(
     obligationAccount.debts
   )) {
-    const marketPool = market.pools[assetCoinName];
+    const marketPool = market.pools[poolCoinName];
     if (marketPool) {
       const availableRepayAmount = (0, import_bignumber3.default)(
         obligationDebt.availableRepayAmount
@@ -2890,7 +3005,7 @@ var ScallopUtils = class {
       throw Error(`Coin ${coinName} is not supported`);
     }
     if (coinName === "sui")
-      return (0, import_utils7.normalizeStructTag)(`${coinPackageId}::sui::SUI`);
+      return (0, import_utils9.normalizeStructTag)(`${coinPackageId}::sui::SUI`);
     const wormHolePckageIds = [
       this._address.get("core.coins.usdc.id") ?? wormholeCoinIds.usdc,
       this._address.get("core.coins.usdt.id") ?? wormholeCoinIds.usdt,
@@ -2918,11 +3033,12 @@ var ScallopUtils = class {
    * @return Market coin type.
    */
   parseMarketCoinType(coinName) {
+    const protocolObjectId = this._address.get("core.object") || PROTOCOL_OBJECT_ID;
     const coinType = this.parseCoinType(coinName);
-    return `${PROTOCOL_OBJECT_ID}::reserve::MarketCoin<${coinType}>`;
+    return `${protocolObjectId}::reserve::MarketCoin<${coinType}>`;
   }
   parseCoinNameFromType(coinType) {
-    coinType = (0, import_utils7.normalizeStructTag)(coinType);
+    coinType = (0, import_utils9.normalizeStructTag)(coinType);
     const coinTypeRegex = new RegExp(`((0x[^:]+::[^:]+::[^<>]+))(?![^<>]*<)`);
     const coinTypeMatch = coinType.match(coinTypeRegex);
     const isMarketCoinType = coinType.includes("reserve::MarketCoin");
@@ -2986,7 +3102,7 @@ var ScallopUtils = class {
    * @param coinType - The coin type, default is 0x2::SUI::SUI.
    * @return The selected transaction coin arguments.
    */
-  async selectCoinIds(amount, coinType = import_utils7.SUI_TYPE_ARG, ownerAddress) {
+  async selectCoinIds(amount, coinType = import_utils9.SUI_TYPE_ARG, ownerAddress) {
     ownerAddress = ownerAddress || this._suiKit.currentAddress();
     const coins = await this._suiKit.suiInteractor.selectCoins(
       ownerAddress,
@@ -3106,16 +3222,16 @@ var ScallopUtils = class {
 };
 
 // src/models/scallopBuilder.ts
-var import_utils16 = require("@mysten/sui.js/utils");
+var import_utils18 = require("@mysten/sui.js/utils");
 var import_sui_kit8 = require("@scallop-io/sui-kit");
 
 // src/builders/coreBuilder.ts
 var import_transactions = require("@mysten/sui.js/transactions");
-var import_utils10 = require("@mysten/sui.js/utils");
+var import_utils12 = require("@mysten/sui.js/utils");
 var import_sui_kit5 = require("@scallop-io/sui-kit");
 
 // src/builders/oracle.ts
-var import_utils9 = require("@mysten/sui.js/utils");
+var import_utils11 = require("@mysten/sui.js/utils");
 var import_pyth_sui_js2 = require("@pythnetwork/pyth-sui-js");
 var updateOracles = async (builder, txBlock, assetCoinNames) => {
   assetCoinNames = assetCoinNames ?? [
@@ -3221,27 +3337,27 @@ var priceUpdateRequest = (txBlock, packageId, xOracleId, coinType) => {
 var confirmPriceUpdateRequest = (txBlock, packageId, xOracleId, request, coinType) => {
   const target = `${packageId}::x_oracle::confirm_price_update_request`;
   const typeArgs = [coinType];
-  txBlock.moveCall(target, [xOracleId, request, import_utils9.SUI_CLOCK_OBJECT_ID], typeArgs);
+  txBlock.moveCall(target, [xOracleId, request, import_utils11.SUI_CLOCK_OBJECT_ID], typeArgs);
   return txBlock;
 };
 var updateSupraPrice = (txBlock, packageId, request, holderId, registryId, coinType) => {
   txBlock.moveCall(
     `${packageId}::rule::set_price`,
-    [request, holderId, registryId, import_utils9.SUI_CLOCK_OBJECT_ID],
+    [request, holderId, registryId, import_utils11.SUI_CLOCK_OBJECT_ID],
     [coinType]
   );
 };
 var updateSwitchboardPrice = (txBlock, packageId, request, aggregatorId, registryId, coinType) => {
   txBlock.moveCall(
     `${packageId}::rule::set_price`,
-    [request, aggregatorId, registryId, import_utils9.SUI_CLOCK_OBJECT_ID],
+    [request, aggregatorId, registryId, import_utils11.SUI_CLOCK_OBJECT_ID],
     [coinType]
   );
 };
 var updatePythPrice = (txBlock, packageId, request, stateId, feedObjectId, registryId, coinType) => {
   txBlock.moveCall(
     `${packageId}::rule::set_price`,
-    [request, stateId, feedObjectId, registryId, import_utils9.SUI_CLOCK_OBJECT_ID],
+    [request, stateId, feedObjectId, registryId, import_utils11.SUI_CLOCK_OBJECT_ID],
     [coinType]
   );
 };
@@ -3307,7 +3423,7 @@ var generateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           amount,
           coreIds.xOracle,
-          import_utils10.SUI_CLOCK_OBJECT_ID
+          import_utils12.SUI_CLOCK_OBJECT_ID
         ],
         [coinType]
       );
@@ -3316,7 +3432,7 @@ var generateCoreNormalMethod = ({
       const coinType = builder.utils.parseCoinType(poolCoinName);
       return txBlock.moveCall(
         `${coreIds.protocolPkg}::mint::mint`,
-        [coreIds.version, coreIds.market, coin, import_utils10.SUI_CLOCK_OBJECT_ID],
+        [coreIds.version, coreIds.market, coin, import_utils12.SUI_CLOCK_OBJECT_ID],
         [coinType]
       );
     },
@@ -3324,7 +3440,7 @@ var generateCoreNormalMethod = ({
       const coinType = builder.utils.parseCoinType(poolCoinName);
       return txBlock.moveCall(
         `${coreIds.protocolPkg}::mint::mint_entry`,
-        [coreIds.version, coreIds.market, coin, import_utils10.SUI_CLOCK_OBJECT_ID],
+        [coreIds.version, coreIds.market, coin, import_utils12.SUI_CLOCK_OBJECT_ID],
         [coinType]
       );
     },
@@ -3332,7 +3448,7 @@ var generateCoreNormalMethod = ({
       const coinType = builder.utils.parseCoinType(poolCoinName);
       return txBlock.moveCall(
         `${coreIds.protocolPkg}::redeem::redeem`,
-        [coreIds.version, coreIds.market, marketCoin, import_utils10.SUI_CLOCK_OBJECT_ID],
+        [coreIds.version, coreIds.market, marketCoin, import_utils12.SUI_CLOCK_OBJECT_ID],
         [coinType]
       );
     },
@@ -3340,7 +3456,7 @@ var generateCoreNormalMethod = ({
       const coinType = builder.utils.parseCoinType(poolCoinName);
       return txBlock.moveCall(
         `${coreIds.protocolPkg}::redeem::redeem_entry`,
-        [coreIds.version, coreIds.market, marketCoin, import_utils10.SUI_CLOCK_OBJECT_ID],
+        [coreIds.version, coreIds.market, marketCoin, import_utils12.SUI_CLOCK_OBJECT_ID],
         [coinType]
       );
     },
@@ -3356,7 +3472,7 @@ var generateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           amount,
           coreIds.xOracle,
-          import_utils10.SUI_CLOCK_OBJECT_ID
+          import_utils12.SUI_CLOCK_OBJECT_ID
         ],
         [coinType]
       );
@@ -3373,7 +3489,7 @@ var generateCoreNormalMethod = ({
           coreIds.coinDecimalsRegistry,
           amount,
           coreIds.xOracle,
-          import_utils10.SUI_CLOCK_OBJECT_ID
+          import_utils12.SUI_CLOCK_OBJECT_ID
         ],
         [coinType]
       );
@@ -3387,7 +3503,7 @@ var generateCoreNormalMethod = ({
           obligation,
           coreIds.market,
           coin,
-          import_utils10.SUI_CLOCK_OBJECT_ID
+          import_utils12.SUI_CLOCK_OBJECT_ID
         ],
         [coinType]
       );
@@ -3565,7 +3681,7 @@ var newCoreTxBlock = (builder, initTxBlock) => {
 
 // src/builders/spoolBuilder.ts
 var import_transactions2 = require("@mysten/sui.js/transactions");
-var import_utils12 = require("@mysten/sui.js/utils");
+var import_utils14 = require("@mysten/sui.js/utils");
 var import_sui_kit6 = require("@scallop-io/sui-kit");
 var requireStakeAccountIds = async (...params) => {
   const [builder, txBlock, stakeMarketCoinName, stakeAccountId] = params;
@@ -3605,7 +3721,7 @@ var generateSpoolNormalMethod = ({
       );
       return txBlock.moveCall(
         `${spoolIds.spoolPkg}::user::new_spool_account`,
-        [stakePoolId, import_utils12.SUI_CLOCK_OBJECT_ID],
+        [stakePoolId, import_utils14.SUI_CLOCK_OBJECT_ID],
         [marketCoinType]
       );
     },
@@ -3616,7 +3732,7 @@ var generateSpoolNormalMethod = ({
       );
       txBlock.moveCall(
         `${spoolIds.spoolPkg}::user::stake`,
-        [stakePoolId, stakeAccount, coin, import_utils12.SUI_CLOCK_OBJECT_ID],
+        [stakePoolId, stakeAccount, coin, import_utils14.SUI_CLOCK_OBJECT_ID],
         [marketCoinType]
       );
     },
@@ -3627,7 +3743,7 @@ var generateSpoolNormalMethod = ({
       );
       return txBlock.moveCall(
         `${spoolIds.spoolPkg}::user::unstake`,
-        [stakePoolId, stakeAccount, amount, import_utils12.SUI_CLOCK_OBJECT_ID],
+        [stakePoolId, stakeAccount, amount, import_utils14.SUI_CLOCK_OBJECT_ID],
         [marketCoinType]
       );
     },
@@ -3643,7 +3759,7 @@ var generateSpoolNormalMethod = ({
       const rewardCoinType = builder.utils.parseCoinType(rewardCoinName);
       return txBlock.moveCall(
         `${spoolIds.spoolPkg}::user::redeem_rewards`,
-        [stakePoolId, rewardPoolId, stakeAccount, import_utils12.SUI_CLOCK_OBJECT_ID],
+        [stakePoolId, rewardPoolId, stakeAccount, import_utils14.SUI_CLOCK_OBJECT_ID],
         [marketCoinType, rewardCoinType]
       );
     }
@@ -3753,7 +3869,7 @@ var newSpoolTxBlock = (builder, initTxBlock) => {
 
 // src/builders/borrowIncentiveBuilder.ts
 var import_transactions3 = require("@mysten/sui.js/transactions");
-var import_utils14 = require("@mysten/sui.js/utils");
+var import_utils16 = require("@mysten/sui.js/utils");
 var import_sui_kit7 = require("@scallop-io/sui-kit");
 var requireObligationInfo2 = async (...params) => {
   const [builder, txBlock, obligationId, obligationKey] = params;
@@ -3797,7 +3913,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           obligaionKey,
           obligationId,
           borrowIncentiveIds.obligationAccessStore,
-          import_utils14.SUI_CLOCK_OBJECT_ID
+          import_utils16.SUI_CLOCK_OBJECT_ID
         ],
         [rewardType]
       );
@@ -3812,7 +3928,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           borrowIncentiveIds.incentiveAccounts,
           obligaionKey,
           obligationId,
-          import_utils14.SUI_CLOCK_OBJECT_ID
+          import_utils16.SUI_CLOCK_OBJECT_ID
         ],
         [rewardType]
       );
@@ -3827,7 +3943,7 @@ var generateBorrowIncentiveNormalMethod = ({ builder, txBlock }) => {
           borrowIncentiveIds.incentiveAccounts,
           obligaionKey,
           obligationId,
-          import_utils14.SUI_CLOCK_OBJECT_ID
+          import_utils16.SUI_CLOCK_OBJECT_ID
         ],
         [rewardType]
       );
@@ -3953,7 +4069,7 @@ var ScallopBuilder = class {
       address: this.address,
       query: this.query
     });
-    this.walletAddress = (0, import_utils16.normalizeSuiAddress)(
+    this.walletAddress = (0, import_utils18.normalizeSuiAddress)(
       params?.walletAddress || this.suiKit.currentAddress()
     );
     this.isTestnet = params.networkType ? params.networkType === "testnet" : false;
@@ -4049,7 +4165,7 @@ var ScallopClient = class {
       query: this.query,
       utils: this.utils
     });
-    this.walletAddress = (0, import_utils17.normalizeSuiAddress)(
+    this.walletAddress = (0, import_utils19.normalizeSuiAddress)(
       params?.walletAddress || this.suiKit.currentAddress()
     );
   }
@@ -4614,6 +4730,7 @@ var Scallop = class {
 0 && (module.exports = {
   ADDRESSES_ID,
   API_BASE_URL,
+  BORROW_FEE_PROTOCOL_ID,
   PROTOCOL_OBJECT_ID,
   SUPPORT_BORROW_INCENTIVE_POOLS,
   SUPPORT_BORROW_INCENTIVE_REWARDS,