@defisaver/positions-sdk 0.0.74 → 0.0.76

package/cjs/config/contracts.d.ts

@@ -4509,6 +4509,9 @@ export namespace MorphoBlueView {
         "1": {
             address: string;
         };
+        "8453": {
+            address: string;
+        };
     };
     export { networks_66 as networks };
 }

package/cjs/config/contracts.js

@@ -823,6 +823,9 @@ module.exports = {
         "networks": {
             "1": {
                 "address": "0xE29175a86B60138403a9534A391acaDb19f1E9a6",
+            },
+            "8453": {
+                "address": "0xDBCACF59C5063da8B15481F88E7D70E13c92f2a1",
             }
         }
     },

package/cjs/markets/morphoBlue/index.d.ts

@@ -26,6 +26,7 @@ export declare const MORPHO_BLUE_USDE_DAI_770: (networkId?: NetworkNumber) => Mo
 export declare const MORPHO_BLUE_USDE_DAI_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_USDE_DAI_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_USDE_DAI_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_CBETH_USDC_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluewstethusdc: MorphoBlueMarketData;
     readonly morphobluesdaiusdc: MorphoBlueMarketData;
@@ -53,5 +54,6 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphoblueusdedai_860: MorphoBlueMarketData;
     readonly morphoblueusdedai_915: MorphoBlueMarketData;
     readonly morphoblueusdedai_945: MorphoBlueMarketData;
+    readonly morphobluecbethusdc_860: MorphoBlueMarketData;
 };
 export declare const findMorphoBlueMarket: (collateralToken: string, loanToken: string, lltv: number, oracle: string, irm: string, network?: NetworkNumber) => MorphoBlueMarketData | null;

package/cjs/markets/morphoBlue/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = 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_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_CBETH_USDC_860 = 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_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");
 const MORPHO_BLUE_WSTETH_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -422,6 +423,23 @@ const MORPHO_BLUE_USDE_DAI_945 = (networkId = common_1.NetworkNumber.Eth) => ({
     protocolName: 'morpho-blue',
 });
 exports.MORPHO_BLUE_USDE_DAI_945 = MORPHO_BLUE_USDE_DAI_945;
+// BASE
+const MORPHO_BLUE_CBETH_USDC_860 = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [common_1.NetworkNumber.Base],
+    label: 'Morpho Blue',
+    shortLabel: 'cbETH/ETH',
+    value: types_1.MorphoBlueVersions.MorphoBlueCbEthUSDC_860,
+    url: 'usdedai-dba352d9',
+    loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+    collateralToken: '0x2Ae3F1Ec7F1F5012CFEab0185bfc7aa3cf0DEc22',
+    oracle: '0x4756c26E01E61c7c2F86b10f4316e179db8F9425',
+    oracleType: types_1.MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.86,
+    marketId: '0xdba352d93a64b17c71104cbddc6aef85cd432322a1446b5b65163cbbc615cd0c',
+    protocolName: 'morpho-blue',
+});
+exports.MORPHO_BLUE_CBETH_USDC_860 = MORPHO_BLUE_CBETH_USDC_860;
 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),
@@ -452,12 +470,13 @@ const MorphoBlueMarkets = (networkId) => ({
     [types_1.MorphoBlueVersions.MorphoBlueUSDeDAI_860]: (0, exports.MORPHO_BLUE_USDE_DAI_860)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueUSDeDAI_915]: (0, exports.MORPHO_BLUE_USDE_DAI_915)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueUSDeDAI_945]: (0, exports.MORPHO_BLUE_USDE_DAI_945)(networkId),
+    [types_1.MorphoBlueVersions.MorphoBlueCbEthUSDC_860]: (0, exports.MORPHO_BLUE_CBETH_USDC_860)(networkId),
 });
 exports.MorphoBlueMarkets = MorphoBlueMarkets;
 const findMorphoBlueMarket = (collateralToken, loanToken, lltv, oracle, irm, network = common_1.NetworkNumber.Eth) => {
     const markets = (0, exports.MorphoBlueMarkets)(network);
     for (const market of Object.values(markets)) {
-        if (market.collateralToken === collateralToken && market.loanToken === loanToken && market.lltv === lltv && market.oracle === oracle && market.irm === irm) {
+        if ((0, utils_1.compareAddresses)(market.collateralToken, collateralToken) && (0, utils_1.compareAddresses)(market.loanToken, loanToken) && market.lltv === lltv && (0, utils_1.compareAddresses)(market.oracle, oracle) && (0, utils_1.compareAddresses)(market.irm, irm)) {
             return market;
         }
     }

package/cjs/morphoBlue/index.js

@@ -15,11 +15,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMorphoBlueAccountData = exports.getMorphoBlueMarketData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
+const common_1 = require("../types/common");
 const contracts_1 = require("../contracts");
 const constants_1 = require("../constants");
 const staking_1 = require("../staking");
 const utils_1 = require("../services/utils");
-const multicall_1 = require("../multicall");
 const morphoBlueHelpers_1 = require("../helpers/morphoBlueHelpers");
 const compound = (ratePerSeconds) => {
     const compounding = new decimal_js_1.default(ratePerSeconds).mul(constants_1.SECONDS_PER_YEAR).toString();
@@ -48,32 +48,19 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
     return __awaiter(this, void 0, void 0, function* () {
         const { loanToken, collateralToken, oracle, irm, lltv, oracleType, } = selectedMarket;
         const lltvInWei = new decimal_js_1.default(lltv).mul(constants_1.WAD).toString();
-        const loanTokenInfo = (0, tokens_1.getAssetInfoByAddress)(loanToken);
-        const collateralTokenInfo = (0, tokens_1.getAssetInfoByAddress)(collateralToken);
-        let loanTokenFeedAddress = loanToken;
+        const loanTokenInfo = (0, tokens_1.getAssetInfoByAddress)(loanToken, network);
+        const collateralTokenInfo = (0, tokens_1.getAssetInfoByAddress)(collateralToken, network);
+        let loanTokenFeedAddress = loanTokenInfo.addresses[common_1.NetworkNumber.Eth];
         if (loanTokenInfo.symbol === 'WETH') {
             const ethAddress = (0, tokens_1.getAssetInfo)('ETH').address;
             loanTokenFeedAddress = ethAddress;
         }
-        const FeedRegistryAddress = (0, contracts_1.getConfigContractAddress)('FeedRegistry', network);
-        const FeedRegistryAbi = (0, contracts_1.getConfigContractAbi)('FeedRegistry');
-        const viewContractAddress = (0, contracts_1.getConfigContractAddress)('MorphoBlueView', network);
-        const viewContractAbi = (0, contracts_1.getConfigContractAbi)('MorphoBlueView');
-        const multicallCallsObject = [
-            {
-                target: FeedRegistryAddress,
-                abiItem: (0, utils_1.getAbiItem)(FeedRegistryAbi, 'latestAnswer'),
-                params: [loanTokenFeedAddress, constants_1.USD_QUOTE],
-            },
-            {
-                target: viewContractAddress,
-                abiItem: (0, utils_1.getAbiItem)(viewContractAbi, 'getMarketInfoNotTuple'),
-                params: [loanToken, collateralToken, oracle, irm, lltvInWei],
-            },
-        ];
-        const multicallData = yield (0, multicall_1.multicall)(multicallCallsObject, web3, network);
-        const loanTokenPrice = multicallData[0][0];
-        const marketInfo = multicallData[1][0];
+        const feedRegistryContract = (0, contracts_1.FeedRegistryContract)(mainnetWeb3, common_1.NetworkNumber.Eth);
+        const morphoBlueViewContract = (0, contracts_1.MorphoBlueViewContract)(web3, network);
+        const [loanTokenPrice, marketInfo] = yield Promise.all([
+            loanTokenInfo.symbol === 'USDA' ? '100000000' : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, constants_1.USD_QUOTE).call(),
+            morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
+        ]);
         const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
         const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate, marketInfo.totalBorrowShares);
         const utillization = new decimal_js_1.default(marketInfo.totalBorrowAssets).div(marketInfo.totalSupplyAssets).mul(100).toString();
@@ -85,7 +72,7 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
         assetsData[(0, utils_1.wethToEth)(loanTokenInfo.symbol)] = {
             symbol: (0, utils_1.wethToEth)(loanTokenInfo.symbol),
             address: loanToken,
-            price: loanTokenInfo.symbol === 'USDA' ? '1' : new decimal_js_1.default(loanTokenPrice).div(1e8).toString(),
+            price: new decimal_js_1.default(loanTokenPrice).div(1e8).toString(),
             supplyRate: new decimal_js_1.default(supplyRate).div(constants_1.WAD).mul(100).toString(),
             borrowRate: new decimal_js_1.default(compoundedBorrowRate).div(constants_1.WAD).mul(100).toString(),
             totalSupply: new decimal_js_1.default(marketInfo.totalSupplyAssets).div(scale).toString(),

package/cjs/types/morphoBlue.d.ts

@@ -25,7 +25,8 @@ export declare enum MorphoBlueVersions {
     MorphoBlueUSDeDAI_770 = "morphoblueusdedai_770",
     MorphoBlueUSDeDAI_860 = "morphoblueusdedai_860",
     MorphoBlueUSDeDAI_915 = "morphoblueusdedai_915",
-    MorphoBlueUSDeDAI_945 = "morphoblueusdedai_945"
+    MorphoBlueUSDeDAI_945 = "morphoblueusdedai_945",
+    MorphoBlueCbEthUSDC_860 = "morphobluecbethusdc_860"
 }
 export declare enum MorphoBlueOracleType {
     MARKET_RATE = "Market rate",

package/cjs/types/morphoBlue.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MorphoBlueOracleType = exports.MorphoBlueVersions = void 0;
 var MorphoBlueVersions;
 (function (MorphoBlueVersions) {
+    // MAINNET
     MorphoBlueVersions["MorphoBlueWstEthUSDC"] = "morphobluewstethusdc";
     MorphoBlueVersions["MorphoBlueSDAIUSDC"] = "morphobluesdaiusdc";
     MorphoBlueVersions["MorphoBlueWBTCUSDC"] = "morphobluewbtcusdc";
@@ -32,6 +33,8 @@ var MorphoBlueVersions;
     MorphoBlueVersions["MorphoBlueUSDeDAI_860"] = "morphoblueusdedai_860";
     MorphoBlueVersions["MorphoBlueUSDeDAI_915"] = "morphoblueusdedai_915";
     MorphoBlueVersions["MorphoBlueUSDeDAI_945"] = "morphoblueusdedai_945";
+    // BASE
+    MorphoBlueVersions["MorphoBlueCbEthUSDC_860"] = "morphobluecbethusdc_860";
 })(MorphoBlueVersions || (exports.MorphoBlueVersions = MorphoBlueVersions = {}));
 var MorphoBlueOracleType;
 (function (MorphoBlueOracleType) {

package/esm/config/contracts.d.ts

@@ -4509,6 +4509,9 @@ export namespace MorphoBlueView {
         "1": {
             address: string;
         };
+        "8453": {
+            address: string;
+        };
     };
     export { networks_66 as networks };
 }

package/esm/config/contracts.js

@@ -822,6 +822,9 @@ module.exports = {
         "networks": {
             "1": {
                 "address": "0xE29175a86B60138403a9534A391acaDb19f1E9a6",
+            },
+            "8453": {
+                "address": "0xDBCACF59C5063da8B15481F88E7D70E13c92f2a1",
             }
         }
     },

package/esm/markets/morphoBlue/index.d.ts

@@ -26,6 +26,7 @@ export declare const MORPHO_BLUE_USDE_DAI_770: (networkId?: NetworkNumber) => Mo
 export declare const MORPHO_BLUE_USDE_DAI_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_USDE_DAI_915: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_USDE_DAI_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_CBETH_USDC_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluewstethusdc: MorphoBlueMarketData;
     readonly morphobluesdaiusdc: MorphoBlueMarketData;
@@ -53,5 +54,6 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphoblueusdedai_860: MorphoBlueMarketData;
     readonly morphoblueusdedai_915: MorphoBlueMarketData;
     readonly morphoblueusdedai_945: MorphoBlueMarketData;
+    readonly morphobluecbethusdc_860: MorphoBlueMarketData;
 };
 export declare const findMorphoBlueMarket: (collateralToken: string, loanToken: string, lltv: number, oracle: string, irm: string, network?: NetworkNumber) => MorphoBlueMarketData | null;

package/esm/markets/morphoBlue/index.js

@@ -1,3 +1,4 @@
+import { compareAddresses } from '../../services/utils';
 import { MorphoBlueOracleType, MorphoBlueVersions } from '../../types';
 import { NetworkNumber } from '../../types/common';
 export const MORPHO_BLUE_WSTETH_USDC = (networkId = NetworkNumber.Eth) => ({
@@ -393,6 +394,22 @@ export const MORPHO_BLUE_USDE_DAI_945 = (networkId = NetworkNumber.Eth) => ({
     marketId: '0xdb760246f6859780f6c1b272d47a8f64710777121118e56e0cdb4b8b744a3094',
     protocolName: 'morpho-blue',
 });
+// BASE
+export const MORPHO_BLUE_CBETH_USDC_860 = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho Blue',
+    shortLabel: 'cbETH/ETH',
+    value: MorphoBlueVersions.MorphoBlueCbEthUSDC_860,
+    url: 'usdedai-dba352d9',
+    loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+    collateralToken: '0x2Ae3F1Ec7F1F5012CFEab0185bfc7aa3cf0DEc22',
+    oracle: '0x4756c26E01E61c7c2F86b10f4316e179db8F9425',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.86,
+    marketId: '0xdba352d93a64b17c71104cbddc6aef85cd432322a1446b5b65163cbbc615cd0c',
+    protocolName: 'morpho-blue',
+});
 export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueWstEthUSDC]: MORPHO_BLUE_WSTETH_USDC(networkId),
     [MorphoBlueVersions.MorphoBlueSDAIUSDC]: MORPHO_BLUE_SDAI_USDC(networkId),
@@ -423,11 +440,12 @@ export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueUSDeDAI_860]: MORPHO_BLUE_USDE_DAI_860(networkId),
     [MorphoBlueVersions.MorphoBlueUSDeDAI_915]: MORPHO_BLUE_USDE_DAI_915(networkId),
     [MorphoBlueVersions.MorphoBlueUSDeDAI_945]: MORPHO_BLUE_USDE_DAI_945(networkId),
+    [MorphoBlueVersions.MorphoBlueCbEthUSDC_860]: MORPHO_BLUE_CBETH_USDC_860(networkId),
 });
 export const findMorphoBlueMarket = (collateralToken, loanToken, lltv, oracle, irm, network = NetworkNumber.Eth) => {
     const markets = MorphoBlueMarkets(network);
     for (const market of Object.values(markets)) {
-        if (market.collateralToken === collateralToken && market.loanToken === loanToken && market.lltv === lltv && market.oracle === oracle && market.irm === irm) {
+        if (compareAddresses(market.collateralToken, collateralToken) && compareAddresses(market.loanToken, loanToken) && market.lltv === lltv && compareAddresses(market.oracle, oracle) && compareAddresses(market.irm, irm)) {
             return market;
         }
     }

package/esm/morphoBlue/index.js

@@ -9,11 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
-import { MorphoBlueViewContract, getConfigContractAbi, getConfigContractAddress, } from '../contracts';
+import { NetworkNumber } from '../types/common';
+import { FeedRegistryContract, MorphoBlueViewContract, } from '../contracts';
 import { WAD, SECONDS_PER_YEAR, USD_QUOTE } from '../constants';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { getAbiItem, wethToEth } from '../services/utils';
-import { multicall } from '../multicall';
+import { wethToEth } from '../services/utils';
 import { getMorphoBlueAggregatedPositionData } from '../helpers/morphoBlueHelpers';
 const compound = (ratePerSeconds) => {
     const compounding = new Dec(ratePerSeconds).mul(SECONDS_PER_YEAR).toString();
@@ -42,32 +42,19 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
     return __awaiter(this, void 0, void 0, function* () {
         const { loanToken, collateralToken, oracle, irm, lltv, oracleType, } = selectedMarket;
         const lltvInWei = new Dec(lltv).mul(WAD).toString();
-        const loanTokenInfo = getAssetInfoByAddress(loanToken);
-        const collateralTokenInfo = getAssetInfoByAddress(collateralToken);
-        let loanTokenFeedAddress = loanToken;
+        const loanTokenInfo = getAssetInfoByAddress(loanToken, network);
+        const collateralTokenInfo = getAssetInfoByAddress(collateralToken, network);
+        let loanTokenFeedAddress = loanTokenInfo.addresses[NetworkNumber.Eth];
         if (loanTokenInfo.symbol === 'WETH') {
             const ethAddress = getAssetInfo('ETH').address;
             loanTokenFeedAddress = ethAddress;
         }
-        const FeedRegistryAddress = getConfigContractAddress('FeedRegistry', network);
-        const FeedRegistryAbi = getConfigContractAbi('FeedRegistry');
-        const viewContractAddress = getConfigContractAddress('MorphoBlueView', network);
-        const viewContractAbi = getConfigContractAbi('MorphoBlueView');
-        const multicallCallsObject = [
-            {
-                target: FeedRegistryAddress,
-                abiItem: getAbiItem(FeedRegistryAbi, 'latestAnswer'),
-                params: [loanTokenFeedAddress, USD_QUOTE],
-            },
-            {
-                target: viewContractAddress,
-                abiItem: getAbiItem(viewContractAbi, 'getMarketInfoNotTuple'),
-                params: [loanToken, collateralToken, oracle, irm, lltvInWei],
-            },
-        ];
-        const multicallData = yield multicall(multicallCallsObject, web3, network);
-        const loanTokenPrice = multicallData[0][0];
-        const marketInfo = multicallData[1][0];
+        const feedRegistryContract = FeedRegistryContract(mainnetWeb3, NetworkNumber.Eth);
+        const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
+        const [loanTokenPrice, marketInfo] = yield Promise.all([
+            loanTokenInfo.symbol === 'USDA' ? '100000000' : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call(),
+            morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
+        ]);
         const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
         const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate, marketInfo.totalBorrowShares);
         const utillization = new Dec(marketInfo.totalBorrowAssets).div(marketInfo.totalSupplyAssets).mul(100).toString();
@@ -79,7 +66,7 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
         assetsData[wethToEth(loanTokenInfo.symbol)] = {
             symbol: wethToEth(loanTokenInfo.symbol),
             address: loanToken,
-            price: loanTokenInfo.symbol === 'USDA' ? '1' : new Dec(loanTokenPrice).div(1e8).toString(),
+            price: new Dec(loanTokenPrice).div(1e8).toString(),
             supplyRate: new Dec(supplyRate).div(WAD).mul(100).toString(),
             borrowRate: new Dec(compoundedBorrowRate).div(WAD).mul(100).toString(),
             totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),

package/esm/types/morphoBlue.d.ts

@@ -25,7 +25,8 @@ export declare enum MorphoBlueVersions {
     MorphoBlueUSDeDAI_770 = "morphoblueusdedai_770",
     MorphoBlueUSDeDAI_860 = "morphoblueusdedai_860",
     MorphoBlueUSDeDAI_915 = "morphoblueusdedai_915",
-    MorphoBlueUSDeDAI_945 = "morphoblueusdedai_945"
+    MorphoBlueUSDeDAI_945 = "morphoblueusdedai_945",
+    MorphoBlueCbEthUSDC_860 = "morphobluecbethusdc_860"
 }
 export declare enum MorphoBlueOracleType {
     MARKET_RATE = "Market rate",

package/esm/types/morphoBlue.js

@@ -1,5 +1,6 @@
 export var MorphoBlueVersions;
 (function (MorphoBlueVersions) {
+    // MAINNET
     MorphoBlueVersions["MorphoBlueWstEthUSDC"] = "morphobluewstethusdc";
     MorphoBlueVersions["MorphoBlueSDAIUSDC"] = "morphobluesdaiusdc";
     MorphoBlueVersions["MorphoBlueWBTCUSDC"] = "morphobluewbtcusdc";
@@ -29,6 +30,8 @@ export var MorphoBlueVersions;
     MorphoBlueVersions["MorphoBlueUSDeDAI_860"] = "morphoblueusdedai_860";
     MorphoBlueVersions["MorphoBlueUSDeDAI_915"] = "morphoblueusdedai_915";
     MorphoBlueVersions["MorphoBlueUSDeDAI_945"] = "morphoblueusdedai_945";
+    // BASE
+    MorphoBlueVersions["MorphoBlueCbEthUSDC_860"] = "morphobluecbethusdc_860";
 })(MorphoBlueVersions || (MorphoBlueVersions = {}));
 export var MorphoBlueOracleType;
 (function (MorphoBlueOracleType) {

package/package.json

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

package/src/config/contracts.js

@@ -822,6 +822,9 @@ module.exports = {
     "networks": {
       "1": {
         "address": "0xE29175a86B60138403a9534A391acaDb19f1E9a6",
+      },
+      "8453": {
+        "address": "0xDBCACF59C5063da8B15481F88E7D70E13c92f2a1",
       }
     }
   },

package/src/markets/morphoBlue/index.ts

@@ -1,3 +1,4 @@
+import { compareAddresses } from '../../services/utils';
 import { MorphoBlueMarketData, MorphoBlueOracleType, MorphoBlueVersions } from '../../types';
 import { NetworkNumber } from '../../types/common';
 
@@ -399,6 +400,24 @@ export const MORPHO_BLUE_USDE_DAI_945 = (networkId: NetworkNumber = NetworkNumbe
   protocolName: 'morpho-blue',
 });
 
+// BASE
+
+export const MORPHO_BLUE_CBETH_USDC_860 = (networkId: NetworkNumber = NetworkNumber.Eth): MorphoBlueMarketData => ({
+  chainIds: [NetworkNumber.Base],
+  label: 'Morpho Blue',
+  shortLabel: 'cbETH/ETH',
+  value: MorphoBlueVersions.MorphoBlueCbEthUSDC_860,
+  url: 'usdedai-dba352d9',
+  loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+  collateralToken: '0x2Ae3F1Ec7F1F5012CFEab0185bfc7aa3cf0DEc22',
+  oracle: '0x4756c26E01E61c7c2F86b10f4316e179db8F9425',
+  oracleType: MorphoBlueOracleType.MARKET_RATE,
+  irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+  lltv: 0.86,
+  marketId: '0xdba352d93a64b17c71104cbddc6aef85cd432322a1446b5b65163cbbc615cd0c',
+  protocolName: 'morpho-blue',
+});
+
 export const MorphoBlueMarkets = (networkId: NetworkNumber) => ({
   [MorphoBlueVersions.MorphoBlueWstEthUSDC]: MORPHO_BLUE_WSTETH_USDC(networkId),
   [MorphoBlueVersions.MorphoBlueSDAIUSDC]: MORPHO_BLUE_SDAI_USDC(networkId),
@@ -429,12 +448,14 @@ export const MorphoBlueMarkets = (networkId: NetworkNumber) => ({
   [MorphoBlueVersions.MorphoBlueUSDeDAI_860]: MORPHO_BLUE_USDE_DAI_860(networkId),
   [MorphoBlueVersions.MorphoBlueUSDeDAI_915]: MORPHO_BLUE_USDE_DAI_915(networkId),
   [MorphoBlueVersions.MorphoBlueUSDeDAI_945]: MORPHO_BLUE_USDE_DAI_945(networkId),
+
+  [MorphoBlueVersions.MorphoBlueCbEthUSDC_860]: MORPHO_BLUE_CBETH_USDC_860(networkId),
 }) as const;
 
 export const findMorphoBlueMarket = (collateralToken: string, loanToken: string, lltv: number, oracle: string, irm: string, network = NetworkNumber.Eth) => {
   const markets = MorphoBlueMarkets(network);
   for (const market of Object.values(markets)) {
-    if (market.collateralToken === collateralToken && market.loanToken === loanToken && market.lltv === lltv && market.oracle === oracle && market.irm === irm) {
+    if (compareAddresses(market.collateralToken, collateralToken) && compareAddresses(market.loanToken, loanToken) && market.lltv === lltv && compareAddresses(market.oracle, oracle) && compareAddresses(market.irm, irm)) {
       return market;
     }
   }

package/src/morphoBlue/index.ts

@@ -3,16 +3,15 @@ import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { MMUsedAssets, NetworkNumber } from '../types/common';
 import {
+  FeedRegistryContract,
   MorphoBlueViewContract,
-  getConfigContractAbi, getConfigContractAddress,
 } from '../contracts';
 import {
   MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData,
 } from '../types';
 import { WAD, SECONDS_PER_YEAR, USD_QUOTE } from '../constants';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { getAbiItem, wethToEth } from '../services/utils';
-import { multicall } from '../multicall';
+import { wethToEth } from '../services/utils';
 import { getMorphoBlueAggregatedPositionData } from '../helpers/morphoBlueHelpers';
 
 
@@ -48,36 +47,21 @@ export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber
     loanToken, collateralToken, oracle, irm, lltv, oracleType,
   } = selectedMarket;
   const lltvInWei = new Dec(lltv).mul(WAD).toString();
-  const loanTokenInfo = getAssetInfoByAddress(loanToken);
-  const collateralTokenInfo = getAssetInfoByAddress(collateralToken);
-  let loanTokenFeedAddress = loanToken;
+  const loanTokenInfo = getAssetInfoByAddress(loanToken, network);
+  const collateralTokenInfo = getAssetInfoByAddress(collateralToken, network);
+  let loanTokenFeedAddress = loanTokenInfo.addresses[NetworkNumber.Eth];
   if (loanTokenInfo.symbol === 'WETH') {
     const ethAddress = getAssetInfo('ETH').address;
     loanTokenFeedAddress = ethAddress;
   }
 
-  const FeedRegistryAddress = getConfigContractAddress('FeedRegistry', network);
-  const FeedRegistryAbi = getConfigContractAbi('FeedRegistry');
-
-  const viewContractAddress = getConfigContractAddress('MorphoBlueView', network);
-  const viewContractAbi = getConfigContractAbi('MorphoBlueView');
-
-  const multicallCallsObject = [
-    {
-      target: FeedRegistryAddress,
-      abiItem: getAbiItem(FeedRegistryAbi, 'latestAnswer'),
-      params: [loanTokenFeedAddress, USD_QUOTE],
-    },
-    {
-      target: viewContractAddress,
-      abiItem: getAbiItem(viewContractAbi, 'getMarketInfoNotTuple'),
-      params: [loanToken, collateralToken, oracle, irm, lltvInWei],
-    },
-  ];
-
-  const multicallData = await multicall(multicallCallsObject, web3, network);
-  const loanTokenPrice = multicallData[0][0];
-  const marketInfo = multicallData[1][0];
+  const feedRegistryContract = FeedRegistryContract(mainnetWeb3, NetworkNumber.Eth);
+  const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
+
+  const [loanTokenPrice, marketInfo] = await Promise.all([
+    loanTokenInfo.symbol === 'USDA' ? '100000000' : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call(),
+    morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
+  ]);
 
   const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
   const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate, marketInfo.totalBorrowShares);
@@ -93,7 +77,7 @@ export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber
   assetsData[wethToEth(loanTokenInfo.symbol)] = {
     symbol: wethToEth(loanTokenInfo.symbol),
     address: loanToken,
-    price: loanTokenInfo.symbol === 'USDA' ? '1' : new Dec(loanTokenPrice).div(1e8).toString(),
+    price: new Dec(loanTokenPrice).div(1e8).toString(),
     supplyRate: new Dec(supplyRate).div(WAD).mul(100).toString(),
     borrowRate: new Dec(compoundedBorrowRate).div(WAD).mul(100).toString(),
     totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),

package/src/types/morphoBlue.ts

@@ -1,6 +1,7 @@
 import { MMUsedAssets, NetworkNumber } from './common';
 
 export enum MorphoBlueVersions {
+  // MAINNET
   MorphoBlueWstEthUSDC = 'morphobluewstethusdc', // wstETH/USDC
   MorphoBlueSDAIUSDC = 'morphobluesdaiusdc', // sDAI/USDC
   MorphoBlueWBTCUSDC = 'morphobluewbtcusdc', // WBTC/USDC
@@ -30,6 +31,9 @@ export enum MorphoBlueVersions {
   MorphoBlueUSDeDAI_860 = 'morphoblueusdedai_860',
   MorphoBlueUSDeDAI_915 = 'morphoblueusdedai_915',
   MorphoBlueUSDeDAI_945 = 'morphoblueusdedai_945',
+
+  // BASE
+  MorphoBlueCbEthUSDC_860 = 'morphobluecbethusdc_860',
 }
 
 export enum MorphoBlueOracleType {