@defisaver/positions-sdk 0.0.88 → 0.0.90

package/README.md

@@ -1,63 +1,63 @@
-# 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)
-- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
-- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
-- [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)
-- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
-
-## 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 Web3 from 'web3';
-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 web3 = new Web3(provider);
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    web3, // 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
-    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    web3,
-    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)
+# 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)
+- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
+- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
+- [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)
+- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
+
+## 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 Web3 from 'web3';
+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 web3 = new Web3(provider);
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    web3, // 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
+    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    web3,
+    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)

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/markets/morphoBlue/index.d.ts

@@ -32,7 +32,10 @@ export declare const MORPHO_BLUE_WSTETH_ETH_945_BASE: (networkId?: NetworkNumber
 export declare const MORPHO_BLUE_WSTETH_ETH_965_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSTETH_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBETH_ETH_965_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_CBETH_ETH_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_ETH_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_RETH_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_RETH_ETH_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluewstethusdc: MorphoBlueMarketData;
     readonly morphobluesdaiusdc: MorphoBlueMarketData;
@@ -63,8 +66,11 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphoblueusdedai_945: MorphoBlueMarketData;
     readonly morphobluecbethusdc_860_base: MorphoBlueMarketData;
     readonly morphobluewstethusdc_860_base: MorphoBlueMarketData;
-    readonly morphobluecbetheth_965_base: MorphoBlueMarketData;
     readonly morphoblueethusdc_860_base: MorphoBlueMarketData;
+    readonly morphobluerethusdc_860_base: MorphoBlueMarketData;
+    readonly morphoblueretheth_945_base: MorphoBlueMarketData;
+    readonly morphobluecbetheth_945_base: MorphoBlueMarketData;
+    readonly morphobluecbetheth_965_base: MorphoBlueMarketData;
     readonly morphobluewstetheth_945_base: MorphoBlueMarketData;
     readonly morphobluewstetheth_965_base: MorphoBlueMarketData;
 };

package/cjs/markets/morphoBlue/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.MORPHO_BLUE_ETH_USDC_860_BASE = exports.MORPHO_BLUE_CBETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_USDC_860_BASE = exports.MORPHO_BLUE_WSTETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_USDC_860_BASE = exports.MORPHO_BLUE_USDE_DAI_945 = exports.MORPHO_BLUE_USDE_DAI_915 = exports.MORPHO_BLUE_USDE_DAI_860 = exports.MORPHO_BLUE_USDE_DAI_770 = exports.MORPHO_BLUE_SUSDE_DAI_945 = exports.MORPHO_BLUE_SUSDE_DAI_915 = exports.MORPHO_BLUE_SUSDE_DAI_860 = exports.MORPHO_BLUE_SUSDE_DAI_770 = exports.MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945 = exports.MORPHO_BLUE_MKR_USDC = exports.MORPHO_BLUE_EZETH_ETH = exports.MORPHO_BLUE_SDAI_ETH = exports.MORPHO_BLUE_SUSDE_USDT = exports.MORPHO_BLUE_USDE_USDT = exports.MORPHO_BLUE_WEETH_ETH = exports.MORPHO_BLUE_WSTETH_PYUSD = exports.MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_USDT = exports.MORPHO_BLUE_WBTC_ETH = exports.MORPHO_BLUE_WBTC_PYUSD = exports.MORPHO_BLUE_WBTC_USDT = exports.MORPHO_BLUE_ETH_USDC = exports.MORPHO_BLUE_WBTC_USDC = exports.MORPHO_BLUE_SDAI_USDC = exports.MORPHO_BLUE_WSTETH_USDC = void 0;
+exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.MORPHO_BLUE_RETH_ETH_945_BASE = exports.MORPHO_BLUE_RETH_USDC_860_BASE = exports.MORPHO_BLUE_ETH_USDC_860_BASE = exports.MORPHO_BLUE_CBETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_USDC_860_BASE = exports.MORPHO_BLUE_WSTETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_USDC_860_BASE = exports.MORPHO_BLUE_USDE_DAI_945 = exports.MORPHO_BLUE_USDE_DAI_915 = exports.MORPHO_BLUE_USDE_DAI_860 = exports.MORPHO_BLUE_USDE_DAI_770 = exports.MORPHO_BLUE_SUSDE_DAI_945 = exports.MORPHO_BLUE_SUSDE_DAI_915 = exports.MORPHO_BLUE_SUSDE_DAI_860 = exports.MORPHO_BLUE_SUSDE_DAI_770 = exports.MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945 = exports.MORPHO_BLUE_MKR_USDC = exports.MORPHO_BLUE_EZETH_ETH = exports.MORPHO_BLUE_SDAI_ETH = exports.MORPHO_BLUE_SUSDE_USDT = exports.MORPHO_BLUE_USDE_USDT = exports.MORPHO_BLUE_WEETH_ETH = exports.MORPHO_BLUE_WSTETH_PYUSD = exports.MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_USDT = exports.MORPHO_BLUE_WBTC_ETH = exports.MORPHO_BLUE_WBTC_PYUSD = exports.MORPHO_BLUE_WBTC_USDT = exports.MORPHO_BLUE_ETH_USDC = exports.MORPHO_BLUE_WBTC_USDC = exports.MORPHO_BLUE_SDAI_USDC = exports.MORPHO_BLUE_WSTETH_USDC = void 0;
 const utils_1 = require("../../services/utils");
 const types_1 = require("../../types");
 const common_1 = require("../../types/common");
@@ -520,6 +520,22 @@ const MORPHO_BLUE_CBETH_ETH_965_BASE = (networkId = common_1.NetworkNumber.Eth)
     protocolName: 'morpho-blue',
 });
 exports.MORPHO_BLUE_CBETH_ETH_965_BASE = MORPHO_BLUE_CBETH_ETH_965_BASE;
+const MORPHO_BLUE_CBETH_ETH_945_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [common_1.NetworkNumber.Base],
+    label: 'Morpho Blue',
+    shortLabel: 'cbETH/ETH',
+    value: types_1.MorphoBlueVersions.MorphoBlueCbEthEth_945_Base,
+    url: 'cbetheth-84662b4f',
+    loanToken: '0x4200000000000000000000000000000000000006',
+    collateralToken: '0x2Ae3F1Ec7F1F5012CFEab0185bfc7aa3cf0DEc22',
+    oracle: '0xB03855Ad5AFD6B8db8091DD5551CAC4ed621d9E6',
+    oracleType: types_1.MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.945,
+    marketId: '0x84662b4f95b85d6b082b68d32cf71bb565b3f22f216a65509cc2ede7dccdfe8c',
+    protocolName: 'morpho-blue',
+});
+exports.MORPHO_BLUE_CBETH_ETH_945_BASE = MORPHO_BLUE_CBETH_ETH_945_BASE;
 const MORPHO_BLUE_ETH_USDC_860_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Base],
     label: 'Morpho Blue',
@@ -536,6 +552,38 @@ const MORPHO_BLUE_ETH_USDC_860_BASE = (networkId = common_1.NetworkNumber.Eth) =
     protocolName: 'morpho-blue',
 });
 exports.MORPHO_BLUE_ETH_USDC_860_BASE = MORPHO_BLUE_ETH_USDC_860_BASE;
+const MORPHO_BLUE_RETH_USDC_860_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [common_1.NetworkNumber.Base],
+    label: 'Morpho Blue',
+    shortLabel: 'rETH/USDC',
+    value: types_1.MorphoBlueVersions.MorphoBlueREthUSDC_860_Base,
+    url: 'rethusdc-db0bc9f1',
+    loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+    collateralToken: '0xB6fe221Fe9EeF5aBa221c348bA20A1Bf5e73624c',
+    oracle: '0x7E1136C04372874cca9C3C9a2DbC461E3858b228',
+    oracleType: types_1.MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.86,
+    marketId: '0xdb0bc9f10a174f29a345c5f30a719933f71ccea7a2a75a632a281929bba1b535',
+    protocolName: 'morpho-blue',
+});
+exports.MORPHO_BLUE_RETH_USDC_860_BASE = MORPHO_BLUE_RETH_USDC_860_BASE;
+const MORPHO_BLUE_RETH_ETH_945_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [common_1.NetworkNumber.Base],
+    label: 'Morpho Blue',
+    shortLabel: 'rETH/ETH',
+    value: types_1.MorphoBlueVersions.MorphoBlueREthEth_945_Base,
+    url: 'retheth-dc69cf2c',
+    loanToken: '0x4200000000000000000000000000000000000006',
+    collateralToken: '0xB6fe221Fe9EeF5aBa221c348bA20A1Bf5e73624c',
+    oracle: '0x05f73c9910806EedE92C83DEb3f805b71C6098f2',
+    oracleType: types_1.MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.945,
+    marketId: '0xdc69cf2caae7b7d1783fb5a9576dc875888afad17ab3d1a3fc102f741441c165',
+    protocolName: 'morpho-blue',
+});
+exports.MORPHO_BLUE_RETH_ETH_945_BASE = MORPHO_BLUE_RETH_ETH_945_BASE;
 const MorphoBlueMarkets = (networkId) => ({
     [types_1.MorphoBlueVersions.MorphoBlueWstEthUSDC]: (0, exports.MORPHO_BLUE_WSTETH_USDC)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueSDAIUSDC]: (0, exports.MORPHO_BLUE_SDAI_USDC)(networkId),
@@ -570,8 +618,12 @@ const MorphoBlueMarkets = (networkId) => ({
     // Base
     [types_1.MorphoBlueVersions.MorphoBlueCbEthUSDC_860_Base]: (0, exports.MORPHO_BLUE_CBETH_USDC_860_BASE)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueWstEthUSDC_860_Base]: (0, exports.MORPHO_BLUE_WSTETH_USDC_860_BASE)(networkId),
-    [types_1.MorphoBlueVersions.MorphoBlueCbEthEth_965_Base]: (0, exports.MORPHO_BLUE_CBETH_ETH_965_BASE)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueEthUSDC_860_Base]: (0, exports.MORPHO_BLUE_ETH_USDC_860_BASE)(networkId),
+    [types_1.MorphoBlueVersions.MorphoBlueREthUSDC_860_Base]: (0, exports.MORPHO_BLUE_RETH_USDC_860_BASE)(networkId),
+    [types_1.MorphoBlueVersions.MorphoBlueREthEth_945_Base]: (0, exports.MORPHO_BLUE_RETH_ETH_945_BASE)(networkId),
+    // cbETH/WETH Base
+    [types_1.MorphoBlueVersions.MorphoBlueCbEthEth_945_Base]: (0, exports.MORPHO_BLUE_CBETH_ETH_945_BASE)(networkId),
+    [types_1.MorphoBlueVersions.MorphoBlueCbEthEth_965_Base]: (0, exports.MORPHO_BLUE_CBETH_ETH_965_BASE)(networkId),
     // wstETH/WETH Base
     [types_1.MorphoBlueVersions.MorphoBlueWstEthEth_945_Base]: (0, exports.MORPHO_BLUE_WSTETH_ETH_945_BASE)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueWstEthEth_965_Base]: (0, exports.MORPHO_BLUE_WSTETH_ETH_965_BASE)(networkId),

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/cjs/types/morphoBlue.d.ts

@@ -29,10 +29,13 @@ export declare enum MorphoBlueVersions {
     MorphoBlueUSDeDAI_945 = "morphoblueusdedai_945",
     MorphoBlueCbEthUSDC_860_Base = "morphobluecbethusdc_860_base",
     MorphoBlueWstEthUSDC_860_Base = "morphobluewstethusdc_860_base",
-    MorphoBlueCbEthEth_965_Base = "morphobluecbetheth_965_base",
     MorphoBlueEthUSDC_860_Base = "morphoblueethusdc_860_base",
+    MorphoBlueCbEthEth_945_Base = "morphobluecbetheth_945_base",
+    MorphoBlueCbEthEth_965_Base = "morphobluecbetheth_965_base",
     MorphoBlueWstEthEth_945_Base = "morphobluewstetheth_945_base",
-    MorphoBlueWstEthEth_965_Base = "morphobluewstetheth_965_base"
+    MorphoBlueWstEthEth_965_Base = "morphobluewstetheth_965_base",
+    MorphoBlueREthUSDC_860_Base = "morphobluerethusdc_860_base",
+    MorphoBlueREthEth_945_Base = "morphoblueretheth_945_base"
 }
 export declare enum MorphoBlueOracleType {
     MARKET_RATE = "Market rate",

package/cjs/types/morphoBlue.js

@@ -37,10 +37,13 @@ var MorphoBlueVersions;
     // BASE
     MorphoBlueVersions["MorphoBlueCbEthUSDC_860_Base"] = "morphobluecbethusdc_860_base";
     MorphoBlueVersions["MorphoBlueWstEthUSDC_860_Base"] = "morphobluewstethusdc_860_base";
-    MorphoBlueVersions["MorphoBlueCbEthEth_965_Base"] = "morphobluecbetheth_965_base";
     MorphoBlueVersions["MorphoBlueEthUSDC_860_Base"] = "morphoblueethusdc_860_base";
+    MorphoBlueVersions["MorphoBlueCbEthEth_945_Base"] = "morphobluecbetheth_945_base";
+    MorphoBlueVersions["MorphoBlueCbEthEth_965_Base"] = "morphobluecbetheth_965_base";
     MorphoBlueVersions["MorphoBlueWstEthEth_945_Base"] = "morphobluewstetheth_945_base";
     MorphoBlueVersions["MorphoBlueWstEthEth_965_Base"] = "morphobluewstetheth_965_base";
+    MorphoBlueVersions["MorphoBlueREthUSDC_860_Base"] = "morphobluerethusdc_860_base";
+    MorphoBlueVersions["MorphoBlueREthEth_945_Base"] = "morphoblueretheth_945_base";
 })(MorphoBlueVersions || (exports.MorphoBlueVersions = MorphoBlueVersions = {}));
 var MorphoBlueOracleType;
 (function (MorphoBlueOracleType) {

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/markets/morphoBlue/index.d.ts

@@ -32,7 +32,10 @@ export declare const MORPHO_BLUE_WSTETH_ETH_945_BASE: (networkId?: NetworkNumber
 export declare const MORPHO_BLUE_WSTETH_ETH_965_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSTETH_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBETH_ETH_965_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_CBETH_ETH_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_ETH_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_RETH_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_RETH_ETH_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluewstethusdc: MorphoBlueMarketData;
     readonly morphobluesdaiusdc: MorphoBlueMarketData;
@@ -63,8 +66,11 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphoblueusdedai_945: MorphoBlueMarketData;
     readonly morphobluecbethusdc_860_base: MorphoBlueMarketData;
     readonly morphobluewstethusdc_860_base: MorphoBlueMarketData;
-    readonly morphobluecbetheth_965_base: MorphoBlueMarketData;
     readonly morphoblueethusdc_860_base: MorphoBlueMarketData;
+    readonly morphobluerethusdc_860_base: MorphoBlueMarketData;
+    readonly morphoblueretheth_945_base: MorphoBlueMarketData;
+    readonly morphobluecbetheth_945_base: MorphoBlueMarketData;
+    readonly morphobluecbetheth_965_base: MorphoBlueMarketData;
     readonly morphobluewstetheth_945_base: MorphoBlueMarketData;
     readonly morphobluewstetheth_965_base: MorphoBlueMarketData;
 };

package/esm/markets/morphoBlue/index.js

@@ -485,6 +485,21 @@ export const MORPHO_BLUE_CBETH_ETH_965_BASE = (networkId = NetworkNumber.Eth) =>
     marketId: '0x6600aae6c56d242fa6ba68bd527aff1a146e77813074413186828fd3f1cdca91',
     protocolName: 'morpho-blue',
 });
+export const MORPHO_BLUE_CBETH_ETH_945_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho Blue',
+    shortLabel: 'cbETH/ETH',
+    value: MorphoBlueVersions.MorphoBlueCbEthEth_945_Base,
+    url: 'cbetheth-84662b4f',
+    loanToken: '0x4200000000000000000000000000000000000006',
+    collateralToken: '0x2Ae3F1Ec7F1F5012CFEab0185bfc7aa3cf0DEc22',
+    oracle: '0xB03855Ad5AFD6B8db8091DD5551CAC4ed621d9E6',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.945,
+    marketId: '0x84662b4f95b85d6b082b68d32cf71bb565b3f22f216a65509cc2ede7dccdfe8c',
+    protocolName: 'morpho-blue',
+});
 export const MORPHO_BLUE_ETH_USDC_860_BASE = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Base],
     label: 'Morpho Blue',
@@ -500,6 +515,36 @@ export const MORPHO_BLUE_ETH_USDC_860_BASE = (networkId = NetworkNumber.Eth) =>
     marketId: '0x8793cf302b8ffd655ab97bd1c695dbd967807e8367a65cb2f4edaf1380ba1bda',
     protocolName: 'morpho-blue',
 });
+export const MORPHO_BLUE_RETH_USDC_860_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho Blue',
+    shortLabel: 'rETH/USDC',
+    value: MorphoBlueVersions.MorphoBlueREthUSDC_860_Base,
+    url: 'rethusdc-db0bc9f1',
+    loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+    collateralToken: '0xB6fe221Fe9EeF5aBa221c348bA20A1Bf5e73624c',
+    oracle: '0x7E1136C04372874cca9C3C9a2DbC461E3858b228',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.86,
+    marketId: '0xdb0bc9f10a174f29a345c5f30a719933f71ccea7a2a75a632a281929bba1b535',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_RETH_ETH_945_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho Blue',
+    shortLabel: 'rETH/ETH',
+    value: MorphoBlueVersions.MorphoBlueREthEth_945_Base,
+    url: 'retheth-dc69cf2c',
+    loanToken: '0x4200000000000000000000000000000000000006',
+    collateralToken: '0xB6fe221Fe9EeF5aBa221c348bA20A1Bf5e73624c',
+    oracle: '0x05f73c9910806EedE92C83DEb3f805b71C6098f2',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.945,
+    marketId: '0xdc69cf2caae7b7d1783fb5a9576dc875888afad17ab3d1a3fc102f741441c165',
+    protocolName: 'morpho-blue',
+});
 export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueWstEthUSDC]: MORPHO_BLUE_WSTETH_USDC(networkId),
     [MorphoBlueVersions.MorphoBlueSDAIUSDC]: MORPHO_BLUE_SDAI_USDC(networkId),
@@ -534,8 +579,12 @@ export const MorphoBlueMarkets = (networkId) => ({
     // Base
     [MorphoBlueVersions.MorphoBlueCbEthUSDC_860_Base]: MORPHO_BLUE_CBETH_USDC_860_BASE(networkId),
     [MorphoBlueVersions.MorphoBlueWstEthUSDC_860_Base]: MORPHO_BLUE_WSTETH_USDC_860_BASE(networkId),
-    [MorphoBlueVersions.MorphoBlueCbEthEth_965_Base]: MORPHO_BLUE_CBETH_ETH_965_BASE(networkId),
     [MorphoBlueVersions.MorphoBlueEthUSDC_860_Base]: MORPHO_BLUE_ETH_USDC_860_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueREthUSDC_860_Base]: MORPHO_BLUE_RETH_USDC_860_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueREthEth_945_Base]: MORPHO_BLUE_RETH_ETH_945_BASE(networkId),
+    // cbETH/WETH Base
+    [MorphoBlueVersions.MorphoBlueCbEthEth_945_Base]: MORPHO_BLUE_CBETH_ETH_945_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueCbEthEth_965_Base]: MORPHO_BLUE_CBETH_ETH_965_BASE(networkId),
     // wstETH/WETH Base
     [MorphoBlueVersions.MorphoBlueWstEthEth_945_Base]: MORPHO_BLUE_WSTETH_ETH_945_BASE(networkId),
     [MorphoBlueVersions.MorphoBlueWstEthEth_965_Base]: MORPHO_BLUE_WSTETH_ETH_965_BASE(networkId),

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/esm/types/morphoBlue.d.ts

@@ -29,10 +29,13 @@ export declare enum MorphoBlueVersions {
     MorphoBlueUSDeDAI_945 = "morphoblueusdedai_945",
     MorphoBlueCbEthUSDC_860_Base = "morphobluecbethusdc_860_base",
     MorphoBlueWstEthUSDC_860_Base = "morphobluewstethusdc_860_base",
-    MorphoBlueCbEthEth_965_Base = "morphobluecbetheth_965_base",
     MorphoBlueEthUSDC_860_Base = "morphoblueethusdc_860_base",
+    MorphoBlueCbEthEth_945_Base = "morphobluecbetheth_945_base",
+    MorphoBlueCbEthEth_965_Base = "morphobluecbetheth_965_base",
     MorphoBlueWstEthEth_945_Base = "morphobluewstetheth_945_base",
-    MorphoBlueWstEthEth_965_Base = "morphobluewstetheth_965_base"
+    MorphoBlueWstEthEth_965_Base = "morphobluewstetheth_965_base",
+    MorphoBlueREthUSDC_860_Base = "morphobluerethusdc_860_base",
+    MorphoBlueREthEth_945_Base = "morphoblueretheth_945_base"
 }
 export declare enum MorphoBlueOracleType {
     MARKET_RATE = "Market rate",

package/esm/types/morphoBlue.js

@@ -34,10 +34,13 @@ export var MorphoBlueVersions;
     // BASE
     MorphoBlueVersions["MorphoBlueCbEthUSDC_860_Base"] = "morphobluecbethusdc_860_base";
     MorphoBlueVersions["MorphoBlueWstEthUSDC_860_Base"] = "morphobluewstethusdc_860_base";
-    MorphoBlueVersions["MorphoBlueCbEthEth_965_Base"] = "morphobluecbetheth_965_base";
     MorphoBlueVersions["MorphoBlueEthUSDC_860_Base"] = "morphoblueethusdc_860_base";
+    MorphoBlueVersions["MorphoBlueCbEthEth_945_Base"] = "morphobluecbetheth_945_base";
+    MorphoBlueVersions["MorphoBlueCbEthEth_965_Base"] = "morphobluecbetheth_965_base";
     MorphoBlueVersions["MorphoBlueWstEthEth_945_Base"] = "morphobluewstetheth_945_base";
     MorphoBlueVersions["MorphoBlueWstEthEth_965_Base"] = "morphobluewstetheth_965_base";
+    MorphoBlueVersions["MorphoBlueREthUSDC_860_Base"] = "morphobluerethusdc_860_base";
+    MorphoBlueVersions["MorphoBlueREthEth_945_Base"] = "morphoblueretheth_945_base";
 })(MorphoBlueVersions || (MorphoBlueVersions = {}));
 export var MorphoBlueOracleType;
 (function (MorphoBlueOracleType) {