@defisaver/positions-sdk 0.0.29 → 0.0.30-dev

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,
+        loanExists: data.loanExists, usedAssets, network: common_1.NetworkNumber.Eth, selectedMarket, numOfBands: data.N,
     })), { userBands });
 });
 exports.getCurveUsdUserData = getCurveUsdUserData;

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

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

package/cjs/helpers/curveUsdHelpers/index.js

@@ -17,26 +17,34 @@ 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 { 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)
+    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)
             .times(100)
             .toString()
         : '0';
-    // we don't have borrowLimitUsd here
-    return {
-        ratio,
-        supplied: _supplied,
-        suppliedUsd: _suppliedUsd,
-        borrowedUsd: _borrowedUsd,
-        borrowed: _borrowed,
-        safetyRatio: ratio,
-    };
+    // 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;
 };
 exports.getCrvUsdAggregatedData = getCrvUsdAggregatedData;

package/cjs/markets/aave/marketAssets.d.ts

@@ -1,9 +1,13 @@
-export declare const aaveV2AssetsDefaultMarket: readonly ["AAVE", "BAL", "BAT", "BUSD", "CRV", "DAI", "ENJ", "ETH", "GUSD", "LINK", "MANA", "MKR", "REN", "SNX", "SUSD", "TUSD", "UNI", "USDC", "USDT", "WBTC", "YFI", "xSUSHI", "ZRX", "RAI", "AMPL", "DPI", "USDP", "RENFIL", "FRAX", "FEI", "stETH", "ENS", "UST", "CVX", "1INCH", "LUSD"];
+export declare const aaveV2AssetsDefaultMarket: string[];
 export declare const morphoAaveV2AssetDefaultMarket: string[];
 export declare const morphoAaveV3AssetEthMarket: string[];
+export declare const aaveV3AssetsDefaultMarketEth: string[];
+export declare const aaveV3AssetsDefaultMarketOpt: string[];
+export declare const aaveV3AssetsDefaultMarketArb: string[];
+export declare const aaveV3AssetsDefaultMarketBase: string[];
 export declare const aaveV3AssetsDefaultMarket: {
-    readonly 1: readonly ["WBTC", "ETH", "wstETH", "USDC", "DAI", "LINK", "AAVE", "cbETH", "USDT", "rETH", "LUSD", "UNI", "MKR", "SNX", "BAL", "LDO", "CRV", "ENS", "1INCH", "GHO", "FRAX", "RPL", "sDAI"];
-    readonly 10: readonly ["DAI", "USDC.e", "USDT", "SUSD", "AAVE", "LINK", "WBTC", "ETH", "OP", "wstETH", "LUSD", "MAI", "rETH"];
-    readonly 42161: readonly ["ETH", "DAI", "EURS", "USDC", "USDT", "AAVE", "LINK", "WBTC", "wstETH", "MAI", "rETH", "LUSD", "USDC.e", "FRAX", "ARB"];
-    readonly 8453: readonly ["ETH", "USDbC", "cbETH", "wstETH"];
+    readonly 1: string[];
+    readonly 10: string[];
+    readonly 42161: string[];
+    readonly 8453: string[];
 };

package/cjs/markets/aave/marketAssets.js

@@ -1,31 +1,24 @@
 "use strict";
-// TODO generate this file automatically
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aaveV3AssetsDefaultMarket = exports.morphoAaveV3AssetEthMarket = exports.morphoAaveV2AssetDefaultMarket = exports.aaveV2AssetsDefaultMarket = void 0;
+exports.aaveV3AssetsDefaultMarket = exports.aaveV3AssetsDefaultMarketBase = exports.aaveV3AssetsDefaultMarketArb = exports.aaveV3AssetsDefaultMarketOpt = exports.aaveV3AssetsDefaultMarketEth = exports.morphoAaveV3AssetEthMarket = exports.morphoAaveV2AssetDefaultMarket = exports.aaveV2AssetsDefaultMarket = void 0;
 const common_1 = require("../../types/common");
-exports.aaveV2AssetsDefaultMarket = [
-    'AAVE', 'BAL', 'BAT', 'BUSD', 'CRV', 'DAI', 'ENJ', 'ETH', 'GUSD', 'LINK', 'MANA', 'MKR',
-    'REN', 'SNX', 'SUSD', 'TUSD', 'UNI', 'USDC', 'USDT', 'WBTC', 'YFI', 'xSUSHI', 'ZRX', 'RAI',
-    'AMPL', 'DPI', 'USDP', 'RENFIL', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD',
+exports.aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
+exports.morphoAaveV2AssetDefaultMarket = ['DAI', 'ETH', 'USDC', 'USDT', 'WBTC', 'stETH', 'CRV'];
+exports.morphoAaveV3AssetEthMarket = [
+    'ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH', 'sDAI', 'USDT',
 ];
-exports.morphoAaveV2AssetDefaultMarket = [
-    'ETH', 'stETH', 'USDC', 'WBTC', 'USDT', 'DAI', 'CRV',
+exports.aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD'];
+exports.aaveV3AssetsDefaultMarketOpt = [
+    'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
 ];
-exports.morphoAaveV3AssetEthMarket = [
-    'ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH',
+exports.aaveV3AssetsDefaultMarketArb = [
+    'ETH', 'DAI', 'EURS', 'USDC', 'USDT', 'AAVE', 'LINK', 'WBTC', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC.e', 'FRAX', 'ARB',
 ];
+exports.aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC'];
+// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.aaveV3AssetsDefaultMarket = {
-    [common_1.NetworkNumber.Eth]: [
-        'WBTC', 'ETH', 'wstETH', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'UNI', 'MKR', 'SNX', 'BAL',
-        'LDO', 'CRV', 'ENS', '1INCH', 'GHO', 'FRAX', 'RPL', 'sDAI',
-    ],
-    [common_1.NetworkNumber.Opt]: [
-        'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH',
-    ],
-    [common_1.NetworkNumber.Arb]: [
-        'ETH', 'DAI', 'EURS', 'USDC', 'USDT', 'AAVE', 'LINK', 'WBTC', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC.e', 'FRAX', 'ARB',
-    ],
-    [common_1.NetworkNumber.Base]: [
-        'ETH', 'USDbC', 'cbETH', 'wstETH',
-    ],
+    [common_1.NetworkNumber.Eth]: exports.aaveV3AssetsDefaultMarketEth,
+    [common_1.NetworkNumber.Opt]: exports.aaveV3AssetsDefaultMarketOpt,
+    [common_1.NetworkNumber.Arb]: exports.aaveV3AssetsDefaultMarketArb,
+    [common_1.NetworkNumber.Base]: exports.aaveV3AssetsDefaultMarketBase,
 };

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

@@ -1,22 +1,28 @@
 export declare const compoundV2CollateralAssets: import("@defisaver/tokens/esm/types").AssetData[];
+export declare const v3USDCCollAssetsEth: string[];
+export declare const v3USDCCollAssetsArb: string[];
 export declare const v3USDCCollAssets: {
-    readonly 1: readonly ["ETH", "COMP", "WBTC", "UNI", "LINK"];
+    readonly 1: string[];
     readonly 10: readonly [];
-    readonly 42161: readonly ["ARB", "ETH", "GMX", "WBTC"];
+    readonly 42161: string[];
     readonly 8453: readonly [];
 };
+export declare const v3USDCeCollAssetsArb: string[];
 export declare const v3USDCeCollAssets: {
     readonly 1: readonly [];
     readonly 10: readonly [];
-    readonly 42161: readonly ["ARB", "ETH", "GMX", "WBTC"];
+    readonly 42161: string[];
     readonly 8453: readonly [];
 };
+export declare const v3ETHCollAssetsEth: string[];
+export declare const v3ETHCollAssetsBase: string[];
 export declare const v3ETHCollAssets: {
-    readonly 1: readonly ["cbETH", "wstETH", "rETH"];
+    readonly 1: string[];
     readonly 10: readonly [];
     readonly 42161: readonly [];
-    readonly 8453: readonly ["cbETH"];
+    readonly 8453: string[];
 };
+export declare const v3USDbCCollAssetsBase: string[];
 export declare const v3USDbCCollAssets: {
     1: never[];
     10: never[];

package/cjs/markets/compound/marketsAssets.js

@@ -1,45 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.compoundV2CollateralAssets = void 0;
+exports.v3USDbCCollAssets = exports.v3USDbCCollAssetsBase = exports.v3ETHCollAssets = exports.v3ETHCollAssetsBase = exports.v3ETHCollAssetsEth = exports.v3USDCeCollAssets = exports.v3USDCeCollAssetsArb = exports.v3USDCCollAssets = exports.v3USDCCollAssetsArb = exports.v3USDCCollAssetsEth = exports.compoundV2CollateralAssets = void 0;
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../../types/common");
 exports.compoundV2CollateralAssets = [
     'cETH', 'cDAI', 'cBAT', 'cZRX', 'cUSDC', 'cWBTC Legacy', 'cWBTC', 'cUSDT',
     'cTUSD', 'cLINK', 'cUSDP', 'cUNI', 'cCOMP', 'cMKR', 'cSUSHI', 'cAAVE', 'cYFI',
 ].map((symbol) => (0, tokens_1.getAssetInfo)(symbol));
+exports.v3USDCCollAssetsEth = ['ETH', 'COMP', 'WBTC', 'UNI', 'LINK'];
+exports.v3USDCCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
+// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.v3USDCCollAssets = {
-    [common_1.NetworkNumber.Eth]: [
-        'ETH', 'COMP', 'WBTC', 'UNI', 'LINK',
-    ],
+    [common_1.NetworkNumber.Eth]: exports.v3USDCCollAssetsEth,
     [common_1.NetworkNumber.Opt]: [],
-    [common_1.NetworkNumber.Arb]: [
-        'ARB', 'ETH', 'GMX', 'WBTC',
-    ],
+    [common_1.NetworkNumber.Arb]: exports.v3USDCCollAssetsArb,
     [common_1.NetworkNumber.Base]: [],
 };
+exports.v3USDCeCollAssetsArb = ['ARB', 'ETH', 'GMX', 'WBTC'];
+// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.v3USDCeCollAssets = {
     [common_1.NetworkNumber.Eth]: [],
     [common_1.NetworkNumber.Opt]: [],
-    [common_1.NetworkNumber.Arb]: [
-        'ARB', 'ETH', 'GMX', 'WBTC',
-    ],
+    [common_1.NetworkNumber.Arb]: exports.v3USDCeCollAssetsArb,
     [common_1.NetworkNumber.Base]: [],
 };
+exports.v3ETHCollAssetsEth = ['cbETH', 'wstETH', 'rETH'];
+exports.v3ETHCollAssetsBase = ['cbETH'];
+// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.v3ETHCollAssets = {
-    [common_1.NetworkNumber.Eth]: [
-        'cbETH', 'wstETH', 'rETH',
-    ],
+    [common_1.NetworkNumber.Eth]: exports.v3ETHCollAssetsEth,
     [common_1.NetworkNumber.Opt]: [],
     [common_1.NetworkNumber.Arb]: [],
-    [common_1.NetworkNumber.Base]: [
-        'cbETH',
-    ],
+    [common_1.NetworkNumber.Base]: exports.v3ETHCollAssetsBase,
 };
+exports.v3USDbCCollAssetsBase = ['ETH', 'cbETH'];
+// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.v3USDbCCollAssets = {
     [common_1.NetworkNumber.Eth]: [],
     [common_1.NetworkNumber.Opt]: [],
     [common_1.NetworkNumber.Arb]: [],
-    [common_1.NetworkNumber.Base]: [
-        'ETH', 'cbETH',
-    ],
+    [common_1.NetworkNumber.Base]: exports.v3USDbCCollAssetsBase,
 };

package/cjs/markets/spark/marketAssets.d.ts

@@ -1,6 +1,7 @@
+export declare const sparkAssetsDefaultMarketEth: string[];
 export declare const sparkAssetsDefaultMarket: {
-    readonly 1: readonly ["ETH", "USDC", "DAI", "GNO", "rETH", "sDAI", "wstETH", "WBTC"];
+    readonly 1: string[];
     readonly 10: readonly [];
-    readonly 42161: readonly [];
     readonly 8453: readonly [];
+    readonly 42161: readonly [];
 };

package/cjs/markets/spark/marketAssets.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sparkAssetsDefaultMarket = void 0;
+exports.sparkAssetsDefaultMarket = exports.sparkAssetsDefaultMarketEth = void 0;
 const common_1 = require("../../types/common");
+exports.sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT'];
+// @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.sparkAssetsDefaultMarket = {
-    [common_1.NetworkNumber.Eth]: [
-        'ETH', 'USDC', 'DAI', 'GNO', 'rETH', 'sDAI', 'wstETH', 'WBTC',
-    ],
+    [common_1.NetworkNumber.Eth]: exports.sparkAssetsDefaultMarketEth,
     [common_1.NetworkNumber.Opt]: [],
-    [common_1.NetworkNumber.Arb]: [],
     [common_1.NetworkNumber.Base]: [],
+    [common_1.NetworkNumber.Arb]: [],
 };

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'];
+exports.STABLE_ASSETS = ['DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'crvUSD'];
 const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;
     let supplyStable = 0;

package/cjs/services/utils.d.ts

@@ -14,3 +14,7 @@ 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.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.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;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../types/common");
@@ -39,3 +39,15 @@ 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/contracts/generated/CrvUSDView.d.ts

@@ -138,7 +138,9 @@ export declare namespace CurveUsdView {
         [
             number | string | BN[],
             number | string | BN[]
-        ]
+        ],
+        number | string | BN,
+        boolean
     ] | {
         loanExists: boolean;
         collateralPrice: number | string | BN;
@@ -152,6 +154,8 @@ 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,
@@ -171,7 +175,9 @@ export declare namespace CurveUsdView {
         [
             string[],
             string[]
-        ]
+        ],
+        string,
+        boolean
     ];
     type UserDataStructOutputStruct = {
         loanExists: boolean;
@@ -186,6 +192,8 @@ export declare namespace CurveUsdView {
         health: string;
         bandRange: [string, string];
         usersBands: [string[], string[]];
+        collRatio: string;
+        isInSoftLiquidation: boolean;
     };
     type UserDataStructOutput = UserDataStructOutputArray & UserDataStructOutputStruct;
 }
@@ -193,15 +201,33 @@ 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(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[]>;
+        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;
+        }>;
         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;

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

@@ -177,6 +177,7 @@ export interface MorphoAaveV3ProxyEthMarket extends BaseContract {
     constructor(jsonInterface: any[], address?: string, options?: ContractOptions): MorphoAaveV3ProxyEthMarket;
     clone(): MorphoAaveV3ProxyEthMarket;
     methods: {
+        marketsCreated(): NonPayableTransactionObject<string[]>;
         approveManager(manager: string, isAllowed: boolean): NonPayableTransactionObject<void>;
         approveManagerWithSig(delegator: string, manager: string, isAllowed: boolean, nonce: number | string | BN, deadline: number | string | BN, signature: Types.SignatureStruct): NonPayableTransactionObject<void>;
         borrow(underlying: string, amount: number | string | BN, onBehalf: string, receiver: string, maxIterations: number | string | BN): NonPayableTransactionObject<string>;

package/cjs/types/curveUsd.d.ts

@@ -67,6 +67,12 @@ export interface CrvUSDAggregatedPositionData {
     borrowedUsd: string;
     borrowed: string;
     safetyRatio: string;
+    borrowLimitUsd: string;
+    minAllowedRatio: number;
+    collFactor: string;
+    leveragedType: string;
+    leveragedAsset?: string;
+    liquidationPrice?: string;
 }
 export interface CrvUSDUsedAsset {
     isSupplied: boolean;