@defisaver/positions-sdk 0.0.88 → 0.0.89

package/cjs/compoundV3/index.js

@@ -58,18 +58,10 @@ const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultWeb3) =>
             coll.priceAlternative = (0, tokens_1.assetAmountInEth)(priceAlternative, 'wstETH');
             // const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
             // eslint-disable-next-line no-await-in-loop
-            coll.incentiveSupplyApy = yield (0, staking_1.getStETHApr)(defaultWeb3);
-            coll.incentiveSupplyToken = 'wstETH';
         }
-        if (coll.symbol === 'cbETH') {
-            // eslint-disable-next-line no-await-in-loop
-            coll.incentiveSupplyApy = yield (0, staking_1.getCbETHApr)(defaultWeb3);
-            coll.incentiveSupplyToken = 'cbETH';
-        }
-        if (coll.symbol === 'rETH') {
-            // eslint-disable-next-line no-await-in-loop
-            coll.incentiveSupplyApy = yield (0, staking_1.getREthApr)(defaultWeb3);
-            coll.incentiveSupplyToken = 'rETH';
+        if (staking_1.STAKING_ASSETS.includes(coll.symbol)) {
+            coll.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(coll.symbol, defaultWeb3);
+            coll.incentiveSupplyToken = coll.symbol;
         }
     }
     const base = (0, compoundHelpers_1.formatBaseData)(data[0].baseToken, network, baseAssetPrice);

package/cjs/morphoAaveV3/index.js

@@ -216,17 +216,9 @@ const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainnetWeb3)
             isolationModeBorrowingEnabled: false,
             isFlashLoanEnabled: false,
         };
-        if (symbol === 'wstETH') {
-            data.incentiveSupplyApy = yield (0, staking_1.getStETHApr)(mainnetWeb3);
-            data.incentiveSupplyToken = symbol;
-        }
-        if (symbol === 'cbETH' && !(0, utils_1.isLayer2Network)(network)) {
-            data.incentiveSupplyApy = yield (0, staking_1.getCbETHApr)(mainnetWeb3);
-            data.incentiveSupplyToken = symbol;
-        }
-        if (symbol === 'rETH') {
-            data.incentiveSupplyApy = yield (0, staking_1.getREthApr)(mainnetWeb3);
-            data.incentiveSupplyToken = symbol;
+        if (staking_1.STAKING_ASSETS.includes(data.symbol)) {
+            data.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(data.symbol, mainnetWeb3);
+            data.incentiveSupplyToken = data.symbol;
         }
         if (data.symbol === 'sDAI') {
             data.incentiveSupplyApy = yield (0, dsrService_1.getDsrApy)(web3, network);

package/cjs/spark/index.js

@@ -126,17 +126,9 @@ const getSparkMarketsData = (web3, network, selectedMarket, mainnetWeb3) => __aw
     yield Promise.all(assetsData.map((market) => __awaiter(void 0, void 0, void 0, function* () {
         /* eslint-disable no-param-reassign */
         const rewardForMarket = rewardInfo[market.underlyingTokenAddress];
-        if (market.symbol === 'wstETH') {
-            market.incentiveSupplyApy = yield (0, staking_1.getStETHApr)(mainnetWeb3);
-            market.incentiveSupplyToken = 'wstETH';
-        }
-        if (market.symbol === 'cbETH' && !(0, utils_1.isLayer2Network)(network)) {
-            market.incentiveSupplyApy = yield (0, staking_1.getCbETHApr)(mainnetWeb3);
-            market.incentiveSupplyToken = 'cbETH';
-        }
-        if (market.symbol === 'rETH') {
-            market.incentiveSupplyApy = yield (0, staking_1.getREthApr)(mainnetWeb3);
-            market.incentiveSupplyToken = 'rETH';
+        if (staking_1.STAKING_ASSETS.includes(market.symbol)) {
+            market.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(market.symbol, mainnetWeb3);
+            market.incentiveSupplyToken = market.symbol;
         }
         if (market.symbol === 'sDAI') {
             market.incentiveSupplyApy = yield (0, dsrService_1.getDsrApy)(web3, network);

package/esm/compoundV3/index.js

@@ -11,7 +11,7 @@ import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo, getAssetInfoByAddress, } from '@defisaver/tokens';
 import { CompV3ViewContract } from '../contracts';
 import { multicall } from '../multicall';
-import { getCbETHApr, getREthApr, getStETHApr, getStETHByWstETHMultiple, getWstETHByStETH, } from '../staking';
+import { getStakingApy, getStETHByWstETHMultiple, getWstETHByStETH, STAKING_ASSETS, } from '../staking';
 import { wethToEth } from '../services/utils';
 import { ZERO_ADDRESS } from '../constants';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
@@ -52,18 +52,10 @@ export const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultW
             coll.priceAlternative = assetAmountInEth(priceAlternative, 'wstETH');
             // const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
             // eslint-disable-next-line no-await-in-loop
-            coll.incentiveSupplyApy = yield getStETHApr(defaultWeb3);
-            coll.incentiveSupplyToken = 'wstETH';
         }
-        if (coll.symbol === 'cbETH') {
-            // eslint-disable-next-line no-await-in-loop
-            coll.incentiveSupplyApy = yield getCbETHApr(defaultWeb3);
-            coll.incentiveSupplyToken = 'cbETH';
-        }
-        if (coll.symbol === 'rETH') {
-            // eslint-disable-next-line no-await-in-loop
-            coll.incentiveSupplyApy = yield getREthApr(defaultWeb3);
-            coll.incentiveSupplyToken = 'rETH';
+        if (STAKING_ASSETS.includes(coll.symbol)) {
+            coll.incentiveSupplyApy = yield getStakingApy(coll.symbol, defaultWeb3);
+            coll.incentiveSupplyToken = coll.symbol;
         }
     }
     const base = formatBaseData(data[0].baseToken, network, baseAssetPrice);

package/esm/morphoAaveV3/index.js

@@ -13,10 +13,10 @@ import PoolInterestRates from '@morpho-org/morpho-aave-v3-sdk/lib/maths/PoolInte
 import P2PInterestRates from '@morpho-org/morpho-aave-v3-sdk/lib/maths/P2PInterestRates';
 import { BigNumber } from '@ethersproject/bignumber';
 import Dec from 'decimal.js';
-import { ethToWeth, ethToWethByAddress, getAbiItem, isLayer2Network, wethToEthByAddress, } from '../services/utils';
+import { ethToWeth, ethToWethByAddress, getAbiItem, wethToEthByAddress, } from '../services/utils';
 import { createContractWrapper, getConfigContractAbi, getConfigContractAddress, } from '../contracts';
 import { multicall } from '../multicall';
-import { getCbETHApr, getREthApr, getStETHApr } from '../staking';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { getDsrApy } from '../services/dsrService';
 import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import { EMPTY_AAVE_DATA } from '../aaveV3';
@@ -210,17 +210,9 @@ export const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainne
             isolationModeBorrowingEnabled: false,
             isFlashLoanEnabled: false,
         };
-        if (symbol === 'wstETH') {
-            data.incentiveSupplyApy = yield getStETHApr(mainnetWeb3);
-            data.incentiveSupplyToken = symbol;
-        }
-        if (symbol === 'cbETH' && !isLayer2Network(network)) {
-            data.incentiveSupplyApy = yield getCbETHApr(mainnetWeb3);
-            data.incentiveSupplyToken = symbol;
-        }
-        if (symbol === 'rETH') {
-            data.incentiveSupplyApy = yield getREthApr(mainnetWeb3);
-            data.incentiveSupplyToken = symbol;
+        if (STAKING_ASSETS.includes(data.symbol)) {
+            data.incentiveSupplyApy = yield getStakingApy(data.symbol, mainnetWeb3);
+            data.incentiveSupplyToken = data.symbol;
         }
         if (data.symbol === 'sDAI') {
             data.incentiveSupplyApy = yield getDsrApy(web3, network);

package/esm/spark/index.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
-import { ethToWeth, getAbiItem, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
-import { calculateNetApy, getCbETHApr, getREthApr, getStETHApr, } from '../staking';
+import { ethToWeth, getAbiItem, wethToEth, wethToEthByAddress, } from '../services/utils';
+import { calculateNetApy, getStakingApy, STAKING_ASSETS, } from '../staking';
 import { getDsrApy } from '../services/dsrService';
 import { SparkIncentiveDataProviderContract, SparkViewContract, getConfigContractAbi, createContractWrapper, } from '../contracts';
 import { multicall } from '../multicall';
@@ -119,17 +119,9 @@ export const getSparkMarketsData = (web3, network, selectedMarket, mainnetWeb3)
     yield Promise.all(assetsData.map((market) => __awaiter(void 0, void 0, void 0, function* () {
         /* eslint-disable no-param-reassign */
         const rewardForMarket = rewardInfo[market.underlyingTokenAddress];
-        if (market.symbol === 'wstETH') {
-            market.incentiveSupplyApy = yield getStETHApr(mainnetWeb3);
-            market.incentiveSupplyToken = 'wstETH';
-        }
-        if (market.symbol === 'cbETH' && !isLayer2Network(network)) {
-            market.incentiveSupplyApy = yield getCbETHApr(mainnetWeb3);
-            market.incentiveSupplyToken = 'cbETH';
-        }
-        if (market.symbol === 'rETH') {
-            market.incentiveSupplyApy = yield getREthApr(mainnetWeb3);
-            market.incentiveSupplyToken = 'rETH';
+        if (STAKING_ASSETS.includes(market.symbol)) {
+            market.incentiveSupplyApy = yield getStakingApy(market.symbol, mainnetWeb3);
+            market.incentiveSupplyToken = market.symbol;
         }
         if (market.symbol === 'sDAI') {
             market.incentiveSupplyApy = yield getDsrApy(web3, network);

package/package.json

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

package/src/compoundV3/index.ts

@@ -12,7 +12,7 @@ import {
   Blockish, EthAddress, NetworkNumber, PositionBalances,
 } from '../types/common';
 import {
-  getCbETHApr, getREthApr, getStETHApr, getStETHByWstETHMultiple, getWstETHByStETH,
+  getStakingApy, getStETHByWstETHMultiple, getWstETHByStETH, STAKING_ASSETS,
 } from '../staking';
 import { wethToEth } from '../services/utils';
 import { ZERO_ADDRESS } from '../constants';
@@ -57,18 +57,10 @@ export const getCompoundV3MarketsData = async (web3: Web3, network: NetworkNumbe
       coll.priceAlternative = assetAmountInEth(priceAlternative, 'wstETH');
       // const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
       // eslint-disable-next-line no-await-in-loop
-      coll.incentiveSupplyApy = await getStETHApr(defaultWeb3);
-      coll.incentiveSupplyToken = 'wstETH';
     }
-    if (coll.symbol === 'cbETH') {
-      // eslint-disable-next-line no-await-in-loop
-      coll.incentiveSupplyApy = await getCbETHApr(defaultWeb3);
-      coll.incentiveSupplyToken = 'cbETH';
-    }
-    if (coll.symbol === 'rETH') {
-      // eslint-disable-next-line no-await-in-loop
-      coll.incentiveSupplyApy = await getREthApr(defaultWeb3);
-      coll.incentiveSupplyToken = 'rETH';
+    if (STAKING_ASSETS.includes(coll.symbol)) {
+      coll.incentiveSupplyApy = await getStakingApy(coll.symbol, defaultWeb3);
+      coll.incentiveSupplyToken = coll.symbol;
     }
   }
   const base = formatBaseData(data[0].baseToken, network, baseAssetPrice);
@@ -271,4 +263,4 @@ export const getCompoundV3FullPositionData = async (web3: Web3, network: Network
   const marketData = await getCompoundV3MarketsData(web3, network, selectedMarket, mainnetWeb3);
   const positionData = await getCompoundV3AccountData(web3, network, address, proxyAddress, { selectedMarket, assetsData: marketData.assetsData });
   return positionData;
-};
+};

package/src/morphoAaveV3/index.ts

@@ -19,7 +19,7 @@ import {
   getConfigContractAddress,
 } from '../contracts';
 import { multicall } from '../multicall';
-import { getCbETHApr, getREthApr, getStETHApr } from '../staking';
+import { getStakingApy, STAKING_ASSETS} from '../staking';
 import {
   MorphoAaveV3AssetData, MorphoAaveV3AssetsData, MorphoAaveV3MarketData, MorphoAaveV3MarketInfo, MorphoAaveV3PositionData,
 } from '../types';
@@ -304,17 +304,9 @@ export const getMorphoAaveV3MarketsData = async (web3: Web3, network: NetworkNum
       isFlashLoanEnabled: false,
     };
 
-    if (symbol === 'wstETH') {
-      data.incentiveSupplyApy = await getStETHApr(mainnetWeb3);
-      data.incentiveSupplyToken = symbol;
-    }
-    if (symbol === 'cbETH' && !isLayer2Network(network)) {
-      data.incentiveSupplyApy = await getCbETHApr(mainnetWeb3);
-      data.incentiveSupplyToken = symbol;
-    }
-    if (symbol === 'rETH') {
-      data.incentiveSupplyApy = await getREthApr(mainnetWeb3);
-      data.incentiveSupplyToken = symbol;
+    if (STAKING_ASSETS.includes(data.symbol)) {
+      data.incentiveSupplyApy = await getStakingApy(data.symbol, mainnetWeb3);
+      data.incentiveSupplyToken = data.symbol;
     }
     if (data.symbol === 'sDAI') {
       data.incentiveSupplyApy = await getDsrApy(web3, network);

package/src/spark/index.ts

@@ -8,7 +8,7 @@ import {
   ethToWeth, getAbiItem, isLayer2Network, wethToEth, wethToEthByAddress,
 } from '../services/utils';
 import {
-  calculateNetApy, getCbETHApr, getREthApr, getStETHApr,
+  calculateNetApy, getStakingApy, STAKING_ASSETS,
 } from '../staking';
 import { getDsrApy } from '../services/dsrService';
 import {
@@ -148,19 +148,9 @@ export const getSparkMarketsData = async (web3: Web3, network: NetworkNumber, se
   await Promise.all(assetsData.map(async (market) => {
     /* eslint-disable no-param-reassign */
     const rewardForMarket = (rewardInfo as any)[market.underlyingTokenAddress];
-    if (market.symbol === 'wstETH') {
-      market.incentiveSupplyApy = await getStETHApr(mainnetWeb3);
-      market.incentiveSupplyToken = 'wstETH';
-    }
-
-    if (market.symbol === 'cbETH' && !isLayer2Network(network)) {
-      market.incentiveSupplyApy = await getCbETHApr(mainnetWeb3);
-      market.incentiveSupplyToken = 'cbETH';
-    }
-
-    if (market.symbol === 'rETH') {
-      market.incentiveSupplyApy = await getREthApr(mainnetWeb3);
-      market.incentiveSupplyToken = 'rETH';
+    if (STAKING_ASSETS.includes(market.symbol)) {
+      market.incentiveSupplyApy = await getStakingApy(market.symbol, mainnetWeb3);
+      market.incentiveSupplyToken = market.symbol;
     }
 
     if (market.symbol === 'sDAI') {