@curvefi/llamalend-api 2.0.9 → 2.0.11

package/docs/SUPPORT_LLv2.md

@@ -469,6 +469,36 @@ market.loan.estimateGas.repay({ debt, address?, shrink? })  // params: { debt: T
 | forceUpdateUserState() | ✅ | ✅ | ✅ | ✅ | ✅ |
 | getCurrentLeverageParams() | ✅ | ✅ | ✅ | ✅ | ✅ |
 
+### `isSoftLiquidation` field in `userState` / `userStateBigInt`
+
+The `userState` and `userStateBigInt` methods now include an `isSoftLiquidation` field in their return value.
+
+**Updated return types:**
+
+```ts
+// userState
+market.userPosition.userState(address?: string): Promise<{
+  collateral: string,
+  borrowed: string,
+  debt: string,
+  N: string,
+  isSoftLiquidation: boolean,
+}>
+
+// userStateBigInt
+market.userPosition.userStateBigInt(address?: string): Promise<{
+  _collateral: bigint,
+  _borrowed: bigint,
+  _debt: bigint,
+  _N: bigint,
+  isSoftLiquidation: boolean,
+}>
+```
+
+**Logic:** `isSoftLiquidation` is `true` when the user has an active loan (`debt > 0`) and the AMM has partially converted collateral into the borrowed token (`borrowed > 0`).
+
+**Note:** Also applies to mint markets (`MintMarketTemplate`). In mint markets the field is returned by `userState` and is `true` when `stablecoin > 0` (the stablecoin amount reflects converted collateral in the AMM).
+
 ---
 
 ## Leverage Module (`market.leverage`)

package/lib/lendMarkets/interfaces/common/userPosition.d.ts

@@ -6,6 +6,7 @@ export interface IUserPosition {
         _borrowed: bigint;
         _debt: bigint;
         _N: bigint;
+        isSoftLiquidation: boolean;
     }>;
     userBandsBigInt: (address: string) => Promise<bigint[]>;
     userState: (address?: string) => Promise<{
@@ -13,6 +14,7 @@ export interface IUserPosition {
         borrowed: string;
         debt: string;
         N: string;
+        isSoftLiquidation: boolean;
     }>;
     userHealth: (full?: boolean, address?: string) => Promise<string>;
     userBands: (address?: string) => Promise<number[]>;

package/lib/lendMarkets/modules/common/leverageZapV2Base.js

@@ -47,7 +47,7 @@ export class LeverageZapV2BaseModule {
                     const j = N - this.market.minBands;
                     calls.push(contract.max_borrowable(this.market.addresses.controller, _userEffectiveCollateral, _maxLeverageCollateral[j], N, fromBN(pBN)));
                 }
-                _maxBorrowable = (yield this.llamalend.multicallProvider.all(calls)).map((_mb) => _mb * BigInt(998) / BigInt(1000));
+                _maxBorrowable = (yield this.llamalend.multicallProvider.all(calls)).map((_mb) => _mb * BigInt(970) / BigInt(1000));
                 maxBorrowableBN = _maxBorrowable.map((_mb) => toBN(_mb, this.market.borrowed_token.decimals));
                 const deltaBN = maxBorrowableBN.map((mb, l) => mb.minus(maxBorrowablePrevBN[l]).abs().div(mb));
                 if (BigNumber.max(...deltaBN).lt(0.0005)) {
@@ -239,7 +239,7 @@ export class LeverageZapV2BaseModule {
                 maxBorrowablePrevBN = maxBorrowableBN;
                 _userEffectiveCollateral = _userCollateral + fromBN(BN(userBorrowed).div(pAvgBN), this.market.collateral_token.decimals);
                 let _maxBorrowable = yield contract.max_borrowable(this.market.addresses.controller, _userEffectiveCollateral, _maxLeverageCollateral, range, fromBN(pAvgBN));
-                _maxBorrowable = _maxBorrowable * BigInt(998) / BigInt(1000);
+                _maxBorrowable = _maxBorrowable * BigInt(970) / BigInt(1000);
                 if (_maxBorrowable === BigInt(0))
                     break;
                 maxBorrowableBN = toBN(_maxBorrowable, this.market.borrowed_token.decimals);
@@ -468,7 +468,7 @@ export class LeverageZapV2BaseModule {
                 maxBorrowablePrevBN = maxBorrowableBN;
                 _userEffectiveCollateral = _userCollateral + fromBN(BN(userBorrowed).div(pAvgBN), this.market.collateral_token.decimals);
                 let _maxBorrowable = yield contract.max_borrowable(this.market.addresses.controller, _userEffectiveCollateral, _maxLeverageCollateral, _N, fromBN(pAvgBN));
-                _maxBorrowable = _maxBorrowable * BigInt(998) / BigInt(1000);
+                _maxBorrowable = _maxBorrowable * BigInt(970) / BigInt(1000);
                 if (_maxBorrowable === BigInt(0))
                     break;
                 maxBorrowableBN = toBN(_maxBorrowable, this.market.borrowed_token.decimals);
@@ -485,7 +485,7 @@ export class LeverageZapV2BaseModule {
                 _userEffectiveCollateral = BigInt(0);
             const _maxTotalCollateral = _userEffectiveCollateral + _maxLeverageCollateral;
             let _maxBorrowable = (yield controllerContract.max_borrowable(_stateCollateral + _maxTotalCollateral, _N, _stateDebt, this.llamalend.constantOptions)) - _stateDebt;
-            _maxBorrowable = _maxBorrowable * BigInt(998) / BigInt(1000);
+            _maxBorrowable = _maxBorrowable * BigInt(970) / BigInt(1000);
             return {
                 maxDebt: formatUnits(_maxBorrowable, this.market.borrowed_token.decimals),
                 maxTotalCollateral: formatUnits(_maxTotalCollateral, this.market.collateral_token.decimals),

package/lib/lendMarkets/modules/common/userPosition.d.ts

@@ -12,12 +12,14 @@ export declare class UserPositionModule implements IUserPosition {
         borrowed: string;
         debt: string;
         N: string;
+        isSoftLiquidation: boolean;
     }>;
     userStateBigInt(address?: string): Promise<{
         _collateral: bigint;
         _borrowed: bigint;
         _debt: bigint;
         _N: bigint;
+        isSoftLiquidation: boolean;
     }>;
     userHealth(full?: boolean, address?: string): Promise<string>;
     private _userBands;

package/lib/lendMarkets/modules/common/userPosition.js

@@ -38,12 +38,14 @@ export class UserPositionModule {
                 borrowed: formatUnits(_borrowed, this.market.borrowed_token.decimals),
                 debt: formatUnits(_debt, this.market.borrowed_token.decimals),
                 N: formatUnits(_N, 0),
+                isSoftLiquidation: !!_debt && !!_borrowed,
             };
         });
     }
     userStateBigInt() {
         return __awaiter(this, arguments, void 0, function* (address = "") {
-            return yield this._userState(address);
+            const state = yield this._userState(address);
+            return Object.assign(Object.assign({}, state), { isSoftLiquidation: !!state._debt && !!state._borrowed });
         });
     }
     userHealth() {

package/lib/mintMarkets/MintMarketTemplate.d.ts

@@ -176,6 +176,7 @@ export declare class MintMarketTemplate {
         collateral: string;
         stablecoin: string;
         debt: string;
+        isSoftLiquidation: boolean;
     }>;
     userLoss(userAddress?: string): Promise<{
         deposited_collateral: string;

package/lib/mintMarkets/MintMarketTemplate.js

@@ -515,6 +515,7 @@ export class MintMarketTemplate {
                 collateral: formatUnits(_collateral, this.collateralDecimals),
                 stablecoin: formatUnits(_stablecoin),
                 debt: formatUnits(_debt),
+                isSoftLiquidation: !!_debt && !!_stablecoin,
             };
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/llamalend-api",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "description": "JavaScript library for Curve Lending",
   "main": "lib/index.js",
   "author": "Macket",

package/src/lendMarkets/interfaces/common/userPosition.ts

@@ -2,9 +2,9 @@ import {IDict} from "../../../interfaces";
 
 export interface IUserPosition {
     userLoanExists: (address?: string) => Promise<boolean>,
-    userStateBigInt: (address?: string) => Promise<{ _collateral: bigint, _borrowed: bigint, _debt: bigint, _N: bigint }>,
+    userStateBigInt: (address?: string) => Promise<{ _collateral: bigint, _borrowed: bigint, _debt: bigint, _N: bigint, isSoftLiquidation: boolean }>,
     userBandsBigInt:(address: string) => Promise<bigint[]>,
-    userState: (address?: string) => Promise<{ collateral: string, borrowed: string, debt: string, N: string }>,
+    userState: (address?: string) => Promise<{ collateral: string, borrowed: string, debt: string, N: string, isSoftLiquidation: boolean }>,
     userHealth: (full?: boolean, address?: string) => Promise<string>,
     userBands: (address?: string) => Promise<number[]>,
     userRange: (address?: string) => Promise<number>,

package/src/lendMarkets/modules/common/leverageZapV2Base.ts

@@ -111,7 +111,7 @@ export class LeverageZapV2BaseModule {
             maxBorrowablePrevBN = maxBorrowableBN;
             _userEffectiveCollateral = _userCollateral + fromBN(BN(userBorrowed).div(pAvgBN), this.market.collateral_token.decimals);
             let _maxBorrowable = await contract.max_borrowable(this.market.addresses.controller, _userEffectiveCollateral, _maxLeverageCollateral, range, fromBN(pAvgBN));
-            _maxBorrowable = _maxBorrowable * BigInt(998) / BigInt(1000)
+            _maxBorrowable = _maxBorrowable * BigInt(970) / BigInt(1000)
             if (_maxBorrowable === BigInt(0)) break;
             maxBorrowableBN = toBN(_maxBorrowable, this.market.borrowed_token.decimals);
 
@@ -182,7 +182,7 @@ export class LeverageZapV2BaseModule {
                 const j = N - this.market.minBands;
                 calls.push(contract.max_borrowable(this.market.addresses.controller, _userEffectiveCollateral, _maxLeverageCollateral[j], N, fromBN(pBN)));
             }
-            _maxBorrowable = (await this.llamalend.multicallProvider.all(calls) as bigint[]).map((_mb) => _mb * BigInt(998) / BigInt(1000));
+            _maxBorrowable = (await this.llamalend.multicallProvider.all(calls) as bigint[]).map((_mb) => _mb * BigInt(970) / BigInt(1000));
             maxBorrowableBN = _maxBorrowable.map((_mb) => toBN(_mb, this.market.borrowed_token.decimals));
 
             const deltaBN = maxBorrowableBN.map((mb, l) => mb.minus(maxBorrowablePrevBN[l]).abs().div(mb));
@@ -599,7 +599,7 @@ export class LeverageZapV2BaseModule {
             maxBorrowablePrevBN = maxBorrowableBN;
             _userEffectiveCollateral = _userCollateral + fromBN(BN(userBorrowed).div(pAvgBN), this.market.collateral_token.decimals);
             let _maxBorrowable = await contract.max_borrowable(this.market.addresses.controller, _userEffectiveCollateral, _maxLeverageCollateral, _N, fromBN(pAvgBN));
-            _maxBorrowable = _maxBorrowable * BigInt(998) / BigInt(1000);
+            _maxBorrowable = _maxBorrowable * BigInt(970) / BigInt(1000);
             if (_maxBorrowable === BigInt(0)) break;
             maxBorrowableBN = toBN(_maxBorrowable, this.market.borrowed_token.decimals);
 
@@ -618,7 +618,7 @@ export class LeverageZapV2BaseModule {
         if (maxBorrowableBN.eq(0)) _userEffectiveCollateral = BigInt(0);
         const _maxTotalCollateral = _userEffectiveCollateral + _maxLeverageCollateral
         let _maxBorrowable = await controllerContract.max_borrowable(_stateCollateral + _maxTotalCollateral, _N, _stateDebt, this.llamalend.constantOptions) - _stateDebt;
-        _maxBorrowable = _maxBorrowable * BigInt(998) / BigInt(1000);
+        _maxBorrowable = _maxBorrowable * BigInt(970) / BigInt(1000);
 
         return {
             maxDebt: formatUnits(_maxBorrowable, this.market.borrowed_token.decimals),

package/src/lendMarkets/modules/common/userPosition.ts

@@ -36,7 +36,7 @@ export class UserPositionModule implements IUserPosition {
         maxAge: 10 * 1000, // 10s
     });
 
-    public async userState(address = ""): Promise<{ collateral: string, borrowed: string, debt: string, N: string }> {
+    public async userState(address = ""): Promise<{ collateral: string, borrowed: string, debt: string, N: string, isSoftLiquidation: boolean }> {
         const { _collateral, _borrowed, _debt, _N } = await this._userState(address);
 
         return {
@@ -44,11 +44,13 @@ export class UserPositionModule implements IUserPosition {
             borrowed: formatUnits(_borrowed, this.market.borrowed_token.decimals),
             debt: formatUnits(_debt, this.market.borrowed_token.decimals),
             N: formatUnits(_N, 0),
+            isSoftLiquidation: !!_debt && !!_borrowed,
         };
     }
 
-    public async userStateBigInt(address = ""): Promise<{ _collateral: bigint, _borrowed: bigint, _debt: bigint, _N: bigint }> {
-        return await this._userState(address);
+    public async userStateBigInt(address = ""): Promise<{ _collateral: bigint, _borrowed: bigint, _debt: bigint, _N: bigint, isSoftLiquidation: boolean }> {
+        const state = await this._userState(address);
+        return { ...state, isSoftLiquidation: !!state._debt && !!state._borrowed };
     }
 
     public async userHealth(full = true, address = ""): Promise<string> {

package/src/mintMarkets/MintMarketTemplate.ts

@@ -536,13 +536,14 @@ export class MintMarketTemplate {
         return { _collateral, _stablecoin, _debt }
     }
 
-    public async userState(address = ""): Promise<{ collateral: string, stablecoin: string, debt: string }> {
+    public async userState(address = ""): Promise<{ collateral: string, stablecoin: string, debt: string, isSoftLiquidation: boolean }> {
         const { _collateral, _stablecoin, _debt } = await this._userState(address);
 
         return {
             collateral: formatUnits(_collateral, this.collateralDecimals),
             stablecoin: formatUnits(_stablecoin),
             debt: formatUnits(_debt),
+            isSoftLiquidation: !!_debt && !!_stablecoin,
         };
     }