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

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,19 +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 getAdditionalMarketRateForDex = (token1PerShare, token0PerShare, incentiveSupplyRate0, incentiveSupplyRate1) => {
-    console.log(incentiveSupplyRate0, incentiveSupplyRate1);
-    const sharesCombined = new decimal_js_1.default(token1PerShare).plus(token0PerShare);
-    const rate0PerShare = incentiveSupplyRate0 ? new decimal_js_1.default(incentiveSupplyRate0).mul(token0PerShare).div(sharesCombined).toString() : 0;
-    const rate1PerShare = incentiveSupplyRate1 ? new decimal_js_1.default(incentiveSupplyRate1).mul(token1PerShare).div(sharesCombined).toString() : 0;
-    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);
@@ -268,8 +279,9 @@ const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         collSecondAssetData.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset1.symbol, mainnetWeb3);
         collSecondAssetData.incentiveSupplyToken = collAsset1.symbol;
     }
-    const marketSupplyRate = getMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, supplyRate0, supplyRate1);
-    const incentiveSupplyRate = getAdditionalMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, collFirstAssetData.incentiveSupplyApy, collSecondAssetData.incentiveSupplyApy);
+    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,
@@ -283,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],
@@ -332,17 +345,20 @@ const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         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,
@@ -372,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,
@@ -404,8 +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 incentiveBorrowRate = getAdditionalMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, debtAsset0Data.incentiveSupplyApy, debtAsset1Data.incentiveSupplyApy);
+    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],
@@ -450,6 +468,9 @@ const parseT3MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         borrowRate: marketBorrowRate,
         supplyRate,
         incentiveBorrowRate,
+        incentiveSupplyRate,
+        tradingBorrowRate,
+        tradingSupplyRate: '0',
         borrowableToken0,
         borrowableToken1,
         totalBorrowToken0,
@@ -545,10 +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 incentiveBorrowRate = getAdditionalMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, debtAsset0Data.incentiveSupplyApy, debtAsset1Data.incentiveSupplyApy);
-    const marketSupplyRate = getMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, supplyRate0, supplyRate1);
-    const incentiveSupplyRate = getAdditionalMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, collAsset0Data.incentiveSupplyApy, collAsset1Data.incentiveSupplyApy);
+    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],
@@ -556,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();
@@ -613,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/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;

package/esm/fluid/index.js

@@ -114,6 +114,30 @@ const getTokenPriceFromChainlink = (asset, network, web3) => __awaiter(void 0, v
     }
     return new Dec(loanTokenPrice).div(1e8).toString();
 });
+const getMarketRateForDex = (token1PerShare, token0PerShare, rate0, rate1, price0, price1) => {
+    const token0PerShareUsd = new Dec(token0PerShare).mul(price0).toString();
+    const token1PerShareUsd = new Dec(token1PerShare).mul(price1).toString();
+    const sharesCombinedUsd = new Dec(token0PerShareUsd).plus(token1PerShareUsd);
+    const rate0PerShare = new Dec(rate0).mul(token0PerShareUsd).div(sharesCombinedUsd).toString();
+    const rate1PerShare = new Dec(rate1).mul(token1PerShareUsd).div(sharesCombinedUsd).toString();
+    return new Dec(rate0PerShare).plus(rate1PerShare).toString();
+};
+const getAdditionalMarketRateForDex = (token1PerShare, token0PerShare, incentiveSupplyRate0, incentiveSupplyRate1, price0, price1) => {
+    const token0PerShareUsd = new Dec(token0PerShare).mul(price0).toString();
+    const token1PerShareUsd = new Dec(token1PerShare).mul(price1).toString();
+    const sharesCombinedUsd = new Dec(token0PerShareUsd).plus(token1PerShareUsd);
+    const rate0PerShare = incentiveSupplyRate0 ? new Dec(incentiveSupplyRate0).mul(token0PerShareUsd).div(sharesCombinedUsd).toString() : 0;
+    const rate1PerShare = incentiveSupplyRate1 ? new Dec(incentiveSupplyRate1).mul(token1PerShareUsd).div(sharesCombinedUsd).toString() : 0;
+    return new Dec(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 Dec(data.tradingApy).div(100).toString();
+});
 const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
     const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
@@ -138,6 +162,7 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         collAssetData.incentiveSupplyApy = yield getStakingApy(collAsset.symbol, mainnetWeb3);
         collAssetData.incentiveSupplyToken = collAsset.symbol;
     }
+    const incentiveSupplyRate = collAssetData.incentiveSupplyApy;
     const debtAssetData = {
         symbol: debtAsset.symbol,
         address: debtAsset.address,
@@ -153,10 +178,7 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAssetData.incentiveBorrowApy = yield getStakingApy(debtAsset.symbol, mainnetWeb3);
         debtAssetData.incentiveBorrowToken = debtAsset.symbol;
     }
-    if (STAKING_ASSETS.includes(debtAssetData.symbol)) {
-        debtAssetData.incentiveBorrowApy = yield getStakingApy(debtAsset.symbol, mainnetWeb3);
-        debtAssetData.incentiveBorrowToken = debtAsset.symbol;
-    }
+    const incentiveBorrowRate = debtAssetData.incentiveBorrowApy;
     const assetsData = {
         [collAsset.symbol]: collAssetData,
         [debtAsset.symbol]: debtAssetData,
@@ -200,6 +222,8 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         liquidationMaxLimit,
         borrowRate,
         supplyRate,
+        incentiveSupplyRate,
+        incentiveBorrowRate,
         oraclePrice,
     };
     return {
@@ -207,19 +231,6 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         marketData,
     };
 });
-const getMarketRateForDex = (token1PerShare, token0PerShare, rate0, rate1) => {
-    const sharesCombined = new Dec(token1PerShare).plus(token0PerShare);
-    const rate0PerShare = new Dec(rate0).mul(token0PerShare).div(sharesCombined).toString();
-    const rate1PerShare = new Dec(rate1).mul(token1PerShare).div(sharesCombined).toString();
-    return new Dec(rate0PerShare).plus(rate1PerShare).toString();
-};
-const getAdditionalMarketRateForDex = (token1PerShare, token0PerShare, incentiveSupplyRate0, incentiveSupplyRate1) => {
-    console.log(incentiveSupplyRate0, incentiveSupplyRate1);
-    const sharesCombined = new Dec(token1PerShare).plus(token0PerShare);
-    const rate0PerShare = incentiveSupplyRate0 ? new Dec(incentiveSupplyRate0).mul(token0PerShare).div(sharesCombined).toString() : 0;
-    const rate1PerShare = incentiveSupplyRate1 ? new Dec(incentiveSupplyRate1).mul(token1PerShare).div(sharesCombined).toString() : 0;
-    return new Dec(rate0PerShare).plus(rate1PerShare).toString();
-};
 const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const collAsset0 = getAssetInfoByAddress(data.supplyToken0, network);
     const collAsset1 = getAssetInfoByAddress(data.supplyToken1, network);
@@ -262,8 +273,9 @@ const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         collSecondAssetData.incentiveSupplyApy = yield getStakingApy(collAsset1.symbol, mainnetWeb3);
         collSecondAssetData.incentiveSupplyToken = collAsset1.symbol;
     }
-    const marketSupplyRate = getMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, supplyRate0, supplyRate1);
-    const incentiveSupplyRate = getAdditionalMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, collFirstAssetData.incentiveSupplyApy, collSecondAssetData.incentiveSupplyApy);
+    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 Dec(data.borrowRateVault).div(100).toString();
     const debtAssetData = {
         symbol: debtAsset.symbol,
@@ -277,6 +289,7 @@ const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAssetData.incentiveBorrowApy = yield getStakingApy(debtAsset.symbol, mainnetWeb3);
         debtAssetData.incentiveBorrowToken = debtAsset.symbol;
     }
+    const incentiveBorrowRate = debtAssetData.incentiveBorrowApy;
     const assetsData = [
         [collAsset0.symbol, collFirstAssetData],
         [collAsset1.symbol, collSecondAssetData],
@@ -326,17 +339,20 @@ const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         borrowRate,
         supplyRate: marketSupplyRate,
         incentiveSupplyRate,
+        incentiveBorrowRate,
         totalSupplyToken0,
         totalSupplyToken1,
         withdrawableToken0,
         withdrawableToken1,
         withdrawableUSD,
         withdrawable: withdrawableShares,
-        widthdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
+        withdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
         maxSupplyShares,
         maxSupplySharesUsd,
         collDexFee: supplyDexFee,
         oraclePrice,
+        tradingSupplyRate,
+        tradingBorrowRate: '0',
     };
     return {
         assetsData,
@@ -366,6 +382,7 @@ const parseT3MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         collAssetData.incentiveSupplyApy = yield getStakingApy(collAsset.symbol, mainnetWeb3);
         collAssetData.incentiveSupplyToken = collAsset.symbol;
     }
+    const incentiveSupplyRate = collAssetData.incentiveSupplyApy;
     const debtAsset0Data = {
         symbol: debtAsset0.symbol,
         address: debtAsset0.address,
@@ -398,8 +415,9 @@ const parseT3MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAsset1Data.incentiveSupplyApy = yield getStakingApy(debtAsset1.symbol, mainnetWeb3);
         debtAsset1Data.incentiveSupplyToken = debtAsset1.symbol;
     }
-    const marketBorrowRate = getMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, borrowRate0, borrowRate1);
-    const incentiveBorrowRate = getAdditionalMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, debtAsset0Data.incentiveSupplyApy, debtAsset1Data.incentiveSupplyApy);
+    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],
@@ -444,6 +462,9 @@ const parseT3MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         borrowRate: marketBorrowRate,
         supplyRate,
         incentiveBorrowRate,
+        incentiveSupplyRate,
+        tradingBorrowRate,
+        tradingSupplyRate: '0',
         borrowableToken0,
         borrowableToken1,
         totalBorrowToken0,
@@ -539,10 +560,13 @@ const parseT4MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAsset1Data.incentiveSupplyApy = yield getStakingApy(debtAsset1.symbol, mainnetWeb3);
         debtAsset1Data.incentiveSupplyToken = debtAsset1.symbol;
     }
-    const marketBorrowRate = getMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, borrowRate0, borrowRate1);
-    const incentiveBorrowRate = getAdditionalMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, debtAsset0Data.incentiveSupplyApy, debtAsset1Data.incentiveSupplyApy);
-    const marketSupplyRate = getMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, supplyRate0, supplyRate1);
-    const incentiveSupplyRate = getAdditionalMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, collAsset0Data.incentiveSupplyApy, collAsset1Data.incentiveSupplyApy);
+    const marketInfo = 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],
@@ -550,7 +574,6 @@ const parseT4MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         [debtAsset1.symbol, debtAsset1Data],
     ]
         .reduce((acc, [symbol, partialData]) => (Object.assign(Object.assign({}, acc), { [symbol]: mergeAssetData(acc[symbol], partialData) })), {});
-    const marketInfo = getFluidMarketInfoById(+data.vaultId, network);
     const liqRatio = new Dec(data.liquidationThreshold).div(100).toString();
     const liquidationMaxLimit = new Dec(data.liquidationMaxLimit).div(100).toString();
     const liqFactor = new Dec(data.liquidationThreshold).div(10000).toString();
@@ -607,13 +630,15 @@ const parseT4MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         withdrawableToken1,
         withdrawableUSD,
         withdrawable: withdrawableShares,
-        widthdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
+        withdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
         maxSupplyShares,
         maxSupplySharesUsd,
         collDexFee: supplyDexFee,
         collSharePrice,
         debtSharePrice,
         oraclePrice,
+        tradingBorrowRate,
+        tradingSupplyRate,
     };
     return {
         assetsData,

package/esm/helpers/fluidHelpers/index.js

@@ -4,6 +4,24 @@ import { FluidVaultType, } from '../../types';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
 import { getEthAmountForDecimals } from '../../services/utils';
+const calculateNetApyDex = ({ marketData, suppliedUsd, borrowedUsd }) => {
+    const { borrowRate, supplyRate, incentiveBorrowRate, incentiveSupplyRate, tradingBorrowRate, tradingSupplyRate, } = marketData;
+    const totalBorrowRate = new Dec(borrowRate).minus(tradingBorrowRate || '0').toString();
+    const totalSupplyRate = new Dec(supplyRate).add(tradingSupplyRate || '0').toString();
+    const borrowIncentive = new Dec(incentiveBorrowRate || '0').mul(borrowedUsd).div(100).toString();
+    const supplyIncentive = new Dec(incentiveSupplyRate || '0').mul(suppliedUsd).div(100).toString();
+    const incentiveUsd = new Dec(supplyIncentive).minus(borrowIncentive).toString();
+    const borrowInterest = new Dec(totalBorrowRate).mul(borrowedUsd).div(100).toString();
+    const supplyInterest = new Dec(totalSupplyRate).mul(suppliedUsd).div(100).toString();
+    const totalInterestUsd = new Dec(supplyInterest).add(incentiveUsd).minus(borrowInterest).toString();
+    const balance = new Dec(suppliedUsd).sub(borrowedUsd).toString();
+    const netApy = new Dec(totalInterestUsd).div(balance).times(100).toString();
+    return {
+        netApy,
+        incentiveUsd,
+        totalInterestUsd,
+    };
+};
 export const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }, supplyShares, borrowShares) => {
     const payload = {};
     payload.suppliedUsd = [FluidVaultType.T1, FluidVaultType.T3].includes(marketData.vaultType)
@@ -12,7 +30,8 @@ export const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, },
     payload.borrowedUsd = [FluidVaultType.T1, FluidVaultType.T2].includes(marketData.vaultType)
         ? getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd)
         : new Dec(marketData.debtSharePrice).mul(borrowShares).toString();
-    const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({ usedAssets, assetsData: assetsData });
+    const isDex = [FluidVaultType.T2, FluidVaultType.T3, FluidVaultType.T4].includes(marketData.vaultType);
+    const { netApy, incentiveUsd, totalInterestUsd } = isDex ? calculateNetApyDex({ marketData, suppliedUsd: payload.suppliedUsd, borrowedUsd: payload.borrowedUsd }) : calculateNetApy({ usedAssets, assetsData: assetsData });
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;
     payload.totalInterestUsd = totalInterestUsd;
@@ -44,7 +63,7 @@ export const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, },
 export 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/esm/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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "1.0.11-fluid-dev11",
+  "version": "1.0.11-fluid-dev12",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/fluid/index.ts

@@ -155,6 +155,39 @@ const getTokenPriceFromChainlink = async (asset: AssetData, network: NetworkNumb
   return new Dec(loanTokenPrice).div(1e8).toString();
 };
 
+const getMarketRateForDex = (token1PerShare: string, token0PerShare: string, rate0: string, rate1: string, price0: string, price1: string) => {
+  const token0PerShareUsd = new Dec(token0PerShare).mul(price0).toString();
+  const token1PerShareUsd = new Dec(token1PerShare).mul(price1).toString();
+  const sharesCombinedUsd = new Dec(token0PerShareUsd).plus(token1PerShareUsd);
+
+  const rate0PerShare = new Dec(rate0).mul(token0PerShareUsd).div(sharesCombinedUsd).toString();
+
+  const rate1PerShare = new Dec(rate1).mul(token1PerShareUsd).div(sharesCombinedUsd).toString();
+
+  return new Dec(rate0PerShare).plus(rate1PerShare).toString();
+};
+
+const getAdditionalMarketRateForDex = (token1PerShare: string, token0PerShare: string, incentiveSupplyRate0: string, incentiveSupplyRate1: string, price0: string, price1: string) => {
+  const token0PerShareUsd = new Dec(token0PerShare).mul(price0).toString();
+  const token1PerShareUsd = new Dec(token1PerShare).mul(price1).toString();
+  const sharesCombinedUsd = new Dec(token0PerShareUsd).plus(token1PerShareUsd);
+
+  const rate0PerShare = incentiveSupplyRate0 ? new Dec(incentiveSupplyRate0).mul(token0PerShareUsd).div(sharesCombinedUsd).toString() : 0;
+
+  const rate1PerShare = incentiveSupplyRate1 ? new Dec(incentiveSupplyRate1).mul(token1PerShareUsd).div(sharesCombinedUsd).toString() : 0;
+
+  return new Dec(rate0PerShare).plus(rate1PerShare).toString();
+};
+
+const getTradingApy = async (poolAddress: EthAddress) => {
+  const res = await fetch(`https://api.fluid.instadapp.io/v2/1/dexes/${poolAddress}/apy`);
+  if (!res.ok) {
+    return '0';
+  }
+  const data = await res.json();
+  return new Dec(data.tradingApy).div(100).toString();
+};
+
 const parseT1MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutputStruct, network: NetworkNumber, mainnetWeb3: Web3) => {
   const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
   const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
@@ -184,6 +217,8 @@ const parseT1MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
     collAssetData.incentiveSupplyToken = collAsset.symbol;
   }
 
+  const incentiveSupplyRate = collAssetData.incentiveSupplyApy;
+
   const debtAssetData: FluidAssetData = {
     symbol: debtAsset.symbol,
     address: debtAsset.address,
@@ -200,10 +235,7 @@ const parseT1MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
     debtAssetData.incentiveBorrowToken = debtAsset.symbol;
   }
 
-  if (STAKING_ASSETS.includes(debtAssetData.symbol)) {
-    debtAssetData.incentiveBorrowApy = await getStakingApy(debtAsset.symbol, mainnetWeb3);
-    debtAssetData.incentiveBorrowToken = debtAsset.symbol;
-  }
+  const incentiveBorrowRate = debtAssetData.incentiveBorrowApy;
 
   const assetsData = {
     [collAsset.symbol]: collAssetData,
@@ -250,6 +282,8 @@ const parseT1MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
     liquidationMaxLimit,
     borrowRate,
     supplyRate,
+    incentiveSupplyRate,
+    incentiveBorrowRate,
     oraclePrice,
   };
 
@@ -259,27 +293,6 @@ const parseT1MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
   } as FluidMarketData;
 };
 
-const getMarketRateForDex = (token1PerShare: string, token0PerShare: string, rate0: string, rate1: string) => {
-  const sharesCombined = new Dec(token1PerShare).plus(token0PerShare);
-
-  const rate0PerShare = new Dec(rate0).mul(token0PerShare).div(sharesCombined).toString();
-
-  const rate1PerShare = new Dec(rate1).mul(token1PerShare).div(sharesCombined).toString();
-
-  return new Dec(rate0PerShare).plus(rate1PerShare).toString();
-};
-
-const getAdditionalMarketRateForDex = (token1PerShare: string, token0PerShare: string, incentiveSupplyRate0: string, incentiveSupplyRate1: string) => {
-  console.log(incentiveSupplyRate0, incentiveSupplyRate1);
-  const sharesCombined = new Dec(token1PerShare).plus(token0PerShare);
-
-  const rate0PerShare = incentiveSupplyRate0 ? new Dec(incentiveSupplyRate0).mul(token0PerShare).div(sharesCombined).toString() : 0;
-
-  const rate1PerShare = incentiveSupplyRate1 ? new Dec(incentiveSupplyRate1).mul(token1PerShare).div(sharesCombined).toString() : 0;
-
-  return new Dec(rate0PerShare).plus(rate1PerShare).toString();
-};
-
 const parseT2MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutputStruct, network: NetworkNumber, mainnetWeb3: Web3) => {
   const collAsset0 = getAssetInfoByAddress(data.supplyToken0, network);
   const collAsset1 = getAssetInfoByAddress(data.supplyToken1, network);
@@ -347,8 +360,9 @@ const parseT2MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
     collSecondAssetData.incentiveSupplyToken = collAsset1.symbol;
   }
 
-  const marketSupplyRate = getMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, supplyRate0, supplyRate1);
-  const incentiveSupplyRate = getAdditionalMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, collFirstAssetData.incentiveSupplyApy!, collSecondAssetData.incentiveSupplyApy!);
+  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 = await getTradingApy(data.dexSupplyData.dexPool);
 
   const borrowRate = new Dec(data.borrowRateVault).div(100).toString();
   const debtAssetData: Partial<FluidAssetData> = {
@@ -364,6 +378,8 @@ const parseT2MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
     debtAssetData.incentiveBorrowToken = debtAsset.symbol;
   }
 
+  const incentiveBorrowRate = debtAssetData.incentiveBorrowApy;
+
   const assetsData: FluidAssetsData = ([
     [collAsset0.symbol, collFirstAssetData],
     [collAsset1.symbol, collSecondAssetData],
@@ -422,17 +438,20 @@ const parseT2MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
     borrowRate,
     supplyRate: marketSupplyRate,
     incentiveSupplyRate,
+    incentiveBorrowRate,
     totalSupplyToken0,
     totalSupplyToken1,
     withdrawableToken0,
     withdrawableToken1,
     withdrawableUSD,
     withdrawable: withdrawableShares,
-    widthdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
+    withdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
     maxSupplyShares,
     maxSupplySharesUsd,
     collDexFee: supplyDexFee,
     oraclePrice,
+    tradingSupplyRate,
+    tradingBorrowRate: '0',
   };
 
   return {
@@ -441,7 +460,6 @@ const parseT2MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
   } as FluidMarketData;
 };
 
-
 const parseT3MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutputStruct, network: NetworkNumber, mainnetWeb3: Web3) => {
   const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
   const debtAsset0 = getAssetInfoByAddress(data.borrowToken0, network);
@@ -489,6 +507,8 @@ const parseT3MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
     collAssetData.incentiveSupplyToken = collAsset.symbol;
   }
 
+  const incentiveSupplyRate = collAssetData.incentiveSupplyApy;
+
   const debtAsset0Data: Partial<FluidAssetData> = {
     symbol: debtAsset0.symbol,
     address: debtAsset0.address,
@@ -522,8 +542,9 @@ const parseT3MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
     debtAsset1Data.incentiveSupplyApy = await getStakingApy(debtAsset1.symbol, mainnetWeb3);
     debtAsset1Data.incentiveSupplyToken = debtAsset1.symbol;
   }
-  const marketBorrowRate = getMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, borrowRate0, borrowRate1);
-  const incentiveBorrowRate = getAdditionalMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, debtAsset0Data.incentiveSupplyApy!, debtAsset1Data.incentiveSupplyApy!);
+  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 = await getTradingApy(data.dexBorrowData.dexPool);
 
   const assetsData: FluidAssetsData = ([
     [collAsset.symbol, collAssetData],
@@ -580,6 +601,9 @@ const parseT3MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
     borrowRate: marketBorrowRate,
     supplyRate,
     incentiveBorrowRate,
+    incentiveSupplyRate,
+    tradingBorrowRate,
+    tradingSupplyRate: '0',
     borrowableToken0,
     borrowableToken1,
     totalBorrowToken0,
@@ -726,12 +750,15 @@ const parseT4MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
     debtAsset1Data.incentiveSupplyApy = await getStakingApy(debtAsset1.symbol, mainnetWeb3);
     debtAsset1Data.incentiveSupplyToken = debtAsset1.symbol;
   }
+  const marketInfo = getFluidMarketInfoById(+data.vaultId, network);
 
-  const marketBorrowRate = getMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, borrowRate0, borrowRate1);
-  const incentiveBorrowRate = getAdditionalMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, debtAsset0Data.incentiveSupplyApy!, debtAsset1Data.incentiveSupplyApy!);
+  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 = await getTradingApy(data.dexBorrowData.dexPool);
 
-  const marketSupplyRate = getMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, supplyRate0, supplyRate1);
-  const incentiveSupplyRate = getAdditionalMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, collAsset0Data.incentiveSupplyApy!, collAsset1Data.incentiveSupplyApy!);
+  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 = await getTradingApy(data.dexSupplyData.dexPool);
 
   const assetsData: FluidAssetsData = ([
     [collAsset0.symbol, collAsset0Data],
@@ -744,7 +771,6 @@ const parseT4MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
       [symbol]: mergeAssetData(acc[symbol], partialData),
     }), {} as Record<string, FluidAssetData>) as FluidAssetsData;
 
-  const marketInfo = getFluidMarketInfoById(+data.vaultId, network);
 
   const liqRatio = new Dec(data.liquidationThreshold).div(100).toString();
   const liquidationMaxLimit = new Dec(data.liquidationMaxLimit).div(100).toString();
@@ -805,13 +831,15 @@ const parseT4MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
     withdrawableToken1,
     withdrawableUSD,
     withdrawable: withdrawableShares,
-    widthdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
+    withdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
     maxSupplyShares,
     maxSupplySharesUsd,
     collDexFee: supplyDexFee,
     collSharePrice,
     debtSharePrice,
     oraclePrice,
+    tradingBorrowRate,
+    tradingSupplyRate,
   };
 
   return {

package/src/helpers/fluidHelpers/index.ts

@@ -13,6 +13,36 @@ import { MMAssetsData } from '../../types/common';
 import { FluidView } from '../../types/contracts/generated';
 import { getEthAmountForDecimals } from '../../services/utils';
 
+const calculateNetApyDex = ({ marketData, suppliedUsd, borrowedUsd }: { marketData: InnerFluidMarketData, suppliedUsd: string, borrowedUsd: string }) => {
+  const {
+    borrowRate,
+    supplyRate,
+    incentiveBorrowRate,
+    incentiveSupplyRate,
+    tradingBorrowRate,
+    tradingSupplyRate,
+  } = marketData;
+
+  const totalBorrowRate = new Dec(borrowRate).minus(tradingBorrowRate || '0').toString();
+  const totalSupplyRate = new Dec(supplyRate).add(tradingSupplyRate || '0').toString();
+
+  const borrowIncentive = new Dec(incentiveBorrowRate || '0').mul(borrowedUsd).div(100).toString();
+  const supplyIncentive = new Dec(incentiveSupplyRate || '0').mul(suppliedUsd).div(100).toString();
+  const incentiveUsd = new Dec(supplyIncentive).minus(borrowIncentive).toString();
+
+  const borrowInterest = new Dec(totalBorrowRate).mul(borrowedUsd).div(100).toString();
+  const supplyInterest = new Dec(totalSupplyRate).mul(suppliedUsd).div(100).toString();
+  const totalInterestUsd = new Dec(supplyInterest).add(incentiveUsd).minus(borrowInterest).toString();
+  const balance = new Dec(suppliedUsd).sub(borrowedUsd).toString();
+  const netApy = new Dec(totalInterestUsd).div(balance).times(100).toString();
+
+  return {
+    netApy,
+    incentiveUsd,
+    totalInterestUsd,
+  };
+};
+
 export const getFluidAggregatedData = ({
   usedAssets,
   assetsData,
@@ -34,7 +64,8 @@ borrowShares?: string,
     ? getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd)
     : new Dec(marketData.debtSharePrice!).mul(borrowShares!).toString();
 
-  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({ usedAssets, assetsData: assetsData as unknown as MMAssetsData });
+  const isDex = [FluidVaultType.T2, FluidVaultType.T3, FluidVaultType.T4].includes(marketData.vaultType);
+  const { netApy, incentiveUsd, totalInterestUsd } = isDex ? calculateNetApyDex({ marketData, suppliedUsd: payload.suppliedUsd, borrowedUsd: payload.borrowedUsd }) : calculateNetApy({ usedAssets, assetsData: assetsData as unknown as MMAssetsData });
   payload.netApy = netApy;
   payload.incentiveUsd = incentiveUsd;
   payload.totalInterestUsd = totalInterestUsd;
@@ -94,7 +125,7 @@ export const parseDexSupplyData = (dexSupplyData: FluidView.DexSupplyDataStructO
   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/src/types/fluid.ts

@@ -252,6 +252,8 @@ export interface InnerFluidMarketData {
   borrowRate: string,
   liquidationMaxLimit: string,
   oraclePrice: string,
+  incentiveBorrowRate?: string,
+  incentiveSupplyRate?: string,
   // T2 and T4 vaults
   collSharePrice?: string,
   maxSupplyShares?: string,
@@ -272,6 +274,9 @@ export interface InnerFluidMarketData {
   totalBorrowToken0?: string,
   totalBorrowToken1?: string,
   borrowDexFee?: string,
+  // Dex vault
+  tradingBorrowRate?: string,
+  tradingSupplyRate?: string,
 }
 
 export interface FluidMarketData {