@defisaver/positions-sdk 2.0.15-dev → 2.0.15-dev-2

package/cjs/fluid/index.js

@@ -236,12 +236,17 @@ const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         canBeBorrowed: false,
         supplyRate,
         borrowRate: '0',
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     if (staking_1.STAKING_ASSETS.includes(collAsset.symbol)) {
-        collAssetData.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset.symbol);
-        collAssetData.incentiveSupplyToken = collAsset.symbol;
+        collAssetData.supplyIncentives.push({
+            apy: yield (0, staking_1.getStakingApy)(collAsset.symbol),
+            token: collAssetData.symbol,
+            incentiveKind: common_1.IncentiveKind.Staking,
+            description: `Native ${collAssetData.symbol} yield.`,
+        });
     }
-    const incentiveSupplyRate = collAssetData.incentiveSupplyApy;
     const debtAssetData = {
         symbol: debtAsset.symbol,
         address: debtAsset.address,
@@ -252,12 +257,17 @@ const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         canBeBorrowed: true,
         supplyRate: '0',
         borrowRate,
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     if (staking_1.STAKING_ASSETS.includes(debtAssetData.symbol)) {
-        debtAssetData.incentiveBorrowApy = yield (0, staking_1.getStakingApy)(debtAsset.symbol);
-        debtAssetData.incentiveBorrowToken = debtAsset.symbol;
+        debtAssetData.borrowIncentives.push({
+            apy: new decimal_js_1.default(yield (0, staking_1.getStakingApy)(debtAsset.symbol)).mul(-1).toString(),
+            token: debtAssetData.symbol,
+            incentiveKind: common_1.IncentiveKind.Reward,
+            description: `Due to the native yield of ${debtAssetData.symbol}, the value of the debt would increase over time.`,
+        });
     }
-    const incentiveBorrowRate = debtAssetData.incentiveBorrowApy;
     const assetsData = {
         [collAsset.symbol]: collAssetData,
         [debtAsset.symbol]: debtAssetData,
@@ -301,8 +311,6 @@ const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         liquidationMaxLimit,
         borrowRate,
         supplyRate,
-        incentiveSupplyRate,
-        incentiveBorrowRate,
         oraclePrice,
     };
     return {
@@ -311,6 +319,7 @@ const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
     };
 });
 const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
+    var _a, _b, _c;
     const collAsset0 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
     const collAsset1 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken1, network);
     const debtAsset = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
@@ -337,10 +346,16 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         withdrawable: withdrawable0,
         tokenPerSupplyShare: token0PerSupplyShare,
         supplyReserves: reservesSupplyToken0,
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     if (staking_1.STAKING_ASSETS.includes(collFirstAssetData.symbol)) {
-        collFirstAssetData.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset0.symbol);
-        collFirstAssetData.incentiveSupplyToken = collAsset0.symbol;
+        collFirstAssetData.supplyIncentives.push({
+            apy: yield (0, staking_1.getStakingApy)(collAsset0.symbol),
+            token: collAsset0.symbol,
+            incentiveKind: common_1.IncentiveKind.Staking,
+            description: `Native ${collAsset0.symbol} yield.`,
+        });
     }
     const collSecondAssetData = {
         symbol: collAsset1.symbol,
@@ -353,13 +368,19 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         utilization: utilizationSupply1,
         tokenPerSupplyShare: token1PerSupplyShare,
         supplyReserves: reservesSupplyToken1,
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     if (staking_1.STAKING_ASSETS.includes(collSecondAssetData.symbol)) {
-        collSecondAssetData.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset1.symbol);
-        collSecondAssetData.incentiveSupplyToken = collAsset1.symbol;
+        collSecondAssetData.supplyIncentives.push({
+            apy: yield (0, staking_1.getStakingApy)(collAsset1.symbol),
+            token: collAsset1.symbol,
+            incentiveKind: common_1.IncentiveKind.Staking,
+            description: `Native ${collAsset1.symbol} yield.`,
+        });
     }
     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 incentiveSupplyRate = getAdditionalMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, ((_a = collFirstAssetData.supplyIncentives[0]) === null || _a === void 0 ? void 0 : _a.apy) || '0', ((_b = collSecondAssetData.supplyIncentives[0]) === null || _b === void 0 ? void 0 : _b.apy) || '0', 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 = {
@@ -369,12 +390,18 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         totalBorrow: data.totalBorrowVault.toString(),
         canBeBorrowed: true,
         borrowRate,
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     if (staking_1.STAKING_ASSETS.includes(debtAssetData.symbol)) {
-        debtAssetData.incentiveBorrowApy = yield (0, staking_1.getStakingApy)(debtAsset.symbol);
-        debtAssetData.incentiveBorrowToken = debtAsset.symbol;
+        debtAssetData.borrowIncentives.push({
+            apy: new decimal_js_1.default(yield (0, staking_1.getStakingApy)(debtAsset.symbol)).mul(-1).toString(),
+            token: debtAsset.symbol,
+            incentiveKind: common_1.IncentiveKind.Reward,
+            description: `Due to the native yield of ${debtAsset.symbol}, the value of the debt would increase over time.`,
+        });
     }
-    const incentiveBorrowRate = debtAssetData.incentiveBorrowApy;
+    const incentiveBorrowRate = new decimal_js_1.default(((_c = debtAssetData.borrowIncentives[0]) === null || _c === void 0 ? void 0 : _c.apy) || '0').mul(-1).toString();
     const assetsData = [
         [collAsset0.symbol, collFirstAssetData],
         [collAsset1.symbol, collSecondAssetData],
@@ -445,6 +472,7 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
     };
 });
 const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
+    var _a, _b, _c, _d;
     const collAsset = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
     const debtAsset0 = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
     const debtAsset1 = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken1, network);
@@ -468,12 +496,18 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         totalSupply: data.totalSupplyVault.toString(),
         canBeSupplied: true,
         supplyRate,
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     if (staking_1.STAKING_ASSETS.includes(collAssetData.symbol)) {
-        collAssetData.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset.symbol);
-        collAssetData.incentiveSupplyToken = collAsset.symbol;
+        collAssetData.supplyIncentives.push({
+            apy: yield (0, staking_1.getStakingApy)(collAsset.symbol),
+            token: collAsset.symbol,
+            incentiveKind: common_1.IncentiveKind.Staking,
+            description: `Native ${collAsset.symbol} yield.`,
+        });
     }
-    const incentiveSupplyRate = collAssetData.incentiveSupplyApy;
+    const incentiveSupplyRate = ((_b = (_a = collAssetData.supplyIncentives) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.apy) || '0';
     const debtAsset0Data = {
         symbol: debtAsset0.symbol,
         address: debtAsset0.address,
@@ -485,10 +519,16 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         utilization: utilizationBorrow0,
         tokenPerBorrowShare: token0PerBorrowShare,
         borrowReserves: reservesBorrowToken0,
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     if (staking_1.STAKING_ASSETS.includes(debtAsset0Data.symbol)) {
-        debtAsset0Data.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(debtAsset0.symbol);
-        debtAsset0Data.incentiveSupplyToken = debtAsset0.symbol;
+        debtAsset0Data.borrowIncentives.push({
+            apy: new decimal_js_1.default(yield (0, staking_1.getStakingApy)(debtAsset0.symbol)).mul(-1).toString(),
+            token: debtAsset0.symbol,
+            incentiveKind: common_1.IncentiveKind.Reward,
+            description: `Due to the native yield of ${debtAsset0.symbol}, the value of the debt would increase over time.`,
+        });
     }
     const debtAsset1Data = {
         symbol: debtAsset1.symbol,
@@ -501,13 +541,19 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         utilization: utilizationBorrow1,
         tokenPerBorrowShare: token1PerBorrowShare,
         borrowReserves: reservesBorrowToken1,
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     if (staking_1.STAKING_ASSETS.includes(debtAsset1Data.symbol)) {
-        debtAsset1Data.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(debtAsset1.symbol);
-        debtAsset1Data.incentiveSupplyToken = debtAsset1.symbol;
+        debtAsset1Data.borrowIncentives.push({
+            apy: new decimal_js_1.default(yield (0, staking_1.getStakingApy)(debtAsset1.symbol)).mul(-1).toString(),
+            token: debtAsset1.symbol,
+            incentiveKind: common_1.IncentiveKind.Reward,
+            description: `Due to the native yield of ${debtAsset1.symbol}, the value of the debt would increase over time.`,
+        });
     }
     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 incentiveBorrowRate = getAdditionalMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, new decimal_js_1.default(((_c = debtAsset0Data.borrowIncentives[0]) === null || _c === void 0 ? void 0 : _c.apy) || '0').mul(-1).toString(), new decimal_js_1.default(((_d = debtAsset1Data.borrowIncentives[0]) === null || _d === void 0 ? void 0 : _d.apy) || '0').mul(-1).toString(), debtAsset0Data.price, debtAsset1Data.price);
     const tradingBorrowRate = yield getTradingApy(data.dexBorrowData.dexPool);
     const assetsData = [
         [collAsset.symbol, collAssetData],
@@ -575,6 +621,7 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
     };
 });
 const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
+    var _a, _b, _c, _d;
     const collAsset0 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
     const collAsset1 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken1, network);
     const debtAsset0 = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
@@ -604,10 +651,16 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         withdrawable: withdrawable0,
         tokenPerSupplyShare: token0PerSupplyShare,
         supplyReserves: reservesSupplyToken0,
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     if (staking_1.STAKING_ASSETS.includes(collAsset0Data.symbol)) {
-        collAsset0Data.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset0.symbol);
-        collAsset0Data.incentiveSupplyToken = collAsset0.symbol;
+        collAsset0Data.supplyIncentives.push({
+            apy: yield (0, staking_1.getStakingApy)(collAsset0.symbol),
+            token: collAsset0.symbol,
+            incentiveKind: common_1.IncentiveKind.Staking,
+            description: `Native ${collAsset0.symbol} yield.`,
+        });
     }
     const collAsset1Data = {
         symbol: collAsset1.symbol,
@@ -620,10 +673,16 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         utilization: utilizationSupply1,
         tokenPerSupplyShare: token1PerSupplyShare,
         supplyReserves: reservesSupplyToken1,
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     if (staking_1.STAKING_ASSETS.includes(collAsset1Data.symbol)) {
-        collAsset1Data.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset1.symbol);
-        collAsset1Data.incentiveSupplyToken = collAsset1.symbol;
+        collAsset1Data.supplyIncentives.push({
+            apy: yield (0, staking_1.getStakingApy)(collAsset1.symbol),
+            token: collAsset1.symbol,
+            incentiveKind: common_1.IncentiveKind.Staking,
+            description: `Native ${collAsset1.symbol} yield.`,
+        });
     }
     const debtAsset0Data = {
         symbol: debtAsset0.symbol,
@@ -636,10 +695,16 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         utilization: utilizationBorrow0,
         tokenPerBorrowShare: token0PerBorrowShare,
         borrowReserves: reservesBorrowToken0,
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     if (staking_1.STAKING_ASSETS.includes(debtAsset0Data.symbol)) {
-        debtAsset0Data.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(debtAsset0.symbol);
-        debtAsset0Data.incentiveSupplyToken = debtAsset0.symbol;
+        debtAsset0Data.borrowIncentives.push({
+            apy: new decimal_js_1.default(yield (0, staking_1.getStakingApy)(debtAsset0.symbol)).mul(-1).toString(),
+            token: debtAsset0.symbol,
+            incentiveKind: common_1.IncentiveKind.Reward,
+            description: `Due to the native yield of ${debtAsset0.symbol}, the value of the debt would increase over time.`,
+        });
     }
     const debtAsset1Data = {
         symbol: debtAsset1.symbol,
@@ -652,17 +717,23 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
         utilization: utilizationBorrow1,
         tokenPerBorrowShare: token1PerBorrowShare,
         borrowReserves: reservesBorrowToken1,
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     if (staking_1.STAKING_ASSETS.includes(debtAsset1Data.symbol)) {
-        debtAsset1Data.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(debtAsset1.symbol);
-        debtAsset1Data.incentiveSupplyToken = debtAsset1.symbol;
+        debtAsset1Data.borrowIncentives.push({
+            apy: new decimal_js_1.default(yield (0, staking_1.getStakingApy)(debtAsset1.symbol)).mul(-1).toString(),
+            token: debtAsset1.symbol,
+            incentiveKind: common_1.IncentiveKind.Reward,
+            description: `Due to the native yield of ${debtAsset1.symbol}, the value of the debt would increase over time.`,
+        });
     }
     const marketInfo = (0, markets_1.getFluidMarketInfoById)(+(data.vaultId.toString()), 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 incentiveBorrowRate = getAdditionalMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, new decimal_js_1.default(((_a = debtAsset0Data.borrowIncentives[0]) === null || _a === void 0 ? void 0 : _a.apy) || '0').mul(-1).toString(), new decimal_js_1.default(((_b = debtAsset1Data.borrowIncentives[0]) === null || _b === void 0 ? void 0 : _b.apy) || '0').mul(-1).toString(), 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 incentiveSupplyRate = getAdditionalMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, ((_c = collAsset0Data.supplyIncentives[0]) === null || _c === void 0 ? void 0 : _c.apy) || '0', ((_d = collAsset1Data.supplyIncentives[0]) === null || _d === void 0 ? void 0 : _d.apy) || '0', collAsset0Data.price, collAsset1Data.price);
     const tradingSupplyRate = yield getTradingApy(data.dexSupplyData.dexPool);
     const assetsData = [
         [collAsset0.symbol, collAsset0Data],

package/cjs/helpers/aaveHelpers/index.js

@@ -94,7 +94,6 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
     const { netApy, incentiveUsd, totalInterestUsd } = (0, staking_1.calculateNetApy)({
         usedAssets,
         assetsData,
-        isAave: true,
     });
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;

package/cjs/helpers/compoundHelpers/index.d.ts

@@ -1,12 +1,10 @@
 import { BaseAdditionalAssetData, CompoundAggregatedPositionData, CompoundMarketData, CompoundV2AssetsData, CompoundV2UsedAssets, CompoundV3AssetData, CompoundV3AssetsData, CompoundV3UsedAssets } from '../../types';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
+import { EthAddress, EthereumProvider, IncentiveData, NetworkNumber } from '../../types/common';
 export declare const formatMarketData: (data: any, network: NetworkNumber, baseAssetPrice: string) => CompoundV3AssetData;
 export declare const formatBaseData: (data: any, network: NetworkNumber, baseAssetPrice: string) => CompoundV3AssetData & BaseAdditionalAssetData;
 export declare const getIncentiveApys: (baseData: CompoundV3AssetData & BaseAdditionalAssetData, compPrice: string) => {
-    incentiveSupplyApy: string;
-    incentiveBorrowApy: string;
-    incentiveSupplyToken: string;
-    incentiveBorrowToken: string;
+    supplyIncentives: IncentiveData[];
+    borrowIncentives: IncentiveData[];
 };
 export declare const getCompoundV2AggregatedData: ({ usedAssets, assetsData, ...rest }: {
     usedAssets: CompoundV2UsedAssets;

package/cjs/helpers/compoundHelpers/index.js

@@ -38,7 +38,7 @@ const formatMarketData = (data, network, baseAssetPrice) => {
     const assetInfo = (0, tokens_1.getAssetInfoByAddress)(data.tokenAddr, network);
     const isWETH = assetInfo.symbol === 'WETH';
     const price = (0, utils_1.getEthAmountForDecimals)(data.price, 8);
-    return (Object.assign(Object.assign({}, data), { borrowCollateralFactor: data.borrowCollateralFactor.toString(), liquidateCollateralFactor: data.liquidateCollateralFactor.toString(), liquidationFactor: data.liquidationFactor.toString(), supplyReserved: data.supplyReserved.toString(), priceInBaseAsset: (0, utils_1.getEthAmountForDecimals)(data.price, 8), price: new decimal_js_1.default(price).mul(baseAssetPrice).toString(), collateralFactor: (0, utils_1.getEthAmountForDecimals)(data.borrowCollateralFactor, 18), liquidationRatio: (0, utils_1.getEthAmountForDecimals)(data.liquidateCollateralFactor, 18), supplyCap: (0, utils_1.getEthAmountForDecimals)(data.supplyCap, assetInfo.decimals), totalSupply: (0, utils_1.getEthAmountForDecimals)(data.totalSupply, assetInfo.decimals), symbol: isWETH ? 'ETH' : assetInfo.symbol, supplyRate: '0', borrowRate: '0', canBeBorrowed: false, canBeSupplied: true }));
+    return (Object.assign(Object.assign({}, data), { borrowCollateralFactor: data.borrowCollateralFactor.toString(), liquidateCollateralFactor: data.liquidateCollateralFactor.toString(), liquidationFactor: data.liquidationFactor.toString(), supplyReserved: data.supplyReserved.toString(), priceInBaseAsset: (0, utils_1.getEthAmountForDecimals)(data.price, 8), price: new decimal_js_1.default(price).mul(baseAssetPrice).toString(), collateralFactor: (0, utils_1.getEthAmountForDecimals)(data.borrowCollateralFactor, 18), liquidationRatio: (0, utils_1.getEthAmountForDecimals)(data.liquidateCollateralFactor, 18), supplyCap: (0, utils_1.getEthAmountForDecimals)(data.supplyCap, assetInfo.decimals), totalSupply: (0, utils_1.getEthAmountForDecimals)(data.totalSupply, assetInfo.decimals), symbol: isWETH ? 'ETH' : assetInfo.symbol, supplyRate: '0', borrowRate: '0', canBeBorrowed: false, canBeSupplied: true, supplyIncentives: [], borrowIncentives: [] }));
 };
 exports.formatMarketData = formatMarketData;
 // TODO: maybe not hardcode decimals
@@ -53,16 +53,20 @@ const formatBaseData = (data, network, baseAssetPrice) => {
         totalBorrow, marketLiquidity: new decimal_js_1.default(totalSupply).minus(totalBorrow).toString(), symbol: (0, utils_1.wethToEth)(assetInfo.symbol), priceInBaseAsset: (0, utils_1.getEthAmountForDecimals)(data.price, 8), price: baseAssetPrice, collateralFactor: '0', liquidationRatio: '0', canBeBorrowed: true, canBeSupplied: true, supplyCap: '0', rewardSupplySpeed: (0, utils_1.getEthAmountForDecimals)(data.baseTrackingSupplyRewardsSpeed, 15), rewardBorrowSpeed: (0, utils_1.getEthAmountForDecimals)(data.baseTrackingBorrowRewardsSpeed, 15), minDebt: (0, utils_1.getEthAmountForDecimals)(data.baseBorrowMin, assetInfo.decimals), isBase: true }));
 };
 exports.formatBaseData = formatBaseData;
-const getIncentiveApys = (baseData, compPrice) => {
-    const incentiveSupplyApy = (0, moneymarket_1.aprToApy)((100 * constants_1.SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.price / +baseData.totalSupply).toString();
-    const incentiveBorrowApy = (0, moneymarket_1.aprToApy)((100 * constants_1.SECONDS_PER_YEAR * +baseData.rewardBorrowSpeed * +compPrice) / +baseData.price / +baseData.totalBorrow).toString();
-    return {
-        incentiveSupplyApy,
-        incentiveBorrowApy,
-        incentiveSupplyToken: 'COMP',
-        incentiveBorrowToken: 'COMP',
-    };
-};
+const getIncentiveApys = (baseData, compPrice) => ({
+    supplyIncentives: [{
+            token: 'COMP',
+            apy: (0, moneymarket_1.aprToApy)((100 * constants_1.SECONDS_PER_YEAR * +baseData.rewardSupplySpeed * +compPrice) / +baseData.price / +baseData.totalSupply).toString(),
+            incentiveKind: common_1.IncentiveKind.Reward,
+            description: 'Eligible for protocol-level COMP incentives.',
+        }],
+    borrowIncentives: [{
+            token: 'COMP',
+            apy: (0, moneymarket_1.aprToApy)((100 * constants_1.SECONDS_PER_YEAR * +baseData.rewardBorrowSpeed * +compPrice) / +baseData.price / +baseData.totalBorrow).toString(),
+            incentiveKind: common_1.IncentiveKind.Reward,
+            description: 'Eligible for protocol-level COMP incentives.',
+        }],
+});
 exports.getIncentiveApys = getIncentiveApys;
 const getCompoundV2AggregatedData = (_a) => {
     var { usedAssets, assetsData } = _a, rest = __rest(_a, ["usedAssets", "assetsData"]);

package/cjs/helpers/eulerHelpers/index.d.ts

@@ -5,11 +5,6 @@ export declare const isLeveragedPos: (usedAssets: EulerV2UsedAssets, dustLimit?:
     leveragedAsset: string;
     leveragedVault: string;
 };
-export declare const calculateNetApy: (usedAssets: EulerV2UsedAssets, assetsData: EulerV2AssetsData) => {
-    netApy: string;
-    totalInterestUsd: string;
-    incentiveUsd: string;
-};
 export declare const getEulerV2AggregatedData: ({ usedAssets, assetsData, network, ...rest }: {
     usedAssets: EulerV2UsedAssets;
     assetsData: EulerV2AssetsData;

package/cjs/helpers/eulerHelpers/index.js

@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEulerV2SubAccounts = exports.getApyAfterValuesEstimationEulerV2 = exports.getEulerV2SupplyRate = exports.getUtilizationRate = exports.getEulerV2BorrowRate = exports.getEulerV2AggregatedData = exports.calculateNetApy = exports.isLeveragedPos = void 0;
+exports.getEulerV2SubAccounts = exports.getApyAfterValuesEstimationEulerV2 = exports.getEulerV2SupplyRate = exports.getUtilizationRate = exports.getEulerV2BorrowRate = exports.getEulerV2AggregatedData = exports.isLeveragedPos = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const moneymarket_1 = require("../../moneymarket");
@@ -89,35 +89,6 @@ const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     };
 };
 exports.isLeveragedPos = isLeveragedPos;
-const calculateNetApy = (usedAssets, assetsData) => {
-    const sumValues = Object.values(usedAssets).reduce((_acc, usedAsset) => {
-        const acc = Object.assign({}, _acc);
-        const assetData = assetsData[usedAsset.vaultAddress.toLowerCase()];
-        if (usedAsset.isSupplied) {
-            const amount = usedAsset.suppliedUsd;
-            acc.suppliedUsd = new decimal_js_1.default(acc.suppliedUsd).add(amount).toString();
-            const rate = assetData.supplyRate;
-            const supplyInterest = (0, staking_1.calculateInterestEarned)(amount, rate, 'year', true);
-            acc.supplyInterest = new decimal_js_1.default(acc.supplyInterest).add(supplyInterest.toString()).toString();
-        }
-        if (usedAsset.isBorrowed) {
-            const amount = usedAsset.borrowedUsd;
-            acc.borrowedUsd = new decimal_js_1.default(acc.borrowedUsd).add(amount).toString();
-            const rate = assetData.borrowRate;
-            const borrowInterest = (0, staking_1.calculateInterestEarned)(amount, rate, 'year', true);
-            acc.borrowInterest = new decimal_js_1.default(acc.borrowInterest).sub(borrowInterest.toString()).toString();
-        }
-        return acc;
-    }, {
-        borrowInterest: '0', supplyInterest: '0', incentiveUsd: '0', borrowedUsd: '0', suppliedUsd: '0',
-    });
-    const { borrowedUsd, suppliedUsd, borrowInterest, supplyInterest, incentiveUsd, } = sumValues;
-    const totalInterestUsd = new decimal_js_1.default(borrowInterest).add(supplyInterest).add(incentiveUsd).toString();
-    const balance = new decimal_js_1.default(suppliedUsd).sub(borrowedUsd);
-    const netApy = new decimal_js_1.default(totalInterestUsd).div(balance).times(100).toString();
-    return { netApy, totalInterestUsd, incentiveUsd };
-};
-exports.calculateNetApy = calculateNetApy;
 const getEulerV2AggregatedData = (_a) => {
     var { usedAssets, assetsData, network } = _a, rest = __rest(_a, ["usedAssets", "assetsData", "network"]);
     const payload = {};
@@ -130,7 +101,7 @@ const getEulerV2AggregatedData = (_a) => {
     payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
     payload.ratio = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.collRatio = +payload.suppliedUsd ? new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
-    const { netApy, incentiveUsd, totalInterestUsd } = (0, exports.calculateNetApy)(usedAssets, assetsData);
+    const { netApy, incentiveUsd, totalInterestUsd } = (0, staking_1.calculateNetApy)({ usedAssets, assetsData: assetsData });
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;
     payload.totalInterestUsd = totalInterestUsd;

package/cjs/helpers/fluidHelpers/index.js

@@ -183,6 +183,8 @@ const EMPTY_ASSET_DATA = {
     canBeBorrowed: false,
     supplyRate: '0',
     borrowRate: '0',
+    supplyIncentives: [],
+    borrowIncentives: [],
 };
 const mergeAssetData = (existing = {}, additional) => (Object.assign(Object.assign(Object.assign({}, EMPTY_ASSET_DATA), existing), additional));
 exports.mergeAssetData = mergeAssetData;

package/cjs/helpers/liquityV2Helpers/index.js

@@ -14,8 +14,9 @@ const calculateNetApyLiquityV2 = (usedAssets, assetsData, interestRate) => {
         if (usedAsset.suppliedUsd) {
             const amount = usedAsset.suppliedUsd;
             acc.suppliedUsd = new decimal_js_1.default(acc.suppliedUsd).add(amount).toString();
-            if (assetData.incentiveSupplyApy) {
-                const incentiveInterest = (0, staking_1.calculateInterestEarned)(amount, assetData.incentiveSupplyApy, 'year', true);
+            for (const supplyIncentive of assetData.supplyIncentives) {
+                const { apy } = supplyIncentive;
+                const incentiveInterest = (0, staking_1.calculateInterestEarned)(amount, apy, 'year', true);
                 acc.incentiveUsd = new decimal_js_1.default(acc.incentiveUsd).add(incentiveInterest).toString();
             }
         }

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -128,73 +128,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, provider, 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/liquityV2/index.js

@@ -64,6 +64,8 @@ const _getLiquityV2MarketData = (provider, network, selectedMarket) => __awaiter
         canBeBorrowed: true,
         leftToBorrowGlobal,
         leftToWithdrawGlobal: '0',
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     assetsData[collateralToken] = {
         symbol: collateralToken,
@@ -75,10 +77,16 @@ const _getLiquityV2MarketData = (provider, network, selectedMarket) => __awaiter
         canBeBorrowed: false,
         leftToBorrowGlobal: '0',
         leftToWithdrawGlobal,
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     if (staking_1.STAKING_ASSETS.includes(collateralToken)) {
-        assetsData[collateralToken].incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collateralToken);
-        assetsData[collateralToken].incentiveSupplyToken = collateralToken;
+        assetsData[collateralToken].supplyIncentives.push({
+            apy: yield (0, staking_1.getStakingApy)(collateralToken),
+            token: collateralToken,
+            incentiveKind: common_1.IncentiveKind.Staking,
+            description: `Native ${collateralToken} yield.`,
+        });
     }
     return {
         assetsData,

package/cjs/llamaLend/index.js

@@ -95,6 +95,8 @@ const _getLlamaLendGlobalData = (provider, network, selectedMarket) => __awaiter
         borrowRate,
         canBeSupplied: true,
         canBeBorrowed: true,
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     assetsData[collAsset] = {
         symbol: collAsset,
@@ -104,10 +106,16 @@ const _getLlamaLendGlobalData = (provider, network, selectedMarket) => __awaiter
         borrowRate: '0',
         canBeSupplied: true,
         canBeBorrowed: false,
+        supplyIncentives: [],
+        borrowIncentives: [],
     };
     if (staking_1.STAKING_ASSETS.includes(collAsset)) {
-        assetsData[collAsset].incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset);
-        assetsData[collAsset].incentiveSupplyToken = collAsset;
+        assetsData[collAsset].supplyIncentives.push({
+            apy: yield (0, staking_1.getStakingApy)(collAsset),
+            token: collAsset,
+            incentiveKind: common_1.IncentiveKind.Staking,
+            description: `Native ${collAsset} yield.`,
+        });
     }
     return {
         A: data.A.toString(),