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

package/.mocharc.json

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

package/.nvmrc

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

package/README.md

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

package/cjs/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.js

@@ -25,7 +25,8 @@ 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 merit_1 = require("./merit");
+const merkl_1 = require("./merkl");
 const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
     const { eModeCategoriesData } = extractedState;
     const usedAssetsValues = Object.values(usedAssets);
@@ -61,12 +62,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, merkleRewardsMap] = 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, rewards_1.getMerkleCampaigns)(network),
+            (0, merkl_1.getMerkleCampaigns)(network),
+            (0, merit_1.getMeritCampaigns)(network, market.value),
         ]);
         isBorrowAllowed = (0, utils_1.isLayer2Network)(network) ? isBorrowAllowed : true;
         const eModeCategoriesData = {};
@@ -148,58 +150,76 @@ 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, index) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            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;
+                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) {
                     // 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',
+                        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 { apr, rewardTokenSymbol, description } = merkleRewardsMap[aTokenAddress].supply;
+                const { apy, rewardTokenSymbol, description, identifier, } = merkleRewardsMap[aTokenAddress].supply;
                 _market.supplyIncentives.push({
-                    apy: (0, moneymarket_1.aprToApy)(apr),
+                    apy,
                     token: rewardTokenSymbol,
-                    incentiveKind: 'reward',
+                    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,
+                    token: rewardTokenSymbol,
+                    incentiveKind: common_1.IncentiveKind.Reward,
+                    description,
+                    eligibilityId: identifier,
+                });
+            }
+            if (meritRewardsMap.supply[_market.symbol]) {
+                const { apy, rewardTokenSymbol, description } = meritRewardsMap.supply[_market.symbol];
+                _market.supplyIncentives.push({
+                    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,
                 });
             }
-            // 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
@@ -207,10 +227,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();
@@ -220,12 +237,10 @@ 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();
                     _market.supplyIncentives.push({
-                        token: (0, rewards_1.getAaveUnderlyingSymbol)(supplyRewardData.rewardTokenSymbol),
+                        token: (0, merkl_1.getAaveUnderlyingSymbol)(supplyRewardData.rewardTokenSymbol),
                         apy: rewardApy,
-                        incentiveKind: 'reward',
+                        incentiveKind: common_1.IncentiveKind.Reward,
                         description: 'Eligible for protocol-level incentives.',
                     });
                 }
@@ -235,9 +250,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();
@@ -247,12 +259,10 @@ 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();
                     _market.borrowIncentives.push({
-                        token: (0, rewards_1.getAaveUnderlyingSymbol)(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,17 @@
+import { NetworkNumber } from '../types/common';
+import { AaveVersions } from '../types';
+type RewardInfo = {
+    apy: string;
+    rewardTokenSymbol: string;
+    description: string;
+};
+type MeritTokenRewardMap = {
+    supply: Record<string, RewardInfo>;
+    borrow: Record<string, RewardInfo>;
+};
+/**
+ * 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>;
+export {};

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/{rewards.d.ts → merkl.d.ts}

@@ -1,14 +1,19 @@
 import { EthAddress, NetworkNumber } from '../types/common';
 type RewardInfo = {
-    apr: number;
-    rewardToken: EthAddress;
+    apy: string;
     rewardTokenSymbol: string;
     description: string;
+    identifier: string;
 };
 type MerkleRewardMap = Record<EthAddress, {
     supply?: RewardInfo;
     borrow?: RewardInfo;
 }>;
 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>;
 export {};

package/cjs/aaveV3/{rewards.js → merkl.js}

@@ -9,7 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMerkleCampaigns = exports.getAaveUnderlyingSymbol = void 0;
+exports.getMerkleCampaigns = exports.formatAaveAsset = exports.getAaveUnderlyingSymbol = void 0;
+const moneymarket_1 = require("../moneymarket");
 const utils_1 = require("../services/utils");
 var OpportunityAction;
 (function (OpportunityAction) {
@@ -36,6 +37,17 @@ const getAaveUnderlyingSymbol = (_symbol = '') => {
     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', {
@@ -46,29 +58,33 @@ const getMerkleCampaigns = (chainId) => __awaiter(void 0, void 0, void 0, functi
         const opportunities = yield res.json();
         const relevantOpportunities = opportunities
             .filter((o) => o.chainId === chainId)
-            .filter((o) => o.liveCampaigns > 0);
+            .filter((o) => o.status === OpportunityStatus.LIVE);
         return relevantOpportunities.reduce((acc, opportunity) => {
+            var _a, _b;
             const rewardToken = opportunity.rewardsRecord.breakdowns[0].token;
-            if (opportunity.action === OpportunityAction.LEND) {
-                const supplyAToken = opportunity.explorerAddress.toLowerCase();
+            const description = `Eligible for ${(0, exports.formatAaveAsset)(rewardToken.symbol)} rewards through Merkl. ${opportunity.description ? `\n${opportunity.description}` : ''}`;
+            if (opportunity.action === 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 = {
-                    apr: opportunity.apr,
-                    rewardToken: rewardToken.address,
-                    rewardTokenSymbol: (0, exports.getAaveUnderlyingSymbol)(rewardToken.symbol),
-                    description: `Eligible for incentives through Merkl. \n${opportunity.description}`,
+                    apy: (0, moneymarket_1.aprToApy)(opportunity.apr),
+                    // rewardToken: rewardToken.address,
+                    rewardTokenSymbol: rewardToken.symbol,
+                    description,
+                    identifier: opportunity.identifier,
                 };
             }
-            if (opportunity.action === OpportunityAction.BORROW) {
-                const borrowAToken = opportunity.explorerAddress.toLowerCase();
+            if (opportunity.action === 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 = {
-                    apr: opportunity.apr,
-                    rewardToken: rewardToken.address,
-                    rewardTokenSymbol: (0, exports.getAaveUnderlyingSymbol)(rewardToken.symbol),
-                    description: `Eligible for incentives through Merkl. \n${opportunity.description}`,
+                    apy: (0, moneymarket_1.aprToApy)(opportunity.apr),
+                    // rewardToken: rewardToken.address,
+                    rewardTokenSymbol: rewardToken.symbol,
+                    description,
+                    identifier: opportunity.identifier,
                 };
             }
             return acc;

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,8 +50,12 @@ 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);