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

package/dist/index.mjs

@@ -2,6 +2,7 @@
 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",
@@ -147,6 +148,7 @@ var EMPTY_ADDRESSES = {
   core: {
     version: "",
     versionCap: "",
+    object: "",
     market: "",
     adminCap: "",
     coinDecimalsRegistry: "",
@@ -324,6 +326,7 @@ var EMPTY_ADDRESSES = {
   spool: {
     id: "",
     adminCap: "",
+    object: "",
     pools: {
       ssui: {
         id: "",
@@ -338,6 +341,7 @@ var EMPTY_ADDRESSES = {
   borrowIncentive: {
     id: "",
     adminCap: "",
+    object: "",
     query: "",
     incentivePools: "",
     incentiveAccounts: ""
@@ -648,7 +652,7 @@ import { normalizeSuiAddress as normalizeSuiAddress2 } from "@mysten/sui.js/util
 import { SuiKit as SuiKit4 } from "@scallop-io/sui-kit";
 
 // src/models/scallopUtils.ts
-import { SUI_TYPE_ARG, normalizeStructTag as normalizeStructTag3 } from "@mysten/sui.js/utils";
+import { SUI_TYPE_ARG, normalizeStructTag as normalizeStructTag5 } from "@mysten/sui.js/utils";
 import { SuiKit as SuiKit2 } from "@scallop-io/sui-kit";
 import { SuiPriceServiceConnection } from "@pythnetwork/pyth-sui-js";
 
@@ -656,6 +660,7 @@ import { SuiPriceServiceConnection } from "@pythnetwork/pyth-sui-js";
 import { SuiKit } from "@scallop-io/sui-kit";
 
 // src/queries/coreQuery.ts
+import { normalizeStructTag as normalizeStructTag2 } from "@mysten/sui.js/utils";
 import { SuiTxBlock as SuiKitTxBlock } from "@scallop-io/sui-kit";
 import BigNumber2 from "bignumber.js";
 
@@ -673,7 +678,7 @@ import BigNumber from "bignumber.js";
 import { normalizeStructTag } from "@mysten/sui.js/utils";
 var parseOriginMarketPoolData = (originMarketPoolData) => {
   return {
-    coinType: "0x" + originMarketPoolData.type.name,
+    coinType: 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,
@@ -686,6 +691,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,
@@ -767,7 +773,7 @@ var calculateMarketPoolData = (utils, parsedMarketPoolData) => {
 };
 var parseOriginMarketCollateralData = (originMarketCollateralData) => {
   return {
-    coinType: "0x" + originMarketCollateralData.type.name,
+    coinType: 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,
@@ -799,7 +805,7 @@ var calculateMarketCollateralData = (utils, parsedMarketCollateralData) => {
 };
 var parseOriginSpoolData = (originSpoolData) => {
   return {
-    stakeType: "0x" + originSpoolData.stakeType.fields.name,
+    stakeType: normalizeStructTag(originSpoolData.stakeType.fields.name),
     maxPoint: Number(originSpoolData.maxDistributedPoint),
     distributedPoint: Number(originSpoolData.distributedPoint),
     pointPerPeriod: Number(originSpoolData.distributedPointPerPeriod),
@@ -856,12 +862,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)
   };
@@ -886,6 +894,7 @@ var calculateSpoolRewardPoolData = (parsedSpoolData, parsedSpoolRewardPoolData,
   const claimedRewardValue = claimedRewardCoin.multipliedBy(rewardCoinPrice);
   const rewardValueForYear = BigNumber(rewardPerSec).shiftedBy(-1 * rewardCoinDecimal).multipliedBy(rateYearFactor).multipliedBy(rewardCoinPrice);
   const rewardRate = rewardValueForYear.dividedBy(calculatedSpoolData.stakedValue).isFinite() ? rewardValueForYear.dividedBy(calculatedSpoolData.stakedValue).toNumber() : Infinity;
+  const rewardFeeRate = BigNumber(parsedSpoolRewardPoolData.feeRateNumerator).dividedBy(parsedSpoolRewardPoolData.feeRateDenominator).toNumber();
   return {
     rewardApr: rewardRate,
     totalRewardAmount: totalRewardAmount.toNumber(),
@@ -897,7 +906,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) => {
@@ -972,6 +982,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
     )
@@ -1001,6 +1017,9 @@ var calculateBorrowIncentiveRewardPoolData = (parsedBorrowIncentivePoolData, par
   const claimedRewardValue = claimedRewardCoin.multipliedBy(rewardCoinPrice);
   const rewardValueForYear = BigNumber(rewardPerSec).shiftedBy(-1 * rewardCoinDecimal).multipliedBy(rateYearFactor).multipliedBy(rewardCoinPrice);
   const rewardRate = rewardValueForYear.dividedBy(calculatedBorrowIncentivePoolData.stakedValue).isFinite() ? rewardValueForYear.dividedBy(calculatedBorrowIncentivePoolData.stakedValue).toNumber() : Infinity;
+  const rewardFeeRate = BigNumber(
+    parsedBorrowIncentiveRewardPoolData.rewardsFeeRateNumerator
+  ).dividedBy(parsedBorrowIncentiveRewardPoolData.rewardsFeeRateDenominator).toNumber();
   return {
     rewardApr: rewardRate,
     totalRewardAmount: totalRewardAmount.toNumber(),
@@ -1012,7 +1031,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) => {
@@ -1088,7 +1108,7 @@ var queryMarket = async (query) => {
   const pools = {};
   const collaterals = {};
   for (const pool of marketData.pools) {
-    const coinType = "0x" + pool.type.name;
+    const coinType = normalizeStructTag2(pool.type.name);
     const poolCoinName = query.utils.parseCoinNameFromType(coinType);
     const coinPrice = (await query.utils.getCoinPrices([poolCoinName]))?.[poolCoinName] ?? 0;
     if (!SUPPORT_POOLS.includes(poolCoinName)) {
@@ -1107,6 +1127,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,
@@ -1130,13 +1151,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 = normalizeStructTag2(collateral.type.name);
     const collateralCoinName = query.utils.parseCoinNameFromType(coinType);
     const coinPrice = (await query.utils.getCoinPrices([collateralCoinName]))?.[collateralCoinName] ?? 0;
     if (!SUPPORT_COLLATERALS.includes(collateralCoinName)) {
@@ -1214,6 +1236,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;
@@ -1263,9 +1286,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,
@@ -1279,6 +1318,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,
@@ -1303,6 +1343,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
@@ -1417,6 +1458,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;
@@ -1424,7 +1466,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
     });
@@ -1637,7 +1679,7 @@ var getMarketCoinAmount = async (query, marketCoinName, ownerAddress) => {
 };
 
 // src/queries/spoolQuery.ts
-import { normalizeStructTag as normalizeStructTag2 } from "@mysten/sui.js/utils";
+import { normalizeStructTag as normalizeStructTag3 } from "@mysten/sui.js/utils";
 var getSpools = async (query, stakeMarketCoinNames) => {
   stakeMarketCoinNames = stakeMarketCoinNames || [...SUPPORT_SPOOLS];
   const stakeCoinNames = stakeMarketCoinNames.map(
@@ -1661,6 +1703,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`
@@ -1672,6 +1715,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([
@@ -1680,19 +1730,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);
@@ -1701,14 +1752,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);
@@ -1745,8 +1799,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;
@@ -1775,7 +1829,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;
     },
     {}
@@ -1793,34 +1847,34 @@ var getStakeAccounts = async (query, ownerAddress) => {
       const index = Number(fields.index);
       const points = Number(fields.points);
       const totalPoints = Number(fields.total_points);
-      if (normalizeStructTag2(type) === stakeMarketCoinTypes.ssui) {
+      if (normalizeStructTag3(type) === stakeMarketCoinTypes.ssui) {
         stakeAccounts.ssui.push({
           id,
-          type,
+          type: normalizeStructTag3(type),
           stakePoolId,
-          stakeType,
+          stakeType: normalizeStructTag3(stakeType),
           staked,
           index,
           points,
           totalPoints
         });
-      } else if (normalizeStructTag2(type) === stakeMarketCoinTypes.susdc) {
+      } else if (normalizeStructTag3(type) === stakeMarketCoinTypes.susdc) {
         stakeAccounts.susdc.push({
           id,
-          type,
+          type: normalizeStructTag3(type),
           stakePoolId,
-          stakeType,
+          stakeType: normalizeStructTag3(stakeType),
           staked,
           index,
           points,
           totalPoints
         });
-      } else if (normalizeStructTag2(type) === stakeMarketCoinTypes.susdt) {
+      } else if (normalizeStructTag3(type) === stakeMarketCoinTypes.susdt) {
         stakeAccounts.susdt.push({
           id,
-          type,
+          type: normalizeStructTag3(type),
           stakePoolId,
-          stakeType,
+          stakeType: normalizeStructTag3(stakeType),
           staked,
           index,
           points,
@@ -1859,13 +1913,13 @@ var getStakePool = async (query, marketCoinName) => {
       const lastUpdate = Number(fields.last_update);
       stakePool = {
         id,
-        type,
+        type: normalizeStructTag3(type),
         maxPoint,
         distributedPoint,
         pointPerPeriod,
         period,
         maxStake,
-        stakeType,
+        stakeType: normalizeStructTag3(stakeType),
         totalStaked,
         index,
         createdAt,
@@ -1876,6 +1930,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`
   );
@@ -1887,23 +1942,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: normalizeStructTag3(type),
         stakePoolId,
         ratioNumerator,
         ratioDenominator,
+        feeRateNumerator,
+        feeRateDenominator,
         rewards,
         claimedRewards
       };
@@ -1913,6 +1983,7 @@ var getStakeRewardPool = async (query, marketCoinName) => {
 };
 
 // src/queries/borrowIncentiveQuery.ts
+import { normalizeStructTag as normalizeStructTag4 } from "@mysten/sui.js/utils";
 import { SuiTxBlock as SuiKitTxBlock2 } from "@scallop-io/sui-kit";
 var queryBorrowIncentivePools = async (query, borrowIncentiveCoinNames) => {
   borrowIncentiveCoinNames = borrowIncentiveCoinNames || [
@@ -1931,7 +2002,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 = normalizeStructTag4(pool.pool_type.name);
     const coinName = query.utils.parseCoinNameFromType(coinType);
     const rewardCoinName = query.utils.parseCoinNameFromType(rewardCoinType);
     if (!borrowIncentiveCoinNames.includes(coinName)) {
@@ -2129,15 +2200,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 ? BigNumber3(spool.currentPointIndex - stakeAccount.index).dividedBy(
         baseIndexRate
       ) : 1;
       availableClaimAmount = availableClaimAmount.plus(
-        BigNumber3(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 = BigNumber3(marketCoinAmount).multipliedBy(
@@ -2222,10 +2297,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 = BigNumber3(0);
   let totalBorrowCapacityValue = BigNumber3(0);
@@ -2327,6 +2405,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 = BigNumber3(0);
+    let availableClaimCoin = BigNumber3(0);
+    if (borrowIncentivePool) {
+      const accountBorrowedAmount = BigNumber3(borrowIncentiveAccount.amount);
+      const baseIndexRate = 1e9;
+      const increasedPointRate = borrowIncentivePool.currentPointIndex ? BigNumber3(
+        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() ? BigNumber3(0) : totalBorrowedValueWithWeight.dividedBy(totalRequiredCollateralValue);
   riskLevel = riskLevel.isFinite() ? riskLevel.isLessThan(1) ? riskLevel : BigNumber3(1) : BigNumber3(1);
   const accountBalanceValue = totalDepositedValue.minus(totalBorrowedValue).isGreaterThan(0) ? totalDepositedValue.minus(totalBorrowedValue) : BigNumber3(0);
@@ -2355,7 +2468,8 @@ var getObligationAccount = async (query, obligationId, ownerAddress, market, coi
     totalDepositedPools,
     totalBorrowedPools,
     collaterals,
-    debts
+    debts,
+    borrowIncentives
   };
   for (const [collateralCoinName, obligationCollateral] of Object.entries(
     obligationAccount.collaterals
@@ -2371,10 +2485,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 = BigNumber3(
         obligationDebt.availableRepayAmount
@@ -2829,7 +2943,7 @@ var ScallopUtils = class {
       throw Error(`Coin ${coinName} is not supported`);
     }
     if (coinName === "sui")
-      return normalizeStructTag3(`${coinPackageId}::sui::SUI`);
+      return normalizeStructTag5(`${coinPackageId}::sui::SUI`);
     const wormHolePckageIds = [
       this._address.get("core.coins.usdc.id") ?? wormholeCoinIds.usdc,
       this._address.get("core.coins.usdt.id") ?? wormholeCoinIds.usdt,
@@ -2857,11 +2971,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 = normalizeStructTag3(coinType);
+    coinType = normalizeStructTag5(coinType);
     const coinTypeRegex = new RegExp(`((0x[^:]+::[^:]+::[^<>]+))(?![^<>]*<)`);
     const coinTypeMatch = coinType.match(coinTypeRegex);
     const isMarketCoinType = coinType.includes("reserve::MarketCoin");
@@ -4555,6 +4670,7 @@ var Scallop = class {
 export {
   ADDRESSES_ID,
   API_BASE_URL,
+  BORROW_FEE_PROTOCOL_ID,
   PROTOCOL_OBJECT_ID,
   SUPPORT_BORROW_INCENTIVE_POOLS,
   SUPPORT_BORROW_INCENTIVE_REWARDS,