@defisaver/positions-sdk 0.0.34 → 0.0.36

package/cjs/compoundV3/index.js

@@ -17,13 +17,12 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
 const multicall_1 = require("../multicall");
-const compound_1 = require("../types/compound");
 const staking_1 = require("../staking");
 const utils_1 = require("../services/utils");
 const constants_1 = require("../constants");
 const moneymarket_1 = require("../moneymarket");
 const compoundHelpers_1 = require("../helpers/compoundHelpers");
-const compound_2 = require("../markets/compound");
+const compound_1 = require("../markets/compound");
 const priceService_1 = require("../services/priceService");
 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);
@@ -44,35 +43,33 @@ const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultWeb3) =>
     ];
     const data = yield (0, multicall_1.multicall)(calls, web3, network);
     const colls = data[1].colls.map((coll) => (0, compoundHelpers_1.formatMarketData)(coll, network, baseAssetPrice));
-    if (selectedMarket.value === compound_1.CompoundVersions.CompoundV3ETH) {
-        for (const coll of colls) {
-            if (coll.symbol === 'wstETH') {
-                // eslint-disable-next-line no-await-in-loop
-                const [[totalSupplyAlternative, supplyCapAlternative], priceAlternative] = yield Promise.all([
-                    (0, staking_1.getStETHByWstETHMultiple)([
-                        (0, tokens_1.assetAmountInWei)(coll.totalSupply, 'wstETH'),
-                        (0, tokens_1.assetAmountInWei)(coll.supplyCap, 'wstETH'),
-                    ], defaultWeb3),
-                    (0, staking_1.getWstETHByStETH)((0, tokens_1.assetAmountInWei)(1, 'stETH'), defaultWeb3),
-                ]);
-                coll.totalSupplyAlternative = (0, tokens_1.assetAmountInEth)(totalSupplyAlternative, 'stETH');
-                coll.supplyCapAlternative = (0, tokens_1.assetAmountInEth)(supplyCapAlternative, 'stETH');
-                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';
-            }
+    for (const coll of colls) {
+        if (coll.symbol === 'wstETH') {
+            // eslint-disable-next-line no-await-in-loop
+            const [[totalSupplyAlternative, supplyCapAlternative], priceAlternative] = yield Promise.all([
+                (0, staking_1.getStETHByWstETHMultiple)([
+                    (0, tokens_1.assetAmountInWei)(coll.totalSupply, 'wstETH'),
+                    (0, tokens_1.assetAmountInWei)(coll.supplyCap, 'wstETH'),
+                ], defaultWeb3),
+                (0, staking_1.getWstETHByStETH)((0, tokens_1.assetAmountInWei)(1, 'stETH'), defaultWeb3),
+            ]);
+            coll.totalSupplyAlternative = (0, tokens_1.assetAmountInEth)(totalSupplyAlternative, 'stETH');
+            coll.supplyCapAlternative = (0, tokens_1.assetAmountInEth)(supplyCapAlternative, 'stETH');
+            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';
         }
     }
     const base = (0, compoundHelpers_1.formatBaseData)(data[0].baseToken, network, baseAssetPrice);
@@ -127,9 +124,9 @@ const getCompoundV3AccountBalances = (web3, network, block, addressMapping, addr
         return balances;
     }
     const market = ({
-        [(0, compound_2.COMPOUND_V3_ETH)(network).baseMarketAddress.toLowerCase()]: (0, compound_2.COMPOUND_V3_ETH)(network),
-        [(0, compound_2.COMPOUND_V3_USDC)(network).baseMarketAddress.toLowerCase()]: (0, compound_2.COMPOUND_V3_USDC)(network),
-        [(0, compound_2.COMPOUND_V3_USDBC)(network).baseMarketAddress.toLowerCase()]: (0, compound_2.COMPOUND_V3_USDBC)(network),
+        [(0, compound_1.COMPOUND_V3_ETH)(network).baseMarketAddress.toLowerCase()]: (0, compound_1.COMPOUND_V3_ETH)(network),
+        [(0, compound_1.COMPOUND_V3_USDC)(network).baseMarketAddress.toLowerCase()]: (0, compound_1.COMPOUND_V3_USDC)(network),
+        [(0, compound_1.COMPOUND_V3_USDBC)(network).baseMarketAddress.toLowerCase()]: (0, compound_1.COMPOUND_V3_USDBC)(network),
     })[marketAddress.toLowerCase()];
     const loanInfoContract = (0, contracts_1.CompV3ViewContract)(web3, network, block);
     const loanInfo = yield loanInfoContract.methods.getLoanData(market.baseMarketAddress, address).call({}, block);
@@ -182,7 +179,7 @@ const getCompoundV3AccountData = (web3, network, address, proxyAddress, extracte
     if (loanData.borrowAmount.toString() !== '0') {
         usedAssets[baseAssetSymbol].isBorrowed = true;
         usedAssets[baseAssetSymbol].borrowed = (0, tokens_1.assetAmountInEth)(loanData.borrowAmount, baseAssetInfo.symbol);
-        if (selectedMarket.value === (0, compound_2.COMPOUND_V3_ETH)(network).value) {
+        if (selectedMarket.value === (0, compound_1.COMPOUND_V3_ETH)(network).value) {
             usedAssets[baseAssetSymbol].borrowedUsd = new decimal_js_1.default((0, tokens_1.assetAmountInEth)(loanData.borrowValue, baseAssetInfo.symbol))
                 .mul(assetsData[baseAssetSymbol].price)
                 .toString();

package/cjs/helpers/morphoBlueHelpers/index.d.ts

@@ -1,7 +1,7 @@
 import { MMUsedAssets } from '../../types/common';
-import { MorphoBlueAggregatedPositionData, MorphoBlueAssetsData } from '../../types';
-export declare const getMorphoBlueAggregatedPositionData: ({ usedAssets, assetsData, lltv }: {
+import { MorphoBlueAggregatedPositionData, MorphoBlueAssetsData, MorphoBlueMarketInfo } from '../../types';
+export declare const getMorphoBlueAggregatedPositionData: ({ usedAssets, assetsData, marketInfo }: {
     usedAssets: MMUsedAssets;
     assetsData: MorphoBlueAssetsData;
-    lltv: string;
+    marketInfo: MorphoBlueMarketInfo;
 }) => MorphoBlueAggregatedPositionData;

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -7,11 +7,12 @@ exports.getMorphoBlueAggregatedPositionData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const moneymarket_1 = require("../../moneymarket");
 const staking_1 = require("../../staking");
-const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, lltv }) => {
+const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }) => {
     const payload = {};
     payload.suppliedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
     payload.suppliedCollateralUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
     payload.borrowedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
+    const { lltv, oracle, collateralToken, loanToken, } = marketInfo;
     payload.borrowLimitUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => {
         const suppliedUsdAmount = suppliedUsd;
         return new decimal_js_1.default(suppliedUsdAmount).mul(lltv);
@@ -19,11 +20,15 @@ const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, lltv }) =
     payload.liquidationLimitUsd = payload.borrowLimitUsd;
     const leftToBorrowUsd = new decimal_js_1.default(payload.borrowLimitUsd).sub(payload.borrowedUsd);
     payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
+    payload.leftToBorrow = new decimal_js_1.default(usedAssets[collateralToken].supplied).mul(oracle).mul(lltv).sub(usedAssets[loanToken].borrowed)
+        .toString();
     const { netApy, incentiveUsd, totalInterestUsd } = (0, staking_1.calculateNetApy)(usedAssets, assetsData);
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;
     payload.totalInterestUsd = totalInterestUsd;
     payload.ltv = new decimal_js_1.default(payload.borrowedUsd).div(payload.suppliedCollateralUsd).toString();
+    payload.ltv = new decimal_js_1.default(usedAssets[loanToken].borrowed).div(oracle).div(usedAssets[collateralToken].supplied).toString();
+    payload.ratio = new decimal_js_1.default(usedAssets[collateralToken].supplied).mul(oracle).div(usedAssets[loanToken].borrowed).toString();
     const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);
     payload.leveragedType = leveragedType;
     if (leveragedType !== '') {

package/cjs/markets/curveUsd/index.js

@@ -5,9 +5,9 @@ const contracts_1 = require("../../contracts");
 const types_1 = require("../../types");
 const CRVUSD_WSTETH_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'wstETH',
+    label: 'CurveUSD - wstETH',
     shortLabel: 'wstETH',
-    value: types_1.CrvUSDVersions.wstETH,
+    value: types_1.CrvUSDVersions.crvUSDwstETH,
     collAsset: 'wstETH',
     baseAsset: 'crvUSD',
     controllerAddress: (0, contracts_1.getConfigContractAddress)('crvUSDwstETHController', networkId),
@@ -17,9 +17,9 @@ const CRVUSD_WSTETH_MARKET = (networkId) => ({
 exports.CRVUSD_WSTETH_MARKET = CRVUSD_WSTETH_MARKET;
 const CRVUSD_ETH_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'ETH',
+    label: 'CurveUSD - ETH',
     shortLabel: 'ETH',
-    value: types_1.CrvUSDVersions.ETH,
+    value: types_1.CrvUSDVersions.crvUSDETH,
     collAsset: 'ETH',
     baseAsset: 'crvUSD',
     controllerAddress: (0, contracts_1.getConfigContractAddress)('crvUSDETHController', networkId),
@@ -29,9 +29,9 @@ const CRVUSD_ETH_MARKET = (networkId) => ({
 exports.CRVUSD_ETH_MARKET = CRVUSD_ETH_MARKET;
 const CRVUSD_WBTC_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'WBTC',
+    label: 'CurveUSD - WBTC',
     shortLabel: 'WBTC',
-    value: types_1.CrvUSDVersions.WBTC,
+    value: types_1.CrvUSDVersions.crvUSDWBTC,
     collAsset: 'WBTC',
     baseAsset: 'crvUSD',
     controllerAddress: (0, contracts_1.getConfigContractAddress)('crvUSDWBTCController', networkId),
@@ -41,9 +41,9 @@ const CRVUSD_WBTC_MARKET = (networkId) => ({
 exports.CRVUSD_WBTC_MARKET = CRVUSD_WBTC_MARKET;
 const CRVUSD_TBTC_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'tBTC',
+    label: 'CurveUSD - tBTC',
     shortLabel: 'tBTC',
-    value: types_1.CrvUSDVersions.tBTC,
+    value: types_1.CrvUSDVersions.crvUSDtBTC,
     collAsset: 'tBTC',
     baseAsset: 'crvUSD',
     controllerAddress: (0, contracts_1.getConfigContractAddress)('crvUSDtBTCController', networkId),
@@ -53,9 +53,9 @@ const CRVUSD_TBTC_MARKET = (networkId) => ({
 exports.CRVUSD_TBTC_MARKET = CRVUSD_TBTC_MARKET;
 const CRVUSD_SFRXETH_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'sfrxETH',
+    label: 'CurveUSD - sfrxETH',
     shortLabel: 'sfrxETH',
-    value: types_1.CrvUSDVersions.sfrxETH,
+    value: types_1.CrvUSDVersions.crvUSDsfrxETH,
     collAsset: 'sfrxETH',
     baseAsset: 'crvUSD',
     controllerAddress: (0, contracts_1.getConfigContractAddress)('crvUSDsfrxETHController', networkId),
@@ -64,10 +64,10 @@ const CRVUSD_SFRXETH_MARKET = (networkId) => ({
 });
 exports.CRVUSD_SFRXETH_MARKET = CRVUSD_SFRXETH_MARKET;
 const CrvUsdMarkets = (networkId) => ({
-    [types_1.CrvUSDVersions.wstETH]: (0, exports.CRVUSD_WSTETH_MARKET)(networkId),
-    [types_1.CrvUSDVersions.ETH]: (0, exports.CRVUSD_ETH_MARKET)(networkId),
-    [types_1.CrvUSDVersions.WBTC]: (0, exports.CRVUSD_WBTC_MARKET)(networkId),
-    [types_1.CrvUSDVersions.tBTC]: (0, exports.CRVUSD_TBTC_MARKET)(networkId),
-    [types_1.CrvUSDVersions.sfrxETH]: (0, exports.CRVUSD_SFRXETH_MARKET)(networkId),
+    [types_1.CrvUSDVersions.crvUSDwstETH]: (0, exports.CRVUSD_WSTETH_MARKET)(networkId),
+    [types_1.CrvUSDVersions.crvUSDETH]: (0, exports.CRVUSD_ETH_MARKET)(networkId),
+    [types_1.CrvUSDVersions.crvUSDWBTC]: (0, exports.CRVUSD_WBTC_MARKET)(networkId),
+    [types_1.CrvUSDVersions.crvUSDtBTC]: (0, exports.CRVUSD_TBTC_MARKET)(networkId),
+    [types_1.CrvUSDVersions.crvUSDsfrxETH]: (0, exports.CRVUSD_SFRXETH_MARKET)(networkId),
 });
 exports.CrvUsdMarkets = CrvUsdMarkets;

package/cjs/markets/morphoBlue/index.js

@@ -8,7 +8,7 @@ const MORPHO_BLUE_WSTETH_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
     label: 'Morpho Blue',
     shortLabel: 'wstETH/ETH',
     value: types_1.MorphoBlueVersions.MorphoBlueWstEthEth,
-    url: 'default',
+    url: 'wstETH/ETH',
     loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
     collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
     oracle: '0x2a01eb9496094da03c4e364def50f5ad1280ad72',
@@ -23,7 +23,7 @@ const MORPHO_BLUE_WSTETH_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
     label: 'Morpho Blue',
     shortLabel: 'wstETH/USDC',
     value: types_1.MorphoBlueVersions.MorphoBlueWstEthUSDC,
-    url: 'default',
+    url: 'wstETH/USDC',
     loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
     collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
     oracle: '0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2',

package/cjs/morphoBlue/index.js

@@ -126,8 +126,8 @@ function getMorphoBlueAccountData(web3, network, account, selectedMarket, market
         const loanInfo = yield viewContract.methods.getUserInfo(marketObject, account).call();
         const usedAssets = {};
         const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
-        const loanTokenSupplied = new decimal_js_1.default(loanInfo.suppliedInAssets).div(constants_1.WAD).toString();
-        const loanTokenBorrowed = new decimal_js_1.default(loanInfo.borrowedInAssets).div(constants_1.WAD).toString();
+        const loanTokenSupplied = (0, tokens_1.assetAmountInEth)(loanInfo.suppliedInAssets, marketInfo.loanToken);
+        const loanTokenBorrowed = (0, tokens_1.assetAmountInEth)(loanInfo.borrowedInAssets, marketInfo.loanToken);
         usedAssets[marketInfo.loanToken] = {
             symbol: loanTokenInfo.symbol,
             supplied: loanTokenSupplied,
@@ -139,7 +139,7 @@ function getMorphoBlueAccountData(web3, network, account, selectedMarket, market
             borrowedUsd: new decimal_js_1.default(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
         };
         const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
-        const collateralTokenSupplied = new decimal_js_1.default(loanInfo.collateral).div(constants_1.WAD).toString();
+        const collateralTokenSupplied = (0, tokens_1.assetAmountInEth)(loanInfo.collateral, marketInfo.collateralToken);
         usedAssets[marketInfo.collateralToken] = {
             symbol: collateralTokenInfo.symbol,
             supplied: collateralTokenSupplied,
@@ -150,7 +150,7 @@ function getMorphoBlueAccountData(web3, network, account, selectedMarket, market
             suppliedUsd: new decimal_js_1.default(collateralTokenSupplied).mul(collateralTokenInfo.price).toString(),
             borrowedUsd: '0',
         };
-        return Object.assign({ usedAssets }, (0, morphoBlueHelpers_1.getMorphoBlueAggregatedPositionData)({ usedAssets, assetsData: marketInfo.assetsData, lltv: marketInfo.lltv }));
+        return Object.assign({ usedAssets }, (0, morphoBlueHelpers_1.getMorphoBlueAggregatedPositionData)({ usedAssets, assetsData: marketInfo.assetsData, marketInfo }));
     });
 }
 exports.getMorphoBlueAccountData = getMorphoBlueAccountData;

package/cjs/types/curveUsd.d.ts

@@ -1,10 +1,10 @@
 import { NetworkNumber } from './common';
 export declare enum CrvUSDVersions {
-    'wstETH' = "wstETH",
-    'WBTC' = "WBTC",
-    'ETH' = "ETH",
-    'tBTC' = "tBTC",
-    'sfrxETH' = "sfrxETH"
+    'crvUSDwstETH' = "wstETH",
+    'crvUSDWBTC' = "WBTC",
+    'crvUSDETH' = "ETH",
+    'crvUSDtBTC' = "tBTC",
+    'crvUSDsfrxETH' = "sfrxETH"
 }
 export declare enum CrvUSDStatus {
     Nonexistant = "Nonexistant",

package/cjs/types/curveUsd.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrvUSDStatus = exports.CrvUSDVersions = void 0;
 var CrvUSDVersions;
 (function (CrvUSDVersions) {
-    CrvUSDVersions["wstETH"] = "wstETH";
-    CrvUSDVersions["WBTC"] = "WBTC";
-    CrvUSDVersions["ETH"] = "ETH";
-    CrvUSDVersions["tBTC"] = "tBTC";
-    CrvUSDVersions["sfrxETH"] = "sfrxETH";
+    CrvUSDVersions["crvUSDwstETH"] = "wstETH";
+    CrvUSDVersions["crvUSDWBTC"] = "WBTC";
+    CrvUSDVersions["crvUSDETH"] = "ETH";
+    CrvUSDVersions["crvUSDtBTC"] = "tBTC";
+    CrvUSDVersions["crvUSDsfrxETH"] = "sfrxETH";
 })(CrvUSDVersions || (exports.CrvUSDVersions = CrvUSDVersions = {}));
 var CrvUSDStatus;
 (function (CrvUSDStatus) {

package/cjs/types/morphoBlue.d.ts

@@ -47,10 +47,12 @@ export interface MorphoBlueAggregatedPositionData {
     borrowLimitUsd: string;
     liquidationLimitUsd: string;
     leftToBorrowUsd: string;
+    leftToBorrow: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
     ltv: string;
+    ratio: string;
     leveragedType: string;
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
@@ -64,10 +66,12 @@ export interface MorphoBluePositionData {
     borrowLimitUsd: string;
     liquidationLimitUsd: string;
     leftToBorrowUsd: string;
+    leftToBorrow: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
     ltv: string;
+    ratio: string;
     leveragedType: string;
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;

package/esm/compoundV3/index.js

@@ -11,7 +11,6 @@ import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo, getAssetInfoByAddress, } from '@defisaver/tokens';
 import { CompV3ViewContract } from '../contracts';
 import { multicall } from '../multicall';
-import { CompoundVersions, } from '../types/compound';
 import { getCbETHApr, getREthApr, getStETHApr, getStETHByWstETHMultiple, getWstETHByStETH, } from '../staking';
 import { wethToEth } from '../services/utils';
 import { ZERO_ADDRESS } from '../constants';
@@ -38,35 +37,33 @@ export const getCompoundV3MarketsData = (web3, network, selectedMarket, defaultW
     ];
     const data = yield multicall(calls, web3, network);
     const colls = data[1].colls.map((coll) => formatMarketData(coll, network, baseAssetPrice));
-    if (selectedMarket.value === CompoundVersions.CompoundV3ETH) {
-        for (const coll of colls) {
-            if (coll.symbol === 'wstETH') {
-                // eslint-disable-next-line no-await-in-loop
-                const [[totalSupplyAlternative, supplyCapAlternative], priceAlternative] = yield Promise.all([
-                    getStETHByWstETHMultiple([
-                        assetAmountInWei(coll.totalSupply, 'wstETH'),
-                        assetAmountInWei(coll.supplyCap, 'wstETH'),
-                    ], defaultWeb3),
-                    getWstETHByStETH(assetAmountInWei(1, 'stETH'), defaultWeb3),
-                ]);
-                coll.totalSupplyAlternative = assetAmountInEth(totalSupplyAlternative, 'stETH');
-                coll.supplyCapAlternative = assetAmountInEth(supplyCapAlternative, 'stETH');
-                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';
-            }
+    for (const coll of colls) {
+        if (coll.symbol === 'wstETH') {
+            // eslint-disable-next-line no-await-in-loop
+            const [[totalSupplyAlternative, supplyCapAlternative], priceAlternative] = yield Promise.all([
+                getStETHByWstETHMultiple([
+                    assetAmountInWei(coll.totalSupply, 'wstETH'),
+                    assetAmountInWei(coll.supplyCap, 'wstETH'),
+                ], defaultWeb3),
+                getWstETHByStETH(assetAmountInWei(1, 'stETH'), defaultWeb3),
+            ]);
+            coll.totalSupplyAlternative = assetAmountInEth(totalSupplyAlternative, 'stETH');
+            coll.supplyCapAlternative = assetAmountInEth(supplyCapAlternative, 'stETH');
+            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';
         }
     }
     const base = formatBaseData(data[0].baseToken, network, baseAssetPrice);

package/esm/helpers/morphoBlueHelpers/index.d.ts

@@ -1,7 +1,7 @@
 import { MMUsedAssets } from '../../types/common';
-import { MorphoBlueAggregatedPositionData, MorphoBlueAssetsData } from '../../types';
-export declare const getMorphoBlueAggregatedPositionData: ({ usedAssets, assetsData, lltv }: {
+import { MorphoBlueAggregatedPositionData, MorphoBlueAssetsData, MorphoBlueMarketInfo } from '../../types';
+export declare const getMorphoBlueAggregatedPositionData: ({ usedAssets, assetsData, marketInfo }: {
     usedAssets: MMUsedAssets;
     assetsData: MorphoBlueAssetsData;
-    lltv: string;
+    marketInfo: MorphoBlueMarketInfo;
 }) => MorphoBlueAggregatedPositionData;

package/esm/helpers/morphoBlueHelpers/index.js

@@ -1,11 +1,12 @@
 import Dec from 'decimal.js';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
-export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, lltv }) => {
+export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }) => {
     const payload = {};
     payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
     payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
     payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
+    const { lltv, oracle, collateralToken, loanToken, } = marketInfo;
     payload.borrowLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => {
         const suppliedUsdAmount = suppliedUsd;
         return new Dec(suppliedUsdAmount).mul(lltv);
@@ -13,11 +14,15 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ll
     payload.liquidationLimitUsd = payload.borrowLimitUsd;
     const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
     payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
+    payload.leftToBorrow = new Dec(usedAssets[collateralToken].supplied).mul(oracle).mul(lltv).sub(usedAssets[loanToken].borrowed)
+        .toString();
     const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy(usedAssets, assetsData);
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;
     payload.totalInterestUsd = totalInterestUsd;
     payload.ltv = new Dec(payload.borrowedUsd).div(payload.suppliedCollateralUsd).toString();
+    payload.ltv = new Dec(usedAssets[loanToken].borrowed).div(oracle).div(usedAssets[collateralToken].supplied).toString();
+    payload.ratio = new Dec(usedAssets[collateralToken].supplied).mul(oracle).div(usedAssets[loanToken].borrowed).toString();
     const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
     payload.leveragedType = leveragedType;
     if (leveragedType !== '') {

package/esm/markets/curveUsd/index.js

@@ -2,9 +2,9 @@ import { getConfigContractAddress } from '../../contracts';
 import { CrvUSDVersions } from '../../types';
 export const CRVUSD_WSTETH_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'wstETH',
+    label: 'CurveUSD - wstETH',
     shortLabel: 'wstETH',
-    value: CrvUSDVersions.wstETH,
+    value: CrvUSDVersions.crvUSDwstETH,
     collAsset: 'wstETH',
     baseAsset: 'crvUSD',
     controllerAddress: getConfigContractAddress('crvUSDwstETHController', networkId),
@@ -13,9 +13,9 @@ export const CRVUSD_WSTETH_MARKET = (networkId) => ({
 });
 export const CRVUSD_ETH_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'ETH',
+    label: 'CurveUSD - ETH',
     shortLabel: 'ETH',
-    value: CrvUSDVersions.ETH,
+    value: CrvUSDVersions.crvUSDETH,
     collAsset: 'ETH',
     baseAsset: 'crvUSD',
     controllerAddress: getConfigContractAddress('crvUSDETHController', networkId),
@@ -24,9 +24,9 @@ export const CRVUSD_ETH_MARKET = (networkId) => ({
 });
 export const CRVUSD_WBTC_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'WBTC',
+    label: 'CurveUSD - WBTC',
     shortLabel: 'WBTC',
-    value: CrvUSDVersions.WBTC,
+    value: CrvUSDVersions.crvUSDWBTC,
     collAsset: 'WBTC',
     baseAsset: 'crvUSD',
     controllerAddress: getConfigContractAddress('crvUSDWBTCController', networkId),
@@ -35,9 +35,9 @@ export const CRVUSD_WBTC_MARKET = (networkId) => ({
 });
 export const CRVUSD_TBTC_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'tBTC',
+    label: 'CurveUSD - tBTC',
     shortLabel: 'tBTC',
-    value: CrvUSDVersions.tBTC,
+    value: CrvUSDVersions.crvUSDtBTC,
     collAsset: 'tBTC',
     baseAsset: 'crvUSD',
     controllerAddress: getConfigContractAddress('crvUSDtBTCController', networkId),
@@ -46,9 +46,9 @@ export const CRVUSD_TBTC_MARKET = (networkId) => ({
 });
 export const CRVUSD_SFRXETH_MARKET = (networkId) => ({
     chainIds: [1],
-    label: 'sfrxETH',
+    label: 'CurveUSD - sfrxETH',
     shortLabel: 'sfrxETH',
-    value: CrvUSDVersions.sfrxETH,
+    value: CrvUSDVersions.crvUSDsfrxETH,
     collAsset: 'sfrxETH',
     baseAsset: 'crvUSD',
     controllerAddress: getConfigContractAddress('crvUSDsfrxETHController', networkId),
@@ -56,9 +56,9 @@ export const CRVUSD_SFRXETH_MARKET = (networkId) => ({
     createCollAssets: ['sfrxETH'],
 });
 export const CrvUsdMarkets = (networkId) => ({
-    [CrvUSDVersions.wstETH]: CRVUSD_WSTETH_MARKET(networkId),
-    [CrvUSDVersions.ETH]: CRVUSD_ETH_MARKET(networkId),
-    [CrvUSDVersions.WBTC]: CRVUSD_WBTC_MARKET(networkId),
-    [CrvUSDVersions.tBTC]: CRVUSD_TBTC_MARKET(networkId),
-    [CrvUSDVersions.sfrxETH]: CRVUSD_SFRXETH_MARKET(networkId),
+    [CrvUSDVersions.crvUSDwstETH]: CRVUSD_WSTETH_MARKET(networkId),
+    [CrvUSDVersions.crvUSDETH]: CRVUSD_ETH_MARKET(networkId),
+    [CrvUSDVersions.crvUSDWBTC]: CRVUSD_WBTC_MARKET(networkId),
+    [CrvUSDVersions.crvUSDtBTC]: CRVUSD_TBTC_MARKET(networkId),
+    [CrvUSDVersions.crvUSDsfrxETH]: CRVUSD_SFRXETH_MARKET(networkId),
 });

package/esm/markets/morphoBlue/index.js

@@ -5,7 +5,7 @@ export const MORPHO_BLUE_WSTETH_ETH = (networkId = NetworkNumber.Eth) => ({
     label: 'Morpho Blue',
     shortLabel: 'wstETH/ETH',
     value: MorphoBlueVersions.MorphoBlueWstEthEth,
-    url: 'default',
+    url: 'wstETH/ETH',
     loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
     collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
     oracle: '0x2a01eb9496094da03c4e364def50f5ad1280ad72',
@@ -19,7 +19,7 @@ export const MORPHO_BLUE_WSTETH_USDC = (networkId = NetworkNumber.Eth) => ({
     label: 'Morpho Blue',
     shortLabel: 'wstETH/USDC',
     value: MorphoBlueVersions.MorphoBlueWstEthUSDC,
-    url: 'default',
+    url: 'wstETH/USDC',
     loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
     collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
     oracle: '0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2',

package/esm/morphoBlue/index.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { MorphoBlueViewContract, getConfigContractAbi, getConfigContractAddress, } from '../contracts';
 import { WAD, SECONDS_PER_YEAR, USD_QUOTE } from '../constants';
 import { getStakingApy } from '../staking';
@@ -119,8 +119,8 @@ export function getMorphoBlueAccountData(web3, network, account, selectedMarket,
         const loanInfo = yield viewContract.methods.getUserInfo(marketObject, account).call();
         const usedAssets = {};
         const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
-        const loanTokenSupplied = new Dec(loanInfo.suppliedInAssets).div(WAD).toString();
-        const loanTokenBorrowed = new Dec(loanInfo.borrowedInAssets).div(WAD).toString();
+        const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets, marketInfo.loanToken);
+        const loanTokenBorrowed = assetAmountInEth(loanInfo.borrowedInAssets, marketInfo.loanToken);
         usedAssets[marketInfo.loanToken] = {
             symbol: loanTokenInfo.symbol,
             supplied: loanTokenSupplied,
@@ -132,7 +132,7 @@ export function getMorphoBlueAccountData(web3, network, account, selectedMarket,
             borrowedUsd: new Dec(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
         };
         const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
-        const collateralTokenSupplied = new Dec(loanInfo.collateral).div(WAD).toString();
+        const collateralTokenSupplied = assetAmountInEth(loanInfo.collateral, marketInfo.collateralToken);
         usedAssets[marketInfo.collateralToken] = {
             symbol: collateralTokenInfo.symbol,
             supplied: collateralTokenSupplied,
@@ -143,6 +143,6 @@ export function getMorphoBlueAccountData(web3, network, account, selectedMarket,
             suppliedUsd: new Dec(collateralTokenSupplied).mul(collateralTokenInfo.price).toString(),
             borrowedUsd: '0',
         };
-        return Object.assign({ usedAssets }, getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, lltv: marketInfo.lltv }));
+        return Object.assign({ usedAssets }, getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, marketInfo }));
     });
 }

package/esm/types/curveUsd.d.ts

@@ -1,10 +1,10 @@
 import { NetworkNumber } from './common';
 export declare enum CrvUSDVersions {
-    'wstETH' = "wstETH",
-    'WBTC' = "WBTC",
-    'ETH' = "ETH",
-    'tBTC' = "tBTC",
-    'sfrxETH' = "sfrxETH"
+    'crvUSDwstETH' = "wstETH",
+    'crvUSDWBTC' = "WBTC",
+    'crvUSDETH' = "ETH",
+    'crvUSDtBTC' = "tBTC",
+    'crvUSDsfrxETH' = "sfrxETH"
 }
 export declare enum CrvUSDStatus {
     Nonexistant = "Nonexistant",

package/esm/types/curveUsd.js

@@ -1,10 +1,10 @@
 export var CrvUSDVersions;
 (function (CrvUSDVersions) {
-    CrvUSDVersions["wstETH"] = "wstETH";
-    CrvUSDVersions["WBTC"] = "WBTC";
-    CrvUSDVersions["ETH"] = "ETH";
-    CrvUSDVersions["tBTC"] = "tBTC";
-    CrvUSDVersions["sfrxETH"] = "sfrxETH";
+    CrvUSDVersions["crvUSDwstETH"] = "wstETH";
+    CrvUSDVersions["crvUSDWBTC"] = "WBTC";
+    CrvUSDVersions["crvUSDETH"] = "ETH";
+    CrvUSDVersions["crvUSDtBTC"] = "tBTC";
+    CrvUSDVersions["crvUSDsfrxETH"] = "sfrxETH";
 })(CrvUSDVersions || (CrvUSDVersions = {}));
 export var CrvUSDStatus;
 (function (CrvUSDStatus) {

package/esm/types/morphoBlue.d.ts

@@ -47,10 +47,12 @@ export interface MorphoBlueAggregatedPositionData {
     borrowLimitUsd: string;
     liquidationLimitUsd: string;
     leftToBorrowUsd: string;
+    leftToBorrow: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
     ltv: string;
+    ratio: string;
     leveragedType: string;
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
@@ -64,10 +66,12 @@ export interface MorphoBluePositionData {
     borrowLimitUsd: string;
     liquidationLimitUsd: string;
     leftToBorrowUsd: string;
+    leftToBorrow: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
     ltv: string;
+    ratio: string;
     leveragedType: string;
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;

package/package.json

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

package/src/compoundV3/index.ts

@@ -42,35 +42,33 @@ export const getCompoundV3MarketsData = async (web3: Web3, network: NetworkNumbe
   ];
   const data = await multicall(calls, web3, network);
   const colls = data[1].colls.map((coll: any) => formatMarketData(coll, network, baseAssetPrice)) as CompoundV3AssetData[];
-  if (selectedMarket.value === CompoundVersions.CompoundV3ETH) {
-    for (const coll of colls) {
-      if (coll.symbol === 'wstETH') {
-        // eslint-disable-next-line no-await-in-loop
-        const [[totalSupplyAlternative, supplyCapAlternative], priceAlternative] = await Promise.all([
-          getStETHByWstETHMultiple([
-            assetAmountInWei(coll.totalSupply, 'wstETH'),
-            assetAmountInWei(coll.supplyCap, 'wstETH'),
-          ], defaultWeb3),
-          getWstETHByStETH(assetAmountInWei(1, 'stETH'), defaultWeb3),
-        ]);
-        coll.totalSupplyAlternative = assetAmountInEth(totalSupplyAlternative, 'stETH');
-        coll.supplyCapAlternative = assetAmountInEth(supplyCapAlternative, 'stETH');
-        coll.priceAlternative = assetAmountInEth(priceAlternative, 'wstETH');
-        // const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
-        // eslint-disable-next-line no-await-in-loop
-        coll.incentiveSupplyApy = await getStETHApr(defaultWeb3);
-        coll.incentiveSupplyToken = 'wstETH';
-      }
-      if (coll.symbol === 'cbETH') {
-        // eslint-disable-next-line no-await-in-loop
-        coll.incentiveSupplyApy = await getCbETHApr(defaultWeb3);
-        coll.incentiveSupplyToken = 'cbETH';
-      }
-      if (coll.symbol === 'rETH') {
-        // eslint-disable-next-line no-await-in-loop
-        coll.incentiveSupplyApy = await getREthApr(defaultWeb3);
-        coll.incentiveSupplyToken = 'rETH';
-      }
+  for (const coll of colls) {
+    if (coll.symbol === 'wstETH') {
+      // eslint-disable-next-line no-await-in-loop
+      const [[totalSupplyAlternative, supplyCapAlternative], priceAlternative] = await Promise.all([
+        getStETHByWstETHMultiple([
+          assetAmountInWei(coll.totalSupply, 'wstETH'),
+          assetAmountInWei(coll.supplyCap, 'wstETH'),
+        ], defaultWeb3),
+        getWstETHByStETH(assetAmountInWei(1, 'stETH'), defaultWeb3),
+      ]);
+      coll.totalSupplyAlternative = assetAmountInEth(totalSupplyAlternative, 'stETH');
+      coll.supplyCapAlternative = assetAmountInEth(supplyCapAlternative, 'stETH');
+      coll.priceAlternative = assetAmountInEth(priceAlternative, 'wstETH');
+      // const stEthMarket = markets.find(({ symbol }) => symbol === 'stETH');
+      // eslint-disable-next-line no-await-in-loop
+      coll.incentiveSupplyApy = await getStETHApr(defaultWeb3);
+      coll.incentiveSupplyToken = 'wstETH';
+    }
+    if (coll.symbol === 'cbETH') {
+      // eslint-disable-next-line no-await-in-loop
+      coll.incentiveSupplyApy = await getCbETHApr(defaultWeb3);
+      coll.incentiveSupplyToken = 'cbETH';
+    }
+    if (coll.symbol === 'rETH') {
+      // eslint-disable-next-line no-await-in-loop
+      coll.incentiveSupplyApy = await getREthApr(defaultWeb3);
+      coll.incentiveSupplyToken = 'rETH';
     }
   }
   const base = formatBaseData(data[0].baseToken, network, baseAssetPrice);

package/src/helpers/morphoBlueHelpers/index.ts

@@ -2,14 +2,18 @@ import Dec from 'decimal.js';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
 import { MMUsedAssets } from '../../types/common';
-import { MorphoBlueAggregatedPositionData, MorphoBlueAssetsData } from '../../types';
+import { MorphoBlueAggregatedPositionData, MorphoBlueAssetsData, MorphoBlueMarketInfo } from '../../types';
 
-export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, lltv }: { usedAssets: MMUsedAssets, assetsData: MorphoBlueAssetsData, lltv: string }): MorphoBlueAggregatedPositionData => {
+export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }: { usedAssets: MMUsedAssets, assetsData: MorphoBlueAssetsData, marketInfo: MorphoBlueMarketInfo }): MorphoBlueAggregatedPositionData => {
   const payload = {} as MorphoBlueAggregatedPositionData;
   payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
   payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
   payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
 
+  const {
+    lltv, oracle, collateralToken, loanToken,
+  } = marketInfo;
+
   payload.borrowLimitUsd = getAssetsTotal(
     usedAssets,
     ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral,
@@ -23,12 +27,17 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ll
   const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
   payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
 
+  payload.leftToBorrow = new Dec(usedAssets[collateralToken].supplied).mul(oracle).mul(lltv).sub(usedAssets[loanToken].borrowed)
+    .toString();
+
   const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy(usedAssets, assetsData as any);
   payload.netApy = netApy;
   payload.incentiveUsd = incentiveUsd;
   payload.totalInterestUsd = totalInterestUsd;
 
   payload.ltv = new Dec(payload.borrowedUsd).div(payload.suppliedCollateralUsd).toString();
+  payload.ltv = new Dec(usedAssets[loanToken].borrowed).div(oracle).div(usedAssets[collateralToken].supplied).toString();
+  payload.ratio = new Dec(usedAssets[collateralToken].supplied).mul(oracle).div(usedAssets[loanToken].borrowed).toString();
 
   const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
   payload.leveragedType = leveragedType;

package/src/markets/curveUsd/index.ts

@@ -4,9 +4,9 @@ import { NetworkNumber } from '../../types/common';
 
 export const CRVUSD_WSTETH_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
   chainIds: [1],
-  label: 'wstETH',
+  label: 'CurveUSD - wstETH',
   shortLabel: 'wstETH',
-  value: CrvUSDVersions.wstETH,
+  value: CrvUSDVersions.crvUSDwstETH,
   collAsset: 'wstETH',
   baseAsset: 'crvUSD',
   controllerAddress: getConfigContractAddress('crvUSDwstETHController', networkId),
@@ -15,9 +15,9 @@ export const CRVUSD_WSTETH_MARKET = (networkId: NetworkNumber): CrvUSDMarketData
 });
 export const CRVUSD_ETH_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
   chainIds: [1],
-  label: 'ETH',
+  label: 'CurveUSD - ETH',
   shortLabel: 'ETH',
-  value: CrvUSDVersions.ETH,
+  value: CrvUSDVersions.crvUSDETH,
   collAsset: 'ETH',
   baseAsset: 'crvUSD',
   controllerAddress: getConfigContractAddress('crvUSDETHController', networkId),
@@ -26,9 +26,9 @@ export const CRVUSD_ETH_MARKET = (networkId: NetworkNumber): CrvUSDMarketData =>
 });
 export const CRVUSD_WBTC_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
   chainIds: [1],
-  label: 'WBTC',
+  label: 'CurveUSD - WBTC',
   shortLabel: 'WBTC',
-  value: CrvUSDVersions.WBTC,
+  value: CrvUSDVersions.crvUSDWBTC,
   collAsset: 'WBTC',
   baseAsset: 'crvUSD',
   controllerAddress: getConfigContractAddress('crvUSDWBTCController', networkId),
@@ -38,9 +38,9 @@ export const CRVUSD_WBTC_MARKET = (networkId: NetworkNumber): CrvUSDMarketData =
 
 export const CRVUSD_TBTC_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
   chainIds: [1],
-  label: 'tBTC',
+  label: 'CurveUSD - tBTC',
   shortLabel: 'tBTC',
-  value: CrvUSDVersions.tBTC,
+  value: CrvUSDVersions.crvUSDtBTC,
   collAsset: 'tBTC',
   baseAsset: 'crvUSD',
   controllerAddress: getConfigContractAddress('crvUSDtBTCController', networkId),
@@ -50,9 +50,9 @@ export const CRVUSD_TBTC_MARKET = (networkId: NetworkNumber): CrvUSDMarketData =
 
 export const CRVUSD_SFRXETH_MARKET = (networkId: NetworkNumber): CrvUSDMarketData => ({
   chainIds: [1],
-  label: 'sfrxETH',
+  label: 'CurveUSD - sfrxETH',
   shortLabel: 'sfrxETH',
-  value: CrvUSDVersions.sfrxETH,
+  value: CrvUSDVersions.crvUSDsfrxETH,
   collAsset: 'sfrxETH',
   baseAsset: 'crvUSD',
   controllerAddress: getConfigContractAddress('crvUSDsfrxETHController', networkId),
@@ -62,9 +62,9 @@ export const CRVUSD_SFRXETH_MARKET = (networkId: NetworkNumber): CrvUSDMarketDat
 
 
 export const CrvUsdMarkets = (networkId: NetworkNumber) => ({
-  [CrvUSDVersions.wstETH]: CRVUSD_WSTETH_MARKET(networkId),
-  [CrvUSDVersions.ETH]: CRVUSD_ETH_MARKET(networkId),
-  [CrvUSDVersions.WBTC]: CRVUSD_WBTC_MARKET(networkId),
-  [CrvUSDVersions.tBTC]: CRVUSD_TBTC_MARKET(networkId),
-  [CrvUSDVersions.sfrxETH]: CRVUSD_SFRXETH_MARKET(networkId),
+  [CrvUSDVersions.crvUSDwstETH]: CRVUSD_WSTETH_MARKET(networkId),
+  [CrvUSDVersions.crvUSDETH]: CRVUSD_ETH_MARKET(networkId),
+  [CrvUSDVersions.crvUSDWBTC]: CRVUSD_WBTC_MARKET(networkId),
+  [CrvUSDVersions.crvUSDtBTC]: CRVUSD_TBTC_MARKET(networkId),
+  [CrvUSDVersions.crvUSDsfrxETH]: CRVUSD_SFRXETH_MARKET(networkId),
 }) as const;

package/src/markets/morphoBlue/index.ts

@@ -6,7 +6,7 @@ export const MORPHO_BLUE_WSTETH_ETH = (networkId: NetworkNumber = NetworkNumber.
   label: 'Morpho Blue',
   shortLabel: 'wstETH/ETH',
   value: MorphoBlueVersions.MorphoBlueWstEthEth,
-  url: 'default',
+  url: 'wstETH/ETH',
   loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
   oracle: '0x2a01eb9496094da03c4e364def50f5ad1280ad72',
@@ -21,7 +21,7 @@ export const MORPHO_BLUE_WSTETH_USDC = (networkId: NetworkNumber = NetworkNumber
   label: 'Morpho Blue',
   shortLabel: 'wstETH/USDC',
   value: MorphoBlueVersions.MorphoBlueWstEthUSDC,
-  url: 'default',
+  url: 'wstETH/USDC',
   loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
   collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
   oracle: '0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2',

package/src/morphoBlue/index.ts

@@ -1,6 +1,6 @@
 import Web3 from 'web3';
 import Dec from 'decimal.js';
-import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { MMUsedAssets, NetworkNumber } from '../types/common';
 import {
   MorphoBlueViewContract,
@@ -138,8 +138,8 @@ export async function getMorphoBlueAccountData(web3: Web3, network: NetworkNumbe
   const usedAssets: MMUsedAssets = {};
 
   const loanTokenInfo = marketInfo.assetsData[marketInfo.loanToken];
-  const loanTokenSupplied = new Dec(loanInfo.suppliedInAssets).div(WAD).toString();
-  const loanTokenBorrowed = new Dec(loanInfo.borrowedInAssets).div(WAD).toString();
+  const loanTokenSupplied = assetAmountInEth(loanInfo.suppliedInAssets, marketInfo.loanToken);
+  const loanTokenBorrowed = assetAmountInEth(loanInfo.borrowedInAssets, marketInfo.loanToken);
   usedAssets[marketInfo.loanToken] = {
     symbol: loanTokenInfo.symbol,
     supplied: loanTokenSupplied,
@@ -152,7 +152,7 @@ export async function getMorphoBlueAccountData(web3: Web3, network: NetworkNumbe
   };
 
   const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
-  const collateralTokenSupplied = new Dec(loanInfo.collateral).div(WAD).toString();
+  const collateralTokenSupplied = assetAmountInEth(loanInfo.collateral, marketInfo.collateralToken);
   usedAssets[marketInfo.collateralToken] = {
     symbol: collateralTokenInfo.symbol,
     supplied: collateralTokenSupplied,
@@ -166,6 +166,6 @@ export async function getMorphoBlueAccountData(web3: Web3, network: NetworkNumbe
 
   return {
     usedAssets,
-    ...getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, lltv: marketInfo.lltv }),
+    ...getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, marketInfo }),
   };
 }

package/src/types/curveUsd.ts

@@ -1,11 +1,11 @@
 import { NetworkNumber } from './common';
 
 export enum CrvUSDVersions {
-  'wstETH' = 'wstETH',
-  'WBTC' = 'WBTC',
-  'ETH' = 'ETH',
-  'tBTC' = 'tBTC',
-  'sfrxETH' = 'sfrxETH',
+  'crvUSDwstETH' = 'wstETH',
+  'crvUSDWBTC' = 'WBTC',
+  'crvUSDETH' = 'ETH',
+  'crvUSDtBTC' = 'tBTC',
+  'crvUSDsfrxETH' = 'sfrxETH',
 }
 
 export enum CrvUSDStatus {

package/src/types/morphoBlue.ts

@@ -52,10 +52,12 @@ export interface MorphoBlueAggregatedPositionData {
   borrowLimitUsd: string,
   liquidationLimitUsd: string,
   leftToBorrowUsd: string,
+  leftToBorrow: string,
   netApy: string,
   incentiveUsd: string,
   totalInterestUsd: string,
   ltv: string,
+  ratio: string,
   leveragedType: string,
   leveragedAsset?: string,
   leveragedLsdAssetRatio?: string,
@@ -70,10 +72,12 @@ export interface MorphoBluePositionData {
   borrowLimitUsd: string,
   liquidationLimitUsd: string,
   leftToBorrowUsd: string,
+  leftToBorrow: string,
   netApy: string,
   incentiveUsd: string,
   totalInterestUsd: string,
   ltv: string,
+  ratio: string,
   leveragedType: string,
   leveragedAsset?: string,
   leveragedLsdAssetRatio?: string,