@defisaver/positions-sdk 2.0.13 → 2.0.15-dev

package/cjs/aaveV3/index.js

@@ -25,6 +25,7 @@ const utils_1 = require("../services/utils");
 const staking_1 = require("../staking");
 const common_1 = require("../types/common");
 const viem_1 = require("../services/viem");
+const rewards_1 = require("./rewards");
 const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
     const { eModeCategoriesData } = extractedState;
     const usedAssetsValues = Object.values(usedAssets);
@@ -60,11 +61,12 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
         const marketAddress = market.providerAddress;
         const networksWithIncentives = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Opt, common_1.NetworkNumber.Linea];
         // eslint-disable-next-line prefer-const
-        let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo] = yield Promise.all([
+        let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo, merkleRewardsMap] = yield Promise.all([
             loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], (0, viem_1.setViemBlockNumber)(blockNumber)),
             loanInfoContract.read.getAllEmodes([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)),
             loanInfoContract.read.isBorrowAllowed([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
             networksWithIncentives.includes(network) ? aaveIncentivesContract.read.getReservesIncentivesData([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)) : null,
+            (0, rewards_1.getMerkleCampaigns)(network),
         ]);
         isBorrowAllowed = (0, utils_1.isLayer2Network)(network) ? isBorrowAllowed : true;
         const eModeCategoriesData = {};
@@ -146,10 +148,13 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 isolationModeBorrowingEnabled: tokenMarket.isolationModeBorrowingEnabled,
                 isFlashLoanEnabled: tokenMarket.isFlashLoanEnabled,
                 aTokenAddress: tokenMarket.aTokenAddress,
+                supplyIncentives: [],
+                borrowIncentives: [],
             });
         })));
         // Get incentives data
-        yield Promise.all(assetsData.map((_market) => __awaiter(this, void 0, void 0, function* () {
+        yield Promise.all(assetsData.map((_market, index) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
             /* eslint-disable no-param-reassign */
             // @ts-ignore
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
@@ -157,38 +162,44 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
             if (isStakingAsset) {
                 _market.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(_market.symbol);
                 _market.incentiveSupplyToken = _market.symbol;
-                if (!_market.supplyIncentives) {
-                    _market.supplyIncentives = [];
-                }
                 _market.supplyIncentives.push({
                     apy: _market.incentiveSupplyApy || '0',
                     token: _market.symbol,
                     incentiveKind: 'staking',
+                    description: `Native ${_market.symbol} yield.`,
                 });
-            }
-            if (_market.canBeBorrowed && _market.incentiveSupplyApy) {
-                _market.incentiveBorrowApy = _market.incentiveSupplyApy;
-                _market.incentiveBorrowToken = _market.incentiveSupplyToken;
-                if (!_market.borrowIncentives) {
-                    _market.borrowIncentives = [];
+                if (_market.canBeBorrowed) {
+                    // when borrowing assets whose value increases over time
+                    _market.incentiveBorrowApy = new decimal_js_1.default(_market.incentiveSupplyApy).mul(-1).toString();
+                    _market.incentiveBorrowToken = _market.symbol;
+                    _market.borrowIncentives.push({
+                        apy: _market.incentiveBorrowApy,
+                        token: _market.incentiveBorrowToken,
+                        incentiveKind: 'reward',
+                        description: `Due to the native yield of ${_market.symbol}, the value of the debt would increase over time.`,
+                    });
                 }
-                _market.borrowIncentives.push({
-                    apy: _market.incentiveBorrowApy,
-                    token: _market.incentiveBorrowToken,
-                    incentiveKind: 'reward',
-                });
             }
-            if (_market.symbol === 'USDe') {
-                const merklApy = yield (0, staking_1.getStakingApy)(_market.symbol);
-                if (!_market.supplyIncentives) {
-                    _market.supplyIncentives = [];
-                }
+            const aTokenAddress = _market.aTokenAddress.toLowerCase(); // DEV: Should aTokenAddress be in AaveV3AssetData type?
+            if ((_a = merkleRewardsMap[aTokenAddress]) === null || _a === void 0 ? void 0 : _a.supply) {
+                const { apr, rewardTokenSymbol, description } = merkleRewardsMap[aTokenAddress].supply;
                 _market.supplyIncentives.push({
-                    apy: merklApy || '0',
-                    token: _market.symbol,
+                    apy: (0, moneymarket_1.aprToApy)(apr),
+                    token: rewardTokenSymbol,
                     incentiveKind: 'reward',
+                    description,
                 });
             }
+            // const aTokenDebtAddress = '0xTODO';
+            // if (merkleRewardsMap[aTokenDebtAddress]?.supply) {
+            //   const { apr, rewardTokenSymbol, description } = merkleRewardsMap[aTokenDebtAddress].supply;
+            //   _market.borrowIncentives.push({
+            //     apy: aprToApy(apr),
+            //     token: rewardTokenSymbol,
+            //     incentiveKind: 'reward',
+            //     description,
+            //   });
+            // }
             if (!rewardForMarket)
                 return;
             // @ts-ignore
@@ -211,13 +222,11 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                         .toString();
                     _market.incentiveSupplyApy = new decimal_js_1.default(_market.incentiveSupplyApy || '0').add(rewardApy)
                         .toString();
-                    if (!_market.supplyIncentives) {
-                        _market.supplyIncentives = [];
-                    }
                     _market.supplyIncentives.push({
-                        token: supplyRewardData.rewardTokenSymbol,
+                        token: (0, rewards_1.getAaveUnderlyingSymbol)(supplyRewardData.rewardTokenSymbol),
                         apy: rewardApy,
                         incentiveKind: 'reward',
+                        description: 'Eligible for protocol-level incentives.',
                     });
                 }
             });
@@ -240,13 +249,11 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                         .toString();
                     _market.incentiveBorrowApy = new decimal_js_1.default(_market.incentiveBorrowApy || '0').add(rewardApy)
                         .toString();
-                    if (!_market.borrowIncentives) {
-                        _market.borrowIncentives = [];
-                    }
                     _market.borrowIncentives.push({
-                        token: borrowRewardData.rewardTokenSymbol,
+                        token: (0, rewards_1.getAaveUnderlyingSymbol)(borrowRewardData.rewardTokenSymbol),
                         apy: rewardApy,
                         incentiveKind: 'reward',
+                        description: 'Eligible for protocol-level incentives.',
                     });
                 }
             });

package/cjs/aaveV3/rewards.d.ts

@@ -0,0 +1,14 @@
+import { EthAddress, NetworkNumber } from '../types/common';
+type RewardInfo = {
+    apr: number;
+    rewardToken: EthAddress;
+    rewardTokenSymbol: string;
+    description: string;
+};
+type MerkleRewardMap = Record<EthAddress, {
+    supply?: RewardInfo;
+    borrow?: RewardInfo;
+}>;
+export declare const getAaveUnderlyingSymbol: (_symbol?: string) => any;
+export declare const getMerkleCampaigns: (chainId: NetworkNumber) => Promise<MerkleRewardMap>;
+export {};

package/cjs/aaveV3/rewards.js

@@ -0,0 +1,82 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMerkleCampaigns = exports.getAaveUnderlyingSymbol = void 0;
+const utils_1 = require("../services/utils");
+var OpportunityAction;
+(function (OpportunityAction) {
+    OpportunityAction["LEND"] = "LEND";
+    OpportunityAction["BORROW"] = "BORROW";
+})(OpportunityAction || (OpportunityAction = {}));
+var OpportunityStatus;
+(function (OpportunityStatus) {
+    OpportunityStatus["LIVE"] = "LIVE";
+    OpportunityStatus["PAST"] = "PAST";
+    OpportunityStatus["UPCOMING"] = "UPCOMING";
+})(OpportunityStatus || (OpportunityStatus = {}));
+const getAaveUnderlyingSymbol = (_symbol = '') => {
+    let symbol = _symbol
+        .replace(/^aEthLido/, '')
+        .replace(/^aEthEtherFi/, '')
+        .replace(/^aEth/, '')
+        .replace(/^aArb/, '')
+        .replace(/^aOpt/, '')
+        .replace(/^aBas/, '')
+        .replace(/^aLin/, '');
+    if (symbol.startsWith('a'))
+        symbol = symbol.slice(1);
+    return (0, utils_1.wethToEth)(symbol);
+};
+exports.getAaveUnderlyingSymbol = getAaveUnderlyingSymbol;
+const getMerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const res = yield fetch('https://api.merkl.xyz/v4/opportunities?mainProtocolId=aave', {
+            signal: AbortSignal.timeout(utils_1.DEFAULT_TIMEOUT),
+        });
+        if (!res.ok)
+            throw new Error('Failed to fetch Merkle campaigns');
+        const opportunities = yield res.json();
+        const relevantOpportunities = opportunities
+            .filter((o) => o.chainId === chainId)
+            .filter((o) => o.liveCampaigns > 0);
+        return relevantOpportunities.reduce((acc, opportunity) => {
+            const rewardToken = opportunity.rewardsRecord.breakdowns[0].token;
+            if (opportunity.action === OpportunityAction.LEND) {
+                const supplyAToken = opportunity.explorerAddress.toLowerCase();
+                if (!acc[supplyAToken])
+                    acc[supplyAToken] = {};
+                acc[supplyAToken].supply = {
+                    apr: opportunity.apr,
+                    rewardToken: rewardToken.address,
+                    rewardTokenSymbol: (0, exports.getAaveUnderlyingSymbol)(rewardToken.symbol),
+                    description: `Eligible for incentives through Merkl. \n${opportunity.description}`,
+                };
+            }
+            if (opportunity.action === OpportunityAction.BORROW) {
+                const borrowAToken = opportunity.explorerAddress.toLowerCase();
+                if (!acc[borrowAToken])
+                    acc[borrowAToken] = {};
+                acc[borrowAToken].borrow = {
+                    apr: opportunity.apr,
+                    rewardToken: rewardToken.address,
+                    rewardTokenSymbol: (0, exports.getAaveUnderlyingSymbol)(rewardToken.symbol),
+                    description: `Eligible for incentives through Merkl. \n${opportunity.description}`,
+                };
+            }
+            return acc;
+        }, {});
+    }
+    catch (e) {
+        console.error('Failed to fetch Merkle campaigns', e);
+        return {};
+    }
+});
+exports.getMerkleCampaigns = getMerkleCampaigns;

package/cjs/markets/aave/marketAssets.js

@@ -10,7 +10,7 @@ exports.aaveV1AssetsDefaultMarket = [
 exports.aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
 exports.aaveV3AssetsDefaultMarketEth = [
     'ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC', 'eBTC', 'RLUSD', 'PT eUSDe May', 'PT sUSDe July', 'USDtb',
-    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov',
+    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov',
 ];
 exports.aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/cjs/staking/staking.js

@@ -65,7 +65,7 @@ const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function*
         return '0';
     }
 });
-exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov'];
+exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov'];
 exports.getStakingApy = (0, memoizee_1.default)((asset) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -112,6 +112,8 @@ exports.getStakingApy = (0, memoizee_1.default)((asset) => __awaiter(void 0, voi
             return yield getApyFromDfsApi('USDe');
         if (asset === 'PT sUSDe Nov')
             return yield getApyFromDfsApi('PT sUSDe Nov');
+        if (asset === 'PT USDe Nov')
+            return yield getApyFromDfsApi('PT USDe Nov');
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);

package/cjs/types/aave.d.ts

@@ -66,6 +66,7 @@ export interface IncentiveData {
     token: string;
     apy: string;
     incentiveKind?: 'staking' | 'reward';
+    description?: string;
 }
 export interface AaveV3AssetData extends AaveAssetData {
     isIsolated: boolean;
@@ -80,8 +81,8 @@ export interface AaveV3AssetData extends AaveAssetData {
     isFlashLoanEnabled: boolean;
     assetId: string | number | null;
     liquidationBonus: string;
-    supplyIncentives?: IncentiveData[];
-    borrowIncentives?: IncentiveData[];
+    supplyIncentives: IncentiveData[];
+    borrowIncentives: IncentiveData[];
 }
 export type EModeCategoriesData = Record<number, EModeCategoryData>;
 export type AaveAssetsData<T> = {

package/esm/aaveV3/index.js

@@ -17,6 +17,7 @@ import { ethToWeth, isEnabledOnBitmap, isLayer2Network, wethToEth, wethToEthByAd
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { NetworkNumber, } from '../types/common';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
+import { getAaveUnderlyingSymbol, getMerkleCampaigns } from './rewards';
 export const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
     const { eModeCategoriesData } = extractedState;
     const usedAssetsValues = Object.values(usedAssets);
@@ -51,11 +52,12 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
         const marketAddress = market.providerAddress;
         const networksWithIncentives = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Opt, NetworkNumber.Linea];
         // eslint-disable-next-line prefer-const
-        let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo] = yield Promise.all([
+        let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo, merkleRewardsMap] = yield Promise.all([
             loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], setViemBlockNumber(blockNumber)),
             loanInfoContract.read.getAllEmodes([marketAddress], setViemBlockNumber(blockNumber)),
             loanInfoContract.read.isBorrowAllowed([marketAddress], setViemBlockNumber(blockNumber)), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
             networksWithIncentives.includes(network) ? aaveIncentivesContract.read.getReservesIncentivesData([marketAddress], setViemBlockNumber(blockNumber)) : null,
+            getMerkleCampaigns(network),
         ]);
         isBorrowAllowed = isLayer2Network(network) ? isBorrowAllowed : true;
         const eModeCategoriesData = {};
@@ -137,10 +139,13 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 isolationModeBorrowingEnabled: tokenMarket.isolationModeBorrowingEnabled,
                 isFlashLoanEnabled: tokenMarket.isFlashLoanEnabled,
                 aTokenAddress: tokenMarket.aTokenAddress,
+                supplyIncentives: [],
+                borrowIncentives: [],
             });
         })));
         // Get incentives data
-        yield Promise.all(assetsData.map((_market) => __awaiter(this, void 0, void 0, function* () {
+        yield Promise.all(assetsData.map((_market, index) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
             /* eslint-disable no-param-reassign */
             // @ts-ignore
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
@@ -148,38 +153,44 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
             if (isStakingAsset) {
                 _market.incentiveSupplyApy = yield getStakingApy(_market.symbol);
                 _market.incentiveSupplyToken = _market.symbol;
-                if (!_market.supplyIncentives) {
-                    _market.supplyIncentives = [];
-                }
                 _market.supplyIncentives.push({
                     apy: _market.incentiveSupplyApy || '0',
                     token: _market.symbol,
                     incentiveKind: 'staking',
+                    description: `Native ${_market.symbol} yield.`,
                 });
-            }
-            if (_market.canBeBorrowed && _market.incentiveSupplyApy) {
-                _market.incentiveBorrowApy = _market.incentiveSupplyApy;
-                _market.incentiveBorrowToken = _market.incentiveSupplyToken;
-                if (!_market.borrowIncentives) {
-                    _market.borrowIncentives = [];
+                if (_market.canBeBorrowed) {
+                    // when borrowing assets whose value increases over time
+                    _market.incentiveBorrowApy = new Dec(_market.incentiveSupplyApy).mul(-1).toString();
+                    _market.incentiveBorrowToken = _market.symbol;
+                    _market.borrowIncentives.push({
+                        apy: _market.incentiveBorrowApy,
+                        token: _market.incentiveBorrowToken,
+                        incentiveKind: 'reward',
+                        description: `Due to the native yield of ${_market.symbol}, the value of the debt would increase over time.`,
+                    });
                 }
-                _market.borrowIncentives.push({
-                    apy: _market.incentiveBorrowApy,
-                    token: _market.incentiveBorrowToken,
-                    incentiveKind: 'reward',
-                });
             }
-            if (_market.symbol === 'USDe') {
-                const merklApy = yield getStakingApy(_market.symbol);
-                if (!_market.supplyIncentives) {
-                    _market.supplyIncentives = [];
-                }
+            const aTokenAddress = _market.aTokenAddress.toLowerCase(); // DEV: Should aTokenAddress be in AaveV3AssetData type?
+            if ((_a = merkleRewardsMap[aTokenAddress]) === null || _a === void 0 ? void 0 : _a.supply) {
+                const { apr, rewardTokenSymbol, description } = merkleRewardsMap[aTokenAddress].supply;
                 _market.supplyIncentives.push({
-                    apy: merklApy || '0',
-                    token: _market.symbol,
+                    apy: aprToApy(apr),
+                    token: rewardTokenSymbol,
                     incentiveKind: 'reward',
+                    description,
                 });
             }
+            // const aTokenDebtAddress = '0xTODO';
+            // if (merkleRewardsMap[aTokenDebtAddress]?.supply) {
+            //   const { apr, rewardTokenSymbol, description } = merkleRewardsMap[aTokenDebtAddress].supply;
+            //   _market.borrowIncentives.push({
+            //     apy: aprToApy(apr),
+            //     token: rewardTokenSymbol,
+            //     incentiveKind: 'reward',
+            //     description,
+            //   });
+            // }
             if (!rewardForMarket)
                 return;
             // @ts-ignore
@@ -202,13 +213,11 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                         .toString();
                     _market.incentiveSupplyApy = new Dec(_market.incentiveSupplyApy || '0').add(rewardApy)
                         .toString();
-                    if (!_market.supplyIncentives) {
-                        _market.supplyIncentives = [];
-                    }
                     _market.supplyIncentives.push({
-                        token: supplyRewardData.rewardTokenSymbol,
+                        token: getAaveUnderlyingSymbol(supplyRewardData.rewardTokenSymbol),
                         apy: rewardApy,
                         incentiveKind: 'reward',
+                        description: 'Eligible for protocol-level incentives.',
                     });
                 }
             });
@@ -231,13 +240,11 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                         .toString();
                     _market.incentiveBorrowApy = new Dec(_market.incentiveBorrowApy || '0').add(rewardApy)
                         .toString();
-                    if (!_market.borrowIncentives) {
-                        _market.borrowIncentives = [];
-                    }
                     _market.borrowIncentives.push({
-                        token: borrowRewardData.rewardTokenSymbol,
+                        token: getAaveUnderlyingSymbol(borrowRewardData.rewardTokenSymbol),
                         apy: rewardApy,
                         incentiveKind: 'reward',
+                        description: 'Eligible for protocol-level incentives.',
                     });
                 }
             });

package/esm/aaveV3/rewards.d.ts

@@ -0,0 +1,14 @@
+import { EthAddress, NetworkNumber } from '../types/common';
+type RewardInfo = {
+    apr: number;
+    rewardToken: EthAddress;
+    rewardTokenSymbol: string;
+    description: string;
+};
+type MerkleRewardMap = Record<EthAddress, {
+    supply?: RewardInfo;
+    borrow?: RewardInfo;
+}>;
+export declare const getAaveUnderlyingSymbol: (_symbol?: string) => any;
+export declare const getMerkleCampaigns: (chainId: NetworkNumber) => Promise<MerkleRewardMap>;
+export {};

package/esm/aaveV3/rewards.js

@@ -0,0 +1,77 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { DEFAULT_TIMEOUT, wethToEth } from '../services/utils';
+var OpportunityAction;
+(function (OpportunityAction) {
+    OpportunityAction["LEND"] = "LEND";
+    OpportunityAction["BORROW"] = "BORROW";
+})(OpportunityAction || (OpportunityAction = {}));
+var OpportunityStatus;
+(function (OpportunityStatus) {
+    OpportunityStatus["LIVE"] = "LIVE";
+    OpportunityStatus["PAST"] = "PAST";
+    OpportunityStatus["UPCOMING"] = "UPCOMING";
+})(OpportunityStatus || (OpportunityStatus = {}));
+export const getAaveUnderlyingSymbol = (_symbol = '') => {
+    let symbol = _symbol
+        .replace(/^aEthLido/, '')
+        .replace(/^aEthEtherFi/, '')
+        .replace(/^aEth/, '')
+        .replace(/^aArb/, '')
+        .replace(/^aOpt/, '')
+        .replace(/^aBas/, '')
+        .replace(/^aLin/, '');
+    if (symbol.startsWith('a'))
+        symbol = symbol.slice(1);
+    return wethToEth(symbol);
+};
+export const getMerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const res = yield fetch('https://api.merkl.xyz/v4/opportunities?mainProtocolId=aave', {
+            signal: AbortSignal.timeout(DEFAULT_TIMEOUT),
+        });
+        if (!res.ok)
+            throw new Error('Failed to fetch Merkle campaigns');
+        const opportunities = yield res.json();
+        const relevantOpportunities = opportunities
+            .filter((o) => o.chainId === chainId)
+            .filter((o) => o.liveCampaigns > 0);
+        return relevantOpportunities.reduce((acc, opportunity) => {
+            const rewardToken = opportunity.rewardsRecord.breakdowns[0].token;
+            if (opportunity.action === OpportunityAction.LEND) {
+                const supplyAToken = opportunity.explorerAddress.toLowerCase();
+                if (!acc[supplyAToken])
+                    acc[supplyAToken] = {};
+                acc[supplyAToken].supply = {
+                    apr: opportunity.apr,
+                    rewardToken: rewardToken.address,
+                    rewardTokenSymbol: getAaveUnderlyingSymbol(rewardToken.symbol),
+                    description: `Eligible for incentives through Merkl. \n${opportunity.description}`,
+                };
+            }
+            if (opportunity.action === OpportunityAction.BORROW) {
+                const borrowAToken = opportunity.explorerAddress.toLowerCase();
+                if (!acc[borrowAToken])
+                    acc[borrowAToken] = {};
+                acc[borrowAToken].borrow = {
+                    apr: opportunity.apr,
+                    rewardToken: rewardToken.address,
+                    rewardTokenSymbol: getAaveUnderlyingSymbol(rewardToken.symbol),
+                    description: `Eligible for incentives through Merkl. \n${opportunity.description}`,
+                };
+            }
+            return acc;
+        }, {});
+    }
+    catch (e) {
+        console.error('Failed to fetch Merkle campaigns', e);
+        return {};
+    }
+});

package/esm/markets/aave/marketAssets.js

@@ -7,7 +7,7 @@ export const aaveV1AssetsDefaultMarket = [
 export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
 export const aaveV3AssetsDefaultMarketEth = [
     'ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC', 'eBTC', 'RLUSD', 'PT eUSDe May', 'PT sUSDe July', 'USDtb',
-    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov',
+    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov',
 ];
 export const aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/esm/staking/staking.js

@@ -59,7 +59,7 @@ const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function*
         return '0';
     }
 });
-export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov'];
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov'];
 export const getStakingApy = memoize((asset) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -106,6 +106,8 @@ export const getStakingApy = memoize((asset) => __awaiter(void 0, void 0, void 0
             return yield getApyFromDfsApi('USDe');
         if (asset === 'PT sUSDe Nov')
             return yield getApyFromDfsApi('PT sUSDe Nov');
+        if (asset === 'PT USDe Nov')
+            return yield getApyFromDfsApi('PT USDe Nov');
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);

package/esm/types/aave.d.ts

@@ -66,6 +66,7 @@ export interface IncentiveData {
     token: string;
     apy: string;
     incentiveKind?: 'staking' | 'reward';
+    description?: string;
 }
 export interface AaveV3AssetData extends AaveAssetData {
     isIsolated: boolean;
@@ -80,8 +81,8 @@ export interface AaveV3AssetData extends AaveAssetData {
     isFlashLoanEnabled: boolean;
     assetId: string | number | null;
     liquidationBonus: string;
-    supplyIncentives?: IncentiveData[];
-    borrowIncentives?: IncentiveData[];
+    supplyIncentives: IncentiveData[];
+    borrowIncentives: IncentiveData[];
 }
 export type EModeCategoriesData = Record<number, EModeCategoryData>;
 export type AaveAssetsData<T> = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.0.13",
+  "version": "2.0.15-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -21,7 +21,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.7.0",
+    "@defisaver/tokens": "^1.7.1",
     "@types/lodash": "^4.17.15",
     "@types/memoizee": "^0.4.12",
     "decimal.js": "^10.6.0",

package/src/aaveV3/index.ts

@@ -29,6 +29,7 @@ import {
   Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances,
 } from '../types/common';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
+import { getAaveUnderlyingSymbol, getMerkleCampaigns } from './rewards';
 
 export const aaveV3EmodeCategoriesMapping = (extractedState: any, usedAssets: AaveV3UsedAssets) => {
   const { eModeCategoriesData }: { assetsData: AaveV3AssetsData, eModeCategoriesData: EModeCategoriesData } = extractedState;
@@ -70,11 +71,12 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
   const networksWithIncentives = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Opt, NetworkNumber.Linea];
 
   // eslint-disable-next-line prefer-const
-  let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo] = await Promise.all([
+  let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo, merkleRewardsMap] = await Promise.all([
     loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses as EthAddress[]], setViemBlockNumber(blockNumber)),
     loanInfoContract.read.getAllEmodes([marketAddress], setViemBlockNumber(blockNumber)),
     loanInfoContract.read.isBorrowAllowed([marketAddress], setViemBlockNumber(blockNumber)), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
     networksWithIncentives.includes(network) ? aaveIncentivesContract.read.getReservesIncentivesData([marketAddress], setViemBlockNumber(blockNumber)) : null,
+    getMerkleCampaigns(network),
   ]);
   isBorrowAllowed = isLayer2Network(network) ? isBorrowAllowed : true;
 
@@ -160,54 +162,63 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
         isolationModeBorrowingEnabled: tokenMarket.isolationModeBorrowingEnabled,
         isFlashLoanEnabled: tokenMarket.isFlashLoanEnabled,
         aTokenAddress: tokenMarket.aTokenAddress,
+        supplyIncentives: [],
+        borrowIncentives: [],
       });
-    }));
-
+    }),
+  );
 
   // Get incentives data
-  await Promise.all(assetsData.map(async (_market: AaveV3AssetData) => {
+  await Promise.all(assetsData.map(async (_market: AaveV3AssetData, index) => {
     /* eslint-disable no-param-reassign */
     // @ts-ignore
     const rewardForMarket = rewardInfo?.[_market.underlyingTokenAddress];
     const isStakingAsset = STAKING_ASSETS.includes(_market.symbol);
+
     if (isStakingAsset) {
       _market.incentiveSupplyApy = await getStakingApy(_market.symbol);
       _market.incentiveSupplyToken = _market.symbol;
-      if (!_market.supplyIncentives) {
-        _market.supplyIncentives = [];
-      }
       _market.supplyIncentives.push({
         apy: _market.incentiveSupplyApy || '0',
         token: _market.symbol,
         incentiveKind: 'staking',
+        description: `Native ${_market.symbol} yield.`,
       });
-    }
-
-    if (_market.canBeBorrowed && _market.incentiveSupplyApy) {
-      _market.incentiveBorrowApy = _market.incentiveSupplyApy;
-      _market.incentiveBorrowToken = _market.incentiveSupplyToken;
-      if (!_market.borrowIncentives) {
-        _market.borrowIncentives = [];
+      if (_market.canBeBorrowed) {
+        // when borrowing assets whose value increases over time
+        _market.incentiveBorrowApy = new Dec(_market.incentiveSupplyApy).mul(-1).toString();
+        _market.incentiveBorrowToken = _market.symbol;
+        _market.borrowIncentives.push({
+          apy: _market.incentiveBorrowApy,
+          token: _market.incentiveBorrowToken,
+          incentiveKind: 'reward',
+          description: `Due to the native yield of ${_market.symbol}, the value of the debt would increase over time.`,
+        });
       }
-      _market.borrowIncentives.push({
-        apy: _market.incentiveBorrowApy,
-        token: _market.incentiveBorrowToken!!,
-        incentiveKind: 'reward',
-      });
     }
 
-    if (_market.symbol === 'USDe') {
-      const merklApy = await getStakingApy(_market.symbol);
-      if (!_market.supplyIncentives) {
-        _market.supplyIncentives = [];
-      }
+    const aTokenAddress = (_market as any).aTokenAddress.toLowerCase(); // DEV: Should aTokenAddress be in AaveV3AssetData type?
+    if (merkleRewardsMap[aTokenAddress]?.supply) {
+      const { apr, rewardTokenSymbol, description } = merkleRewardsMap[aTokenAddress].supply;
       _market.supplyIncentives.push({
-        apy: merklApy || '0',
-        token: _market.symbol,
+        apy: aprToApy(apr),
+        token: rewardTokenSymbol,
         incentiveKind: 'reward',
+        description,
       });
     }
 
+    // const aTokenDebtAddress = '0xTODO'; // variableDebtTokenAddress is not in loanInfo ATM
+    // if (merkleRewardsMap[aTokenDebtAddress]?.supply) {
+    //   const { apr, rewardTokenSymbol, description } = merkleRewardsMap[aTokenDebtAddress].supply;
+    //   _market.borrowIncentives.push({
+    //     apy: aprToApy(apr),
+    //     token: rewardTokenSymbol,
+    //     incentiveKind: 'reward',
+    //     description,
+    //   });
+    // }
+
     if (!rewardForMarket) return;
     // @ts-ignore
     rewardForMarket.aIncentiveData.rewardsTokenInformation.forEach(supplyRewardData => {
@@ -227,14 +238,11 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
           .toString();
         _market.incentiveSupplyApy = new Dec(_market.incentiveSupplyApy || '0').add(rewardApy)
           .toString();
-
-        if (!_market.supplyIncentives) {
-          _market.supplyIncentives = [];
-        }
         _market.supplyIncentives.push({
-          token: supplyRewardData.rewardTokenSymbol,
+          token: getAaveUnderlyingSymbol(supplyRewardData.rewardTokenSymbol),
           apy: rewardApy,
           incentiveKind: 'reward',
+          description: 'Eligible for protocol-level incentives.',
         });
       }
     });
@@ -255,14 +263,11 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
           .toString();
         _market.incentiveBorrowApy = new Dec(_market.incentiveBorrowApy || '0').add(rewardApy)
           .toString();
-
-        if (!_market.borrowIncentives) {
-          _market.borrowIncentives = [];
-        }
         _market.borrowIncentives.push({
-          token: borrowRewardData.rewardTokenSymbol,
+          token: getAaveUnderlyingSymbol(borrowRewardData.rewardTokenSymbol),
           apy: rewardApy,
           incentiveKind: 'reward',
+          description: 'Eligible for protocol-level incentives.',
         });
       }
     });

package/src/aaveV3/rewards.ts

@@ -0,0 +1,125 @@
+import { DEFAULT_TIMEOUT, wethToEth } from '../services/utils';
+import { EthAddress, NetworkNumber } from '../types/common';
+
+enum OpportunityAction {
+  LEND = 'LEND',
+  BORROW = 'BORROW',
+}
+
+enum OpportunityStatus {
+  LIVE = 'LIVE',
+  PAST = 'PAST',
+  UPCOMING = 'UPCOMING',
+}
+
+type MerklOpportunity = {
+  chainId: number;
+  type: string;
+  identifier: EthAddress;
+  name: string;
+  status: OpportunityStatus;
+  action: OpportunityAction;
+  tvl: number;
+  apr: number;
+  dailyRewards: number;
+  tags: [];
+  id: string;
+  explorerAddress?: EthAddress;
+  tokens: {
+    id: string;
+    name: string;
+    chainId: number;
+    address: EthAddress;
+    decimals: number;
+    icon: string;
+    verified: boolean;
+    isTest: boolean;
+    price: number;
+    symbol: string;
+  }[];
+  rewardsRecord: {
+    id: string;
+    total: number;
+    timestamp: string;
+    breakdowns: {
+      token: {
+        id: string;
+        name: string;
+        chainId: number;
+        address: string;
+        decimals: number;
+        symbol: string;
+        displaySymbol: string;
+        icon: string;
+        verified: boolean;
+        isTest: boolean;
+        type: string;
+        isNative: boolean;
+        price: number;
+      };
+      amount: string;
+      value: number;
+      distributionType: string;
+      id: string;
+      campaignId: string;
+      dailyRewardsRecordId: string;
+    }[];
+  };
+};
+
+type RewardInfo = { apr: number; rewardToken: EthAddress; rewardTokenSymbol: string, description: string };
+type MerkleRewardMap = Record<EthAddress, { supply?: RewardInfo; borrow?: RewardInfo }>;
+
+export const getAaveUnderlyingSymbol = (_symbol = '') => {
+  let symbol = _symbol
+    .replace(/^aEthLido/, '')
+    .replace(/^aEthEtherFi/, '')
+    .replace(/^aEth/, '')
+    .replace(/^aArb/, '')
+    .replace(/^aOpt/, '')
+    .replace(/^aBas/, '')
+    .replace(/^aLin/, '');
+  if (symbol.startsWith('a')) symbol = symbol.slice(1);
+  return wethToEth(symbol);
+};
+
+export const getMerkleCampaigns = async (chainId: NetworkNumber): Promise<MerkleRewardMap> => {
+  try {
+    const res = await fetch('https://api.merkl.xyz/v4/opportunities?mainProtocolId=aave', {
+      signal: AbortSignal.timeout(DEFAULT_TIMEOUT),
+    });
+    if (!res.ok) throw new Error('Failed to fetch Merkle campaigns');
+    const opportunities = await res.json() as MerklOpportunity[];
+    const relevantOpportunities = opportunities
+      .filter((o: any) => o.chainId === chainId)
+      .filter((o: any) => o.liveCampaigns > 0);
+    return relevantOpportunities.reduce((acc: any, opportunity: any) => {
+      const rewardToken = opportunity.rewardsRecord.breakdowns[0].token;
+      if (opportunity.action === OpportunityAction.LEND) {
+        const supplyAToken = opportunity.explorerAddress.toLowerCase() as EthAddress;
+        if (!acc[supplyAToken]) acc[supplyAToken] = {};
+        acc[supplyAToken].supply = {
+          apr: opportunity.apr,
+          rewardToken: rewardToken.address,
+          rewardTokenSymbol: getAaveUnderlyingSymbol(rewardToken.symbol),
+          description: `Eligible for incentives through Merkl. \n${opportunity.description}`,
+        };
+      }
+      if (opportunity.action === OpportunityAction.BORROW) {
+        const borrowAToken = opportunity.explorerAddress.toLowerCase() as EthAddress;
+        if (!acc[borrowAToken]) acc[borrowAToken] = {};
+        acc[borrowAToken].borrow = {
+          apr: opportunity.apr,
+          rewardToken: rewardToken.address,
+          rewardTokenSymbol: getAaveUnderlyingSymbol(rewardToken.symbol),
+          description: `Eligible for incentives through Merkl. \n${opportunity.description}`,
+        };
+      }
+      return acc;
+    }, {} as MerkleRewardMap);
+  } catch (e) {
+    console.error('Failed to fetch Merkle campaigns', e);
+    return {};
+  }
+};
+

package/src/markets/aave/marketAssets.ts

@@ -10,7 +10,7 @@ export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', '
 
 export const aaveV3AssetsDefaultMarketEth = [
   'ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC', 'eBTC', 'RLUSD', 'PT eUSDe May', 'PT sUSDe July', 'USDtb',
-  'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov',
+  'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov',
 ];
 export const aaveV3AssetsDefaultMarketOpt = [
   'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/src/staking/staking.ts

@@ -54,7 +54,7 @@ const getApyFromDfsApi = async (asset: string) => {
   }
 };
 
-export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov'];
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov'];
 
 export const getStakingApy = memoize(async (asset: string) => {
   try {
@@ -80,6 +80,7 @@ export const getStakingApy = memoize(async (asset: string) => {
     if (asset === 'tETH') return await getApyFromDfsApi('tETH');
     if (asset === 'USDe') return await getApyFromDfsApi('USDe');
     if (asset === 'PT sUSDe Nov') return await getApyFromDfsApi('PT sUSDe Nov');
+    if (asset === 'PT USDe Nov') return await getApyFromDfsApi('PT USDe Nov');
   } catch (e) {
     console.error(`Failed to fetch APY for ${asset}`);
   }

package/src/types/aave.ts

@@ -74,6 +74,7 @@ export interface IncentiveData {
   token: string,
   apy: string,
   incentiveKind?: 'staking' | 'reward';
+  description?: string;
 }
 
 export interface AaveV3AssetData extends AaveAssetData {
@@ -89,8 +90,8 @@ export interface AaveV3AssetData extends AaveAssetData {
   isFlashLoanEnabled: boolean,
   assetId: string | number | null,
   liquidationBonus: string,
-  supplyIncentives?: IncentiveData[];
-  borrowIncentives?: IncentiveData[];
+  supplyIncentives: IncentiveData[];
+  borrowIncentives: IncentiveData[];
 }
 
 export type EModeCategoriesData = Record<number, EModeCategoryData>;