@defisaver/positions-sdk 1.0.11-fluid-dev10 → 1.0.11-fluid-dev12

package/.mocharc.json

@@ -1,4 +1,4 @@
-{
-    "require": "ts-node/register",
-    "extension": ["ts"]
-}
+{
+    "require": "ts-node/register",
+    "extension": ["ts"]
+}

package/.nvmrc

@@ -1 +1 @@
-v20.17.0
+v20.17.0

package/README.md

@@ -1,69 +1,69 @@
-# DeFi Saver Positions SDK
-
-Supported protocols: 
-- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
-- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
-- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
-- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
-- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
-- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
-- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
-- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
-- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
-- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
-- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
-
-## Setup
-Supported Node version is v10.
-
-- run `npm install` (first time)
-- run `npm run build`
-
-`build` command will generate contracts and build ejs and esm folders
-
-## How to use
-[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
-
-This is a Compound V3 example, and every other protocol is similar
-```js
-import Web3 from 'web3';
-import { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-const web3 = new Web3(provider);
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
-    1, // network
-    selectedMarket, // market object like in /src/markets/compound/index.ts
-    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    web3,
-    1, // network
-    userAddress, // EOA or DSProxy
-    '', // proxy address of the user, or just empty string if checking for EOA
-    {
-        selectedMarket, // market object as in /src/markets/compound/index.ts
-        assetsData,
-    }
-);
-```
-
-More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
-
-## Testing
-
-`npm run test` - Run all tests
-
-`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest
+# DeFi Saver Positions SDK
+
+Supported protocols: 
+- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
+- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
+- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
+- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
+- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
+- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
+- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
+- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
+- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
+- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
+- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
+
+## Setup
+Supported Node version is v10.
+
+- run `npm install` (first time)
+- run `npm run build`
+
+`build` command will generate contracts and build ejs and esm folders
+
+## How to use
+[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
+
+This is a Compound V3 example, and every other protocol is similar
+```js
+import Web3 from 'web3';
+import { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+const web3 = new Web3(provider);
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
+    1, // network
+    selectedMarket, // market object like in /src/markets/compound/index.ts
+    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    web3,
+    1, // network
+    userAddress, // EOA or DSProxy
+    '', // proxy address of the user, or just empty string if checking for EOA
+    {
+        selectedMarket, // market object as in /src/markets/compound/index.ts
+        assetsData,
+    }
+);
+```
+
+More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
+
+## Testing
+
+`npm run test` - Run all tests
+
+`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest

package/cjs/fluid/index.js

@@ -120,6 +120,30 @@ const getTokenPriceFromChainlink = (asset, network, web3) => __awaiter(void 0, v
     }
     return new decimal_js_1.default(loanTokenPrice).div(1e8).toString();
 });
+const getMarketRateForDex = (token1PerShare, token0PerShare, rate0, rate1, price0, price1) => {
+    const token0PerShareUsd = new decimal_js_1.default(token0PerShare).mul(price0).toString();
+    const token1PerShareUsd = new decimal_js_1.default(token1PerShare).mul(price1).toString();
+    const sharesCombinedUsd = new decimal_js_1.default(token0PerShareUsd).plus(token1PerShareUsd);
+    const rate0PerShare = new decimal_js_1.default(rate0).mul(token0PerShareUsd).div(sharesCombinedUsd).toString();
+    const rate1PerShare = new decimal_js_1.default(rate1).mul(token1PerShareUsd).div(sharesCombinedUsd).toString();
+    return new decimal_js_1.default(rate0PerShare).plus(rate1PerShare).toString();
+};
+const getAdditionalMarketRateForDex = (token1PerShare, token0PerShare, incentiveSupplyRate0, incentiveSupplyRate1, price0, price1) => {
+    const token0PerShareUsd = new decimal_js_1.default(token0PerShare).mul(price0).toString();
+    const token1PerShareUsd = new decimal_js_1.default(token1PerShare).mul(price1).toString();
+    const sharesCombinedUsd = new decimal_js_1.default(token0PerShareUsd).plus(token1PerShareUsd);
+    const rate0PerShare = incentiveSupplyRate0 ? new decimal_js_1.default(incentiveSupplyRate0).mul(token0PerShareUsd).div(sharesCombinedUsd).toString() : 0;
+    const rate1PerShare = incentiveSupplyRate1 ? new decimal_js_1.default(incentiveSupplyRate1).mul(token1PerShareUsd).div(sharesCombinedUsd).toString() : 0;
+    return new decimal_js_1.default(rate0PerShare).plus(rate1PerShare).toString();
+};
+const getTradingApy = (poolAddress) => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield fetch(`https://api.fluid.instadapp.io/v2/1/dexes/${poolAddress}/apy`);
+    if (!res.ok) {
+        return '0';
+    }
+    const data = yield res.json();
+    return new decimal_js_1.default(data.tradingApy).div(100).toString();
+});
 const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const collAsset = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
     const debtAsset = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
@@ -144,6 +168,7 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         collAssetData.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset.symbol, mainnetWeb3);
         collAssetData.incentiveSupplyToken = collAsset.symbol;
     }
+    const incentiveSupplyRate = collAssetData.incentiveSupplyApy;
     const debtAssetData = {
         symbol: debtAsset.symbol,
         address: debtAsset.address,
@@ -159,10 +184,7 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAssetData.incentiveBorrowApy = yield (0, staking_1.getStakingApy)(debtAsset.symbol, mainnetWeb3);
         debtAssetData.incentiveBorrowToken = debtAsset.symbol;
     }
-    if (staking_1.STAKING_ASSETS.includes(debtAssetData.symbol)) {
-        debtAssetData.incentiveBorrowApy = yield (0, staking_1.getStakingApy)(debtAsset.symbol, mainnetWeb3);
-        debtAssetData.incentiveBorrowToken = debtAsset.symbol;
-    }
+    const incentiveBorrowRate = debtAssetData.incentiveBorrowApy;
     const assetsData = {
         [collAsset.symbol]: collAssetData,
         [debtAsset.symbol]: debtAssetData,
@@ -206,6 +228,8 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         liquidationMaxLimit,
         borrowRate,
         supplyRate,
+        incentiveSupplyRate,
+        incentiveBorrowRate,
         oraclePrice,
     };
     return {
@@ -213,12 +237,6 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         marketData,
     };
 });
-const getMarketRateForDex = (token1PerShare, token0PerShare, rate0, rate1) => {
-    const sharesCombined = new decimal_js_1.default(token1PerShare).plus(token0PerShare);
-    const rate0PerShare = new decimal_js_1.default(rate0).mul(token0PerShare).div(sharesCombined).toString();
-    const rate1PerShare = new decimal_js_1.default(rate1).mul(token1PerShare).div(sharesCombined).toString();
-    return new decimal_js_1.default(rate0PerShare).plus(rate1PerShare).toString();
-};
 const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const collAsset0 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
     const collAsset1 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken1, network);
@@ -257,11 +275,13 @@ const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         tokenPerSupplyShare: token1PerSupplyShare,
         supplyReserves: reservesSupplyToken1,
     };
-    if (staking_1.STAKING_ASSETS.includes(collFirstAssetData.symbol)) {
-        collFirstAssetData.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset1.symbol, mainnetWeb3);
-        collFirstAssetData.incentiveSupplyToken = collAsset1.symbol;
+    if (staking_1.STAKING_ASSETS.includes(collSecondAssetData.symbol)) {
+        collSecondAssetData.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset1.symbol, mainnetWeb3);
+        collSecondAssetData.incentiveSupplyToken = collAsset1.symbol;
     }
-    const marketSupplyRate = getMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, supplyRate0, supplyRate1);
+    const marketSupplyRate = getMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, supplyRate0, supplyRate1, collFirstAssetData.price, collSecondAssetData.price);
+    const incentiveSupplyRate = getAdditionalMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, collFirstAssetData.incentiveSupplyApy, collSecondAssetData.incentiveSupplyApy, collFirstAssetData.price, collSecondAssetData.price);
+    const tradingSupplyRate = yield getTradingApy(data.dexSupplyData.dexPool);
     const borrowRate = new decimal_js_1.default(data.borrowRateVault).div(100).toString();
     const debtAssetData = {
         symbol: debtAsset.symbol,
@@ -275,6 +295,7 @@ const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAssetData.incentiveBorrowApy = yield (0, staking_1.getStakingApy)(debtAsset.symbol, mainnetWeb3);
         debtAssetData.incentiveBorrowToken = debtAsset.symbol;
     }
+    const incentiveBorrowRate = debtAssetData.incentiveBorrowApy;
     const assetsData = [
         [collAsset0.symbol, collFirstAssetData],
         [collAsset1.symbol, collSecondAssetData],
@@ -323,17 +344,21 @@ const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         liquidationMaxLimit,
         borrowRate,
         supplyRate: marketSupplyRate,
+        incentiveSupplyRate,
+        incentiveBorrowRate,
         totalSupplyToken0,
         totalSupplyToken1,
         withdrawableToken0,
         withdrawableToken1,
         withdrawableUSD,
         withdrawable: withdrawableShares,
-        widthdrawableDex: new decimal_js_1.default(maxSupplyShares).minus(totalSupplyShares).toString(),
+        withdrawableDex: new decimal_js_1.default(maxSupplyShares).minus(totalSupplyShares).toString(),
         maxSupplyShares,
         maxSupplySharesUsd,
         collDexFee: supplyDexFee,
         oraclePrice,
+        tradingSupplyRate,
+        tradingBorrowRate: '0',
     };
     return {
         assetsData,
@@ -363,6 +388,7 @@ const parseT3MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         collAssetData.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset.symbol, mainnetWeb3);
         collAssetData.incentiveSupplyToken = collAsset.symbol;
     }
+    const incentiveSupplyRate = collAssetData.incentiveSupplyApy;
     const debtAsset0Data = {
         symbol: debtAsset0.symbol,
         address: debtAsset0.address,
@@ -395,7 +421,9 @@ const parseT3MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAsset1Data.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(debtAsset1.symbol, mainnetWeb3);
         debtAsset1Data.incentiveSupplyToken = debtAsset1.symbol;
     }
-    const marketBorrowRate = getMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, borrowRate0, borrowRate1);
+    const marketBorrowRate = getMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, borrowRate0, borrowRate1, debtAsset0Data.price, debtAsset1Data.price);
+    const incentiveBorrowRate = getAdditionalMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, debtAsset0Data.incentiveSupplyApy, debtAsset1Data.incentiveSupplyApy, debtAsset0Data.price, debtAsset1Data.price);
+    const tradingBorrowRate = yield getTradingApy(data.dexBorrowData.dexPool);
     const assetsData = [
         [collAsset.symbol, collAssetData],
         [debtAsset0.symbol, debtAsset0Data],
@@ -439,6 +467,10 @@ const parseT3MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         liquidationMaxLimit,
         borrowRate: marketBorrowRate,
         supplyRate,
+        incentiveBorrowRate,
+        incentiveSupplyRate,
+        tradingBorrowRate,
+        tradingSupplyRate: '0',
         borrowableToken0,
         borrowableToken1,
         totalBorrowToken0,
@@ -534,8 +566,13 @@ const parseT4MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAsset1Data.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(debtAsset1.symbol, mainnetWeb3);
         debtAsset1Data.incentiveSupplyToken = debtAsset1.symbol;
     }
-    const marketBorrowRate = getMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, borrowRate0, borrowRate1);
-    const marketSupplyRate = getMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, supplyRate0, supplyRate1);
+    const marketInfo = (0, markets_1.getFluidMarketInfoById)(+data.vaultId, network);
+    const marketBorrowRate = getMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, borrowRate0, borrowRate1, debtAsset0Data.price, debtAsset1Data.price);
+    const incentiveBorrowRate = getAdditionalMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, debtAsset0Data.incentiveSupplyApy, debtAsset1Data.incentiveSupplyApy, debtAsset0Data.price, debtAsset1Data.price);
+    const tradingBorrowRate = yield getTradingApy(data.dexBorrowData.dexPool);
+    const marketSupplyRate = getMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, supplyRate0, supplyRate1, collAsset0Data.price, collAsset1Data.price);
+    const incentiveSupplyRate = getAdditionalMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, collAsset0Data.incentiveSupplyApy, collAsset1Data.incentiveSupplyApy, collAsset0Data.price, collAsset1Data.price);
+    const tradingSupplyRate = yield getTradingApy(data.dexSupplyData.dexPool);
     const assetsData = [
         [collAsset0.symbol, collAsset0Data],
         [collAsset1.symbol, collAsset1Data],
@@ -543,7 +580,6 @@ const parseT4MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         [debtAsset1.symbol, debtAsset1Data],
     ]
         .reduce((acc, [symbol, partialData]) => (Object.assign(Object.assign({}, acc), { [symbol]: (0, fluidHelpers_1.mergeAssetData)(acc[symbol], partialData) })), {});
-    const marketInfo = (0, markets_1.getFluidMarketInfoById)(+data.vaultId, network);
     const liqRatio = new decimal_js_1.default(data.liquidationThreshold).div(100).toString();
     const liquidationMaxLimit = new decimal_js_1.default(data.liquidationMaxLimit).div(100).toString();
     const liqFactor = new decimal_js_1.default(data.liquidationThreshold).div(10000).toString();
@@ -581,7 +617,9 @@ const parseT4MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         totalBorrowVaultUsd,
         liquidationMaxLimit,
         borrowRate: marketBorrowRate,
+        incentiveBorrowRate,
         supplyRate: marketSupplyRate,
+        incentiveSupplyRate,
         borrowableToken0,
         borrowableToken1,
         totalBorrowToken0,
@@ -598,13 +636,15 @@ const parseT4MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         withdrawableToken1,
         withdrawableUSD,
         withdrawable: withdrawableShares,
-        widthdrawableDex: new decimal_js_1.default(maxSupplyShares).minus(totalSupplyShares).toString(),
+        withdrawableDex: new decimal_js_1.default(maxSupplyShares).minus(totalSupplyShares).toString(),
         maxSupplyShares,
         maxSupplySharesUsd,
         collDexFee: supplyDexFee,
         collSharePrice,
         debtSharePrice,
         oraclePrice,
+        tradingBorrowRate,
+        tradingSupplyRate,
     };
     return {
         assetsData,

package/cjs/helpers/fluidHelpers/index.js

@@ -10,6 +10,24 @@ const types_1 = require("../../types");
 const moneymarket_1 = require("../../moneymarket");
 const staking_1 = require("../../staking");
 const utils_1 = require("../../services/utils");
+const calculateNetApyDex = ({ marketData, suppliedUsd, borrowedUsd }) => {
+    const { borrowRate, supplyRate, incentiveBorrowRate, incentiveSupplyRate, tradingBorrowRate, tradingSupplyRate, } = marketData;
+    const totalBorrowRate = new decimal_js_1.default(borrowRate).minus(tradingBorrowRate || '0').toString();
+    const totalSupplyRate = new decimal_js_1.default(supplyRate).add(tradingSupplyRate || '0').toString();
+    const borrowIncentive = new decimal_js_1.default(incentiveBorrowRate || '0').mul(borrowedUsd).div(100).toString();
+    const supplyIncentive = new decimal_js_1.default(incentiveSupplyRate || '0').mul(suppliedUsd).div(100).toString();
+    const incentiveUsd = new decimal_js_1.default(supplyIncentive).minus(borrowIncentive).toString();
+    const borrowInterest = new decimal_js_1.default(totalBorrowRate).mul(borrowedUsd).div(100).toString();
+    const supplyInterest = new decimal_js_1.default(totalSupplyRate).mul(suppliedUsd).div(100).toString();
+    const totalInterestUsd = new decimal_js_1.default(supplyInterest).add(incentiveUsd).minus(borrowInterest).toString();
+    const balance = new decimal_js_1.default(suppliedUsd).sub(borrowedUsd).toString();
+    const netApy = new decimal_js_1.default(totalInterestUsd).div(balance).times(100).toString();
+    return {
+        netApy,
+        incentiveUsd,
+        totalInterestUsd,
+    };
+};
 const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }, supplyShares, borrowShares) => {
     const payload = {};
     payload.suppliedUsd = [types_1.FluidVaultType.T1, types_1.FluidVaultType.T3].includes(marketData.vaultType)
@@ -18,7 +36,8 @@ const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }, supplyS
     payload.borrowedUsd = [types_1.FluidVaultType.T1, types_1.FluidVaultType.T2].includes(marketData.vaultType)
         ? (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd)
         : new decimal_js_1.default(marketData.debtSharePrice).mul(borrowShares).toString();
-    const { netApy, incentiveUsd, totalInterestUsd } = (0, staking_1.calculateNetApy)({ usedAssets, assetsData: assetsData });
+    const isDex = [types_1.FluidVaultType.T2, types_1.FluidVaultType.T3, types_1.FluidVaultType.T4].includes(marketData.vaultType);
+    const { netApy, incentiveUsd, totalInterestUsd } = isDex ? calculateNetApyDex({ marketData, suppliedUsd: payload.suppliedUsd, borrowedUsd: payload.borrowedUsd }) : (0, staking_1.calculateNetApy)({ usedAssets, assetsData: assetsData });
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;
     payload.totalInterestUsd = totalInterestUsd;
@@ -51,7 +70,7 @@ exports.getFluidAggregatedData = getFluidAggregatedData;
 const parseDexSupplyData = (dexSupplyData, collAsset0, collAsset1) => {
     const { dexPool, // address of the dex pool
     dexId, // id of the dex pool
-    fee: _fee, // fee of the dex pool TODO videti sa Rajkom
+    fee: _fee, // fee of the dex pool (Only used as swap fees)
     lastStoredPrice, // last stored price of the dex pool
     centerPrice, // center price of the dex pool
     token0Utilization, // token0 utilization

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -117,73 +117,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, web3, network) =>
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

package/cjs/types/fluid.d.ts

@@ -241,6 +241,8 @@ export interface InnerFluidMarketData {
     borrowRate: string;
     liquidationMaxLimit: string;
     oraclePrice: string;
+    incentiveBorrowRate?: string;
+    incentiveSupplyRate?: string;
     collSharePrice?: string;
     maxSupplyShares?: string;
     maxSupplySharesUsd?: string;
@@ -259,6 +261,8 @@ export interface InnerFluidMarketData {
     totalBorrowToken0?: string;
     totalBorrowToken1?: string;
     borrowDexFee?: string;
+    tradingBorrowRate?: string;
+    tradingSupplyRate?: string;
 }
 export interface FluidMarketData {
     assetsData: FluidAssetsData;