@defisaver/positions-sdk 0.0.123 → 0.0.125

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

@@ -24,7 +24,7 @@ const moneymarket_1 = require("../moneymarket");
 const compoundHelpers_1 = require("../helpers/compoundHelpers");
 const compound_1 = require("../markets/compound");
 const priceService_1 = require("../services/priceService");
-const getSupportedAssetsAddressesForMarket = (selectedMarket, network) => selectedMarket.collAssets.map(asset => (0, tokens_1.getAssetInfo)(asset, network)).map(addr => addr.address.toLowerCase());
+const getSupportedAssetsAddressesForMarket = (selectedMarket, network) => selectedMarket.collAssets.map(asset => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(asset), network)).map(addr => addr.address.toLowerCase());
 const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const baseAssetPrice = selectedMarket.baseAsset === 'ETH' ? yield (0, priceService_1.getEthPrice)(defaultWeb3) : yield (0, priceService_1.getUSDCPrice)(defaultWeb3);
     const compPrice = yield (0, priceService_1.getCompPrice)(defaultWeb3);

package/cjs/markets/morphoBlue/index.js

@@ -6,7 +6,7 @@ const types_1 = require("../../types");
 const common_1 = require("../../types/common");
 const MORPHO_BLUE_WSTETH_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'wstETH/USDC',
     value: types_1.MorphoBlueVersions.MorphoBlueWstEthUSDC,
     url: 'wstethusdc',
@@ -22,7 +22,7 @@ const MORPHO_BLUE_WSTETH_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_WSTETH_USDC = MORPHO_BLUE_WSTETH_USDC;
 const MORPHO_BLUE_SDAI_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'sDAI/USDC',
     value: types_1.MorphoBlueVersions.MorphoBlueSDAIUSDC,
     url: 'sdaiusdc',
@@ -38,7 +38,7 @@ const MORPHO_BLUE_SDAI_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_SDAI_USDC = MORPHO_BLUE_SDAI_USDC;
 const MORPHO_BLUE_WBTC_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'WBTC/USDC',
     value: types_1.MorphoBlueVersions.MorphoBlueWBTCUSDC,
     url: 'wbtcusdc',
@@ -54,7 +54,7 @@ const MORPHO_BLUE_WBTC_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_WBTC_USDC = MORPHO_BLUE_WBTC_USDC;
 const MORPHO_BLUE_ETH_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'ETH/USDC',
     value: types_1.MorphoBlueVersions.MorphoBlueEthUSDC,
     url: 'ethusdc',
@@ -70,7 +70,7 @@ const MORPHO_BLUE_ETH_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_ETH_USDC = MORPHO_BLUE_ETH_USDC;
 const MORPHO_BLUE_WBTC_USDT = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'WBTC/USDT',
     value: types_1.MorphoBlueVersions.MorphoBlueWBTCUSDT,
     url: 'wbtcusdt',
@@ -86,7 +86,7 @@ const MORPHO_BLUE_WBTC_USDT = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_WBTC_USDT = MORPHO_BLUE_WBTC_USDT;
 const MORPHO_BLUE_WBTC_PYUSD = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'WBTC/PYUSD',
     value: types_1.MorphoBlueVersions.MorphoBlueWBTCPYUSD,
     url: 'wbtcpyusd',
@@ -102,7 +102,7 @@ const MORPHO_BLUE_WBTC_PYUSD = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_WBTC_PYUSD = MORPHO_BLUE_WBTC_PYUSD;
 const MORPHO_BLUE_WBTC_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'WBTC/ETH',
     value: types_1.MorphoBlueVersions.MorphoBlueWBTCEth,
     url: 'wbtceth',
@@ -118,7 +118,7 @@ const MORPHO_BLUE_WBTC_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_WBTC_ETH = MORPHO_BLUE_WBTC_ETH;
 const MORPHO_BLUE_WSTETH_USDT = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'wstETH/USDT',
     value: types_1.MorphoBlueVersions.MorphoBlueWstEthUSDT,
     url: 'wstethusdt',
@@ -134,7 +134,7 @@ const MORPHO_BLUE_WSTETH_USDT = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_WSTETH_USDT = MORPHO_BLUE_WSTETH_USDT;
 const MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'wstETH/USDA',
     value: types_1.MorphoBlueVersions.MorphoBlueWstEthUSDA_Exchange_Rate,
     url: 'wstethusda',
@@ -150,7 +150,7 @@ const MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE = (networkId = common_1.NetworkNumbe
 exports.MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE = MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE;
 const MORPHO_BLUE_WSTETH_PYUSD = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'wstETH/PYUSD',
     value: types_1.MorphoBlueVersions.MorphoBlueWstEthPYUSD,
     url: 'wstethpyusd',
@@ -166,7 +166,7 @@ const MORPHO_BLUE_WSTETH_PYUSD = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_WSTETH_PYUSD = MORPHO_BLUE_WSTETH_PYUSD;
 const MORPHO_BLUE_WEETH_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'weETH/ETH',
     value: types_1.MorphoBlueVersions.MorphoBlueWeEthEth,
     url: 'weetheth',
@@ -182,7 +182,7 @@ const MORPHO_BLUE_WEETH_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_WEETH_ETH = MORPHO_BLUE_WEETH_ETH;
 const MORPHO_BLUE_USDE_USDT = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'USDe/USDT',
     value: types_1.MorphoBlueVersions.MorphoBlueUSDeUSDT,
     url: 'usdeusdt',
@@ -198,7 +198,7 @@ const MORPHO_BLUE_USDE_USDT = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_USDE_USDT = MORPHO_BLUE_USDE_USDT;
 const MORPHO_BLUE_SUSDE_USDT = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'sUSDe/USDT',
     value: types_1.MorphoBlueVersions.MorphoBlueSUSDeUSDT,
     url: 'susdeusdt',
@@ -214,7 +214,7 @@ const MORPHO_BLUE_SUSDE_USDT = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_SUSDE_USDT = MORPHO_BLUE_SUSDE_USDT;
 const MORPHO_BLUE_SDAI_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'sDAI/ETH',
     value: types_1.MorphoBlueVersions.MorphoBlueSDAIEth,
     url: 'sdaieth',
@@ -230,7 +230,7 @@ const MORPHO_BLUE_SDAI_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_SDAI_ETH = MORPHO_BLUE_SDAI_ETH;
 const MORPHO_BLUE_EZETH_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'ezETH/ETH',
     value: types_1.MorphoBlueVersions.MorphoBlueEzEthEth,
     url: 'ezetheth',
@@ -246,7 +246,7 @@ const MORPHO_BLUE_EZETH_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_EZETH_ETH = MORPHO_BLUE_EZETH_ETH;
 const MORPHO_BLUE_MKR_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'MKR/USDC',
     value: types_1.MorphoBlueVersions.MorphoBlueMKRUSDC,
     url: 'mkrusdc',
@@ -263,7 +263,7 @@ exports.MORPHO_BLUE_MKR_USDC = MORPHO_BLUE_MKR_USDC;
 // wstETH/WETH
 const MORPHO_BLUE_WSTETH_ETH_945 = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'wstETH/ETH',
     value: types_1.MorphoBlueVersions.MorphoBlueWstEthEth_945,
     url: 'wstetheth-c54d7acf',
@@ -279,7 +279,7 @@ const MORPHO_BLUE_WSTETH_ETH_945 = (networkId = common_1.NetworkNumber.Eth) => (
 exports.MORPHO_BLUE_WSTETH_ETH_945 = MORPHO_BLUE_WSTETH_ETH_945;
 const MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'wstETH/ETH',
     value: types_1.MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate,
     url: 'wstetheth-d0e50cda',
@@ -295,7 +295,7 @@ const MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE = (networkId = common_1.NetworkNu
 exports.MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE = MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE;
 const MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'wstETH/ETH',
     value: types_1.MorphoBlueVersions.MorphoBlueWstEthEth_965_Exchange_Rate,
     url: 'wstetheth-b8fc70e8',
@@ -312,7 +312,7 @@ exports.MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE = MORPHO_BLUE_WSTETH_ETH_965_EX
 // sUSDe/DAI
 const MORPHO_BLUE_SUSDE_DAI_770 = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'sUSDe/DAI',
     value: types_1.MorphoBlueVersions.MorphoBlueSUSDeDAI_770,
     url: 'susdedai-42dcfb38',
@@ -328,7 +328,7 @@ const MORPHO_BLUE_SUSDE_DAI_770 = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_SUSDE_DAI_770 = MORPHO_BLUE_SUSDE_DAI_770;
 const MORPHO_BLUE_SUSDE_DAI_860 = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'sUSDe/DAI',
     value: types_1.MorphoBlueVersions.MorphoBlueSUSDeDAI_860,
     url: 'susdedai-39d11026',
@@ -344,7 +344,7 @@ const MORPHO_BLUE_SUSDE_DAI_860 = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_SUSDE_DAI_860 = MORPHO_BLUE_SUSDE_DAI_860;
 const MORPHO_BLUE_SUSDE_DAI_915 = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'sUSDe/DAI',
     value: types_1.MorphoBlueVersions.MorphoBlueSUSDeDAI_915,
     url: 'susdedai-1247f1c2',
@@ -360,7 +360,7 @@ const MORPHO_BLUE_SUSDE_DAI_915 = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_SUSDE_DAI_915 = MORPHO_BLUE_SUSDE_DAI_915;
 const MORPHO_BLUE_SUSDE_DAI_945 = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'sUSDe/DAI',
     value: types_1.MorphoBlueVersions.MorphoBlueSUSDeDAI_945,
     url: 'susdedai-0e475337',
@@ -377,7 +377,7 @@ exports.MORPHO_BLUE_SUSDE_DAI_945 = MORPHO_BLUE_SUSDE_DAI_945;
 // USDe/DAI
 const MORPHO_BLUE_USDE_DAI_770 = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'USDe/DAI',
     value: types_1.MorphoBlueVersions.MorphoBlueUSDeDAI_770,
     url: 'usdedai-fd8493f0',
@@ -393,7 +393,7 @@ const MORPHO_BLUE_USDE_DAI_770 = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_USDE_DAI_770 = MORPHO_BLUE_USDE_DAI_770;
 const MORPHO_BLUE_USDE_DAI_860 = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'USDe/DAI',
     value: types_1.MorphoBlueVersions.MorphoBlueUSDeDAI_860,
     url: 'usdedai-c581c5f7',
@@ -409,7 +409,7 @@ const MORPHO_BLUE_USDE_DAI_860 = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_USDE_DAI_860 = MORPHO_BLUE_USDE_DAI_860;
 const MORPHO_BLUE_USDE_DAI_915 = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'USDe/DAI',
     value: types_1.MorphoBlueVersions.MorphoBlueUSDeDAI_915,
     url: 'usdedai-8e6aeb10',
@@ -425,7 +425,7 @@ const MORPHO_BLUE_USDE_DAI_915 = (networkId = common_1.NetworkNumber.Eth) => ({
 exports.MORPHO_BLUE_USDE_DAI_915 = MORPHO_BLUE_USDE_DAI_915;
 const MORPHO_BLUE_USDE_DAI_945 = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [1],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'USDe/DAI',
     value: types_1.MorphoBlueVersions.MorphoBlueUSDeDAI_945,
     url: 'usdedai-db760246',
@@ -442,7 +442,7 @@ exports.MORPHO_BLUE_USDE_DAI_945 = MORPHO_BLUE_USDE_DAI_945;
 // BASE
 const MORPHO_BLUE_CBETH_USDC_860_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Base],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'cbETH/USDC',
     value: types_1.MorphoBlueVersions.MorphoBlueCbEthUSDC_860_Base,
     url: 'cbethusdc-dba352d9',
@@ -458,7 +458,7 @@ const MORPHO_BLUE_CBETH_USDC_860_BASE = (networkId = common_1.NetworkNumber.Eth)
 exports.MORPHO_BLUE_CBETH_USDC_860_BASE = MORPHO_BLUE_CBETH_USDC_860_BASE;
 const MORPHO_BLUE_WSTETH_ETH_945_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Base],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'wstETH/ETH',
     value: types_1.MorphoBlueVersions.MorphoBlueWstEthEth_945_Base,
     url: 'wstetheth-3a4048c6',
@@ -474,7 +474,7 @@ const MORPHO_BLUE_WSTETH_ETH_945_BASE = (networkId = common_1.NetworkNumber.Eth)
 exports.MORPHO_BLUE_WSTETH_ETH_945_BASE = MORPHO_BLUE_WSTETH_ETH_945_BASE;
 const MORPHO_BLUE_WSTETH_ETH_965_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Base],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'wstETH/ETH',
     value: types_1.MorphoBlueVersions.MorphoBlueWstEthEth_965_Base,
     url: 'wstetheth-6aa81f51',
@@ -490,7 +490,7 @@ const MORPHO_BLUE_WSTETH_ETH_965_BASE = (networkId = common_1.NetworkNumber.Eth)
 exports.MORPHO_BLUE_WSTETH_ETH_965_BASE = MORPHO_BLUE_WSTETH_ETH_965_BASE;
 const MORPHO_BLUE_WSTETH_USDC_860_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Base],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'wstETH/USDC',
     value: types_1.MorphoBlueVersions.MorphoBlueWstEthUSDC_860_Base,
     url: 'wstethusdc-a066f389',
@@ -506,7 +506,7 @@ const MORPHO_BLUE_WSTETH_USDC_860_BASE = (networkId = common_1.NetworkNumber.Eth
 exports.MORPHO_BLUE_WSTETH_USDC_860_BASE = MORPHO_BLUE_WSTETH_USDC_860_BASE;
 const MORPHO_BLUE_CBETH_ETH_965_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Base],
-    label: 'Morpho Blue',
+    label: 'Morpho',
     shortLabel: 'cbETH/ETH',
     value: types_1.MorphoBlueVersions.MorphoBlueCbEthEth_965_Base,
     url: 'cbetheth-6600aae6',
@@ -522,7 +522,7 @@ const MORPHO_BLUE_CBETH_ETH_965_BASE = (networkId = common_1.NetworkNumber.Eth)
 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',
+    label: 'Morpho',
     shortLabel: 'cbETH/ETH',
     value: types_1.MorphoBlueVersions.MorphoBlueCbEthEth_945_Base,
     url: 'cbetheth-84662b4f',
@@ -538,7 +538,7 @@ const MORPHO_BLUE_CBETH_ETH_945_BASE = (networkId = common_1.NetworkNumber.Eth)
 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',
+    label: 'Morpho',
     shortLabel: 'ETH/USDC',
     value: types_1.MorphoBlueVersions.MorphoBlueEthUSDC_860_Base,
     url: 'ethusdc-8793cf30',
@@ -554,7 +554,7 @@ const MORPHO_BLUE_ETH_USDC_860_BASE = (networkId = common_1.NetworkNumber.Eth) =
 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',
+    label: 'Morpho',
     shortLabel: 'rETH/USDC',
     value: types_1.MorphoBlueVersions.MorphoBlueREthUSDC_860_Base,
     url: 'rethusdc-db0bc9f1',
@@ -570,7 +570,7 @@ const MORPHO_BLUE_RETH_USDC_860_BASE = (networkId = common_1.NetworkNumber.Eth)
 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',
+    label: 'Morpho',
     shortLabel: 'rETH/ETH',
     value: types_1.MorphoBlueVersions.MorphoBlueREthEth_945_Base,
     url: 'retheth-dc69cf2c',

package/esm/compoundV3/index.js

@@ -12,13 +12,13 @@ import { assetAmountInEth, assetAmountInWei, getAssetInfo, getAssetInfoByAddress
 import { CompV3ViewContract } from '../contracts';
 import { multicall } from '../multicall';
 import { getStakingApy, getStETHByWstETHMultiple, getWstETHByStETH, STAKING_ASSETS, } from '../staking';
-import { wethToEth } from '../services/utils';
+import { ethToWeth, wethToEth } from '../services/utils';
 import { ZERO_ADDRESS } from '../constants';
 import { calculateBorrowingAssetLimit } from '../moneymarket';
 import { formatBaseData, formatMarketData, getCompoundV3AggregatedData, getIncentiveApys, } from '../helpers/compoundHelpers';
 import { COMPOUND_V3_ETH, COMPOUND_V3_USDBC, COMPOUND_V3_USDC } from '../markets/compound';
 import { getEthPrice, getCompPrice, getUSDCPrice } from '../services/priceService';
-const getSupportedAssetsAddressesForMarket = (selectedMarket, network) => selectedMarket.collAssets.map(asset => getAssetInfo(asset, network)).map(addr => addr.address.toLowerCase());
+const getSupportedAssetsAddressesForMarket = (selectedMarket, network) => selectedMarket.collAssets.map(asset => getAssetInfo(ethToWeth(asset), network)).map(addr => addr.address.toLowerCase());
 export const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const baseAssetPrice = selectedMarket.baseAsset === 'ETH' ? yield getEthPrice(defaultWeb3) : yield getUSDCPrice(defaultWeb3);
     const compPrice = yield getCompPrice(defaultWeb3);