@defisaver/positions-sdk 1.0.3 → 1.0.4

package/.mocharc.json

@@ -1,4 +1,4 @@
-{
-    "require": "ts-node/register",
-    "extension": ["ts"]
-}
+{
+    "require": "ts-node/register",
+    "extension": ["ts"]
+}

package/.nvmrc

@@ -1 +1 @@
-v20.17.0
+v20.17.0

package/README.md

@@ -1,69 +1,69 @@
-# DeFi Saver Positions SDK
-
-Supported protocols: 
-- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
-- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
-- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
-- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
-- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
-- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
-- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
-- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
-- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
-- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
-- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
-
-## Setup
-Supported Node version is v10.
-
-- run `npm install` (first time)
-- run `npm run build`
-
-`build` command will generate contracts and build ejs and esm folders
-
-## How to use
-[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
-
-This is a Compound V3 example, and every other protocol is similar
-```js
-import Web3 from 'web3';
-import { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-const web3 = new Web3(provider);
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
-    1, // network
-    selectedMarket, // market object like in /src/markets/compound/index.ts
-    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    web3,
-    1, // network
-    userAddress, // EOA or DSProxy
-    '', // proxy address of the user, or just empty string if checking for EOA
-    {
-        selectedMarket, // market object as in /src/markets/compound/index.ts
-        assetsData,
-    }
-);
-```
-
-More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
-
-## Testing
-
-`npm run test` - Run all tests
-
-`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest
+# DeFi Saver Positions SDK
+
+Supported protocols: 
+- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
+- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
+- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
+- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
+- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
+- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
+- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
+- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
+- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
+- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
+- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
+
+## Setup
+Supported Node version is v10.
+
+- run `npm install` (first time)
+- run `npm run build`
+
+`build` command will generate contracts and build ejs and esm folders
+
+## How to use
+[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
+
+This is a Compound V3 example, and every other protocol is similar
+```js
+import Web3 from 'web3';
+import { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+const web3 = new Web3(provider);
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
+    1, // network
+    selectedMarket, // market object like in /src/markets/compound/index.ts
+    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    web3,
+    1, // network
+    userAddress, // EOA or DSProxy
+    '', // proxy address of the user, or just empty string if checking for EOA
+    {
+        selectedMarket, // market object as in /src/markets/compound/index.ts
+        assetsData,
+    }
+);
+```
+
+More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
+
+## Testing
+
+`npm run test` - Run all tests
+
+`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest

package/cjs/aaveV3/index.js

@@ -13,17 +13,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAaveV3FullPositionData = exports.getAaveV3AccountData = exports.getAaveV3AccountBalances = exports.EMPTY_AAVE_DATA = exports.getAaveV3MarketData = exports.aaveV3EmodeCategoriesMapping = exports.aaveV3CalculateDiscountRate = exports.test = void 0;
-const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
-const contracts_1 = require("../contracts");
-const utils_1 = require("../services/utils");
-const common_1 = require("../types/common");
-const staking_1 = require("../staking");
-const multicall_1 = require("../multicall");
+const decimal_js_1 = __importDefault(require("decimal.js"));
 const assets_1 = require("../assets");
-const moneymarket_1 = require("../moneymarket");
+const contracts_1 = require("../contracts");
 const aaveHelpers_1 = require("../helpers/aaveHelpers");
 const aave_1 = require("../markets/aave");
+const moneymarket_1 = require("../moneymarket");
+const multicall_1 = require("../multicall");
+const utils_1 = require("../services/utils");
+const staking_1 = require("../staking");
+const common_1 = require("../types/common");
 const test = (web3, network) => {
     const contract = (0, contracts_1.AaveV3ViewContract)(web3, 1);
     return contract.methods.AAVE_REFERRAL_CODE().call();

package/cjs/curveUsd/index.js

@@ -79,6 +79,11 @@ const getCurveUsdGlobalData = (web3, network, selectedMarket) => __awaiter(void
             abiItem: contract.options.jsonInterface.find(({ name }) => name === 'globalData'),
             params: [selectedMarket.controllerAddress],
         },
+        {
+            target: selectedMarket.controllerAddress,
+            abiItem: (0, utils_1.getAbiItem)((0, contracts_1.getConfigContractAbi)('crvUSDwstETHController'), 'loan_discount'),
+            params: [],
+        },
     ];
     const multiRes = yield (0, multicall_1.multicall)(multicallData, web3, network);
     const data = multiRes[2][0];
@@ -96,10 +101,12 @@ const getCurveUsdGlobalData = (web3, network, selectedMarket) => __awaiter(void
         .toString();
     const bandsData = yield getAndFormatBands(web3, network, selectedMarket, data.minBand, data.maxBand);
     const leftToBorrow = new decimal_js_1.default(debtCeiling).minus(totalDebt).toString();
+    const loanDiscount = (0, tokens_1.assetAmountInEth)(multiRes[3][0], debtAsset);
     return Object.assign(Object.assign({}, data), { debtCeiling,
         totalDebt,
         ammPrice, oraclePrice: (0, tokens_1.assetAmountInEth)(data.oraclePrice, debtAsset), basePrice: (0, tokens_1.assetAmountInEth)(data.basePrice, debtAsset), minted: (0, tokens_1.assetAmountInEth)(data.minted, debtAsset), redeemed: (0, tokens_1.assetAmountInEth)(data.redeemed, debtAsset), borrowRate,
-        futureBorrowRate, bands: bandsData, leftToBorrow });
+        futureBorrowRate, bands: bandsData, leftToBorrow,
+        loanDiscount });
 });
 exports.getCurveUsdGlobalData = getCurveUsdGlobalData;
 const getStatusForUser = (bandRange, activeBand, crvUSDSupplied, collSupplied, healthPercent) => {

package/cjs/fluid/index.d.ts

@@ -78,6 +78,8 @@ export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user
         leveragedAsset?: string | undefined;
         liquidationPrice?: string | undefined;
         leveragedLsdAssetRatio?: string | undefined;
+        minCollRatio?: string | undefined;
+        collLiquidationRatio?: string | undefined;
         owner: string;
         vaultId: number;
         usedAssets: FluidUsedAssets;

package/cjs/helpers/aaveHelpers/index.js

@@ -134,6 +134,12 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
         }
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+    payload.healthRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).mul(payload.liqPercent).div(payload.borrowedUsd).div(100)
+        .toString();
+    payload.healthLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).mul(payload.liqRatio).div(payload.borrowLimitUsd)
+        .toString();
     return payload;
 };
 exports.aaveAnyGetAggregatedPositionData = aaveAnyGetAggregatedPositionData;

package/cjs/helpers/compoundHelpers/index.js

@@ -135,6 +135,8 @@ const getCompoundV3AggregatedData = (_a) => {
         }
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     // TO DO: handle strategies
     /* const subscribedStrategies = rest.compoundStrategies
       ? compoundV3GetSubscribedStrategies({ selectedMarket, compoundStrategies: rest.compoundStrategies })

package/cjs/helpers/eulerHelpers/index.js

@@ -151,6 +151,8 @@ const getEulerV2AggregatedData = (_a) => {
         }
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };
 exports.getEulerV2AggregatedData = getEulerV2AggregatedData;

package/cjs/helpers/fluidHelpers/index.js

@@ -36,6 +36,8 @@ const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }) => {
         }
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new decimal_js_1.default(payload.suppliedUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };
 exports.getFluidAggregatedData = getFluidAggregatedData;

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -57,6 +57,8 @@ const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInf
         }
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };
 exports.getMorphoBlueAggregatedPositionData = getMorphoBlueAggregatedPositionData;
@@ -115,73 +117,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, web3, network) =>
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

package/cjs/helpers/sparkHelpers/index.js

@@ -98,6 +98,8 @@ const sparkGetAggregatedPositionData = (_a) => {
         }
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     return payload;
 };
 exports.sparkGetAggregatedPositionData = sparkGetAggregatedPositionData;

package/cjs/staking/staking.d.ts

@@ -1,7 +1,8 @@
 import Web3 from 'web3';
+import memoize from 'memoizee';
 import { MMAssetsData, MMUsedAssets } from '../types/common';
 export declare const STAKING_ASSETS: string[];
-export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>;
+export declare const getStakingApy: ((asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>) & memoize.Memoized<(asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>>;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
 export declare const calculateNetApy: ({ usedAssets, assetsData, isMorpho }: {
     usedAssets: MMUsedAssets;

package/cjs/staking/staking.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.STAKING_ASSETS = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
+const memoizee_1 = __importDefault(require("memoizee"));
 const contracts_1 = require("../contracts");
 const common_1 = require("../types/common");
 const constants_1 = require("../constants");
@@ -110,14 +111,10 @@ const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function*
     if (!res.ok)
         throw new Error(`Failed to fetch APY for ${asset}`);
     const data = yield res.json();
-    // if our server returns apr, transform it into apy
-    if (['weETH'].includes(asset)) {
-        return (0, moneymarket_1.aprToApy)(data.apy);
-    }
     return String(data.apy);
 });
 exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS'];
-const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => __awaiter(void 0, void 0, void 0, function* () {
+exports.getStakingApy = (0, memoizee_1.default)((asset, web3, blockNumber = 'latest', fromBlock = undefined) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
             return yield getStETHApy(web3, fromBlock, blockNumber);
@@ -150,8 +147,7 @@ const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefine
         console.error(`Failed to fetch APY for ${asset}`);
     }
     return '0';
-});
-exports.getStakingApy = getStakingApy;
+}), { promise: true, maxAge: 2 * 60 * 1000 });
 const calculateInterestEarned = (principal, interest, type, apy = false) => {
     let interval = 1;
     if (+interest === 0)

package/cjs/types/aave.d.ts

@@ -229,6 +229,10 @@ export interface AaveV3AggregatedPositionData {
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
+    healthRatio?: string;
+    healthLiquidationRatio?: string;
 }
 export interface AaveHelperCommon {
     usedAssets: any;

package/cjs/types/compound.d.ts

@@ -96,6 +96,8 @@ export interface CompoundAggregatedPositionData {
     minRatio: string;
     debtTooLow: boolean;
     minDebt: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
 }
 export interface CompoundPositionData extends MMPositionData {
     ratio: string;

package/cjs/types/curveUsd.d.ts

@@ -59,6 +59,7 @@ export interface CrvUSDGlobalMarketData {
     futureBorrowRate: string;
     leftToBorrow: string;
     bands: BandData[];
+    loanDiscount: string;
 }
 export interface CrvUSDAggregatedPositionData {
     ratio: string;

package/cjs/types/euler.d.ts

@@ -146,4 +146,6 @@ export interface EulerV2AggregatedPositionData {
     liquidationPrice?: string;
     minRatio: string;
     minDebt: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
 }

package/cjs/types/fluid.d.ts

@@ -240,6 +240,8 @@ export interface FluidAggregatedVaultData {
     leveragedAsset?: string;
     liquidationPrice?: string;
     leveragedLsdAssetRatio?: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
 }
 export interface BaseFluidVaultData {
     owner: string;

package/cjs/types/morphoBlue.d.ts

@@ -122,6 +122,8 @@ export interface MorphoBlueAggregatedPositionData {
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
+    minCollRatio?: string;
+    collLiquidationRatio?: string;
 }
 export interface MorphoBluePositionData {
     usedAssets: MMUsedAssets;

package/cjs/types/spark.d.ts

@@ -97,6 +97,8 @@ export interface SparkAggregatedPositionData {
     leveragedAsset?: string;
     leveragedLsdAssetRatio?: string;
     liquidationPrice?: string;
+    minCollRatio: string;
+    collLiquidationRatio: string;
 }
 export interface SparkPositionData extends MMPositionData {
     ratio: string;

package/esm/aaveV3/index.js

@@ -7,17 +7,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
-import { AaveIncentiveDataProviderV3Contract, AaveV3ViewContract, createContractWrapper, getConfigContractAbi, getConfigContractAddress, GhoTokenContract, } from '../contracts';
-import { addToObjectIf, ethToWeth, getAbiItem, isEnabledOnBitmap, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
-import { NetworkNumber, } from '../types/common';
-import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { multicall } from '../multicall';
+import Dec from 'decimal.js';
 import { getAssetsBalances } from '../assets';
-import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
+import { AaveIncentiveDataProviderV3Contract, AaveV3ViewContract, createContractWrapper, getConfigContractAbi, getConfigContractAddress, GhoTokenContract, } from '../contracts';
 import { aaveAnyGetAggregatedPositionData, aaveV3IsInIsolationMode, aaveV3IsInSiloedMode } from '../helpers/aaveHelpers';
 import { AAVE_V3 } from '../markets/aave';
+import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
+import { multicall } from '../multicall';
+import { addToObjectIf, ethToWeth, getAbiItem, isEnabledOnBitmap, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
+import { NetworkNumber, } from '../types/common';
 export const test = (web3, network) => {
     const contract = AaveV3ViewContract(web3, 1);
     return contract.methods.AAVE_REFERRAL_CODE().call();

package/esm/curveUsd/index.js

@@ -12,10 +12,10 @@ import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
 import { CrvUSDStatus, } from '../types';
 import { multicall } from '../multicall';
 import { NetworkNumber, } from '../types/common';
-import { CrvUSDFactoryContract, CrvUSDViewContract } from '../contracts';
+import { CrvUSDFactoryContract, CrvUSDViewContract, getConfigContractAbi } from '../contracts';
 import { getCrvUsdAggregatedData } from '../helpers/curveUsdHelpers';
 import { CrvUsdMarkets } from '../markets';
-import { wethToEth } from '../services/utils';
+import { getAbiItem, wethToEth } from '../services/utils';
 const getAndFormatBands = (web3, network, selectedMarket, _minBand, _maxBand) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = CrvUSDViewContract(web3, network);
     const minBand = parseInt(_minBand, 10);
@@ -73,6 +73,11 @@ export const getCurveUsdGlobalData = (web3, network, selectedMarket) => __awaite
             abiItem: contract.options.jsonInterface.find(({ name }) => name === 'globalData'),
             params: [selectedMarket.controllerAddress],
         },
+        {
+            target: selectedMarket.controllerAddress,
+            abiItem: getAbiItem(getConfigContractAbi('crvUSDwstETHController'), 'loan_discount'),
+            params: [],
+        },
     ];
     const multiRes = yield multicall(multicallData, web3, network);
     const data = multiRes[2][0];
@@ -90,10 +95,12 @@ export const getCurveUsdGlobalData = (web3, network, selectedMarket) => __awaite
         .toString();
     const bandsData = yield getAndFormatBands(web3, network, selectedMarket, data.minBand, data.maxBand);
     const leftToBorrow = new Dec(debtCeiling).minus(totalDebt).toString();
+    const loanDiscount = assetAmountInEth(multiRes[3][0], debtAsset);
     return Object.assign(Object.assign({}, data), { debtCeiling,
         totalDebt,
         ammPrice, oraclePrice: assetAmountInEth(data.oraclePrice, debtAsset), basePrice: assetAmountInEth(data.basePrice, debtAsset), minted: assetAmountInEth(data.minted, debtAsset), redeemed: assetAmountInEth(data.redeemed, debtAsset), borrowRate,
-        futureBorrowRate, bands: bandsData, leftToBorrow });
+        futureBorrowRate, bands: bandsData, leftToBorrow,
+        loanDiscount });
 });
 const getStatusForUser = (bandRange, activeBand, crvUSDSupplied, collSupplied, healthPercent) => {
     // if bands are equal, that can only be [0,0] which means user doesn't have loan (min number of bands is 4)

package/esm/fluid/index.d.ts

@@ -78,6 +78,8 @@ export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user
         leveragedAsset?: string | undefined;
         liquidationPrice?: string | undefined;
         leveragedLsdAssetRatio?: string | undefined;
+        minCollRatio?: string | undefined;
+        collLiquidationRatio?: string | undefined;
         owner: string;
         vaultId: number;
         usedAssets: FluidUsedAssets;

package/esm/helpers/aaveHelpers/index.js

@@ -117,6 +117,12 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
         }
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
+    payload.healthRatio = new Dec(payload.suppliedCollateralUsd).mul(payload.liqPercent).div(payload.borrowedUsd).div(100)
+        .toString();
+    payload.healthLiquidationRatio = new Dec(payload.suppliedCollateralUsd).mul(payload.liqRatio).div(payload.borrowLimitUsd)
+        .toString();
     return payload;
 };
 const getApyAfterValuesEstimationInner = (selectedMarket, actions, viewContract, network) => __awaiter(void 0, void 0, void 0, function* () {

package/esm/helpers/compoundHelpers/index.js

@@ -125,6 +125,8 @@ export const getCompoundV3AggregatedData = (_a) => {
         }
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
     }
+    payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
+    payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     // TO DO: handle strategies
     /* const subscribedStrategies = rest.compoundStrategies
       ? compoundV3GetSubscribedStrategies({ selectedMarket, compoundStrategies: rest.compoundStrategies })