@defisaver/positions-sdk 0.0.30 → 0.0.33

package/esm/contracts.js

@@ -9,12 +9,9 @@ export 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, addressOrObject] of Object.entries(oldVersions).reverse()) {
+        for (const [createdBlock, oldVersionObject] of Object.entries(oldVersions).reverse()) {
             if (block >= Number(createdBlock)) {
-                if (typeof addressOrObject !== 'string') {
-                    return addressOrObject.address;
-                }
-                return addressOrObject;
+                return oldVersionObject.address;
             }
         }
     }
@@ -29,12 +26,9 @@ export 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, addressOrObject] of Object.entries(oldVersions).reverse()) {
+        for (const [createdBlock, oldVersionObject] of Object.entries(oldVersions).reverse()) {
             if (block >= Number(createdBlock)) {
-                if (typeof addressOrObject !== 'string') {
-                    return addressOrObject.abi;
-                }
-                return latestAbi;
+                return oldVersionObject.abi;
             }
         }
     }
@@ -80,3 +74,5 @@ export const ChickenBondsManagerContract = createContractFromConfigFunc('Chicken
 export const ETHPriceFeedContract = createContractFromConfigFunc('ETHPriceFeed');
 export const COMPPriceFeedContract = createContractFromConfigFunc('COMPPriceFeed');
 export const USDCPriceFeedContract = createContractFromConfigFunc('USDCPriceFeed');
+export const FeedRegistryContract = createContractFromConfigFunc('FeedRegistry');
+export const MorphoBlueViewContract = createContractFromConfigFunc('MorphoBlueView');

package/esm/curveUsd/index.js

@@ -179,7 +179,7 @@ export const getCurveUsdUserData = (web3, network, address, selectedMarket, acti
         priceHigh,
         priceLow, liquidationDiscount: assetAmountInEth(data.liquidationDiscount), numOfBands: data.N, usedAssets,
         status }), getCrvUsdAggregatedData({
-        loanExists: data.loanExists, usedAssets, network: NetworkNumber.Eth, selectedMarket,
+        loanExists: data.loanExists, usedAssets, network: NetworkNumber.Eth, selectedMarket, numOfBands: data.N,
     })), { userBands });
 });
 export const getCurveUsdFullPositionData = (web3, network, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {

package/esm/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/esm/helpers/curveUsdHelpers/index.js

@@ -10,26 +10,34 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import Dec from 'decimal.js';
-import { getAssetsTotal } from '../../moneymarket';
+import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
+import { mapRange } from '../../services/utils';
 export const getCrvUsdAggregatedData = (_a) => {
-    var { loanExists, usedAssets, network, selectedMarket } = _a, rest = __rest(_a, ["loanExists", "usedAssets", "network", "selectedMarket"]);
-    const _supplied = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ supplied }) => supplied); // this is wrong if we are in soft-liquidations
-    const _borrowed = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowed }) => borrowed);
-    const _suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
-    const _borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
-    const ratio = loanExists
-        ? new Dec(_suppliedUsd)
-            .dividedBy(_borrowedUsd)
+    var _b;
+    var { loanExists, usedAssets, network, selectedMarket, numOfBands } = _a, rest = __rest(_a, ["loanExists", "usedAssets", "network", "selectedMarket", "numOfBands"]);
+    const payload = {};
+    payload.supplied = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ supplied }) => supplied); // this is wrong if we are in soft-liquidations
+    payload.borrowed = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowed }) => borrowed);
+    payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
+    payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
+    payload.ratio = loanExists
+        ? new Dec(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 = mapRange(numOfBands, 4, 50, 115, 140); // collateral ratio
+    payload.collFactor = new Dec(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 Dec(usedAssets[selectedMarket.collAsset].suppliedUsd).mul(payload.collFactor).toString()
+        : '0';
+    const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
+    payload.leveragedType = leveragedType;
+    if (leveragedType !== '') {
+        payload.leveragedAsset = leveragedAsset;
+        payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, usedAssets[selectedMarket.collAsset].price, payload.borrowedUsd, payload.borrowLimitUsd);
+    }
+    return payload;
 };

package/esm/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/esm/helpers/index.js

@@ -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/esm/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/esm/helpers/morphoBlueHelpers/index.js

@@ -0,0 +1,34 @@
+import Dec from 'decimal.js';
+import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
+import { calculateNetApy } from '../../staking';
+export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, lltv }) => {
+    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);
+    payload.borrowLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd }) => {
+        const suppliedUsdAmount = suppliedUsd;
+        return new Dec(suppliedUsdAmount).mul(lltv);
+    });
+    payload.liquidationLimitUsd = payload.borrowLimitUsd;
+    const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
+    payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.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();
+    const { leveragedType, leveragedAsset } = 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 Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
+            assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
+        }
+        payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
+    }
+    return payload;
+};

package/esm/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/esm/index.js

@@ -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/esm/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/esm/markets/index.js

@@ -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/esm/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/esm/markets/morphoBlue/index.js

@@ -0,0 +1,19 @@
+import { MorphoBlueVersions } from '../../types';
+import { NetworkNumber } from '../../types/common';
+export const MORPHO_BLUE_WSTETH_ETH = (networkId = NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'wstETH/ETH',
+    value: MorphoBlueVersions.MorphoBlueWstEthEth,
+    url: 'default',
+    loanToken: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+    collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+    oracle: '0x2a01eb9496094da03c4e364def50f5ad1280ad72',
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.945,
+    // icon: SvgAdapter(protocolIcons.spark),
+    protocolName: 'morpho-blue',
+});
+export const MorphoBlueMarkets = (networkId) => ({
+    [MorphoBlueVersions.MorphoBlueWstEthEth]: MORPHO_BLUE_WSTETH_ETH(networkId),
+});

package/esm/moneymarket/moneymarketCommonService.js

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

package/esm/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/esm/morphoBlue/index.js

@@ -0,0 +1,145 @@
+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());
+    });
+};
+import Dec from 'decimal.js';
+import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import { MorphoBlueViewContract, getConfigContractAbi, getConfigContractAddress, } from '../contracts';
+import { WAD, SECONDS_PER_YEAR, USD_QUOTE } from '../constants';
+import { getStakingApy } from '../staking';
+import { getAbiItem, wethToEth } from '../services/utils';
+import { multicall } from '../multicall';
+import { getMorphoBlueAggregatedPositionData } from '../helpers/morphoBlueHelpers';
+const compound = (ratePerSeconds) => {
+    const compounding = new Dec(ratePerSeconds).mul(SECONDS_PER_YEAR).toString();
+    const apyNumber = Math.expm1(new Dec(compounding).div(WAD).toNumber());
+    return new Dec(apyNumber).mul(WAD).floor().toString();
+};
+const getSupplyRate = (totalSupplyAssets, totalBorrowAssets, borrowRate, fee) => {
+    if (totalBorrowAssets === '0' || totalSupplyAssets === '0') {
+        return 0;
+    }
+    const utillization = new Dec(totalBorrowAssets).mul(WAD).div(totalSupplyAssets).ceil()
+        .toString();
+    const supplyRate = new Dec(utillization).mul(borrowRate).div(WAD).ceil()
+        .toString();
+    const ratePerSecond = new Dec(supplyRate).mul(new Dec(WAD).minus(fee)).div(WAD).ceil()
+        .toString();
+    return compound(ratePerSecond);
+};
+const getBorrowRate = (borrowRate, totalBorrowShares) => {
+    if (totalBorrowShares === '0') {
+        return 0;
+    }
+    return compound(borrowRate);
+};
+export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { loanToken, collateralToken, oracle, irm, lltv, } = selectedMarket;
+        const lltvInWei = new Dec(lltv).mul(WAD).toString();
+        const loanTokenInfo = getAssetInfoByAddress(loanToken);
+        const collateralTokenInfo = getAssetInfoByAddress(collateralToken);
+        let loanTokenFeedAddress = loanToken;
+        if (loanTokenInfo.symbol === 'WETH') {
+            const ethAddress = getAssetInfo('ETH').address;
+            loanTokenFeedAddress = ethAddress;
+        }
+        const FeedRegistryAddress = getConfigContractAddress('FeedRegistry', network);
+        const FeedRegistryAbi = getConfigContractAbi('FeedRegistry');
+        const viewContractAddress = getConfigContractAddress('MorphoBlueView', network);
+        const viewContractAbi = getConfigContractAbi('MorphoBlueView');
+        const multicallCallsObject = [
+            {
+                target: FeedRegistryAddress,
+                abiItem: getAbiItem(FeedRegistryAbi, 'latestAnswer'),
+                params: [loanTokenFeedAddress, USD_QUOTE],
+            },
+            {
+                target: viewContractAddress,
+                abiItem: getAbiItem(viewContractAbi, 'getMarketInfoNotTuple'),
+                params: [loanToken, collateralToken, oracle, irm, lltvInWei],
+            },
+        ];
+        const multicallData = yield 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 Dec(marketInfo.totalBorrowAssets).div(marketInfo.totalSupplyAssets).mul(100).toString();
+        const oracleRate = new Dec(marketInfo.oracle).div(1e36).toString();
+        const assetsData = {};
+        assetsData[wethToEth(loanTokenInfo.symbol)] = {
+            symbol: wethToEth(loanTokenInfo.symbol),
+            address: loanToken,
+            price: new Dec(loanTokenPrice).div(1e8).toString(),
+            supplyRate: new Dec(supplyRate).div(WAD).mul(100).toString(),
+            borrowRate: new Dec(compoundedBorrowRate).div(WAD).mul(100).toString(),
+            totalSupply: new Dec(marketInfo.totalSupplyAssets).div(WAD).toString(),
+            totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(WAD).toString(),
+        };
+        assetsData[wethToEth(collateralTokenInfo.symbol)] = {
+            symbol: wethToEth(collateralTokenInfo.symbol),
+            address: collateralToken,
+            price: new Dec(loanTokenPrice).div(1e8).mul(oracleRate).toString(),
+            supplyRate: '0',
+            borrowRate: '0',
+        };
+        if (['wstETH', 'cbETH', 'rETH'].includes(collateralTokenInfo.symbol)) {
+            assetsData[collateralTokenInfo.symbol].incentiveSupplyApy = yield getStakingApy(collateralTokenInfo.symbol, mainnetWeb3);
+            assetsData[collateralTokenInfo.symbol].incentiveSupplyToken = collateralTokenInfo.symbol;
+        }
+        return {
+            id: marketInfo.id,
+            fee: new Dec(marketInfo.fee).div(WAD).toString(),
+            loanToken: wethToEth(loanTokenInfo.symbol),
+            collateralToken: wethToEth(collateralTokenInfo.symbol),
+            utillization,
+            oracle: oracleRate,
+            lltv: new Dec(lltv).toString(),
+            assetsData,
+        };
+    });
+}
+export 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 Dec(lltv).mul(WAD).toString();
+        const marketObject = {
+            loanToken, collateralToken, oracle, irm, lltv: lltvInWei,
+        };
+        const viewContract = MorphoBlueViewContract(web3, network);
+        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();
+        usedAssets[marketInfo.loanToken] = {
+            symbol: loanTokenInfo.symbol,
+            supplied: loanTokenSupplied,
+            borrowed: loanTokenBorrowed,
+            isSupplied: new Dec(loanInfo.suppliedInAssets).gt(0),
+            isBorrowed: new Dec(loanInfo.borrowedInAssets).gt(0),
+            collateral: false,
+            suppliedUsd: new Dec(loanTokenSupplied).mul(loanTokenInfo.price).toString(),
+            borrowedUsd: new Dec(loanTokenBorrowed).mul(loanTokenInfo.price).toString(),
+        };
+        const collateralTokenInfo = marketInfo.assetsData[marketInfo.collateralToken];
+        const collateralTokenSupplied = new Dec(loanInfo.collateral).div(WAD).toString();
+        usedAssets[marketInfo.collateralToken] = {
+            symbol: collateralTokenInfo.symbol,
+            supplied: collateralTokenSupplied,
+            borrowed: '0',
+            isSupplied: new Dec(loanInfo.collateral).gt(0),
+            isBorrowed: false,
+            collateral: true,
+            suppliedUsd: new Dec(collateralTokenSupplied).mul(collateralTokenInfo.price).toString(),
+            borrowedUsd: '0',
+        };
+        return Object.assign({ usedAssets }, getMorphoBlueAggregatedPositionData({ usedAssets, assetsData: marketInfo.assetsData, lltv: marketInfo.lltv }));
+    });
+}

package/esm/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/esm/services/utils.js

@@ -19,3 +19,14 @@ export const bytesToString = (hex) => Buffer.from(hex.replace(/^0x/, ''), 'hex')
     .toString()
     // eslint-disable-next-line no-control-regex
     .replace(/\x00/g, '');
+/**
+ * Map an input value from one range (minInput, maxInput) to a value in another range (minOutput, maxOutput)
+ */
+export const mapRange = (input, minInput, maxInput, minOutput, maxOutput) => {
+    // slope = 1.0 * (output_end - output_start) / (input_end - input_start)
+    const inputDiff = new Dec(maxInput).minus(minInput);
+    const outputDiff = new Dec(maxOutput).minus(minOutput);
+    const slope = new Dec(outputDiff).div(inputDiff);
+    // output = output_start + slope * (input - input_start)
+    return new Dec(minOutput).plus(new Dec(slope).mul(new Dec(input).minus(minInput))).toDP(2).toNumber();
+};

package/esm/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/esm/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;