@defisaver/positions-sdk 0.0.52 → 0.0.53

package/cjs/curveUsd/index.js

@@ -102,13 +102,14 @@ const getCurveUsdGlobalData = (web3, network, selectedMarket) => __awaiter(void
         futureBorrowRate, bands: bandsData, leftToBorrow });
 });
 exports.getCurveUsdGlobalData = getCurveUsdGlobalData;
-const getStatusForUser = (bandRange, activeBand, crvUSDSupplied, collSupplied) => {
+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)
     if (new decimal_js_1.default(bandRange[0]).eq(bandRange[1]))
         return types_1.CrvUSDStatus.Nonexistant;
     // if user doesn't have crvUSD as collateral, then his position is not in soft liquidation
     if (new decimal_js_1.default(crvUSDSupplied).lte(0)) {
-        if (new decimal_js_1.default(bandRange[0]).minus(activeBand).lte(3))
+        const isHealthRisky = new decimal_js_1.default(healthPercent).lt(10);
+        if (new decimal_js_1.default(bandRange[0]).minus(activeBand).lte(3) || isHealthRisky)
             return types_1.CrvUSDStatus.Risk; // if user band is less than 3 bands away from active band, his position is at risk
         return types_1.CrvUSDStatus.Safe;
     }
@@ -180,7 +181,7 @@ const getCurveUsdUserData = (web3, network, address, selectedMarket, activeBand)
     const priceHigh = (0, tokens_1.assetAmountInEth)(data.priceHigh);
     const priceLow = (0, tokens_1.assetAmountInEth)(data.priceLow);
     const _userBands = data.loanExists ? (yield getAndFormatBands(web3, network, selectedMarket, data.bandRange[0], data.bandRange[1])) : [];
-    const status = data.loanExists ? getStatusForUser(data.bandRange, activeBand, crvUSDSupplied, collSupplied) : types_1.CrvUSDStatus.Nonexistant;
+    const status = data.loanExists ? getStatusForUser(data.bandRange, activeBand, crvUSDSupplied, collSupplied, healthPercent) : types_1.CrvUSDStatus.Nonexistant;
     const userBands = _userBands.map((band, index) => (Object.assign(Object.assign({}, band), { userDebtAmount: (0, tokens_1.assetAmountInEth)(data.usersBands[0][index], debtAsset), userCollAmount: (0, tokens_1.assetAmountInEth)(data.usersBands[1][index], collAsset) }))).sort((a, b) => parseInt(b.id, 10) - parseInt(a.id, 10));
     return Object.assign(Object.assign(Object.assign(Object.assign({}, data), { debtAmount: (0, tokens_1.assetAmountInEth)(data.debtAmount, debtAsset), health,
         healthPercent,

package/cjs/llamaLend/index.js

@@ -133,13 +133,14 @@ const getLlamaLendGlobalData = (web3, network, selectedMarket) => __awaiter(void
         futureBorrowRate, bands: bandsData, leftToBorrow });
 });
 exports.getLlamaLendGlobalData = getLlamaLendGlobalData;
-const getStatusForUser = (bandRange, activeBand, debtSupplied, collSupplied) => {
+const getStatusForUser = (bandRange, activeBand, debtSupplied, 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)
     if (new decimal_js_1.default(bandRange[0]).eq(bandRange[1]))
         return types_1.LlamaLendStatus.Nonexistant;
     // if user doesn't have debtAsset as collateral, then his position is not in soft liquidation
     if (new decimal_js_1.default(debtSupplied).lte(0)) {
-        if (new decimal_js_1.default(bandRange[0]).minus(activeBand).lte(3))
+        const isHealthRisky = new decimal_js_1.default(healthPercent).lt(10);
+        if (new decimal_js_1.default(bandRange[0]).minus(activeBand).lte(3) || isHealthRisky)
             return types_1.LlamaLendStatus.Risk; // if user band is less than 3 bands away from active band, his position is at risk
         return types_1.LlamaLendStatus.Safe;
     }
@@ -219,7 +220,7 @@ const getLlamaLendUserData = (web3, network, address, selectedMarket, marketData
     const priceHigh = (0, tokens_1.assetAmountInEth)(data.priceHigh);
     const priceLow = (0, tokens_1.assetAmountInEth)(data.priceLow);
     const _userBands = data.loanExists ? (yield getAndFormatBands(web3, network, selectedMarket, data.bandRange[0], data.bandRange[1])) : [];
-    const status = data.loanExists ? getStatusForUser(data.bandRange, marketData.activeBand, debtSupplied, collSupplied) : types_1.LlamaLendStatus.Nonexistant;
+    const status = data.loanExists ? getStatusForUser(data.bandRange, marketData.activeBand, debtSupplied, collSupplied, healthPercent) : types_1.LlamaLendStatus.Nonexistant;
     const userBands = _userBands.map((band, index) => (Object.assign(Object.assign({}, band), { userDebtAmount: (0, tokens_1.assetAmountInEth)(data.usersBands[0][index], debtAsset), userCollAmount: (0, tokens_1.assetAmountInEth)(data.usersBands[1][index], collAsset) }))).sort((a, b) => parseInt(b.id, 10) - parseInt(a.id, 10));
     return Object.assign(Object.assign(Object.assign(Object.assign({}, data), { debtAmount: (0, tokens_1.assetAmountInEth)(data.debtAmount, debtAsset), health,
         healthPercent,

package/esm/curveUsd/index.js

@@ -95,13 +95,14 @@ export const getCurveUsdGlobalData = (web3, network, selectedMarket) => __awaite
         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 });
 });
-const getStatusForUser = (bandRange, activeBand, crvUSDSupplied, collSupplied) => {
+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)
     if (new Dec(bandRange[0]).eq(bandRange[1]))
         return CrvUSDStatus.Nonexistant;
     // if user doesn't have crvUSD as collateral, then his position is not in soft liquidation
     if (new Dec(crvUSDSupplied).lte(0)) {
-        if (new Dec(bandRange[0]).minus(activeBand).lte(3))
+        const isHealthRisky = new Dec(healthPercent).lt(10);
+        if (new Dec(bandRange[0]).minus(activeBand).lte(3) || isHealthRisky)
             return CrvUSDStatus.Risk; // if user band is less than 3 bands away from active band, his position is at risk
         return CrvUSDStatus.Safe;
     }
@@ -172,7 +173,7 @@ export const getCurveUsdUserData = (web3, network, address, selectedMarket, acti
     const priceHigh = assetAmountInEth(data.priceHigh);
     const priceLow = assetAmountInEth(data.priceLow);
     const _userBands = data.loanExists ? (yield getAndFormatBands(web3, network, selectedMarket, data.bandRange[0], data.bandRange[1])) : [];
-    const status = data.loanExists ? getStatusForUser(data.bandRange, activeBand, crvUSDSupplied, collSupplied) : CrvUSDStatus.Nonexistant;
+    const status = data.loanExists ? getStatusForUser(data.bandRange, activeBand, crvUSDSupplied, collSupplied, healthPercent) : CrvUSDStatus.Nonexistant;
     const userBands = _userBands.map((band, index) => (Object.assign(Object.assign({}, band), { userDebtAmount: assetAmountInEth(data.usersBands[0][index], debtAsset), userCollAmount: assetAmountInEth(data.usersBands[1][index], collAsset) }))).sort((a, b) => parseInt(b.id, 10) - parseInt(a.id, 10));
     return Object.assign(Object.assign(Object.assign(Object.assign({}, data), { debtAmount: assetAmountInEth(data.debtAmount, debtAsset), health,
         healthPercent,

package/esm/llamaLend/index.js

@@ -126,13 +126,14 @@ export const getLlamaLendGlobalData = (web3, network, selectedMarket) => __await
         lendRate,
         futureBorrowRate, bands: bandsData, leftToBorrow });
 });
-const getStatusForUser = (bandRange, activeBand, debtSupplied, collSupplied) => {
+const getStatusForUser = (bandRange, activeBand, debtSupplied, 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)
     if (new Dec(bandRange[0]).eq(bandRange[1]))
         return LlamaLendStatus.Nonexistant;
     // if user doesn't have debtAsset as collateral, then his position is not in soft liquidation
     if (new Dec(debtSupplied).lte(0)) {
-        if (new Dec(bandRange[0]).minus(activeBand).lte(3))
+        const isHealthRisky = new Dec(healthPercent).lt(10);
+        if (new Dec(bandRange[0]).minus(activeBand).lte(3) || isHealthRisky)
             return LlamaLendStatus.Risk; // if user band is less than 3 bands away from active band, his position is at risk
         return LlamaLendStatus.Safe;
     }
@@ -211,7 +212,7 @@ export const getLlamaLendUserData = (web3, network, address, selectedMarket, mar
     const priceHigh = assetAmountInEth(data.priceHigh);
     const priceLow = assetAmountInEth(data.priceLow);
     const _userBands = data.loanExists ? (yield getAndFormatBands(web3, network, selectedMarket, data.bandRange[0], data.bandRange[1])) : [];
-    const status = data.loanExists ? getStatusForUser(data.bandRange, marketData.activeBand, debtSupplied, collSupplied) : LlamaLendStatus.Nonexistant;
+    const status = data.loanExists ? getStatusForUser(data.bandRange, marketData.activeBand, debtSupplied, collSupplied, healthPercent) : LlamaLendStatus.Nonexistant;
     const userBands = _userBands.map((band, index) => (Object.assign(Object.assign({}, band), { userDebtAmount: assetAmountInEth(data.usersBands[0][index], debtAsset), userCollAmount: assetAmountInEth(data.usersBands[1][index], collAsset) }))).sort((a, b) => parseInt(b.id, 10) - parseInt(a.id, 10));
     return Object.assign(Object.assign(Object.assign(Object.assign({}, data), { debtAmount: assetAmountInEth(data.debtAmount, debtAsset), health,
         healthPercent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.52",
+  "version": "0.0.53",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/curveUsd/index.ts

@@ -111,12 +111,13 @@ export const getCurveUsdGlobalData = async (web3: Web3, network: NetworkNumber,
   };
 };
 
-const getStatusForUser = (bandRange: string[], activeBand: string, crvUSDSupplied: string, collSupplied: string) => {
+const getStatusForUser = (bandRange: string[], activeBand: string, crvUSDSupplied: string, collSupplied: string, healthPercent: string) => {
   // if bands are equal, that can only be [0,0] which means user doesn't have loan (min number of bands is 4)
   if (new Dec(bandRange[0]).eq(bandRange[1])) return CrvUSDStatus.Nonexistant;
   // if user doesn't have crvUSD as collateral, then his position is not in soft liquidation
   if (new Dec(crvUSDSupplied).lte(0)) {
-    if (new Dec(bandRange[0]).minus(activeBand).lte(3)) return CrvUSDStatus.Risk; // if user band is less than 3 bands away from active band, his position is at risk
+    const isHealthRisky = new Dec(healthPercent).lt(10);
+    if (new Dec(bandRange[0]).minus(activeBand).lte(3) || isHealthRisky) return CrvUSDStatus.Risk; // if user band is less than 3 bands away from active band, his position is at risk
     return CrvUSDStatus.Safe;
   }
   if (new Dec(bandRange[0]).lte(activeBand) && new Dec(bandRange[1]).gte(activeBand)) return CrvUSDStatus.SoftLiquidating; // user has crvUSD as coll so he is in soft liquidation
@@ -196,7 +197,7 @@ export const getCurveUsdUserData = async (web3: Web3, network: NetworkNumber, ad
 
   const _userBands = data.loanExists ? (await getAndFormatBands(web3, network, selectedMarket, data.bandRange[0], data.bandRange[1])) : [];
 
-  const status = data.loanExists ? getStatusForUser(data.bandRange, activeBand, crvUSDSupplied, collSupplied) : CrvUSDStatus.Nonexistant;
+  const status = data.loanExists ? getStatusForUser(data.bandRange, activeBand, crvUSDSupplied, collSupplied, healthPercent) : CrvUSDStatus.Nonexistant;
 
   const userBands = _userBands.map((band, index) => ({
     ...band,

package/src/llamaLend/index.ts

@@ -146,12 +146,13 @@ export const getLlamaLendGlobalData = async (web3: Web3, network: NetworkNumber,
   };
 };
 
-const getStatusForUser = (bandRange: string[], activeBand: string, debtSupplied: string, collSupplied: string) => {
+const getStatusForUser = (bandRange: string[], activeBand: string, debtSupplied: string, collSupplied: string, healthPercent: string) => {
   // if bands are equal, that can only be [0,0] which means user doesn't have loan (min number of bands is 4)
   if (new Dec(bandRange[0]).eq(bandRange[1])) return LlamaLendStatus.Nonexistant;
   // if user doesn't have debtAsset as collateral, then his position is not in soft liquidation
   if (new Dec(debtSupplied).lte(0)) {
-    if (new Dec(bandRange[0]).minus(activeBand).lte(3)) return LlamaLendStatus.Risk; // if user band is less than 3 bands away from active band, his position is at risk
+    const isHealthRisky = new Dec(healthPercent).lt(10);
+    if (new Dec(bandRange[0]).minus(activeBand).lte(3) || isHealthRisky) return LlamaLendStatus.Risk; // if user band is less than 3 bands away from active band, his position is at risk
     return LlamaLendStatus.Safe;
   }
   if (new Dec(bandRange[0]).lte(activeBand) && new Dec(bandRange[1]).gte(activeBand)) return LlamaLendStatus.SoftLiquidating; // user has debtAsset as coll so he is in soft liquidation
@@ -245,7 +246,7 @@ export const getLlamaLendUserData = async (web3: Web3, network: NetworkNumber, a
 
   const _userBands = data.loanExists ? (await getAndFormatBands(web3, network, selectedMarket, data.bandRange[0], data.bandRange[1])) : [];
 
-  const status = data.loanExists ? getStatusForUser(data.bandRange, marketData.activeBand, debtSupplied, collSupplied) : LlamaLendStatus.Nonexistant;
+  const status = data.loanExists ? getStatusForUser(data.bandRange, marketData.activeBand, debtSupplied, collSupplied, healthPercent) : LlamaLendStatus.Nonexistant;
 
   const userBands = _userBands.map((band, index) => ({
     ...band,