@defisaver/positions-sdk 0.0.35 → 0.0.37

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/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

@@ -90,6 +90,8 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
             borrowRate: new decimal_js_1.default(compoundedBorrowRate).div(constants_1.WAD).mul(100).toString(),
             totalSupply: new decimal_js_1.default(marketInfo.totalSupplyAssets).div(scale).toString(),
             totalBorrow: new decimal_js_1.default(marketInfo.totalBorrowAssets).div(scale).toString(),
+            canBeSupplied: true,
+            canBeBorrowed: true,
         };
         assetsData[(0, utils_1.wethToEth)(collateralTokenInfo.symbol)] = {
             symbol: (0, utils_1.wethToEth)(collateralTokenInfo.symbol),
@@ -97,6 +99,8 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
             price: new decimal_js_1.default(loanTokenPrice).div(1e8).mul(oracleRate).toString(),
             supplyRate: '0',
             borrowRate: '0',
+            canBeSupplied: true,
+            canBeBorrowed: false,
         };
         if (['wstETH', 'cbETH', 'rETH'].includes(collateralTokenInfo.symbol)) {
             assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collateralTokenInfo.symbol, mainnetWeb3);
@@ -126,8 +130,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 +143,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 +154,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/morphoBlue.d.ts

@@ -26,6 +26,8 @@ export interface MorphoBlueAssetData {
     incentiveSupplyToken?: string;
     totalSupply?: string;
     totalBorrow?: string;
+    canBeSupplied?: boolean;
+    canBeBorrowed?: boolean;
 }
 export type MorphoBlueAssetsData = {
     [key: string]: MorphoBlueAssetData;
@@ -47,10 +49,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 +68,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/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/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';
@@ -84,6 +84,8 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
             borrowRate: new Dec(compoundedBorrowRate).div(WAD).mul(100).toString(),
             totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),
             totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(scale).toString(),
+            canBeSupplied: true,
+            canBeBorrowed: true,
         };
         assetsData[wethToEth(collateralTokenInfo.symbol)] = {
             symbol: wethToEth(collateralTokenInfo.symbol),
@@ -91,6 +93,8 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
             price: new Dec(loanTokenPrice).div(1e8).mul(oracleRate).toString(),
             supplyRate: '0',
             borrowRate: '0',
+            canBeSupplied: true,
+            canBeBorrowed: false,
         };
         if (['wstETH', 'cbETH', 'rETH'].includes(collateralTokenInfo.symbol)) {
             assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = yield getStakingApy(collateralTokenInfo.symbol, mainnetWeb3);
@@ -119,8 +123,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 +136,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 +147,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/morphoBlue.d.ts

@@ -26,6 +26,8 @@ export interface MorphoBlueAssetData {
     incentiveSupplyToken?: string;
     totalSupply?: string;
     totalBorrow?: string;
+    canBeSupplied?: boolean;
+    canBeBorrowed?: boolean;
 }
 export type MorphoBlueAssetsData = {
     [key: string]: MorphoBlueAssetData;
@@ -47,10 +49,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 +68,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.35",
+  "version": "0.0.37",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

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/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,
@@ -98,6 +98,8 @@ export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber
     borrowRate: new Dec(compoundedBorrowRate).div(WAD).mul(100).toString(),
     totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),
     totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(scale).toString(),
+    canBeSupplied: true,
+    canBeBorrowed: true,
   };
 
   assetsData[wethToEth(collateralTokenInfo.symbol)] = {
@@ -106,6 +108,8 @@ export async function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber
     price: new Dec(loanTokenPrice).div(1e8).mul(oracleRate).toString(),
     supplyRate: '0',
     borrowRate: '0',
+    canBeSupplied: true,
+    canBeBorrowed: false,
   };
 
   if (['wstETH', 'cbETH', 'rETH'].includes(collateralTokenInfo.symbol)) {
@@ -138,8 +142,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 +156,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 +170,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/morphoBlue.ts

@@ -30,6 +30,8 @@ export interface MorphoBlueAssetData {
   incentiveSupplyToken?: string,
   totalSupply?: string,
   totalBorrow?: string,
+  canBeSupplied?: boolean,
+  canBeBorrowed?: boolean,
 }
 
 export type MorphoBlueAssetsData = { [key: string]: MorphoBlueAssetData };
@@ -52,10 +54,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 +74,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,