@defisaver/positions-sdk 0.0.30-dev → 0.0.32

package/cjs/contracts.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.USDCPriceFeedContract = exports.COMPPriceFeedContract = exports.ETHPriceFeedContract = exports.ChickenBondsManagerContract = exports.ChickenBondsViewContract = exports.McdVatContract = exports.McdJugContract = exports.McdDogContract = exports.McdSpotterContract = exports.McdViewContract = exports.LiquityActivePoolContract = exports.LiquityPriceFeedContract = exports.LiquityTroveManagerContract = exports.LiquityCollSurplusPoolContract = exports.LiquityViewContract = exports.CrvUSDFactoryContract = exports.CrvUSDViewContract = exports.SparkViewContract = exports.SparkIncentiveDataProviderContract = exports.MorphoAaveV2ViewContract = exports.PotContract = exports.ComptrollerContract = exports.CompoundLoanInfoContract = exports.AaveLoanInfoV2Contract = exports.wstETHContract = exports.CompV3ViewContract = exports.BalanceScannerContract = exports.REthContract = exports.CbEthContract = exports.LidoContract = exports.GhoTokenContract = exports.AaveIncentiveDataProviderV3Contract = exports.AaveV3ViewContract = exports.UniMulticallContract = exports.createContractWrapper = exports.getErc20Contract = exports.getConfigContractAbi = exports.getConfigContractAddress = void 0;
+exports.MorphoBlueViewContract = exports.FeedRegistryContract = exports.USDCPriceFeedContract = exports.COMPPriceFeedContract = exports.ETHPriceFeedContract = exports.ChickenBondsManagerContract = exports.ChickenBondsViewContract = exports.McdVatContract = exports.McdJugContract = exports.McdDogContract = exports.McdSpotterContract = exports.McdViewContract = exports.LiquityActivePoolContract = exports.LiquityPriceFeedContract = exports.LiquityTroveManagerContract = exports.LiquityCollSurplusPoolContract = exports.LiquityViewContract = exports.CrvUSDFactoryContract = exports.CrvUSDViewContract = exports.SparkViewContract = exports.SparkIncentiveDataProviderContract = exports.MorphoAaveV2ViewContract = exports.PotContract = exports.ComptrollerContract = exports.CompoundLoanInfoContract = exports.AaveLoanInfoV2Contract = exports.wstETHContract = exports.CompV3ViewContract = exports.BalanceScannerContract = exports.REthContract = exports.CbEthContract = exports.LidoContract = exports.GhoTokenContract = exports.AaveIncentiveDataProviderV3Contract = exports.AaveV3ViewContract = exports.UniMulticallContract = exports.createContractWrapper = exports.getErc20Contract = exports.getConfigContractAbi = exports.getConfigContractAddress = void 0;
 const contracts_1 = __importDefault(require("./config/contracts"));
 const contractConfig = contracts_1.default;
 const getConfigContractAddress = (name, network, block) => {
@@ -15,9 +15,12 @@ const getConfigContractAddress = (name, network, block) => {
         }
         const oldVersions = (networkData === null || networkData === void 0 ? void 0 : networkData.oldVersions) || {};
         // Versions are ordered from oldest to the newest
-        for (const [createdBlock, oldVersionObject] of Object.entries(oldVersions).reverse()) {
+        for (const [createdBlock, addressOrObject] of Object.entries(oldVersions).reverse()) {
             if (block >= Number(createdBlock)) {
-                return oldVersionObject.address;
+                if (typeof addressOrObject !== 'string') {
+                    return addressOrObject.address;
+                }
+                return addressOrObject;
             }
         }
     }
@@ -33,9 +36,12 @@ const getConfigContractAbi = (name, network, block) => {
         }
         const oldVersions = (networkData === null || networkData === void 0 ? void 0 : networkData.oldVersions) || {};
         // Versions are ordered from oldest to the newest
-        for (const [createdBlock, oldVersionObject] of Object.entries(oldVersions).reverse()) {
+        for (const [createdBlock, addressOrObject] of Object.entries(oldVersions).reverse()) {
             if (block >= Number(createdBlock)) {
-                return oldVersionObject.abi;
+                if (typeof addressOrObject !== 'string') {
+                    return addressOrObject.abi;
+                }
+                return latestAbi;
             }
         }
     }
@@ -84,3 +90,5 @@ exports.ChickenBondsManagerContract = createContractFromConfigFunc('ChickenBonds
 exports.ETHPriceFeedContract = createContractFromConfigFunc('ETHPriceFeed');
 exports.COMPPriceFeedContract = createContractFromConfigFunc('COMPPriceFeed');
 exports.USDCPriceFeedContract = createContractFromConfigFunc('USDCPriceFeed');
+exports.FeedRegistryContract = createContractFromConfigFunc('FeedRegistry');
+exports.MorphoBlueViewContract = createContractFromConfigFunc('MorphoBlueView');

package/cjs/curveUsd/index.js

@@ -187,7 +187,7 @@ const getCurveUsdUserData = (web3, network, address, selectedMarket, activeBand)
         priceHigh,
         priceLow, liquidationDiscount: (0, tokens_1.assetAmountInEth)(data.liquidationDiscount), numOfBands: data.N, usedAssets,
         status }), (0, curveUsdHelpers_1.getCrvUsdAggregatedData)({
-        loanExists: data.loanExists, usedAssets, network: common_1.NetworkNumber.Eth, selectedMarket, numOfBands: data.N,
+        loanExists: data.loanExists, usedAssets, network: common_1.NetworkNumber.Eth, selectedMarket,
     })), { userBands });
 });
 exports.getCurveUsdUserData = getCurveUsdUserData;

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

@@ -1,9 +1,8 @@
 import { CrvUSDAggregatedPositionData, CrvUSDMarketData, CrvUSDUsedAssets } from '../../types';
 import { NetworkNumber } from '../../types/common';
-export declare const getCrvUsdAggregatedData: ({ loanExists, usedAssets, network, selectedMarket, numOfBands, ...rest }: {
+export declare const getCrvUsdAggregatedData: ({ loanExists, usedAssets, network, selectedMarket, ...rest }: {
     loanExists: boolean;
     usedAssets: CrvUSDUsedAssets;
     network: NetworkNumber;
     selectedMarket: CrvUSDMarketData;
-    numOfBands: number | string;
 }) => CrvUSDAggregatedPositionData;

package/cjs/helpers/curveUsdHelpers/index.js

@@ -17,34 +17,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCrvUsdAggregatedData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const moneymarket_1 = require("../../moneymarket");
-const utils_1 = require("../../services/utils");
 const getCrvUsdAggregatedData = (_a) => {
-    var _b;
-    var { loanExists, usedAssets, network, selectedMarket, numOfBands } = _a, rest = __rest(_a, ["loanExists", "usedAssets", "network", "selectedMarket", "numOfBands"]);
-    const payload = {};
-    payload.supplied = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ supplied }) => supplied); // this is wrong if we are in soft-liquidations
-    payload.borrowed = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowed }) => borrowed);
-    payload.suppliedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
-    payload.borrowedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
-    payload.ratio = loanExists
-        ? new decimal_js_1.default(payload.suppliedUsd)
-            .dividedBy(payload.borrowedUsd)
+    var { loanExists, usedAssets, network, selectedMarket } = _a, rest = __rest(_a, ["loanExists", "usedAssets", "network", "selectedMarket"]);
+    const _supplied = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ supplied }) => supplied); // this is wrong if we are in soft-liquidations
+    const _borrowed = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowed }) => borrowed);
+    const _suppliedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
+    const _borrowedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
+    const ratio = loanExists
+        ? new decimal_js_1.default(_suppliedUsd)
+            .dividedBy(_borrowedUsd)
             .times(100)
             .toString()
         : '0';
-    // this is all approximation
-    payload.minAllowedRatio = (0, utils_1.mapRange)(numOfBands, 4, 50, 115, 140); // collateral ratio
-    payload.collFactor = new decimal_js_1.default(1).div(payload.minAllowedRatio).mul(100).toString(); // collateral factor = 1 / collateral ratio
-    // only take in consideration collAsset
-    payload.borrowLimitUsd = ((_b = usedAssets === null || usedAssets === void 0 ? void 0 : usedAssets[selectedMarket.collAsset]) === null || _b === void 0 ? void 0 : _b.isSupplied)
-        ? new decimal_js_1.default(usedAssets[selectedMarket.collAsset].suppliedUsd).mul(payload.collFactor).toString()
-        : '0';
-    const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);
-    payload.leveragedType = leveragedType;
-    if (leveragedType !== '') {
-        payload.leveragedAsset = leveragedAsset;
-        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, usedAssets[selectedMarket.collAsset].price, payload.borrowedUsd, payload.borrowLimitUsd);
-    }
-    return payload;
+    // we don't have borrowLimitUsd here
+    return {
+        ratio,
+        supplied: _supplied,
+        suppliedUsd: _suppliedUsd,
+        borrowedUsd: _borrowedUsd,
+        borrowed: _borrowed,
+        safetyRatio: ratio,
+    };
 };
 exports.getCrvUsdAggregatedData = getCrvUsdAggregatedData;

package/cjs/helpers/index.d.ts

@@ -4,3 +4,4 @@ export * as sparkHelpers from './sparkHelpers';
 export * as curveUsdHelpers from './curveUsdHelpers';
 export * as makerHelpers from './makerHelpers';
 export * as chickenBondsHelpers from './chickenBondsHelpers';
+export * as morphoBlueHelpers from './morphoBlueHelpers';

package/cjs/helpers/index.js

@@ -23,10 +23,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.chickenBondsHelpers = exports.makerHelpers = exports.curveUsdHelpers = exports.sparkHelpers = exports.compoundHelpers = exports.aaveHelpers = void 0;
+exports.morphoBlueHelpers = exports.chickenBondsHelpers = exports.makerHelpers = exports.curveUsdHelpers = exports.sparkHelpers = exports.compoundHelpers = exports.aaveHelpers = void 0;
 exports.aaveHelpers = __importStar(require("./aaveHelpers"));
 exports.compoundHelpers = __importStar(require("./compoundHelpers"));
 exports.sparkHelpers = __importStar(require("./sparkHelpers"));
 exports.curveUsdHelpers = __importStar(require("./curveUsdHelpers"));
 exports.makerHelpers = __importStar(require("./makerHelpers"));
 exports.chickenBondsHelpers = __importStar(require("./chickenBondsHelpers"));
+exports.morphoBlueHelpers = __importStar(require("./morphoBlueHelpers"));

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

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

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -0,0 +1,41 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+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 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);
+    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);
+    });
+    payload.liquidationLimitUsd = payload.borrowLimitUsd;
+    const leftToBorrowUsd = new decimal_js_1.default(payload.borrowLimitUsd).sub(payload.borrowedUsd);
+    payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.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();
+    const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);
+    payload.leveragedType = leveragedType;
+    if (leveragedType !== '') {
+        payload.leveragedAsset = leveragedAsset;
+        let assetPrice = assetsData[leveragedAsset].price;
+        if (leveragedType === 'lsd-leverage') {
+            // Treat ETH like a stablecoin in a long stETH position
+            payload.leveragedLsdAssetRatio = new decimal_js_1.default(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
+            assetPrice = new decimal_js_1.default(assetPrice).div(assetsData.ETH.price).toString();
+        }
+        payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+    }
+    return payload;
+};
+exports.getMorphoBlueAggregatedPositionData = getMorphoBlueAggregatedPositionData;

package/cjs/index.d.ts

@@ -15,5 +15,6 @@ import * as markets from './markets';
 import * as helpers from './helpers';
 import * as chickenBonds from './chickenBonds';
 import * as exchange from './exchange';
+import * as morphoBlue from './morphoBlue';
 export * from './types';
-export { aaveV2, aaveV3, morphoAaveV2, morphoAaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, maker, chickenBonds, exchange, staking, multicall, moneymarket, markets, helpers, };
+export { aaveV2, aaveV3, morphoAaveV2, morphoAaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, maker, chickenBonds, exchange, staking, multicall, moneymarket, markets, helpers, morphoBlue, };

package/cjs/index.js

@@ -26,7 +26,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.helpers = exports.markets = exports.moneymarket = exports.multicall = exports.staking = exports.exchange = exports.chickenBonds = exports.maker = exports.liquity = exports.curveUsd = exports.spark = exports.compoundV3 = exports.compoundV2 = exports.morphoAaveV3 = exports.morphoAaveV2 = exports.aaveV3 = exports.aaveV2 = void 0;
+exports.morphoBlue = exports.helpers = exports.markets = exports.moneymarket = exports.multicall = exports.staking = exports.exchange = exports.chickenBonds = exports.maker = exports.liquity = exports.curveUsd = exports.spark = exports.compoundV3 = exports.compoundV2 = exports.morphoAaveV3 = exports.morphoAaveV2 = exports.aaveV3 = exports.aaveV2 = void 0;
 const aaveV3 = __importStar(require("./aaveV3"));
 exports.aaveV3 = aaveV3;
 const morphoAaveV3 = __importStar(require("./morphoAaveV3"));
@@ -61,4 +61,6 @@ const chickenBonds = __importStar(require("./chickenBonds"));
 exports.chickenBonds = chickenBonds;
 const exchange = __importStar(require("./exchange"));
 exports.exchange = exchange;
+const morphoBlue = __importStar(require("./morphoBlue"));
+exports.morphoBlue = morphoBlue;
 __exportStar(require("./types"), exports);

package/cjs/markets/index.d.ts

@@ -2,3 +2,4 @@ export { AaveMarkets } from './aave';
 export { CompoundMarkets } from './compound';
 export { SparkMarkets } from './spark';
 export { CrvUsdMarkets } from './curveUsd';
+export { MorphoBlueMarkets } from './morphoBlue';

package/cjs/markets/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CrvUsdMarkets = exports.SparkMarkets = exports.CompoundMarkets = exports.AaveMarkets = void 0;
+exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.CompoundMarkets = exports.AaveMarkets = void 0;
 var aave_1 = require("./aave");
 Object.defineProperty(exports, "AaveMarkets", { enumerable: true, get: function () { return aave_1.AaveMarkets; } });
 var compound_1 = require("./compound");
@@ -9,3 +9,5 @@ var spark_1 = require("./spark");
 Object.defineProperty(exports, "SparkMarkets", { enumerable: true, get: function () { return spark_1.SparkMarkets; } });
 var curveUsd_1 = require("./curveUsd");
 Object.defineProperty(exports, "CrvUsdMarkets", { enumerable: true, get: function () { return curveUsd_1.CrvUsdMarkets; } });
+var morphoBlue_1 = require("./morphoBlue");
+Object.defineProperty(exports, "MorphoBlueMarkets", { enumerable: true, get: function () { return morphoBlue_1.MorphoBlueMarkets; } });

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

@@ -0,0 +1,6 @@
+import { MorphoBlueMarketData } from '../../types';
+import { NetworkNumber } from '../../types/common';
+export declare const MORPHO_BLUE_WSTETH_ETH: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
+    readonly morphobluewstetheth: MorphoBlueMarketData;
+};

package/cjs/markets/morphoBlue/index.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MorphoBlueMarkets = exports.MORPHO_BLUE_WSTETH_ETH = void 0;
+const types_1 = require("../../types");
+const common_1 = require("../../types/common");
+const MORPHO_BLUE_WSTETH_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'wstETH/ETH',
+    value: types_1.MorphoBlueVersions.MorphoBlueWstEthEth,
+    url: 'default',
+    loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+    collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+    oracle: '0x2a01eb9496094da03c4e364def50f5ad1280ad72',
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.945,
+    // icon: SvgAdapter(protocolIcons.spark),
+    protocolName: 'morpho-blue',
+});
+exports.MORPHO_BLUE_WSTETH_ETH = MORPHO_BLUE_WSTETH_ETH;
+const MorphoBlueMarkets = (networkId) => ({
+    [types_1.MorphoBlueVersions.MorphoBlueWstEthEth]: (0, exports.MORPHO_BLUE_WSTETH_ETH)(networkId),
+});
+exports.MorphoBlueMarkets = MorphoBlueMarkets;

package/cjs/moneymarket/moneymarketCommonService.js

@@ -27,7 +27,7 @@ const calcLeverageLiqPrice = (leverageType, assetPrice, borrowedUsd, borrowLimit
 exports.calcLeverageLiqPrice = calcLeverageLiqPrice;
 const calculateBorrowingAssetLimit = (assetBorrowedUsd, borrowLimitUsd) => new decimal_js_1.default(assetBorrowedUsd).div(borrowLimitUsd).times(100).toString();
 exports.calculateBorrowingAssetLimit = calculateBorrowingAssetLimit;
-exports.STABLE_ASSETS = ['DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'crvUSD'];
+exports.STABLE_ASSETS = ['DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI'];
 const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;
     let supplyStable = 0;

package/cjs/morphoBlue/index.d.ts

@@ -0,0 +1,5 @@
+import Web3 from 'web3';
+import { NetworkNumber } from '../types/common';
+import { MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBluePositionData } from '../types';
+export declare function getMorphoBlueMarketData(web3: Web3, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, mainnetWeb3: Web3): Promise<MorphoBlueMarketInfo>;
+export declare function getMorphoBlueAccountData(web3: Web3, network: NetworkNumber, account: string, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData>;

package/cjs/morphoBlue/index.js

@@ -0,0 +1,153 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMorphoBlueAccountData = exports.getMorphoBlueMarketData = void 0;
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const tokens_1 = require("@defisaver/tokens");
+const contracts_1 = require("../contracts");
+const constants_1 = require("../constants");
+const staking_1 = require("../staking");
+const utils_1 = require("../services/utils");
+const multicall_1 = require("../multicall");
+const morphoBlueHelpers_1 = require("../helpers/morphoBlueHelpers");
+const compound = (ratePerSeconds) => {
+    const compounding = new decimal_js_1.default(ratePerSeconds).mul(constants_1.SECONDS_PER_YEAR).toString();
+    const apyNumber = Math.expm1(new decimal_js_1.default(compounding).div(constants_1.WAD).toNumber());
+    return new decimal_js_1.default(apyNumber).mul(constants_1.WAD).floor().toString();
+};
+const getSupplyRate = (totalSupplyAssets, totalBorrowAssets, borrowRate, fee) => {
+    if (totalBorrowAssets === '0' || totalSupplyAssets === '0') {
+        return 0;
+    }
+    const utillization = new decimal_js_1.default(totalBorrowAssets).mul(constants_1.WAD).div(totalSupplyAssets).ceil()
+        .toString();
+    const supplyRate = new decimal_js_1.default(utillization).mul(borrowRate).div(constants_1.WAD).ceil()
+        .toString();
+    const ratePerSecond = new decimal_js_1.default(supplyRate).mul(new decimal_js_1.default(constants_1.WAD).minus(fee)).div(constants_1.WAD).ceil()
+        .toString();
+    return compound(ratePerSecond);
+};
+const getBorrowRate = (borrowRate, totalBorrowShares) => {
+    if (totalBorrowShares === '0') {
+        return 0;
+    }
+    return compound(borrowRate);
+};
+function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { loanToken, collateralToken, oracle, irm, lltv, } = selectedMarket;
+        const lltvInWei = new decimal_js_1.default(lltv).mul(constants_1.WAD).toString();
+        const loanTokenInfo = (0, tokens_1.getAssetInfoByAddress)(loanToken);
+        const collateralTokenInfo = (0, tokens_1.getAssetInfoByAddress)(collateralToken);
+        let loanTokenFeedAddress = loanToken;
+        if (loanTokenInfo.symbol === 'WETH') {
+            const ethAddress = (0, tokens_1.getAssetInfo)('ETH').address;
+            loanTokenFeedAddress = ethAddress;
+        }
+        const FeedRegistryAddress = (0, contracts_1.getConfigContractAddress)('FeedRegistry', network);
+        const FeedRegistryAbi = (0, contracts_1.getConfigContractAbi)('FeedRegistry');
+        const viewContractAddress = (0, contracts_1.getConfigContractAddress)('MorphoBlueView', network);
+        const viewContractAbi = (0, contracts_1.getConfigContractAbi)('MorphoBlueView');
+        const multicallCallsObject = [
+            {
+                target: FeedRegistryAddress,
+                abiItem: (0, utils_1.getAbiItem)(FeedRegistryAbi, 'latestAnswer'),
+                params: [loanTokenFeedAddress, constants_1.USD_QUOTE],
+            },
+            {
+                target: viewContractAddress,
+                abiItem: (0, utils_1.getAbiItem)(viewContractAbi, 'getMarketInfoNotTuple'),
+                params: [loanToken, collateralToken, oracle, irm, lltvInWei],
+            },
+        ];
+        const multicallData = yield (0, multicall_1.multicall)(multicallCallsObject, web3, network);
+        const loanTokenPrice = multicallData[0][0];
+        const marketInfo = multicallData[1][0];
+        const supplyRate = getSupplyRate(marketInfo.totalSupplyAssets, marketInfo.totalBorrowAssets, marketInfo.borrowRate, marketInfo.fee);
+        const compoundedBorrowRate = getBorrowRate(marketInfo.borrowRate, marketInfo.totalBorrowShares);
+        const utillization = new decimal_js_1.default(marketInfo.totalBorrowAssets).div(marketInfo.totalSupplyAssets).mul(100).toString();
+        const oracleRate = new decimal_js_1.default(marketInfo.oracle).div(1e36).toString();
+        const assetsData = {};
+        assetsData[(0, utils_1.wethToEth)(loanTokenInfo.symbol)] = {
+            symbol: (0, utils_1.wethToEth)(loanTokenInfo.symbol),
+            address: loanToken,
+            price: new decimal_js_1.default(loanTokenPrice).div(1e8).toString(),
+            supplyRate: new decimal_js_1.default(supplyRate).div(constants_1.WAD).mul(100).toString(),
+            borrowRate: new decimal_js_1.default(compoundedBorrowRate).div(constants_1.WAD).mul(100).toString(),
+            totalSupply: new decimal_js_1.default(marketInfo.totalSupplyAssets).div(constants_1.WAD).toString(),
+            totalBorrow: new decimal_js_1.default(marketInfo.totalBorrowAssets).div(constants_1.WAD).toString(),
+        };
+        assetsData[(0, utils_1.wethToEth)(collateralTokenInfo.symbol)] = {
+            symbol: (0, utils_1.wethToEth)(collateralTokenInfo.symbol),
+            address: collateralToken,
+            price: new decimal_js_1.default(loanTokenPrice).div(1e8).mul(oracleRate).toString(),
+            supplyRate: '0',
+            borrowRate: '0',
+        };
+        if (['wstETH', 'cbETH', 'rETH'].includes(collateralTokenInfo.symbol)) {
+            assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collateralTokenInfo.symbol, mainnetWeb3);
+            assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
+        }
+        return {
+            id: marketInfo.id,
+            fee: new decimal_js_1.default(marketInfo.fee).div(constants_1.WAD).toString(),
+            loanToken: (0, utils_1.wethToEth)(loanTokenInfo.symbol),
+            collateralToken: (0, utils_1.wethToEth)(collateralTokenInfo.symbol),
+            utillization,
+            oracle: oracleRate,
+            lltv: new decimal_js_1.default(lltv).toString(),
+            assetsData,
+        };
+    });
+}
+exports.getMorphoBlueMarketData = getMorphoBlueMarketData;
+function getMorphoBlueAccountData(web3, network, account, selectedMarket, marketInfo) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { loanToken, collateralToken, oracle, irm, lltv, } = selectedMarket;
+        const lltvInWei = new decimal_js_1.default(lltv).mul(constants_1.WAD).toString();
+        const marketObject = {
+            loanToken, collateralToken, oracle, irm, lltv: lltvInWei,
+        };
+        const viewContract = (0, contracts_1.MorphoBlueViewContract)(web3, network);
+        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();
+        usedAssets[marketInfo.loanToken] = {
+            symbol: loanTokenInfo.symbol,
+            supplied: loanTokenSupplied,
+            borrowed: loanTokenBorrowed,
+            isSupplied: new decimal_js_1.default(loanInfo.suppliedInAssets).gt(0),
+            isBorrowed: new decimal_js_1.default(loanInfo.borrowedInAssets).gt(0),
+            collateral: false,
+            suppliedUsd: new decimal_js_1.default(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
+            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();
+        usedAssets[marketInfo.collateralToken] = {
+            symbol: collateralTokenInfo.symbol,
+            supplied: collateralTokenSupplied,
+            borrowed: '0',
+            isSupplied: new decimal_js_1.default(loanInfo.collateral).gt(0),
+            isBorrowed: false,
+            collateral: true,
+            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 }));
+    });
+}
+exports.getMorphoBlueAccountData = getMorphoBlueAccountData;

package/cjs/services/utils.d.ts

@@ -14,7 +14,3 @@ export declare const handleWbtcLegacy: (asset: string) => string;
 export declare const wethToEthByAddress: (maybeWethAddr: string, chainId?: NetworkNumber) => string;
 export declare const ethToWethByAddress: (maybeEthAddr: string, chainId?: NetworkNumber) => string;
 export declare const bytesToString: (hex: string) => string;
-/**
- * Map an input value from one range (minInput, maxInput) to a value in another range (minOutput, maxOutput)
- */
-export declare const mapRange: (input: number | string, minInput: number | string, maxInput: number | string, minOutput: number | string, maxOutput: number | string) => number;

package/cjs/services/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapRange = exports.bytesToString = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.handleWbtcLegacy = exports.getEthAmountForDecimals = exports.compareAddresses = exports.isAddress = exports.ADDRESS_REGEX = exports.getAbiItem = exports.wstEthToStEth = exports.stEthToWstEth = exports.wethToEth = exports.ethToWeth = exports.addToObjectIf = exports.isLayer2Network = void 0;
+exports.bytesToString = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.handleWbtcLegacy = exports.getEthAmountForDecimals = exports.compareAddresses = exports.isAddress = exports.ADDRESS_REGEX = exports.getAbiItem = exports.wstEthToStEth = exports.stEthToWstEth = exports.wethToEth = exports.ethToWeth = exports.addToObjectIf = exports.isLayer2Network = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../types/common");
@@ -39,15 +39,3 @@ const bytesToString = (hex) => Buffer.from(hex.replace(/^0x/, ''), 'hex')
     // eslint-disable-next-line no-control-regex
     .replace(/\x00/g, '');
 exports.bytesToString = bytesToString;
-/**
- * Map an input value from one range (minInput, maxInput) to a value in another range (minOutput, maxOutput)
- */
-const mapRange = (input, minInput, maxInput, minOutput, maxOutput) => {
-    // slope = 1.0 * (output_end - output_start) / (input_end - input_start)
-    const inputDiff = new decimal_js_1.default(maxInput).minus(minInput);
-    const outputDiff = new decimal_js_1.default(maxOutput).minus(minOutput);
-    const slope = new decimal_js_1.default(outputDiff).div(inputDiff);
-    // output = output_start + slope * (input - input_start)
-    return new decimal_js_1.default(minOutput).plus(new decimal_js_1.default(slope).mul(new decimal_js_1.default(input).minus(minInput))).toDP(2).toNumber();
-};
-exports.mapRange = mapRange;

package/cjs/types/common.d.ts

@@ -44,7 +44,7 @@ export interface MMUsedAsset {
     borrowed: string;
     borrowedUsd: string;
     isBorrowed: boolean;
-    debt: string;
+    debt?: string;
     supplyRate?: string;
     borrowRate?: string;
     discountedBorrowRate?: string;

package/cjs/types/contracts/generated/CrvUSDView.d.ts

@@ -138,9 +138,7 @@ export declare namespace CurveUsdView {
         [
             number | string | BN[],
             number | string | BN[]
-        ],
-        number | string | BN,
-        boolean
+        ]
     ] | {
         loanExists: boolean;
         collateralPrice: number | string | BN;
@@ -154,8 +152,6 @@ export declare namespace CurveUsdView {
         health: number | string | BN;
         bandRange: [number | string | BN, number | string | BN];
         usersBands: [number | string | BN[], number | string | BN[]];
-        collRatio: number | string | BN;
-        isInSoftLiquidation: boolean;
     };
     type UserDataStructOutputArray = [
         boolean,
@@ -175,9 +171,7 @@ export declare namespace CurveUsdView {
         [
             string[],
             string[]
-        ],
-        string,
-        boolean
+        ]
     ];
     type UserDataStructOutputStruct = {
         loanExists: boolean;
@@ -192,8 +186,6 @@ export declare namespace CurveUsdView {
         health: string;
         bandRange: [string, string];
         usersBands: [string[], string[]];
-        collRatio: string;
-        isInSoftLiquidation: boolean;
     };
     type UserDataStructOutput = UserDataStructOutputArray & UserDataStructOutputStruct;
 }
@@ -201,33 +193,15 @@ export interface CrvUSDView extends BaseContract {
     constructor(jsonInterface: any[], address?: string, options?: ContractOptions): CrvUSDView;
     clone(): CrvUSDView;
     methods: {
-        WBTC_HEALTH_ZAP(): NonPayableTransactionObject<string>;
-        WBTC_MARKET(): NonPayableTransactionObject<string>;
         createLoanData(market: string, collateral: number | string | BN, debt: number | string | BN, N: number | string | BN): NonPayableTransactionObject<CurveUsdView.CreateLoanDataStructOutput>;
         getBandData(market: string, n: number | string | BN): NonPayableTransactionObject<CurveUsdView.BandStructOutput>;
-        getBandsData(market: string, from: number | string | BN, to: number | string | BN): NonPayableTransactionObject<CurveUsdView.BandStructOutput[]>;
-        getBandsDataForPosition(market: string, collateral: number | string | BN, debt: number | string | BN, N: number | string | BN): NonPayableTransactionObject<CurveUsdView.BandStructOutput[]>;
-        getCollAmountsFromAMM(_controllerAddress: string, _user: string): NonPayableTransactionObject<[
-            string,
-            string
-        ] & {
-            crvUsdAmount: string;
-            collAmount: string;
-        }>;
-        getCollateralRatio(_user: string, _controllerAddr: string): NonPayableTransactionObject<[
-            string,
-            boolean
-        ] & {
-            collRatio: string;
-            isInSoftLiquidation: boolean;
-        }>;
+        "getBandsData(address,uint256,uint256,uint256)"(market: string, collateral: number | string | BN, debt: number | string | BN, N: number | string | BN): NonPayableTransactionObject<CurveUsdView.BandStructOutput[]>;
+        "getBandsData(address,int256,int256)"(market: string, from: number | string | BN, to: number | string | BN): NonPayableTransactionObject<CurveUsdView.BandStructOutput[]>;
         globalData(market: string): NonPayableTransactionObject<CurveUsdView.GlobalDataStructOutput>;
         healthCalculator(market: string, user: string, collChange: number | string | BN, debtChange: number | string | BN, isFull: boolean, numBands: number | string | BN): NonPayableTransactionObject<string>;
-        isControllerValid(_controllerAddr: string): NonPayableTransactionObject<boolean>;
         maxBorrow(market: string, collateral: number | string | BN, N: number | string | BN): NonPayableTransactionObject<string>;
         minCollateral(market: string, debt: number | string | BN, N: number | string | BN): NonPayableTransactionObject<string>;
         userData(market: string, user: string): NonPayableTransactionObject<CurveUsdView.UserDataStructOutput>;
-        userMaxWithdraw(_controllerAddress: string, _user: string): NonPayableTransactionObject<string>;
     };
     events: {
         allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;