@defisaver/positions-sdk 2.0.15-dev.0 → 2.1.1-dev.0

package/cjs/aaveV2/index.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAaveV2FullPositionData = exports.getAaveV2AccountData = exports._getAaveV2AccountData = exports.getAaveV2AccountBalances = exports._getAaveV2AccountBalances = exports.getAaveV2MarketsData = exports._getAaveV2MarketsData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
+const common_1 = require("../types/common");
 const staking_1 = require("../staking");
 const utils_1 = require("../services/utils");
 const contracts_1 = require("../contracts");
@@ -62,15 +63,18 @@ const _getAaveV2MarketsData = (provider, network, selectedMarket) => __awaiter(v
         totalBorrow: (0, tokens_1.assetAmountInEth)(market.totalBorrow.toString(), selectedMarket.assets[i]),
         totalBorrowVar: (0, tokens_1.assetAmountInEth)(market.totalBorrowVar.toString(), selectedMarket.assets[i]),
         priceInEth: new decimal_js_1.default(market.price.toString()).div(1e18).toString(),
-        incentiveSupplyToken: 'AAVE',
-        incentiveBorrowToken: 'AAVE',
-        incentiveSupplyApy: '0',
+        supplyIncentives: [],
+        borrowIncentives: [],
         price: new decimal_js_1.default(market.price.toString()).div(1e18).mul(ethPrice).toString(),
     }));
     const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
     if (stEthMarket) {
-        stEthMarket.incentiveSupplyApy = yield (0, staking_1.getStakingApy)('stETH');
-        stEthMarket.incentiveSupplyToken = 'stETH';
+        stEthMarket.supplyIncentives.push({
+            apy: yield (0, staking_1.getStakingApy)('stETH'),
+            token: 'stETH',
+            incentiveKind: common_1.IncentiveKind.Staking,
+            description: 'Native stETH yield.',
+        });
     }
     const payload = {};
     // Sort by market size

package/cjs/aaveV3/index.d.ts

@@ -1,6 +1,8 @@
 import { Client } from 'viem';
 import { AaveMarketInfo, AaveV3MarketData, AaveV3PositionData, AaveV3UsedAssets, EModeCategoryDataMapping } from '../types/aave';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
+import { getMeritCampaigns } from './merit';
+import { getMerkleCampaigns } from './merkl';
 export declare const aaveV3EmodeCategoriesMapping: (extractedState: any, usedAssets: AaveV3UsedAssets) => {
     [key: number]: EModeCategoryDataMapping;
 };
@@ -32,3 +34,4 @@ export declare const getAaveV3AccountBalances: (provider: EthereumProvider, netw
 export declare const _getAaveV3AccountData: (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber?: "latest" | number) => Promise<AaveV3PositionData>;
 export declare const getAaveV3AccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber?: "latest" | number) => Promise<AaveV3PositionData>;
 export declare const getAaveV3FullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, market: AaveMarketInfo) => Promise<AaveV3PositionData>;
+export { getMeritCampaigns, getMerkleCampaigns, };

package/cjs/aaveV3/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAaveV3FullPositionData = exports.getAaveV3AccountData = exports._getAaveV3AccountData = exports.getAaveV3AccountBalances = exports._getAaveV3AccountBalances = exports.EMPTY_AAVE_DATA = exports.aaveV3EmodeCategoriesMapping = void 0;
+exports.getMerkleCampaigns = exports.getMeritCampaigns = exports.getAaveV3FullPositionData = exports.getAaveV3AccountData = exports._getAaveV3AccountData = exports.getAaveV3AccountBalances = exports._getAaveV3AccountBalances = exports.EMPTY_AAVE_DATA = exports.aaveV3EmodeCategoriesMapping = void 0;
 exports._getAaveV3MarketData = _getAaveV3MarketData;
 exports.getAaveV3MarketData = getAaveV3MarketData;
 const tokens_1 = require("@defisaver/tokens");
@@ -25,6 +25,10 @@ const utils_1 = require("../services/utils");
 const staking_1 = require("../staking");
 const common_1 = require("../types/common");
 const viem_1 = require("../services/viem");
+const merit_1 = require("./merit");
+Object.defineProperty(exports, "getMeritCampaigns", { enumerable: true, get: function () { return merit_1.getMeritCampaigns; } });
+const merkl_1 = require("./merkl");
+Object.defineProperty(exports, "getMerkleCampaigns", { enumerable: true, get: function () { return merkl_1.getMerkleCampaigns; } });
 const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
     const { eModeCategoriesData } = extractedState;
     const usedAssetsValues = Object.values(usedAssets);
@@ -60,11 +64,13 @@ 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, meritRewardsMap] = 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, merkl_1.getMerkleCampaigns)(network),
+            (0, merit_1.getMeritCampaigns)(network, market.value),
         ]);
         isBorrowAllowed = (0, utils_1.isLayer2Network)(network) ? isBorrowAllowed : true;
         const eModeCategoriesData = {};
@@ -146,47 +152,74 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 isolationModeBorrowingEnabled: tokenMarket.isolationModeBorrowingEnabled,
                 isFlashLoanEnabled: tokenMarket.isFlashLoanEnabled,
                 aTokenAddress: tokenMarket.aTokenAddress,
+                vTokenAddress: tokenMarket.debtTokenAddress,
+                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, _b;
             /* eslint-disable no-param-reassign */
             // @ts-ignore
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
             const isStakingAsset = staking_1.STAKING_ASSETS.includes(_market.symbol);
             if (isStakingAsset) {
-                _market.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(_market.symbol);
-                _market.incentiveSupplyToken = _market.symbol;
-                if (!_market.supplyIncentives) {
-                    _market.supplyIncentives = [];
-                }
+                const yieldApy = yield (0, staking_1.getStakingApy)(_market.symbol);
                 _market.supplyIncentives.push({
-                    apy: _market.incentiveSupplyApy || '0',
+                    apy: yieldApy,
                     token: _market.symbol,
-                    incentiveKind: 'staking',
+                    incentiveKind: common_1.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.borrowIncentives.push({
+                        apy: new decimal_js_1.default(yieldApy).mul(-1).toString(),
+                        token: _market.symbol,
+                        incentiveKind: common_1.IncentiveKind.Reward,
+                        description: `Due to the native yield of ${_market.symbol}, the value of the debt would increase over time.`,
+                    });
                 }
+            }
+            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 { apy, rewardTokenSymbol, description, identifier, } = merkleRewardsMap[aTokenAddress].supply;
+                _market.supplyIncentives.push({
+                    apy,
+                    token: rewardTokenSymbol,
+                    incentiveKind: common_1.IncentiveKind.Reward,
+                    description,
+                    eligibilityId: identifier,
+                });
+            }
+            const vTokenAddress = _market.vTokenAddress.toLowerCase(); // DEV: Should vTokenAddress be in AaveV3AssetData type?
+            if ((_b = merkleRewardsMap[vTokenAddress]) === null || _b === void 0 ? void 0 : _b.borrow) {
+                const { apy, rewardTokenSymbol, description, identifier, } = merkleRewardsMap[vTokenAddress].borrow;
                 _market.borrowIncentives.push({
-                    apy: _market.incentiveBorrowApy,
-                    token: _market.incentiveBorrowToken,
-                    incentiveKind: 'reward',
+                    apy,
+                    token: rewardTokenSymbol,
+                    incentiveKind: common_1.IncentiveKind.Reward,
+                    description,
+                    eligibilityId: identifier,
                 });
             }
-            if (_market.symbol === 'USDe') {
-                const merklApy = yield (0, staking_1.getStakingApy)(_market.symbol);
-                if (!_market.supplyIncentives) {
-                    _market.supplyIncentives = [];
-                }
+            if (meritRewardsMap.supply[_market.symbol]) {
+                const { apy, rewardTokenSymbol, description } = meritRewardsMap.supply[_market.symbol];
                 _market.supplyIncentives.push({
-                    apy: merklApy || '0',
-                    token: _market.symbol,
-                    incentiveKind: 'reward',
+                    apy,
+                    token: rewardTokenSymbol,
+                    incentiveKind: common_1.IncentiveKind.Reward,
+                    description,
+                });
+            }
+            if (meritRewardsMap.borrow[_market.symbol]) {
+                const { apy, rewardTokenSymbol, description } = meritRewardsMap.borrow[_market.symbol];
+                _market.borrowIncentives.push({
+                    apy,
+                    token: rewardTokenSymbol,
+                    incentiveKind: common_1.IncentiveKind.Reward,
+                    description,
                 });
             }
             if (!rewardForMarket)
@@ -196,10 +229,7 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 if (supplyRewardData) {
                     if (+(supplyRewardData.emissionEndTimestamp.toString()) * 1000 < Date.now())
                         return;
-                    _market.incentiveSupplyToken = supplyRewardData.rewardTokenSymbol;
                     // reward token is aave asset
-                    if (supplyRewardData.rewardTokenSymbol.startsWith('a') && supplyRewardData.rewardTokenSymbol.includes(_market.symbol))
-                        _market.incentiveSupplyToken = _market.symbol;
                     const supplyEmissionPerSecond = supplyRewardData.emissionPerSecond;
                     const supplyRewardPrice = new decimal_js_1.default(supplyRewardData.rewardPriceFeed).div(Math.pow(10, +supplyRewardData.priceFeedDecimals))
                         .toString();
@@ -209,15 +239,11 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                         .div(_market.price)
                         .div(_market.totalSupply)
                         .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, merkl_1.getAaveUnderlyingSymbol)(supplyRewardData.rewardTokenSymbol),
                         apy: rewardApy,
-                        incentiveKind: 'reward',
+                        incentiveKind: common_1.IncentiveKind.Reward,
+                        description: 'Eligible for protocol-level incentives.',
                     });
                 }
             });
@@ -226,9 +252,6 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                 if (borrowRewardData) {
                     if (+(borrowRewardData.emissionEndTimestamp.toString()) * 1000 < Date.now())
                         return;
-                    _market.incentiveBorrowToken = borrowRewardData.rewardTokenSymbol;
-                    if (borrowRewardData.rewardTokenSymbol.startsWith('a') && borrowRewardData.rewardTokenSymbol.includes(_market.symbol))
-                        _market.incentiveBorrowToken = _market.symbol;
                     const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
                     const supplyRewardPrice = new decimal_js_1.default(borrowRewardData.rewardPriceFeed).div(Math.pow(10, +borrowRewardData.priceFeedDecimals))
                         .toString();
@@ -238,15 +261,11 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
                         .div(_market.price)
                         .div(_market.totalBorrowVar)
                         .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, merkl_1.getAaveUnderlyingSymbol)(borrowRewardData.rewardTokenSymbol),
                         apy: rewardApy,
-                        incentiveKind: 'reward',
+                        incentiveKind: common_1.IncentiveKind.Reward,
+                        description: 'Eligible for protocol-level incentives.',
                     });
                 }
             });

package/cjs/aaveV3/merit.d.ts

@@ -0,0 +1,7 @@
+import { NetworkNumber } from '../types/common';
+import { AaveVersions, MeritTokenRewardMap } from '../types';
+/**
+ * Fetches merit rewards data from Aave API
+ */
+export declare const fetchMeritRewardsData: () => Promise<Record<string, number | null>>;
+export declare const getMeritCampaigns: (chainId: NetworkNumber, market: AaveVersions) => Promise<MeritTokenRewardMap>;

package/cjs/aaveV3/merit.js

@@ -0,0 +1,95 @@
+"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.getMeritCampaigns = exports.fetchMeritRewardsData = void 0;
+const utils_1 = require("../services/utils");
+const common_1 = require("../types/common");
+const moneymarket_1 = require("../moneymarket");
+const types_1 = require("../types");
+/**
+ * Maps API keys to reward data & actions - hardcoded and needs to be maintained actively.
+ * Mapping based on Aave interface implementation: https://github.com/aave/interface/blob/main/src/hooks/useMeritIncentives.ts
+ * Active campaigns found here: https://apps.aavechan.com/merit
+ */
+const MERIT_DATA_MAP = {
+    [common_1.NetworkNumber.Eth]: {
+        [types_1.AaveVersions.AaveV3]: {
+            'ethereum-supply-ethx': { rewardTokenSymbol: 'SD', action: 'supply', supplyTokens: ['ETHx'] },
+            'ethereum-supply-rlusd': { rewardTokenSymbol: 'aEthRLUSD', action: 'supply', supplyTokens: ['RLUSD'] },
+            // Campaign disabled here as it's present on Merkl API:
+            // 'ethereum-borrow-eurc': { rewardTokenSymbol: 'aEthEURC', action: 'borrow', borrowTokens: ['EURC'] },
+        },
+        [types_1.AaveVersions.AaveV3Lido]: {},
+        [types_1.AaveVersions.AaveV3Etherfi]: {},
+    },
+    [common_1.NetworkNumber.Arb]: {
+        [types_1.AaveVersions.AaveV3]: {},
+    },
+    [common_1.NetworkNumber.Opt]: {
+        [types_1.AaveVersions.AaveV3]: {},
+    },
+    [common_1.NetworkNumber.Base]: {
+        [types_1.AaveVersions.AaveV3]: {
+            'base-borrow-usdc': { rewardTokenSymbol: 'USDC', action: 'borrow', borrowTokens: ['USDC'] },
+            'base-borrow-gho': { rewardTokenSymbol: 'GHO', action: 'borrow', borrowTokens: ['GHO'] },
+            'base-borrow-eurc': { rewardTokenSymbol: 'EURC', action: 'borrow', borrowTokens: ['EURC'] },
+        },
+    },
+    [common_1.NetworkNumber.Linea]: {
+        [types_1.AaveVersions.AaveV3]: {},
+    },
+};
+/**
+ * Fetches merit rewards data from Aave API
+ */
+const fetchMeritRewardsData = () => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const response = yield fetch('https://apps.aavechan.com/api/merit/aprs', {
+            signal: AbortSignal.timeout(utils_1.DEFAULT_TIMEOUT),
+        });
+        const data = yield response.json();
+        return data.currentAPR.actionsAPR;
+    }
+    catch (error) {
+        console.error('Failed to fetch merit rewards data:', error);
+        return {};
+    }
+});
+exports.fetchMeritRewardsData = fetchMeritRewardsData;
+const getMeritCampaigns = (chainId, market) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    const meritData = yield (0, exports.fetchMeritRewardsData)();
+    const relevantCampaigns = {
+        supply: {},
+        borrow: {},
+    };
+    Object.entries(((_a = MERIT_DATA_MAP[chainId]) === null || _a === void 0 ? void 0 : _a[market]) || {})
+        .filter(([key, rewardData]) => !!meritData[key])
+        .forEach(([key, rewardData]) => {
+        var _a, _b;
+        const apr = meritData[key];
+        if (!apr)
+            return;
+        const reward = {
+            rewardTokenSymbol: rewardData.rewardTokenSymbol,
+            apy: (0, moneymarket_1.aprToApy)(apr).toString(),
+            description: `Eligible for Merit rewards in ${rewardData.rewardTokenSymbol}. ${rewardData.message ? `\n${rewardData.message}` : ''}`,
+        };
+        (_a = rewardData.supplyTokens) === null || _a === void 0 ? void 0 : _a.forEach(token => {
+            relevantCampaigns.supply[token] = reward;
+        });
+        (_b = rewardData.borrowTokens) === null || _b === void 0 ? void 0 : _b.forEach(token => {
+            relevantCampaigns.borrow[token] = reward;
+        });
+    });
+    return relevantCampaigns;
+});
+exports.getMeritCampaigns = getMeritCampaigns;

package/cjs/aaveV3/merkl.d.ts

@@ -0,0 +1,9 @@
+import { MerkleRewardMap } from '../types';
+import { NetworkNumber } from '../types/common';
+export declare const getAaveUnderlyingSymbol: (_symbol?: string) => any;
+/**
+ * aEthLidoUSDC -> aUSDC
+ * USDC -> USDC
+ */
+export declare const formatAaveAsset: (_symbol: string) => string;
+export declare const getMerkleCampaigns: (chainId: NetworkNumber) => Promise<MerkleRewardMap>;

package/cjs/aaveV3/merkl.js

@@ -0,0 +1,88 @@
+"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.formatAaveAsset = exports.getAaveUnderlyingSymbol = void 0;
+const moneymarket_1 = require("../moneymarket");
+const utils_1 = require("../services/utils");
+const types_1 = require("../types");
+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;
+/**
+ * aEthLidoUSDC -> aUSDC
+ * USDC -> USDC
+ */
+const formatAaveAsset = (_symbol) => {
+    if (_symbol.startsWith('a')) {
+        return `a${(0, exports.getAaveUnderlyingSymbol)(_symbol)}`;
+    }
+    return _symbol;
+};
+exports.formatAaveAsset = formatAaveAsset;
+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.status === types_1.OpportunityStatus.LIVE);
+        return relevantOpportunities.reduce((acc, opportunity) => {
+            var _a, _b;
+            const rewardToken = opportunity.rewardsRecord.breakdowns[0].token;
+            const description = `Eligible for ${(0, exports.formatAaveAsset)(rewardToken.symbol)} rewards through Merkl. ${opportunity.description ? `\n${opportunity.description}` : ''}`;
+            if (opportunity.action === types_1.OpportunityAction.LEND && opportunity.explorerAddress) {
+                const supplyAToken = (_a = opportunity.explorerAddress) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+                if (!acc[supplyAToken])
+                    acc[supplyAToken] = {};
+                acc[supplyAToken].supply = {
+                    apy: (0, moneymarket_1.aprToApy)(opportunity.apr),
+                    // rewardToken: rewardToken.address,
+                    rewardTokenSymbol: rewardToken.symbol,
+                    description,
+                    identifier: opportunity.identifier,
+                };
+            }
+            if (opportunity.action === types_1.OpportunityAction.BORROW && opportunity.explorerAddress) {
+                const borrowAToken = (_b = opportunity.explorerAddress) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+                if (!acc[borrowAToken])
+                    acc[borrowAToken] = {};
+                acc[borrowAToken].borrow = {
+                    apy: (0, moneymarket_1.aprToApy)(opportunity.apr),
+                    // rewardToken: rewardToken.address,
+                    rewardTokenSymbol: rewardToken.symbol,
+                    description,
+                    identifier: opportunity.identifier,
+                };
+            }
+            return acc;
+        }, {});
+    }
+    catch (e) {
+        console.error('Failed to fetch Merkle campaigns', e);
+        return {};
+    }
+});
+exports.getMerkleCampaigns = getMerkleCampaigns;

package/cjs/compoundV2/index.js

@@ -18,6 +18,7 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
 const constants_1 = require("../constants");
 const moneymarket_1 = require("../moneymarket");
 const utils_1 = require("../services/utils");
+const common_1 = require("../types/common");
 const contracts_1 = require("../contracts");
 const markets_1 = require("../markets");
 const compoundHelpers_1 = require("../helpers/compoundHelpers");
@@ -39,9 +40,6 @@ const _getCompoundV2MarketsData = (provider, network) => __awaiter(void 0, void
         const compBorrowSpeeds = market.compBorrowSpeeds.toString();
         const assetPrice = market.price.toString();
         const pricePrecisionDiff = 18 - (0, tokens_1.getAssetInfo)((0, tokens_1.getAssetInfoByAddress)(cAddresses[i]).underlyingAsset).decimals;
-        // compSupplySpeeds/compBorrowSpeeds is per block per market (borrow & supply are separate markets)
-        const incentiveSupplyApy = (0, moneymarket_1.aprToApy)((100 * constants_1.BLOCKS_IN_A_YEAR * +compSupplySpeeds * +compPrice) / +assetPrice / +totalSupply).toString();
-        const incentiveBorrowApy = (0, moneymarket_1.aprToApy)((100 * constants_1.BLOCKS_IN_A_YEAR * +compBorrowSpeeds * +compPrice) / +assetPrice / +totalBorrow).toString();
         if (cAddresses[i].toLowerCase() === '0xc11b1268c1a384e55c48c2391d8d480264a3a7f4'.toLowerCase()) {
             symbol = 'WBTC Legacy';
             isWbtcLegacy = true;
@@ -51,10 +49,18 @@ const _getCompoundV2MarketsData = (provider, network) => __awaiter(void 0, void
             underlyingTokenAddress: market.underlyingTokenAddress,
             supplyRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(constants_1.BLOCKS_IN_A_YEAR).times(market.supplyRate.toString()).div(1e16).toString()).toString(),
             borrowRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(constants_1.BLOCKS_IN_A_YEAR).times(market.borrowRate.toString()).div(1e16).toString()).toString(),
-            incentiveSupplyToken: 'COMP',
-            incentiveBorrowToken: 'COMP',
-            incentiveSupplyApy,
-            incentiveBorrowApy,
+            supplyIncentives: [{
+                    token: 'COMP',
+                    apy: (0, moneymarket_1.aprToApy)((100 * constants_1.BLOCKS_IN_A_YEAR * +compSupplySpeeds * +compPrice) / +assetPrice / +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.BLOCKS_IN_A_YEAR * +compBorrowSpeeds * +compPrice) / +assetPrice / +totalBorrow).toString(),
+                    incentiveKind: common_1.IncentiveKind.Reward,
+                    description: 'Eligible for protocol-level COMP incentives.',
+                }],
             collateralFactor: new decimal_js_1.default(market.collateralFactor.toString()).div(1e18).toString(),
             marketLiquidity: (0, tokens_1.assetAmountInEth)(market.marketLiquidity.toString(), (0, utils_1.handleWbtcLegacy)(symbol)),
             utilization: new decimal_js_1.default(market.totalBorrow.toString()).div(totalSupply).times(100).toString(),

package/cjs/compoundV3/index.js

@@ -16,6 +16,7 @@ exports.getCompoundV3FullPositionData = exports.getCompoundV3AccountData = expor
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
+const common_1 = require("../types/common");
 const staking_1 = require("../staking");
 const utils_1 = require("../services/utils");
 const constants_1 = require("../constants");
@@ -49,13 +50,17 @@ const _getCompoundV3MarketsData = (provider, network, selectedMarket, defaultPro
         .map((coll) => (0, compoundHelpers_1.formatMarketData)(coll, network, baseAssetPrice));
     for (const coll of colls) {
         if (staking_1.STAKING_ASSETS.includes(coll.symbol)) {
-            coll.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(coll.symbol);
-            coll.incentiveSupplyToken = coll.symbol;
+            coll.supplyIncentives.push({
+                apy: yield (0, staking_1.getStakingApy)(coll.symbol),
+                token: coll.symbol,
+                incentiveKind: common_1.IncentiveKind.Staking,
+                description: `Native ${coll.symbol} yield.`,
+            });
         }
     }
     const base = (0, compoundHelpers_1.formatBaseData)(baseTokenInfo, network, baseAssetPrice);
     const payload = {};
-    const baseObj = Object.assign(Object.assign({}, base), (0, compoundHelpers_1.getIncentiveApys)(base, compPrice));
+    const baseObj = Object.assign(Object.assign({}, base), (yield (0, compoundHelpers_1.getIncentiveApys)(base, compPrice)));
     const allAssets = [baseObj, ...colls];
     allAssets
         .sort((a, b) => {