@defisaver/positions-sdk 0.0.166 → 0.0.168

package/.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Attach by Process ID",
+      "processId": "${command:PickProcess}",
+      "request": "attach",
+      "skipFiles": [
+        "<node_internals>/**"
+      ],
+      "type": "node"
+    }
+  ]
+}

package/.vscode/settings.json

@@ -0,0 +1,22 @@
+{
+  "workbench.colorCustomizations": {
+    "activityBar.activeBackground": "#f2255a",
+    "activityBar.background": "#f2255a",
+    "activityBar.foreground": "#e7e7e7",
+    "activityBar.inactiveForeground": "#e7e7e799",
+    "activityBarBadge.background": "#40d30d",
+    "activityBarBadge.foreground": "#15202b",
+    "commandCenter.border": "#e7e7e799",
+    "sash.hoverBorder": "#f2255a",
+    "statusBar.background": "#d70d41",
+    "statusBar.foreground": "#e7e7e7",
+    "statusBarItem.hoverBackground": "#f2255a",
+    "statusBarItem.remoteBackground": "#d70d41",
+    "statusBarItem.remoteForeground": "#e7e7e7",
+    "titleBar.activeBackground": "#d70d41",
+    "titleBar.activeForeground": "#e7e7e7",
+    "titleBar.inactiveBackground": "#d70d4199",
+    "titleBar.inactiveForeground": "#e7e7e799"
+  },
+  "peacock.color": "#d70d41"
+}

package/cjs/aaveV2/index.js

@@ -66,7 +66,7 @@ const getAaveV2MarketsData = (web3, network, selectedMarket, mainnetWeb3) => __a
     }));
     const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
     if (stEthMarket) {
-        stEthMarket.incentiveSupplyApy = yield (0, staking_1.getStETHApr)(mainnetWeb3);
+        stEthMarket.incentiveSupplyApy = yield (0, staking_1.getStETHApy)(mainnetWeb3);
         stEthMarket.incentiveSupplyToken = 'stETH';
     }
     const payload = {};

package/cjs/aaveV3/index.js

@@ -184,6 +184,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 },
             })), { symbol, isIsolated: new decimal_js_1.default(tokenMarket.debtCeilingForIsolationMode).gt(0), debtCeilingForIsolationMode: new decimal_js_1.default(tokenMarket.debtCeilingForIsolationMode).div(100).toString(), isSiloed: tokenMarket.isSiloedForBorrowing, isolationModeTotalDebt: new decimal_js_1.default(tokenMarket.isolationModeTotalDebt).div(100).toString(), assetId: Number(tokenMarket.assetId), underlyingTokenAddress: tokenMarket.underlyingTokenAddress, supplyRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(tokenMarket.supplyRate.toString()).div(1e25).toString()), borrowRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(tokenMarket.borrowRateVariable.toString()).div(1e25).toString()), borrowRateDiscounted: (0, moneymarket_1.aprToApy)(nativeAsset ? new decimal_js_1.default(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0'), borrowRateStable: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(tokenMarket.borrowRateStable.toString()).div(1e25).toString()), collateralFactor: new decimal_js_1.default(tokenMarket.collateralFactor.toString()).div(10000).toString(), liquidationRatio: new decimal_js_1.default(tokenMarket.liquidationRatio.toString()).div(10000).toString(), marketLiquidity, utilization: new decimal_js_1.default(tokenMarket.totalBorrow.toString()).times(100).div(new decimal_js_1.default(tokenMarket.totalSupply.toString())).toString(), usageAsCollateralEnabled: tokenMarket.usageAsCollateralEnabled, supplyCap: tokenMarket.supplyCap, borrowCap, totalSupply: (0, tokens_1.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: (0, tokens_1.assetAmountInEth)(tokenMarket.totalBorrow.toString(), symbol), totalBorrowVar: (0, tokens_1.assetAmountInEth)(tokenMarket.totalBorrowVar.toString(), symbol), price: new decimal_js_1.default(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];
@@ -191,53 +192,82 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
             if (isStakingAsset) {
                 _market.incentiveSupplyApy = yield (0, staking_1.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 decimal_js_1.default(supplyRewardData.rewardPriceFeed).div(Math.pow(10, +supplyRewardData.priceFeedDecimals)).toString();
-                const rewardApy = new decimal_js_1.default(supplyEmissionPerSecond).div((Math.pow(10, +supplyRewardData.rewardTokenDecimals)) / 100)
-                    .mul(365 * 24 * 3600)
-                    .mul(supplyRewardPrice)
-                    .div(_market.price)
-                    .div(_market.totalSupply)
-                    .toString();
-                _market.incentiveSupplyApy = new decimal_js_1.default(_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 decimal_js_1.default(borrowRewardData.rewardPriceFeed).div(Math.pow(10, +borrowRewardData.priceFeedDecimals)).toString();
-                const rewardApy = new decimal_js_1.default(supplyEmissionPerSecond).div((Math.pow(10, +borrowRewardData.rewardTokenDecimals)) / 100)
-                    .mul(365 * 24 * 3600)
-                    .mul(supplyRewardPrice)
-                    .div(_market.price)
-                    .div(_market.totalBorrowVar)
-                    .toString();
-                _market.incentiveBorrowApy = new decimal_js_1.default(_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 decimal_js_1.default(supplyRewardData.rewardPriceFeed).div(Math.pow(10, +supplyRewardData.priceFeedDecimals))
+                        .toString();
+                    const rewardApy = new decimal_js_1.default(supplyEmissionPerSecond).div((Math.pow(10, +supplyRewardData.rewardTokenDecimals)) / 100)
+                        .mul(365 * 24 * 3600)
+                        .mul(supplyRewardPrice)
+                        .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,
+                        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 decimal_js_1.default(borrowRewardData.rewardPriceFeed).div(Math.pow(10, +borrowRewardData.priceFeedDecimals))
+                        .toString();
+                    const rewardApy = new decimal_js_1.default(supplyEmissionPerSecond).div((Math.pow(10, +borrowRewardData.rewardTokenDecimals)) / 100)
+                        .mul(365 * 24 * 3600)
+                        .mul(supplyRewardPrice)
+                        .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,
+                        apy: rewardApy,
+                    });
+                }
+            });
         })));
         const payload = {};
         // Sort by market size

package/cjs/compoundV2/index.js

@@ -19,11 +19,11 @@ const constants_1 = require("../constants");
 const moneymarket_1 = require("../moneymarket");
 const utils_1 = require("../services/utils");
 const contracts_1 = require("../contracts");
-const marketsAssets_1 = require("../markets/compound/marketsAssets");
+const markets_1 = require("../markets");
 const compoundHelpers_1 = require("../helpers/compoundHelpers");
 const compAddress = '0xc00e94cb662c3520282e6f5717214004a7f26888';
 const getCompoundV2MarketsData = (web3, network) => __awaiter(void 0, void 0, void 0, function* () {
-    const cAddresses = marketsAssets_1.compoundV2CollateralAssets.map(a => a.address);
+    const cAddresses = markets_1.compoundV2CollateralAssets.map(a => a.address);
     const loanInfoContract = (0, contracts_1.CompoundLoanInfoContract)(web3, network);
     const loanInfo = yield loanInfoContract.methods.getFullTokensInfo(cAddresses).call();
     const compPrice = loanInfo.find(m => (0, utils_1.compareAddresses)(m.underlyingTokenAddress, compAddress)).price.toString();
@@ -135,15 +135,15 @@ const getCompoundV2AccountData = (web3, network, address, assetsData) => __await
         throw new Error('No address provided');
     let payload = Object.assign(Object.assign({}, exports.EMPTY_COMPOUND_DATA), { lastUpdated: Date.now() });
     const loanInfoContract = (0, contracts_1.CompoundLoanInfoContract)(web3, network);
-    const loanInfo = yield loanInfoContract.methods.getTokenBalances(address, marketsAssets_1.compoundV2CollateralAssets.map(a => a.address)).call();
+    const loanInfo = yield loanInfoContract.methods.getTokenBalances(address, markets_1.compoundV2CollateralAssets.map(a => a.address)).call();
     const collateralAssetsAddresses = yield (0, exports.getCollateralAssetsAddresses)(web3, network, address);
     const usedAssets = {};
     loanInfo.balances.forEach((weiAmount, i) => {
-        const asset = marketsAssets_1.compoundV2CollateralAssets[i].symbol === 'cWBTC Legacy'
-            ? `${marketsAssets_1.compoundV2CollateralAssets[i].underlyingAsset} Legacy`
-            : marketsAssets_1.compoundV2CollateralAssets[i].underlyingAsset;
+        const asset = markets_1.compoundV2CollateralAssets[i].symbol === 'cWBTC Legacy'
+            ? `${markets_1.compoundV2CollateralAssets[i].underlyingAsset} Legacy`
+            : markets_1.compoundV2CollateralAssets[i].underlyingAsset;
         const amount = (0, tokens_1.assetAmountInEth)(weiAmount.toString(), asset);
-        const collateral = !!collateralAssetsAddresses.find(a => (0, utils_1.compareAddresses)(a, marketsAssets_1.compoundV2CollateralAssets[i].address));
+        const collateral = !!collateralAssetsAddresses.find(a => (0, utils_1.compareAddresses)(a, markets_1.compoundV2CollateralAssets[i].address));
         if (weiAmount.toString() === '0' && !collateral)
             return;
         if (!usedAssets[asset])
@@ -153,9 +153,9 @@ const getCompoundV2AccountData = (web3, network, address, assetsData) => __await
     loanInfo.borrows.forEach((weiAmount, i) => {
         if (weiAmount.toString() === '0')
             return;
-        const asset = marketsAssets_1.compoundV2CollateralAssets[i].symbol === 'cWBTC Legacy'
-            ? `${marketsAssets_1.compoundV2CollateralAssets[i].underlyingAsset} Legacy`
-            : marketsAssets_1.compoundV2CollateralAssets[i].underlyingAsset;
+        const asset = markets_1.compoundV2CollateralAssets[i].symbol === 'cWBTC Legacy'
+            ? `${markets_1.compoundV2CollateralAssets[i].underlyingAsset} Legacy`
+            : markets_1.compoundV2CollateralAssets[i].underlyingAsset;
         const amount = (0, tokens_1.assetAmountInEth)(weiAmount.toString(), asset);
         if (!usedAssets[asset])
             usedAssets[asset] = {};

package/cjs/morphoAaveV2/index.js

@@ -93,7 +93,7 @@ const getMorphoAaveV2MarketsData = (web3, network, mainnetWeb3) => __awaiter(voi
     });
     const stEthMarket = assetsData.find(({ symbol }) => symbol === 'stETH');
     if (stEthMarket) {
-        stEthMarket.incentiveSupplyApy = yield (0, staking_1.getStETHApr)(mainnetWeb3);
+        stEthMarket.incentiveSupplyApy = yield (0, staking_1.getStETHApy)(mainnetWeb3);
         stEthMarket.incentiveSupplyToken = 'stETH';
     }
     const payload = {};

package/cjs/spark/index.js

@@ -129,45 +129,79 @@ const getSparkMarketsData = (web3, network, selectedMarket, mainnetWeb3) => __aw
         if (staking_1.STAKING_ASSETS.includes(market.symbol)) {
             market.incentiveSupplyApy = yield (0, staking_1.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 (0, dsrService_1.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 decimal_js_1.default(supplyRewardData.rewardPriceFeed).div(Math.pow(10, supplyRewardData.priceFeedDecimals)).toString();
-            market.incentiveSupplyApy = new decimal_js_1.default(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 decimal_js_1.default(borrowRewardData.rewardPriceFeed).div(Math.pow(10, borrowRewardData.priceFeedDecimals)).toString();
-            market.incentiveBorrowApy = new decimal_js_1.default(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 decimal_js_1.default(supplyRewardData.rewardPriceFeed).div(Math.pow(10, supplyRewardData.priceFeedDecimals))
+                    .toString();
+                const rewardApy = new decimal_js_1.default(supplyEmissionPerSecond).div((Math.pow(10, supplyRewardData.rewardTokenDecimals)) / 100)
+                    .mul(365 * 24 * 3600)
+                    .mul(supplyRewardPrice)
+                    .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,
+                    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 decimal_js_1.default(borrowRewardData.rewardPriceFeed).div(Math.pow(10, borrowRewardData.priceFeedDecimals))
+                    .toString();
+                const rewardApy = new decimal_js_1.default(supplyEmissionPerSecond).div((Math.pow(10, borrowRewardData.rewardTokenDecimals)) / 100)
+                    .mul(365 * 24 * 3600)
+                    .mul(supplyRewardPrice)
+                    .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,
+                    apy: rewardApy,
+                });
+            }
+        });
         /* eslint-enable no-param-reassign */
     })));
     const payload = {};

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

@@ -12,13 +12,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.STAKING_ASSETS = exports.getSsrApy = exports.getDsrApy = exports.getREthApr = exports.getCbETHApr = exports.getStETHApr = void 0;
+exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.STAKING_ASSETS = exports.getSsrApy = exports.getDsrApy = exports.getREthApy = exports.getCbETHApy = exports.getStETHApy = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const contracts_1 = require("../contracts");
 const common_1 = require("../types/common");
 const constants_1 = require("../constants");
 const multicall_1 = require("../multicall");
-const getStETHApr = (web3, fromBlock = 17900000, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
+const moneymarket_1 = require("../moneymarket");
+const getStETHApy = (web3, fromBlock = 17900000, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const tokenRebasedEvents = yield (0, contracts_1.LidoContract)(web3, common_1.NetworkNumber.Eth).getPastEvents('TokenRebased', { fromBlock, toBlock: blockNumber });
         tokenRebasedEvents.sort((a, b) => b.blockNumber - a.blockNumber); // sort from highest to lowest block number
@@ -30,17 +31,17 @@ const getStETHApr = (web3, fromBlock = 17900000, blockNumber = 'latest') => __aw
                 .div(event.timeElapsed.toString()).mul(100)
                 .toNumber();
         });
-        return aprs.reduce((a, b) => a + b, 0) / aprs.length;
+        return (0, moneymarket_1.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 (0, moneymarket_1.aprToApy)(data.data.smaApr);
     }
 });
-exports.getStETHApr = getStETHApr;
-const getCbETHApr = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
+exports.getStETHApy = getStETHApy;
+const getCbETHApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     let currentBlock = blockNumber;
     if (blockNumber === 'latest')
         currentBlock = yield web3.eth.getBlockNumber();
@@ -55,10 +56,10 @@ const getCbETHApr = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0,
         .mul(constants_1.BLOCKS_IN_A_YEAR / blockDiff)
         .mul(100)
         .toString();
-    return apr;
+    return (0, moneymarket_1.aprToApy)(apr);
 });
-exports.getCbETHApr = getCbETHApr;
-const getREthApr = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
+exports.getCbETHApy = getCbETHApy;
+const getREthApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     let currentBlock = blockNumber;
     if (blockNumber === 'latest')
         currentBlock = yield web3.eth.getBlockNumber();
@@ -73,9 +74,9 @@ const getREthApr = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, v
         .mul(constants_1.BLOCKS_IN_A_YEAR / blockDiff)
         .mul(100)
         .toString();
-    return apr;
+    return (0, moneymarket_1.aprToApy)(apr);
 });
-exports.getREthApr = getREthApr;
+exports.getREthApy = getREthApy;
 const getDsrApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     const potContract = (0, contracts_1.PotContract)(web3, common_1.NetworkNumber.Eth);
     return new decimal_js_1.default(yield potContract.methods.dsr().call())
@@ -93,7 +94,6 @@ const getSsrApy = () => __awaiter(void 0, void 0, void 0, function* () {
 });
 exports.getSsrApy = getSsrApy;
 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: {
@@ -113,18 +113,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 (0, moneymarket_1.aprToApy)(data.apy);
+    }
     return data.apy;
 });
 exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS'];
 const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
-    console.log('getStakingApy', asset, blockNumber, fromBlock);
     try {
         if (asset === 'stETH' || asset === 'wstETH')
-            return (0, exports.getStETHApr)(web3, fromBlock, blockNumber);
+            return (0, exports.getStETHApy)(web3, fromBlock, blockNumber);
         if (asset === 'cbETH')
-            return (0, exports.getCbETHApr)(web3, blockNumber);
+            return (0, exports.getCbETHApy)(web3, blockNumber);
         if (asset === 'rETH')
-            return (0, exports.getREthApr)(web3, blockNumber);
+            return (0, exports.getREthApy)(web3, blockNumber);
         if (asset === 'sDAI')
             return (0, exports.getDsrApy)(web3);
         if (asset === 'sUSDe')

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
-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 = (web3, network, selectedMarket, mainnetWeb3)
     }));
     const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
     if (stEthMarket) {
-        stEthMarket.incentiveSupplyApy = yield getStETHApr(mainnetWeb3);
+        stEthMarket.incentiveSupplyApy = yield getStETHApy(mainnetWeb3);
         stEthMarket.incentiveSupplyToken = 'stETH';
     }
     const payload = {};