@defisaver/positions-sdk 0.0.187 → 0.0.188-dev-markets

package/esm/markets/compound/index.js

@@ -1,7 +1,7 @@
 import { getConfigContractAddress } from '../../contracts';
 import { CompoundVersions } from '../../types';
 import { NetworkNumber } from '../../types/common';
-import { compoundV2CollateralAssets, v3ETHCollAssets, v3USDbCCollAssets, v3USDCCollAssets, v3USDCeCollAssets, v3USDTCollAssets, } from './marketsAssets';
+import { compoundV2CollateralAssets, v3ETHCollAssets, v3USDbCCollAssets, v3USDCCollAssets, v3USDCeCollAssets, v3USDSCollAssets, v3USDTCollAssets, v3wstETHCollAssets, } from './marketsAssets';
 export { compoundV2CollateralAssets, v3ETHCollAssets, v3USDbCCollAssets, v3USDCCollAssets, v3USDCeCollAssets, v3USDTCollAssets, };
 const EMPTY_BULKER_OPTIONS = { supply: '', withdraw: '' };
 const STANDARD_BULKER_OPTIONS = {
@@ -13,6 +13,8 @@ const BULKER_OPTIONS = {
         [CompoundVersions.CompoundV3USDC]: { supply: 2, withdraw: 5 },
         [CompoundVersions.CompoundV3ETH]: STANDARD_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDT]: STANDARD_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3wstETH]: STANDARD_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDS]: STANDARD_BULKER_OPTIONS,
         // Non-existing markets, keeping it because of typescript
         [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
@@ -26,6 +28,8 @@ const BULKER_OPTIONS = {
         // Non-existing markets, keeping it because of typescript
         [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3wstETH]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDS]: EMPTY_BULKER_OPTIONS,
     },
     [NetworkNumber.Base]: {
         [CompoundVersions.CompoundV3ETH]: STANDARD_BULKER_OPTIONS,
@@ -35,6 +39,8 @@ const BULKER_OPTIONS = {
         [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDT]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3wstETH]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDS]: EMPTY_BULKER_OPTIONS,
     },
     [NetworkNumber.Opt]: {
         [CompoundVersions.CompoundV3USDC]: STANDARD_BULKER_OPTIONS,
@@ -44,6 +50,8 @@ const BULKER_OPTIONS = {
         [CompoundVersions.CompoundV3USDbC]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV2]: EMPTY_BULKER_OPTIONS,
         [CompoundVersions.CompoundV3USDCe]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3wstETH]: EMPTY_BULKER_OPTIONS,
+        [CompoundVersions.CompoundV3USDS]: EMPTY_BULKER_OPTIONS,
     },
 };
 export const COMPOUND_V2 = {
@@ -136,6 +144,34 @@ export const COMPOUND_V3_USDT = (networkId) => ({
     bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3USDT],
     // icon: SvgAdapter(protocolIcons.compoundv3),
 });
+export const COMPOUND_V3_WSTETH = (networkId) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'Compound V3 - wstETH',
+    shortLabel: 'v3',
+    value: CompoundVersions.CompoundV3wstETH,
+    baseAsset: 'wstETH',
+    collAssets: networkId ? v3wstETHCollAssets[networkId] : [],
+    baseMarket: 'cWstETHv3',
+    baseMarketAddress: getConfigContractAddress('cWstETHv3', networkId),
+    secondLabel: 'Market',
+    bulkerName: networkId === NetworkNumber.Eth ? 'CompV3BulkerMainnetETH' : 'CompV3BulkerL2',
+    bulkerAddress: getConfigContractAddress(networkId === NetworkNumber.Eth ? 'CompV3BulkerMainnetETH' : 'CompV3BulkerL2', networkId),
+    bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3wstETH],
+});
+export const COMPOUND_V3_USDS = (networkId) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'Compound V3 - USDS',
+    shortLabel: 'v3',
+    value: CompoundVersions.CompoundV3USDS,
+    baseAsset: 'USDS',
+    collAssets: networkId ? v3USDSCollAssets[networkId] : [],
+    baseMarket: 'cUSDSv3',
+    baseMarketAddress: getConfigContractAddress('cUSDSv3', networkId),
+    secondLabel: 'Market',
+    bulkerName: networkId === NetworkNumber.Eth ? 'CompV3BulkerMainnetETH' : 'CompV3BulkerL2',
+    bulkerAddress: getConfigContractAddress(networkId === NetworkNumber.Eth ? 'CompV3BulkerMainnetETH' : 'CompV3BulkerL2', networkId),
+    bulkerOptions: BULKER_OPTIONS[networkId][CompoundVersions.CompoundV3USDS],
+});
 export const CompoundMarkets = (networkId) => ({
     [CompoundVersions.CompoundV2]: COMPOUND_V2,
     [CompoundVersions.CompoundV3ETH]: COMPOUND_V3_ETH(networkId),
@@ -143,4 +179,6 @@ export const CompoundMarkets = (networkId) => ({
     [CompoundVersions.CompoundV3USDbC]: COMPOUND_V3_USDBC(networkId),
     [CompoundVersions.CompoundV3USDCe]: COMPOUND_V3_USDCe(networkId),
     [CompoundVersions.CompoundV3USDT]: COMPOUND_V3_USDT(networkId),
+    [CompoundVersions.CompoundV3wstETH]: COMPOUND_V3_WSTETH(networkId),
+    [CompoundVersions.CompoundV3USDS]: COMPOUND_V3_USDS(networkId),
 });

package/esm/markets/compound/marketsAssets.d.ts

@@ -42,3 +42,17 @@ export declare const v3USDTCollAssets: {
     42161: string[];
     8453: never[];
 };
+export declare const v3USDSCollAssetsEth: string[];
+export declare const v3USDSCollAssets: {
+    1: string[];
+    10: never[];
+    42161: never[];
+    8453: never[];
+};
+export declare const v3wstETHCollAssetsEth: string[];
+export declare const v3wstETHCollAssets: {
+    1: string[];
+    10: never[];
+    42161: never[];
+    8453: never[];
+};

package/esm/markets/compound/marketsAssets.js

@@ -5,7 +5,7 @@ export const compoundV2CollateralAssets = [
     'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
 ].map((symbol) => getAssetInfo(symbol));
 export const v3USDCCollAssetsEth = ['COMP', 'WBTC', 'ETH', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC'];
-export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC', 'wstETH', 'ezETH'];
+export const v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC', 'wstETH', 'ezETH', 'wUSDM'];
 export const v3USDCCollAssetsBase = ['ETH', 'cbETH', 'wstETH', 'cbBTC'];
 export const v3USDCCollAssetsOpt = ['ETH', 'OP', 'WBTC', 'wstETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
@@ -42,7 +42,7 @@ export const v3USDbCCollAssets = {
     [NetworkNumber.Arb]: [],
     [NetworkNumber.Base]: v3USDbCCollAssetsBase,
 };
-export const v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'wUSDM', 'sFRAX'];
+export const v3USDTCollAssetsEth = ['COMP', 'ETH', 'WBTC', 'UNI', 'LINK', 'wstETH', 'cbBTC', 'tBTC', 'wUSDM', 'sFRAX', 'mETH'];
 export const v3USDTCollAssetsArb = ['ETH', 'WBTC', 'wstETH', 'ARB', 'GMX'];
 export const v3USDTCollAssetsOpt = ['ETH', 'WBTC', 'OP', 'wstETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
@@ -52,3 +52,17 @@ export const v3USDTCollAssets = {
     [NetworkNumber.Arb]: v3USDTCollAssetsArb,
     [NetworkNumber.Base]: [],
 };
+export const v3USDSCollAssetsEth = ['wstETH', 'ETH', 'sUSDS', 'cbETH', 'tBTC', 'USDe'];
+export const v3USDSCollAssets = {
+    [NetworkNumber.Eth]: v3USDSCollAssetsEth,
+    [NetworkNumber.Opt]: [],
+    [NetworkNumber.Arb]: [],
+    [NetworkNumber.Base]: [],
+};
+export const v3wstETHCollAssetsEth = ['rsETH', 'ezETH'];
+export const v3wstETHCollAssets = {
+    [NetworkNumber.Eth]: v3wstETHCollAssetsEth,
+    [NetworkNumber.Opt]: [],
+    [NetworkNumber.Arb]: [],
+    [NetworkNumber.Base]: [],
+};

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

@@ -48,6 +48,10 @@ export declare const MORPHO_BLUE_RETH_ETH_945_BASE: (networkId?: NetworkNumber)
 export declare const MORPHO_BLUE_CBBTC_ETH_915_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBBTC_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_LBTC_WBTC_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_LBTC_CBBTC_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_WSTETH_EURC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_CBBTC_EURC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluewstethusdc: MorphoBlueMarketData;
     readonly morphobluesdaiusdc: MorphoBlueMarketData;
@@ -72,6 +76,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluecbbtcusdc: MorphoBlueMarketData;
     readonly morphoblueretheth_945: MorphoBlueMarketData;
     readonly morphobluesusdeusdc_915: MorphoBlueMarketData;
+    readonly morphobluelbtcwbtc_945: MorphoBlueMarketData;
     readonly morphobluewstetheth_945: MorphoBlueMarketData;
     readonly morphobluewstetheth_945_exchange_rate: MorphoBlueMarketData;
     readonly morphobluewstetheth_965_exchange_rate: MorphoBlueMarketData;
@@ -92,6 +97,9 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphoblueretheth_945_base: MorphoBlueMarketData;
     readonly morphobluecbbtceth_915_base: MorphoBlueMarketData;
     readonly morphobluecbbtcusdc_860_base: MorphoBlueMarketData;
+    readonly morphobluecbbtceurc_860_base: MorphoBlueMarketData;
+    readonly morphobluewstetheurc_860_base: MorphoBlueMarketData;
+    readonly morphobluelbtccbbtc_945_base: MorphoBlueMarketData;
     readonly morphobluewsuperoethbweth_915_base: MorphoBlueMarketData;
     readonly morphobluecbetheth_945_base: MorphoBlueMarketData;
     readonly morphobluecbetheth_965_base: MorphoBlueMarketData;

package/esm/markets/morphoBlue/index.js

@@ -715,7 +715,7 @@ export const MORPHO_BLUE_CBBTC_USDC_860_BASE = (networkId = NetworkNumber.Eth) =
 export const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Base],
     label: 'Morpho',
-    shortLabel: 'wsuperOETHb/WETH',
+    shortLabel: 'wsuperOETHb/ETH',
     value: MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base,
     url: 'wsuperoethbweth-144bf18d',
     loanToken: '0x4200000000000000000000000000000000000006',
@@ -727,6 +727,66 @@ export const MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = (networkId = NetworkNumber.
     marketId: '0x144bf18d6bf4c59602548a825034f73bf1d20177fc5f975fc69d5a5eba929b45',
     protocolName: 'morpho-blue',
 });
+export const MORPHO_BLUE_LBTC_WBTC_945 = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Eth],
+    label: 'Morpho',
+    shortLabel: 'LBTC/WBTC',
+    value: MorphoBlueVersions.MorphoBlueLBTCWBTC_945,
+    url: 'lbtcwbtc-f6a05662',
+    loanToken: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
+    collateralToken: '0x8236a87084f8B84306f72007F36F2618A5634494',
+    oracle: '0xa98105B8227E0f2157816Feb7A331364A9B74F80',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.945,
+    marketId: '0xf6a056627a51e511ec7f48332421432ea6971fc148d8f3c451e14ea108026549',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_LBTC_CBBTC_945_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho',
+    shortLabel: 'LBTC/cbBTC',
+    value: MorphoBlueVersions.MorphoBlueLBTCCbBTC_945_Base,
+    url: 'lbtccbbtc-30767836',
+    loanToken: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
+    collateralToken: '0xecAc9C5F704e954931349Da37F60E39f515c11c1',
+    oracle: '0x9Ae0E86e88AEE94B700240eBE0BD17D969BAD0EA',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.945,
+    marketId: '0x30767836635facec1282e6ef4a5981406ed4e72727b3a63a3a72c74e8279a8d7',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_WSTETH_EURC_860_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho',
+    shortLabel: 'wstETH/EURC',
+    value: MorphoBlueVersions.MorphoBlueWstEthEURC_860_Base,
+    url: 'wstetheurc-f7e40290',
+    loanToken: '0x60a3E35Cc302bFA44Cb288Bc5a4F316Fdb1adb42',
+    collateralToken: '0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452',
+    oracle: '0xa54122f0E0766258377Ffe732e454A3248f454F4',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.86,
+    marketId: '0xf7e40290f8ca1d5848b3c129502599aa0f0602eb5f5235218797a34242719561',
+    protocolName: 'morpho-blue',
+});
+export const MORPHO_BLUE_CBBTC_EURC_860_BASE = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [NetworkNumber.Base],
+    label: 'Morpho',
+    shortLabel: 'cbBTC/EURC',
+    value: MorphoBlueVersions.MorphoBlueCbBTCEURC_860_Base,
+    url: 'cbbtceurc-67ebd84b',
+    loanToken: '0x60a3E35Cc302bFA44Cb288Bc5a4F316Fdb1adb42',
+    collateralToken: '0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf',
+    oracle: '0xA857411CB2231a6A87a3bEF987a4cED8A067d799',
+    oracleType: MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.86,
+    marketId: '0x67ebd84b2fb39e3bc5a13d97e4c07abe1ea617e40654826e9abce252e95f049e',
+    protocolName: 'morpho-blue',
+});
 export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueWstEthUSDC]: MORPHO_BLUE_WSTETH_USDC(networkId),
     [MorphoBlueVersions.MorphoBlueSDAIUSDC]: MORPHO_BLUE_SDAI_USDC(networkId),
@@ -751,6 +811,7 @@ export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueCbBTCUSDC_860]: MORPHO_BLUE_CBBTC_USDC_860(networkId),
     [MorphoBlueVersions.MorphoBlueREthEth_945]: MORPHO_BLUE_RETH_ETH_945(networkId),
     [MorphoBlueVersions.MorphoBlueSUSDeUSDC_915]: MORPHO_BLUE_SUSDE_USDC_915(networkId),
+    [MorphoBlueVersions.MorphoBlueLBTCWBTC_945]: MORPHO_BLUE_LBTC_WBTC_945(networkId),
     // wstETH/WETH
     [MorphoBlueVersions.MorphoBlueWstEthEth_945]: MORPHO_BLUE_WSTETH_ETH_945(networkId),
     [MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate]: MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE(networkId),
@@ -775,6 +836,9 @@ export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueREthEth_945_Base]: MORPHO_BLUE_RETH_ETH_945_BASE(networkId),
     [MorphoBlueVersions.MorphoBlueCbBTCEth_915_Base]: MORPHO_BLUE_CBBTC_ETH_915_BASE(networkId),
     [MorphoBlueVersions.MorphoBlueCbBTCUSDC_860_Base]: MORPHO_BLUE_CBBTC_USDC_860_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueCbBTCEURC_860_Base]: MORPHO_BLUE_CBBTC_EURC_860_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueWstEthEURC_860_Base]: MORPHO_BLUE_WSTETH_EURC_860_BASE(networkId),
+    [MorphoBlueVersions.MorphoBlueLBTCCbBTC_945_Base]: MORPHO_BLUE_LBTC_CBBTC_945_BASE(networkId),
     // wsuperOETHb/WETH Base
     [MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base]: MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE(networkId),
     // cbETH/WETH Base

package/esm/morphoBlue/index.js

@@ -8,30 +8,47 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
 import { NetworkNumber, } from '../types/common';
-import { FeedRegistryContract, MorphoBlueViewContract, } from '../contracts';
-import { WAD, USD_QUOTE } from '../constants';
+import { DFSFeedRegistryContract, FeedRegistryContract, MorphoBlueViewContract } from '../contracts';
+import { USD_QUOTE, WAD } from '../constants';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { wethToEth } from '../services/utils';
 import { getBorrowRate, getMorphoBlueAggregatedPositionData, getSupplyRate } from '../helpers/morphoBlueHelpers';
+import { getChainlinkAssetAddress } from '../services/priceService';
+const isMainnetNetwork = (network) => network === NetworkNumber.Eth;
 export 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 Dec(lltv).mul(WAD).toString();
         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 feedRegistryContract = FeedRegistryContract(mainnetWeb3, NetworkNumber.Eth);
+        const loanTokenFeedAddress = getChainlinkAssetAddress(loanTokenInfo.symbol, network);
         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(),
-        ]);
+        let marketInfo;
+        let loanTokenPrice;
+        const isTokenUSDA = loanTokenInfo.symbol === 'USDA';
+        const isMainnet = isMainnetNetwork(network);
+        if (isMainnet) {
+            const feedRegistryContract = FeedRegistryContract(mainnetWeb3, NetworkNumber.Eth);
+            const [_loanTokenPrice, _marketInfo] = yield Promise.all([
+                isTokenUSDA ? Promise.resolve('100000000') : feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call(),
+                morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
+            ]);
+            marketInfo = _marketInfo;
+            loanTokenPrice = _loanTokenPrice;
+        }
+        else {
+            // Currently only base network is supported
+            const feedRegistryContract = DFSFeedRegistryContract(web3, network);
+            const [loanTokenPriceRound, _marketInfo] = yield Promise.all([
+                isTokenUSDA ? Promise.resolve({ answer: '100000000' }) // Normalize to match the expected object structure
+                    : feedRegistryContract.methods.latestRoundData(loanTokenFeedAddress, USD_QUOTE).call(),
+                morphoBlueViewContract.methods.getMarketInfoNotTuple(loanToken, collateralToken, oracle, irm, lltvInWei).call(),
+            ]);
+            marketInfo = _marketInfo;
+            loanTokenPrice = loanTokenPriceRound.answer;
+        }
         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();

package/esm/services/priceService.d.ts

@@ -1,4 +1,7 @@
 import Web3 from 'web3';
+import { NetworkNumber } from '../types/common';
 export declare const getEthPrice: (web3: Web3) => Promise<string>;
 export declare const getUSDCPrice: (web3: Web3) => Promise<string>;
 export declare const getCompPrice: (web3: Web3) => Promise<string>;
+export declare const getWstETHPrice: (web3: Web3) => Promise<string>;
+export declare const getChainlinkAssetAddress: (symbol: string, network: NetworkNumber) => string;

package/esm/services/priceService.js

@@ -8,8 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { COMPPriceFeedContract, ETHPriceFeedContract, USDCPriceFeedContract } from '../contracts';
+import { getAssetInfo } from '@defisaver/tokens';
+import { COMPPriceFeedContract, ETHPriceFeedContract, USDCPriceFeedContract, WstETHPriceFeedContract, } from '../contracts';
 import { NetworkNumber } from '../types/common';
+import { multicall } from '../multicall';
 export const getEthPrice = (web3) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = ETHPriceFeedContract(web3, NetworkNumber.Eth);
     const price = yield contract.methods.latestAnswer().call();
@@ -25,3 +27,31 @@ export const getCompPrice = (web3) => __awaiter(void 0, void 0, void 0, function
     const price = yield contract.methods.latestAnswer().call();
     return new Dec(price).div(1e8).toString();
 });
+export const getWstETHPrice = (web3) => __awaiter(void 0, void 0, void 0, function* () {
+    const wstETHFeedContract = WstETHPriceFeedContract(web3, NetworkNumber.Eth);
+    const ethFeedContract = ETHPriceFeedContract(web3, NetworkNumber.Eth);
+    const calls = [
+        {
+            target: ethFeedContract.options.address,
+            abiItem: ethFeedContract.options.jsonInterface.find(({ name }) => name === 'latestAnswer'),
+            params: [],
+        },
+        {
+            target: wstETHFeedContract.options.address,
+            abiItem: wstETHFeedContract.options.jsonInterface.find(({ name }) => name === 'latestRoundData'),
+            params: [],
+        },
+    ];
+    const multicallRes = yield multicall(calls, web3);
+    const ethPrice = new Dec(multicallRes[0][0]).div(1e8);
+    const wstETHRate = new Dec(multicallRes[1].answer).div(1e8);
+    return new Dec(ethPrice).mul(wstETHRate).toString();
+});
+// chainlink price feed available only on mainnet
+export const getChainlinkAssetAddress = (symbol, network) => {
+    if (['WBTC', 'RENBTC'].includes(symbol === null || symbol === void 0 ? void 0 : symbol.toUpperCase()))
+        return '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB';
+    if ((symbol === null || symbol === void 0 ? void 0 : symbol.toUpperCase()) === 'WETH')
+        return getAssetInfo('ETH').addresses[network];
+    return getAssetInfo(symbol).addresses[network];
+};

package/esm/types/compound.d.ts

@@ -5,7 +5,9 @@ export declare enum CompoundVersions {
     'CompoundV3USDCe' = "v3-USDC.e",
     'CompoundV3ETH' = "v3-ETH",
     'CompoundV3USDbC' = "v3-USDbC",
-    'CompoundV3USDT' = "v3-USDT"
+    'CompoundV3USDT' = "v3-USDT",
+    'CompoundV3USDS' = "v3-USDS",
+    'CompoundV3wstETH' = "v3-wstETH"
 }
 export interface CompoundBulkerOptions {
     supply: number | string;

package/esm/types/compound.js

@@ -6,4 +6,6 @@ export var CompoundVersions;
     CompoundVersions["CompoundV3ETH"] = "v3-ETH";
     CompoundVersions["CompoundV3USDbC"] = "v3-USDbC";
     CompoundVersions["CompoundV3USDT"] = "v3-USDT";
+    CompoundVersions["CompoundV3USDS"] = "v3-USDS";
+    CompoundVersions["CompoundV3wstETH"] = "v3-wstETH";
 })(CompoundVersions || (CompoundVersions = {}));