@defisaver/positions-sdk 0.0.32 → 0.0.34

package/cjs/markets/morphoBlue/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MorphoBlueMarkets = exports.MORPHO_BLUE_WSTETH_ETH = void 0;
+exports.MorphoBlueMarkets = exports.MORPHO_BLUE_WSTETH_USDC = 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) => ({
@@ -18,7 +18,23 @@ const MORPHO_BLUE_WSTETH_ETH = (networkId = common_1.NetworkNumber.Eth) => ({
     protocolName: 'morpho-blue',
 });
 exports.MORPHO_BLUE_WSTETH_ETH = MORPHO_BLUE_WSTETH_ETH;
+const MORPHO_BLUE_WSTETH_USDC = (networkId = common_1.NetworkNumber.Eth) => ({
+    chainIds: [1],
+    label: 'Morpho Blue',
+    shortLabel: 'wstETH/USDC',
+    value: types_1.MorphoBlueVersions.MorphoBlueWstEthUSDC,
+    url: 'default',
+    loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+    collateralToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+    oracle: '0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2',
+    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+    lltv: 0.86,
+    // icon: SvgAdapter(protocolIcons.spark),
+    protocolName: 'morpho-blue',
+});
+exports.MORPHO_BLUE_WSTETH_USDC = MORPHO_BLUE_WSTETH_USDC;
 const MorphoBlueMarkets = (networkId) => ({
     [types_1.MorphoBlueVersions.MorphoBlueWstEthEth]: (0, exports.MORPHO_BLUE_WSTETH_ETH)(networkId),
+    [types_1.MorphoBlueVersions.MorphoBlueWstEthUSDC]: (0, exports.MORPHO_BLUE_WSTETH_USDC)(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'];
+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/morphoBlue/index.js

@@ -77,7 +77,10 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
         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 oracleScaleFactor = new decimal_js_1.default(36).add(loanTokenInfo.decimals).sub(collateralTokenInfo.decimals).toString();
+        const oracleScale = new decimal_js_1.default(10).pow(oracleScaleFactor).toString();
+        const scale = new decimal_js_1.default(10).pow(loanTokenInfo.decimals).toString();
+        const oracleRate = new decimal_js_1.default(marketInfo.oracle).div(oracleScale).toString();
         const assetsData = {};
         assetsData[(0, utils_1.wethToEth)(loanTokenInfo.symbol)] = {
             symbol: (0, utils_1.wethToEth)(loanTokenInfo.symbol),
@@ -85,8 +88,8 @@ function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
             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(),
+            totalSupply: new decimal_js_1.default(marketInfo.totalSupplyAssets).div(scale).toString(),
+            totalBorrow: new decimal_js_1.default(marketInfo.totalBorrowAssets).div(scale).toString(),
         };
         assetsData[(0, utils_1.wethToEth)(collateralTokenInfo.symbol)] = {
             symbol: (0, utils_1.wethToEth)(collateralTokenInfo.symbol),

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

package/cjs/types/morphoBlue.d.ts

@@ -1,6 +1,7 @@
 import { MMUsedAssets, NetworkNumber } from './common';
 export declare enum MorphoBlueVersions {
-    MorphoBlueWstEthEth = "morphobluewstetheth"
+    MorphoBlueWstEthEth = "morphobluewstetheth",
+    MorphoBlueWstEthUSDC = "morphobluewstethusdc"
 }
 export interface MorphoBlueMarketData {
     chainIds: NetworkNumber[];

package/cjs/types/morphoBlue.js

@@ -4,4 +4,5 @@ exports.MorphoBlueVersions = void 0;
 var MorphoBlueVersions;
 (function (MorphoBlueVersions) {
     MorphoBlueVersions["MorphoBlueWstEthEth"] = "morphobluewstetheth";
+    MorphoBlueVersions["MorphoBlueWstEthUSDC"] = "morphobluewstethusdc";
 })(MorphoBlueVersions || (exports.MorphoBlueVersions = MorphoBlueVersions = {}));