@defisaver/positions-sdk 0.0.166 → 0.0.168

package/esm/aaveV3/index.js

@@ -175,6 +175,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 },
             })), { symbol, isIsolated: new Dec(tokenMarket.debtCeilingForIsolationMode).gt(0), debtCeilingForIsolationMode: new Dec(tokenMarket.debtCeilingForIsolationMode).div(100).toString(), isSiloed: tokenMarket.isSiloedForBorrowing, isolationModeTotalDebt: new Dec(tokenMarket.isolationModeTotalDebt).div(100).toString(), assetId: Number(tokenMarket.assetId), underlyingTokenAddress: tokenMarket.underlyingTokenAddress, supplyRate: aprToApy(new Dec(tokenMarket.supplyRate.toString()).div(1e25).toString()), borrowRate: aprToApy(new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).toString()), borrowRateDiscounted: aprToApy(nativeAsset ? new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0'), borrowRateStable: aprToApy(new Dec(tokenMarket.borrowRateStable.toString()).div(1e25).toString()), collateralFactor: new Dec(tokenMarket.collateralFactor.toString()).div(10000).toString(), liquidationRatio: new Dec(tokenMarket.liquidationRatio.toString()).div(10000).toString(), marketLiquidity, utilization: new Dec(tokenMarket.totalBorrow.toString()).times(100).div(new Dec(tokenMarket.totalSupply.toString())).toString(), usageAsCollateralEnabled: tokenMarket.usageAsCollateralEnabled, supplyCap: tokenMarket.supplyCap, borrowCap, totalSupply: assetAmountInEth(tokenMarket.totalSupply.toString(), symbol), isInactive: !tokenMarket.isActive, isFrozen: tokenMarket.isFrozen, isPaused: tokenMarket.isPaused, canBeBorrowed: tokenMarket.isActive && !tokenMarket.isPaused && !tokenMarket.isFrozen && tokenMarket.borrowingEnabled && isBorrowAllowed, canBeSupplied: !nativeAsset && tokenMarket.isActive && !tokenMarket.isPaused && !tokenMarket.isFrozen, canBeWithdrawn: tokenMarket.isActive && !tokenMarket.isPaused, canBePayBacked: tokenMarket.isActive && !tokenMarket.isPaused, disabledStableBorrowing: !tokenMarket.stableBorrowRateEnabled, totalBorrow: assetAmountInEth(tokenMarket.totalBorrow.toString(), symbol), totalBorrowVar: assetAmountInEth(tokenMarket.totalBorrowVar.toString(), symbol), price: new Dec(tokenMarket.price.toString()).div(1e8).toString(), isolationModeBorrowingEnabled: tokenMarket.isolationModeBorrowingEnabled, isFlashLoanEnabled: tokenMarket.isFlashLoanEnabled, aTokenAddress: tokenMarket.aTokenAddress }));
         })));
+        // Get incentives data
         yield Promise.all(assetsData.map((_market) => __awaiter(this, void 0, void 0, function* () {
             /* eslint-disable no-param-reassign */
             const rewardForMarket = rewardInfo === null || rewardInfo === void 0 ? void 0 : rewardInfo[_market.underlyingTokenAddress];
@@ -182,53 +183,82 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
             if (isStakingAsset) {
                 _market.incentiveSupplyApy = yield getStakingApy(_market.symbol, defaultWeb3);
                 _market.incentiveSupplyToken = _market.symbol;
+                if (!_market.supplyIncentives) {
+                    _market.supplyIncentives = [];
+                }
+                _market.supplyIncentives.push({
+                    apy: _market.incentiveSupplyApy || '0',
+                    token: _market.symbol,
+                });
             }
             if (_market.canBeBorrowed && _market.incentiveSupplyApy) {
-                _market.incentiveBorrowApy = `-${_market.incentiveSupplyApy}`;
+                _market.incentiveBorrowApy = _market.incentiveSupplyApy;
                 _market.incentiveBorrowToken = _market.incentiveSupplyToken;
+                if (!_market.borrowIncentives) {
+                    _market.borrowIncentives = [];
+                }
+                _market.borrowIncentives.push({
+                    apy: _market.incentiveBorrowApy,
+                    token: _market.incentiveBorrowToken,
+                });
             }
             if (!rewardForMarket)
                 return;
-            const supplyRewardData = rewardForMarket.aIncentiveData.rewardsTokenInformation[0];
-            if (supplyRewardData) {
-                if (isStakingAsset && _market.incentiveSupplyToken !== supplyRewardData.rewardTokenSymbol)
-                    return;
-                if (+supplyRewardData.emissionEndTimestamp * 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 Dec(supplyRewardData.rewardPriceFeed).div(Math.pow(10, +supplyRewardData.priceFeedDecimals)).toString();
-                const rewardApy = new Dec(supplyEmissionPerSecond).div((Math.pow(10, +supplyRewardData.rewardTokenDecimals)) / 100)
-                    .mul(365 * 24 * 3600)
-                    .mul(supplyRewardPrice)
-                    .div(_market.price)
-                    .div(_market.totalSupply)
-                    .toString();
-                _market.incentiveSupplyApy = new Dec(_market.incentiveSupplyApy || '0').add(rewardApy).toString();
-            }
-            const borrowRewardData = rewardForMarket.vIncentiveData.rewardsTokenInformation[0];
-            if (borrowRewardData) {
-                if (isStakingAsset && _market.incentiveSupplyToken !== borrowRewardData.rewardTokenSymbol)
-                    return;
-                if (+borrowRewardData.emissionEndTimestamp * 1000 < Date.now())
-                    return;
-                _market.incentiveBorrowToken = borrowRewardData.rewardTokenSymbol;
-                if (supplyRewardData.rewardTokenSymbol.startsWith('a') && supplyRewardData.rewardTokenSymbol.includes(_market.symbol))
-                    _market.incentiveBorrowToken = _market.symbol;
-                const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
-                const supplyRewardPrice = new Dec(borrowRewardData.rewardPriceFeed).div(Math.pow(10, +borrowRewardData.priceFeedDecimals)).toString();
-                const rewardApy = new Dec(supplyEmissionPerSecond).div((Math.pow(10, +borrowRewardData.rewardTokenDecimals)) / 100)
-                    .mul(365 * 24 * 3600)
-                    .mul(supplyRewardPrice)
-                    .div(_market.price)
-                    .div(_market.totalBorrowVar)
-                    .toString();
-                _market.incentiveBorrowApy = new Dec(_market.incentiveSupplyApy || '0').add(rewardApy).toString();
-            }
-            /* eslint-enable no-param-reassign */
+            rewardForMarket.aIncentiveData.rewardsTokenInformation.forEach(supplyRewardData => {
+                if (supplyRewardData) {
+                    if (+supplyRewardData.emissionEndTimestamp * 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 Dec(supplyRewardData.rewardPriceFeed).div(Math.pow(10, +supplyRewardData.priceFeedDecimals))
+                        .toString();
+                    const rewardApy = new Dec(supplyEmissionPerSecond).div((Math.pow(10, +supplyRewardData.rewardTokenDecimals)) / 100)
+                        .mul(365 * 24 * 3600)
+                        .mul(supplyRewardPrice)
+                        .div(_market.price)
+                        .div(_market.totalSupply)
+                        .toString();
+                    _market.incentiveSupplyApy = new Dec(_market.incentiveSupplyApy || '0').add(rewardApy)
+                        .toString();
+                    if (!_market.supplyIncentives) {
+                        _market.supplyIncentives = [];
+                    }
+                    _market.supplyIncentives.push({
+                        token: supplyRewardData.rewardTokenSymbol,
+                        apy: rewardApy,
+                    });
+                }
+            });
+            rewardForMarket.vIncentiveData.rewardsTokenInformation.forEach(borrowRewardData => {
+                if (borrowRewardData) {
+                    if (+borrowRewardData.emissionEndTimestamp * 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 Dec(borrowRewardData.rewardPriceFeed).div(Math.pow(10, +borrowRewardData.priceFeedDecimals))
+                        .toString();
+                    const rewardApy = new Dec(supplyEmissionPerSecond).div((Math.pow(10, +borrowRewardData.rewardTokenDecimals)) / 100)
+                        .mul(365 * 24 * 3600)
+                        .mul(supplyRewardPrice)
+                        .div(_market.price)
+                        .div(_market.totalBorrowVar)
+                        .toString();
+                    _market.incentiveBorrowApy = new Dec(_market.incentiveBorrowApy || '0').add(rewardApy)
+                        .toString();
+                    if (!_market.borrowIncentives) {
+                        _market.borrowIncentives = [];
+                    }
+                    _market.borrowIncentives.push({
+                        token: borrowRewardData.rewardTokenSymbol,
+                        apy: rewardApy,
+                    });
+                }
+            });
         })));
         const payload = {};
         // Sort by market size

package/esm/compoundV2/index.js

@@ -13,7 +13,7 @@ import { BLOCKS_IN_A_YEAR } from '../constants';
 import { aprToApy } from '../moneymarket';
 import { compareAddresses, handleWbtcLegacy, wethToEth } from '../services/utils';
 import { CompoundLoanInfoContract, ComptrollerContract } from '../contracts';
-import { compoundV2CollateralAssets } from '../markets/compound/marketsAssets';
+import { compoundV2CollateralAssets } from '../markets';
 import { getCompoundV2AggregatedData } from '../helpers/compoundHelpers';
 const compAddress = '0xc00e94cb662c3520282e6f5717214004a7f26888';
 export const getCompoundV2MarketsData = (web3, network) => __awaiter(void 0, void 0, void 0, function* () {

package/esm/morphoAaveV2/index.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
 import Dec from 'decimal.js';
 import { wethToEthByAddress } from '../services/utils';
-import { getStETHApr } from '../staking';
+import { getStETHApy } from '../staking';
 import { MorphoAaveV2ViewContract } from '../contracts';
 import { AaveVersions, } from '../types';
 import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
@@ -87,7 +87,7 @@ export const getMorphoAaveV2MarketsData = (web3, network, mainnetWeb3) => __awai
     });
     const stEthMarket = assetsData.find(({ symbol }) => symbol === 'stETH');
     if (stEthMarket) {
-        stEthMarket.incentiveSupplyApy = yield getStETHApr(mainnetWeb3);
+        stEthMarket.incentiveSupplyApy = yield getStETHApy(mainnetWeb3);
         stEthMarket.incentiveSupplyToken = 'stETH';
     }
     const payload = {};

package/esm/spark/index.js

@@ -122,45 +122,79 @@ export const getSparkMarketsData = (web3, network, selectedMarket, mainnetWeb3)
         if (STAKING_ASSETS.includes(market.symbol)) {
             market.incentiveSupplyApy = yield getStakingApy(market.symbol, mainnetWeb3);
             market.incentiveSupplyToken = market.symbol;
+            if (!market.supplyIncentives) {
+                market.supplyIncentives = [];
+            }
+            market.supplyIncentives.push({
+                apy: market.incentiveSupplyApy || '0',
+                token: market.symbol,
+            });
         }
         if (market.symbol === 'sDAI') {
             market.incentiveSupplyApy = yield getDsrApy(web3, network);
             market.incentiveSupplyToken = 'sDAI';
         }
         if (market.canBeBorrowed && market.incentiveSupplyApy) {
-            market.incentiveBorrowApy = `-${market.incentiveSupplyApy}`;
+            market.incentiveBorrowApy = market.incentiveSupplyApy;
             market.incentiveBorrowToken = market.incentiveSupplyToken;
+            if (!market.borrowIncentives) {
+                market.borrowIncentives = [];
+            }
+            market.borrowIncentives.push({
+                apy: market.incentiveBorrowApy,
+                token: market.incentiveBorrowToken,
+            });
         }
         if (!rewardForMarket)
             return;
-        const supplyRewardData = rewardForMarket.aIncentiveData.rewardsTokenInformation[0];
-        if (supplyRewardData) {
-            if (supplyRewardData.emissionEndTimestamp * 1000 < Date.now())
-                return;
-            market.incentiveSupplyToken = supplyRewardData.rewardTokenSymbol;
-            const supplyEmissionPerSecond = supplyRewardData.emissionPerSecond;
-            const supplyRewardPrice = new Dec(supplyRewardData.rewardPriceFeed).div(Math.pow(10, supplyRewardData.priceFeedDecimals)).toString();
-            market.incentiveSupplyApy = new Dec(supplyEmissionPerSecond).div((Math.pow(10, supplyRewardData.rewardTokenDecimals)) / 100)
-                .mul(365 * 24 * 3600)
-                .mul(supplyRewardPrice)
-                .div(market.price)
-                .div(market.totalSupply)
-                .toString();
-        }
-        const borrowRewardData = rewardForMarket.vIncentiveData.rewardsTokenInformation[0];
-        if (borrowRewardData) {
-            if (borrowRewardData.emissionEndTimestamp * 1000 < Date.now())
-                return;
-            market.incentiveBorrowToken = borrowRewardData.rewardTokenSymbol;
-            const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
-            const supplyRewardPrice = new Dec(borrowRewardData.rewardPriceFeed).div(Math.pow(10, borrowRewardData.priceFeedDecimals)).toString();
-            market.incentiveBorrowApy = new Dec(supplyEmissionPerSecond).div((Math.pow(10, borrowRewardData.rewardTokenDecimals)) / 100)
-                .mul(365 * 24 * 3600)
-                .mul(supplyRewardPrice)
-                .div(market.price)
-                .div(market.totalBorrowVar)
-                .toString();
-        }
+        rewardForMarket.aIncentiveData.rewardsTokenInformation.forEach(supplyRewardData => {
+            if (supplyRewardData) {
+                if (supplyRewardData.emissionEndTimestamp * 1000 < Date.now())
+                    return;
+                market.incentiveSupplyToken = supplyRewardData.rewardTokenSymbol;
+                const supplyEmissionPerSecond = supplyRewardData.emissionPerSecond;
+                const supplyRewardPrice = new Dec(supplyRewardData.rewardPriceFeed).div(Math.pow(10, supplyRewardData.priceFeedDecimals))
+                    .toString();
+                const rewardApy = new Dec(supplyEmissionPerSecond).div((Math.pow(10, supplyRewardData.rewardTokenDecimals)) / 100)
+                    .mul(365 * 24 * 3600)
+                    .mul(supplyRewardPrice)
+                    .div(market.price)
+                    .div(market.totalSupply)
+                    .toString();
+                market.incentiveSupplyApy = new Dec(market.incentiveSupplyApy || '0').add(rewardApy).toString();
+                if (!market.supplyIncentives) {
+                    market.supplyIncentives = [];
+                }
+                market.supplyIncentives.push({
+                    token: supplyRewardData.rewardTokenSymbol,
+                    apy: rewardApy,
+                });
+            }
+        });
+        rewardForMarket.vIncentiveData.rewardsTokenInformation.forEach(borrowRewardData => {
+            if (borrowRewardData) {
+                if (borrowRewardData.emissionEndTimestamp * 1000 < Date.now())
+                    return;
+                market.incentiveBorrowToken = borrowRewardData.rewardTokenSymbol;
+                const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
+                const supplyRewardPrice = new Dec(borrowRewardData.rewardPriceFeed).div(Math.pow(10, borrowRewardData.priceFeedDecimals))
+                    .toString();
+                const rewardApy = new Dec(supplyEmissionPerSecond).div((Math.pow(10, borrowRewardData.rewardTokenDecimals)) / 100)
+                    .mul(365 * 24 * 3600)
+                    .mul(supplyRewardPrice)
+                    .div(market.price)
+                    .div(market.totalBorrowVar)
+                    .toString();
+                market.incentiveBorrowApy = new Dec(market.incentiveBorrowApy || '0').add(rewardApy).toString();
+                if (!market.borrowIncentives) {
+                    market.borrowIncentives = [];
+                }
+                market.borrowIncentives.push({
+                    token: borrowRewardData.rewardTokenSymbol,
+                    apy: rewardApy,
+                });
+            }
+        });
         /* eslint-enable no-param-reassign */
     })));
     const payload = {};

package/esm/staking/staking.d.ts

@@ -1,12 +1,12 @@
 import Web3 from 'web3';
 import { MMAssetsData, MMUsedAssets } from '../types/common';
-export declare const getStETHApr: (web3: Web3, fromBlock?: number, blockNumber?: 'latest' | number) => Promise<any>;
-export declare const getCbETHApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
-export declare const getREthApr: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
+export declare const getStETHApy: (web3: Web3, fromBlock?: number, blockNumber?: 'latest' | number) => Promise<string>;
+export declare const getCbETHApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
+export declare const getREthApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getDsrApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
 export declare const getSsrApy: () => Promise<string>;
 export declare const STAKING_ASSETS: string[];
-export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<any> | "0" | undefined;
+export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => "0" | Promise<any> | undefined;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
 export declare const calculateNetApy: (usedAssets: MMUsedAssets, assetsData: MMAssetsData, isMorpho?: boolean) => {
     netApy: string;

package/esm/staking/staking.js

@@ -12,7 +12,8 @@ import { CbEthContract, LidoContract, PotContract, REthContract, wstETHContract,
 import { NetworkNumber } from '../types/common';
 import { BLOCKS_IN_A_YEAR, SECONDS_PER_YEAR, AVG_BLOCK_TIME } from '../constants';
 import { multicall } from '../multicall';
-export const getStETHApr = (web3, fromBlock = 17900000, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
+import { aprToApy } from '../moneymarket';
+export const getStETHApy = (web3, fromBlock = 17900000, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const tokenRebasedEvents = yield LidoContract(web3, NetworkNumber.Eth).getPastEvents('TokenRebased', { fromBlock, toBlock: blockNumber });
         tokenRebasedEvents.sort((a, b) => b.blockNumber - a.blockNumber); // sort from highest to lowest block number
@@ -24,16 +25,16 @@ export const getStETHApr = (web3, fromBlock = 17900000, blockNumber = 'latest')
                 .div(event.timeElapsed.toString()).mul(100)
                 .toNumber();
         });
-        return aprs.reduce((a, b) => a + b, 0) / aprs.length;
+        return aprToApy(aprs.reduce((a, b) => a + b, 0) / aprs.length);
     }
     catch (e) {
         console.warn('Failed to fetch stETH APY from events, falling back to Lido API');
         const res = yield fetch('https://eth-api.lido.fi/v1/protocol/steth/apr/sma');
         const data = yield res.json();
-        return data.data.smaApr;
+        return aprToApy(data.data.smaApr);
     }
 });
-export const getCbETHApr = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
+export const getCbETHApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     let currentBlock = blockNumber;
     if (blockNumber === 'latest')
         currentBlock = yield web3.eth.getBlockNumber();
@@ -48,9 +49,9 @@ export const getCbETHApr = (web3, blockNumber = 'latest') => __awaiter(void 0, v
         .mul(BLOCKS_IN_A_YEAR / blockDiff)
         .mul(100)
         .toString();
-    return apr;
+    return aprToApy(apr);
 });
-export const getREthApr = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
+export const getREthApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     let currentBlock = blockNumber;
     if (blockNumber === 'latest')
         currentBlock = yield web3.eth.getBlockNumber();
@@ -65,7 +66,7 @@ export const getREthApr = (web3, blockNumber = 'latest') => __awaiter(void 0, vo
         .mul(BLOCKS_IN_A_YEAR / blockDiff)
         .mul(100)
         .toString();
-    return apr;
+    return aprToApy(apr);
 });
 export const getDsrApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     const potContract = PotContract(web3, NetworkNumber.Eth);
@@ -82,7 +83,6 @@ export const getSsrApy = () => __awaiter(void 0, void 0, void 0, function* () {
     return new Dec(data.data.skyData[0].sky_savings_rate_apy).mul(100).toString();
 });
 const getSuperOETHApy = () => __awaiter(void 0, void 0, void 0, function* () {
-    console.log('getSuperOETHApy');
     const res = yield fetch('https://origin.squids.live/origin-squid/graphql', {
         method: 'POST',
         headers: {
@@ -102,18 +102,21 @@ const getSuperOETHApy = () => __awaiter(void 0, void 0, void 0, function* () {
 const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function* () {
     const res = yield fetch(`https://app.defisaver.com/api/staking/apy?asset=${asset}`);
     const data = yield res.json();
+    // if our server returns apr, transform it into apy
+    if (['weETH'].includes(asset)) {
+        return aprToApy(data.apy);
+    }
     return data.apy;
 });
 export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS'];
 export const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
-    console.log('getStakingApy', asset, blockNumber, fromBlock);
     try {
         if (asset === 'stETH' || asset === 'wstETH')
-            return getStETHApr(web3, fromBlock, blockNumber);
+            return getStETHApy(web3, fromBlock, blockNumber);
         if (asset === 'cbETH')
-            return getCbETHApr(web3, blockNumber);
+            return getCbETHApy(web3, blockNumber);
         if (asset === 'rETH')
-            return getREthApr(web3, blockNumber);
+            return getREthApy(web3, blockNumber);
         if (asset === 'sDAI')
             return getDsrApy(web3);
         if (asset === 'sUSDe')

package/esm/types/aave.d.ts

@@ -73,6 +73,10 @@ export interface AaveV2AssetData extends AaveAssetData {
 }
 export interface MorphoAaveV2AssetData extends AaveV2AssetData {
 }
+export interface IncentiveData {
+    token: string;
+    apy: string;
+}
 export interface AaveV3AssetData extends AaveAssetData {
     isIsolated: boolean;
     isSiloed: boolean;
@@ -88,6 +92,8 @@ export interface AaveV3AssetData extends AaveAssetData {
     isPaused: boolean;
     isFlashLoanEnabled: boolean;
     assetId: string | null;
+    supplyIncentives?: IncentiveData[];
+    borrowIncentives?: IncentiveData[];
 }
 export type EModeCategoriesData = Record<number, EModeCategoryData>;
 export interface MorphoAaveV3AssetData extends Omit<AaveV3AssetData, 'nativeAsset' | 'discountData' | 'borrowRateDiscounted'> {

package/esm/types/spark.d.ts

@@ -1,4 +1,5 @@
 import { MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
+import { IncentiveData } from './aave';
 export declare enum SparkVersions {
     SparkV1 = "v1default"
 }
@@ -47,6 +48,8 @@ export interface SparkAssetData extends MMAssetData {
     eModeCategory: number;
     eModeCategoryData: SparkEModeCategoryData;
     liquidationRatio: string;
+    supplyIncentives?: IncentiveData[];
+    borrowIncentives?: IncentiveData[];
 }
 export interface SparkAssetsData {
     [token: string]: SparkAssetData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.166",
+  "version": "0.0.168",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV2/index.ts

@@ -4,7 +4,7 @@ import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
 import {
   Blockish, EthAddress, NetworkNumber, PositionBalances,
 } from '../types/common';
-import { calculateNetApy, getStETHApr } from '../staking';
+import { calculateNetApy, getStETHApy } from '../staking';
 import { ethToWeth, wethToEth, wethToEthByAddress } from '../services/utils';
 import { AaveLoanInfoV2Contract, createContractWrapper } from '../contracts';
 import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
@@ -60,7 +60,7 @@ export const getAaveV2MarketsData = async (web3: Web3, network: NetworkNumber, s
 
   const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
   if (stEthMarket) {
-    stEthMarket.incentiveSupplyApy = await getStETHApr(mainnetWeb3);
+    stEthMarket.incentiveSupplyApy = await getStETHApy(mainnetWeb3);
     stEthMarket.incentiveSupplyToken = 'stETH';
   }
 

package/src/aaveV3/index.ts

@@ -276,6 +276,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
     }));
 
 
+  // Get incentives data
   await Promise.all(assetsData.map(async (_market: AaveV3AssetData) => {
     /* eslint-disable no-param-reassign */
     const rewardForMarket: IUiIncentiveDataProviderV3.AggregatedReserveIncentiveDataStructOutput | undefined = rewardInfo?.[_market.underlyingTokenAddress as any];
@@ -283,48 +284,81 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
     if (isStakingAsset) {
       _market.incentiveSupplyApy = await getStakingApy(_market.symbol, defaultWeb3);
       _market.incentiveSupplyToken = _market.symbol;
+      if (!_market.supplyIncentives) {
+        _market.supplyIncentives = [];
+      }
+      _market.supplyIncentives.push({
+        apy: _market.incentiveSupplyApy || '0',
+        token: _market.symbol,
+      });
     }
 
     if (_market.canBeBorrowed && _market.incentiveSupplyApy) {
-      _market.incentiveBorrowApy = `-${_market.incentiveSupplyApy}`;
+      _market.incentiveBorrowApy = _market.incentiveSupplyApy;
       _market.incentiveBorrowToken = _market.incentiveSupplyToken;
+      if (!_market.borrowIncentives) {
+        _market.borrowIncentives = [];
+      }
+      _market.borrowIncentives.push({
+        apy: _market.incentiveBorrowApy,
+        token: _market.incentiveBorrowToken!!,
+      });
     }
 
     if (!rewardForMarket) return;
-    const supplyRewardData = rewardForMarket.aIncentiveData.rewardsTokenInformation[0];
-    if (supplyRewardData) {
-      if (isStakingAsset && _market.incentiveSupplyToken !== supplyRewardData.rewardTokenSymbol) return;
-      if (+supplyRewardData.emissionEndTimestamp * 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 Dec(supplyRewardData.rewardPriceFeed).div(10 ** +supplyRewardData.priceFeedDecimals).toString();
-      const rewardApy = new Dec(supplyEmissionPerSecond).div((10 ** +supplyRewardData.rewardTokenDecimals) / 100)
-        .mul(365 * 24 * 3600)
-        .mul(supplyRewardPrice)
-        .div(_market.price)
-        .div(_market.totalSupply)
-        .toString();
-      _market.incentiveSupplyApy = new Dec(_market.incentiveSupplyApy || '0').add(rewardApy).toString();
-    }
-    const borrowRewardData = rewardForMarket.vIncentiveData.rewardsTokenInformation[0];
-    if (borrowRewardData) {
-      if (isStakingAsset && _market.incentiveSupplyToken !== borrowRewardData.rewardTokenSymbol) return;
-      if (+borrowRewardData.emissionEndTimestamp * 1000 < Date.now()) return;
-      _market.incentiveBorrowToken = borrowRewardData.rewardTokenSymbol;
-      if (supplyRewardData.rewardTokenSymbol.startsWith('a') && supplyRewardData.rewardTokenSymbol.includes(_market.symbol)) _market.incentiveBorrowToken = _market.symbol;
-      const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
-      const supplyRewardPrice = new Dec(borrowRewardData.rewardPriceFeed).div(10 ** +borrowRewardData.priceFeedDecimals).toString();
-      const rewardApy = new Dec(supplyEmissionPerSecond).div((10 ** +borrowRewardData.rewardTokenDecimals) / 100)
-        .mul(365 * 24 * 3600)
-        .mul(supplyRewardPrice)
-        .div(_market.price)
-        .div(_market.totalBorrowVar)
-        .toString();
-      _market.incentiveBorrowApy = new Dec(_market.incentiveSupplyApy || '0').add(rewardApy).toString();
-    }
-    /* eslint-enable no-param-reassign */
+    rewardForMarket.aIncentiveData.rewardsTokenInformation.forEach(supplyRewardData => {
+      if (supplyRewardData) {
+        if (+supplyRewardData.emissionEndTimestamp * 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 Dec(supplyRewardData.rewardPriceFeed).div(10 ** +supplyRewardData.priceFeedDecimals)
+          .toString();
+        const rewardApy = new Dec(supplyEmissionPerSecond).div((10 ** +supplyRewardData.rewardTokenDecimals) / 100)
+          .mul(365 * 24 * 3600)
+          .mul(supplyRewardPrice)
+          .div(_market.price)
+          .div(_market.totalSupply)
+          .toString();
+        _market.incentiveSupplyApy = new Dec(_market.incentiveSupplyApy || '0').add(rewardApy)
+          .toString();
+
+        if (!_market.supplyIncentives) {
+          _market.supplyIncentives = [];
+        }
+        _market.supplyIncentives.push({
+          token: supplyRewardData.rewardTokenSymbol,
+          apy: rewardApy,
+        });
+      }
+    });
+    rewardForMarket.vIncentiveData.rewardsTokenInformation.forEach(borrowRewardData => {
+      if (borrowRewardData) {
+        if (+borrowRewardData.emissionEndTimestamp * 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 Dec(borrowRewardData.rewardPriceFeed).div(10 ** +borrowRewardData.priceFeedDecimals)
+          .toString();
+        const rewardApy = new Dec(supplyEmissionPerSecond).div((10 ** +borrowRewardData.rewardTokenDecimals) / 100)
+          .mul(365 * 24 * 3600)
+          .mul(supplyRewardPrice)
+          .div(_market.price)
+          .div(_market.totalBorrowVar)
+          .toString();
+        _market.incentiveBorrowApy = new Dec(_market.incentiveBorrowApy || '0').add(rewardApy)
+          .toString();
+
+        if (!_market.borrowIncentives) {
+          _market.borrowIncentives = [];
+        }
+        _market.borrowIncentives.push({
+          token: borrowRewardData.rewardTokenSymbol,
+          apy: rewardApy,
+        });
+      }
+    });
   }));
 
   const payload: AaveV3AssetsData = {};

package/src/compoundV2/index.ts

@@ -8,7 +8,7 @@ import {
   Blockish, EthAddress, NetworkNumber, PositionBalances,
 } from '../types/common';
 import { CompoundLoanInfoContract, ComptrollerContract } from '../contracts';
-import { compoundV2CollateralAssets } from '../markets/compound/marketsAssets';
+import { compoundV2CollateralAssets } from '../markets';
 import {
   CompoundV2AssetsData, CompoundV2MarketsData, CompoundV2PositionData, CompoundV2UsedAsset, CompoundV2UsedAssets,
 } from '../types';
@@ -217,4 +217,4 @@ export const getCompoundV2FullPositionData = async (web3: Web3, network: Network
   const marketData = await getCompoundV2MarketsData(web3, network);
   const positionData = await getCompoundV2AccountData(web3, network, address, marketData.assetsData);
   return positionData;
-};
+};

package/src/morphoAaveV2/index.ts

@@ -5,7 +5,7 @@ import { wethToEthByAddress } from '../services/utils';
 import {
   Blockish, EthAddress, NetworkNumber, PositionBalances,
 } from '../types/common';
-import { getStETHApr } from '../staking';
+import { getStETHApy } from '../staking';
 import { MorphoAaveV2ViewContract } from '../contracts';
 import {
   AavePositionData,
@@ -103,7 +103,7 @@ export const getMorphoAaveV2MarketsData = async (web3: Web3, network: NetworkNum
 
   const stEthMarket = assetsData.find(({ symbol }) => symbol === 'stETH');
   if (stEthMarket) {
-    stEthMarket.incentiveSupplyApy = await getStETHApr(mainnetWeb3);
+    stEthMarket.incentiveSupplyApy = await getStETHApy(mainnetWeb3);
     stEthMarket.incentiveSupplyToken = 'stETH';
   }