@curvefi/llamalend-api 2.0.8 → 2.0.10

package/docs/SUPPORT_LLv2.md

@@ -370,14 +370,49 @@ On the frontend, the value that we now return as **`totalAssets`** corresponds t
 
 | Method | v1 | v2 | Logic Unchanged | Parameters Unchanged | Return Type Unchanged |
 |--------|----|----|-----------------|----------------------|-----------------------|
-| repayBands() | ✅ | ✅ | ✅ | ✅ | ✅ |
-| repayPrices() | ✅ | ✅ | ✅ | ✅ | ✅ |
+| repayBands() | ✅ | ✅ | ❌ | ❌ | ✅ |
+| repayPrices() | ✅ | ✅ | ❌ | ❌ | ✅ |
 | repayIsApproved() | ✅ | ✅ | ✅ | ✅ | ✅ |
 | repayApprove() | ✅ | ✅ | ✅ | ✅ | ✅ |
-| repayHealth() | ✅ | ✅ | ✅ | ✅ | ✅ |
-| repay() | ✅ | ✅ | ❌ | ❌ | ❌ |
+| repayHealth() | ✅ | ✅ | ❌ | ❌ | ✅ |
+| repay() | ✅ | ✅ | ❌ | ❌ | ✅ |
 | repayFutureLeverage() | ✅ | ✅ | ✅ | ✅ | ✅ |
 
+#### Shrink mechanism (v2 only)
+
+In v2, the `repay` operation supports a new **shrink** mode that allows users to exit soft-liquidation by cutting the converted part of their position.
+
+When a user is in soft-liquidation, some bands are converted from collateral to borrowed asset. With `shrink = true`, all borrowed assets within the position are used for debt repayment, and the position shrinks to only the unconverted bands.
+
+**Example:**  
+A position with 10 bands where 3 are fully converted and 1 is partially converted (active band):
+
+Before shrink: `| c | c | c | c | c | c | c_a + b_a | b | b | b |`  
+After shrink (6 bands): `| c + c_a/6 | c + c_a/6 | c + c_a/6 | c + c_a/6 | c + c_a/6 | c + c_a/6 |`
+
+**Constraints:**
+- User must have at least 4 unconverted bands to shrink
+- Additional borrowed tokens may be required (use `tokens_to_shrink` on the controller contract to check)
+
+**Updated method signatures (v2):**
+
+```ts
+// Preview bands/prices after repay (with optional shrink)
+market.loan.repayBands({ debt, address?, shrink? })    // params: { debt: TAmount, address?: string, shrink?: boolean }
+market.loan.repayPrices({ debt, address?, shrink? })   // params: { debt: TAmount, address?: string, shrink?: boolean }
+
+// Preview health after repay (with optional shrink)
+market.loan.repayHealth({ debt, shrink?, full?, address? })  // params: { debt: TAmount, shrink?: boolean, full?: boolean, address?: string }
+
+// Execute repay (with optional shrink)
+market.loan.repay({ debt, address?, shrink? })          // params: { debt: TAmount, address?: string, shrink?: boolean }
+
+// Estimate gas (with optional shrink)
+market.loan.estimateGas.repay({ debt, address?, shrink? })  // params: { debt: TAmount, address?: string, shrink?: boolean }
+```
+
+**Note:** When `shrink = false` (default), v2 repay behaves identically to v1. The `shrink` parameter is only relevant for v2 markets and has no effect on v1.
+
 ### Repay (Full)
 
 | Method | v1 | v2 | Logic Unchanged | Parameters Unchanged | Return Type Unchanged |

package/lib/constants/abis/ControllerV2.json

@@ -839,31 +839,6 @@
             }
         ]
     },
-    {
-        "stateMutability": "view",
-        "type": "function",
-        "name": "calculate_debt_n1",
-        "inputs": [
-            {
-                "name": "_collateral",
-                "type": "uint256"
-            },
-            {
-                "name": "_debt",
-                "type": "uint256"
-            },
-            {
-                "name": "_N",
-                "type": "uint256"
-            }
-        ],
-        "outputs": [
-            {
-                "name": "",
-                "type": "int256"
-            }
-        ]
-    },
     {
         "stateMutability": "view",
         "type": "function",

package/lib/lendMarkets/interfaces/v1/loanV1.d.ts

@@ -38,12 +38,26 @@ export interface ILoanV1 {
     removeCollateralHealth: (collateral: TAmount, full?: boolean, address?: string) => Promise<string>;
     removeCollateral: (collateral: TAmount) => Promise<string>;
     removeCollateralFutureLeverage: (collateral: TAmount, userAddress?: string) => Promise<string>;
-    repayBands: (debt: TAmount, address?: string) => Promise<[number, number]>;
-    repayPrices: (debt: TAmount, address?: string) => Promise<string[]>;
+    repayBands: (params: {
+        debt: TAmount;
+        address?: string;
+    }) => Promise<[number, number]>;
+    repayPrices: (params: {
+        debt: TAmount;
+        address?: string;
+    }) => Promise<string[]>;
     repayIsApproved: (debt: TAmount) => Promise<boolean>;
     repayApprove: (debt: TAmount) => Promise<string[]>;
-    repayHealth: (debt: TAmount, full?: boolean, address?: string) => Promise<string>;
-    repay: (debt: TAmount, address?: string) => Promise<string>;
+    repayHealth: (params: {
+        debt: TAmount;
+        full?: boolean;
+        address?: string;
+    }) => Promise<string>;
+    repay: (params: {
+        debt: TAmount;
+        address?: string;
+        shrink?: boolean;
+    }) => Promise<string>;
     repayFutureLeverage: (debt: TAmount, userAddress?: string) => Promise<string>;
     fullRepayIsApproved: (address?: string) => Promise<boolean>;
     fullRepayApprove: (address?: string) => Promise<string[]>;
@@ -68,7 +82,11 @@ export interface ILoanV1 {
         addCollateral: (collateral: TAmount, address?: string) => Promise<TGas>;
         removeCollateral: (collateral: TAmount) => Promise<TGas>;
         repayApprove: (debt: TAmount) => Promise<TGas>;
-        repay: (debt: TAmount, address?: string) => Promise<TGas>;
+        repay: (params: {
+            debt: TAmount;
+            address?: string;
+            shrink?: boolean;
+        }) => Promise<TGas>;
         fullRepayApprove: (address?: string) => Promise<TGas>;
         fullRepay: (address?: string) => Promise<TGas>;
         liquidateApprove: (address?: string) => Promise<TGas>;

package/lib/lendMarkets/interfaces/v2/loanV2.d.ts

@@ -38,12 +38,29 @@ export interface ILoanV2 {
     removeCollateralHealth: (collateral: TAmount, full?: boolean, address?: string) => Promise<string>;
     removeCollateral: (collateral: TAmount) => Promise<string>;
     removeCollateralFutureLeverage: (collateral: TAmount, userAddress?: string) => Promise<string>;
-    repayBands: (debt: TAmount, address?: string) => Promise<[number, number]>;
-    repayPrices: (debt: TAmount, address?: string) => Promise<string[]>;
+    repayBands: (params: {
+        debt: TAmount;
+        address?: string;
+        shrink?: boolean;
+    }) => Promise<[number, number]>;
+    repayPrices: (params: {
+        debt: TAmount;
+        address?: string;
+        shrink?: boolean;
+    }) => Promise<string[]>;
     repayIsApproved: (debt: TAmount) => Promise<boolean>;
     repayApprove: (debt: TAmount) => Promise<string[]>;
-    repayHealth: (debt: TAmount, shrink?: boolean, full?: boolean, address?: string) => Promise<string>;
-    repay: (debt: TAmount, address?: string) => Promise<string>;
+    repayHealth: (params: {
+        debt: TAmount;
+        shrink?: boolean;
+        full?: boolean;
+        address?: string;
+    }) => Promise<string>;
+    repay: (params: {
+        debt: TAmount;
+        address?: string;
+        shrink?: boolean;
+    }) => Promise<string>;
     repayFutureLeverage: (debt: TAmount, userAddress?: string) => Promise<string>;
     fullRepayIsApproved: (address?: string) => Promise<boolean>;
     fullRepayApprove: (address?: string) => Promise<string[]>;
@@ -68,7 +85,11 @@ export interface ILoanV2 {
         addCollateral: (collateral: TAmount, address?: string) => Promise<TGas>;
         removeCollateral: (collateral: TAmount) => Promise<TGas>;
         repayApprove: (debt: TAmount) => Promise<TGas>;
-        repay: (debt: TAmount, address?: string) => Promise<TGas>;
+        repay: (params: {
+            debt: TAmount;
+            address?: string;
+            shrink?: boolean;
+        }) => Promise<TGas>;
         fullRepayApprove: (address?: string) => Promise<TGas>;
         fullRepay: (address?: string) => Promise<TGas>;
         liquidateApprove: (address?: string) => Promise<TGas>;

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/loanBase.d.ts

@@ -2,20 +2,51 @@ import memoize from "memoizee";
 import { TAmount, TGas, IPartialFrac } from "../../../interfaces";
 import type { LendMarketTemplate } from "../../LendMarketTemplate";
 import { Llamalend } from "../../../llamalend";
-export declare class LoanBaseModule {
+export declare abstract class LoanBaseModule {
     protected market: LendMarketTemplate;
     protected llamalend: Llamalend;
     constructor(market: LendMarketTemplate);
+    protected abstract _calcN1(_collateral: bigint, _debt: bigint, range: number): Promise<bigint>;
+    protected abstract _calcN1AllRanges(_collateral: bigint, _debt: bigint, maxN: number): Promise<bigint[]>;
+    protected abstract _maxBorrowable(collateralAmount: TAmount, range?: number): Promise<bigint>;
+    protected abstract _getMaxBorrowableCall(_collateral: bigint, N: number): any;
+    protected abstract _createLoanContractCall(_collateral: bigint, _debt: bigint, range: number, estimateGas: boolean): Promise<string | TGas>;
+    protected abstract _borrowMoreContractCall(_collateral: bigint, _debt: bigint, estimateGas: boolean): Promise<string | TGas>;
+    protected abstract _repayContractCall(params: {
+        _debt: bigint;
+        address: string;
+        n: number | bigint;
+        estimateGas: boolean;
+        shrink?: boolean;
+    }): Promise<string | TGas>;
+    protected abstract _partialLiquidateContractCall(address: string, _minAmount: bigint, frac: string, estimateGas: boolean): Promise<string | TGas>;
+    protected abstract _repayBands(params: {
+        debt: number | string;
+        address: string;
+        shrink?: boolean;
+    }): Promise<[bigint, bigint]>;
+    abstract repayBands(params: {
+        debt: number | string;
+        address?: string;
+        shrink?: boolean;
+    }): Promise<[number, number]>;
+    abstract repayPrices(params: {
+        debt: number | string;
+        address?: string;
+        shrink?: boolean;
+    }): Promise<string[]>;
+    abstract createLoanHealth(collateral: number | string, debt: number | string, range: number, full?: boolean): Promise<string>;
+    abstract borrowMoreHealth(collateral: number | string, debt: number | string, full?: boolean, address?: string): Promise<string>;
+    abstract addCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
+    abstract removeCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
     _checkRange(range: number): void;
-    createLoanMaxRecv(collateral: number | string, range: number): Promise<string>;
+    createLoanMaxRecv(collateral: TAmount, range: number): Promise<string>;
     createLoanMaxRecvAllRanges: ((collateral: number | string) => Promise<{
         [index: number]: string;
     }>) & memoize.Memoized<(collateral: number | string) => Promise<{
         [index: number]: string;
     }>>;
     getMaxRange(collateral: number | string, debt: number | string): Promise<number>;
-    private _calcN1;
-    private _calcN1AllRanges;
     private _createLoanBands;
     private _createLoanBandsAllRanges;
     createLoanBands(collateral: number | string, debt: number | string, range: number): Promise<[number, number]>;
@@ -26,7 +57,6 @@ export declare class LoanBaseModule {
     createLoanPricesAllRanges(collateral: number | string, debt: number | string): Promise<{
         [index: number]: [string, string] | null;
     }>;
-    createLoanHealth(collateral: number | string, debt: number | string, range: number, full?: boolean): Promise<string>;
     createLoanIsApproved(collateral: number | string): Promise<boolean>;
     private createLoanApproveEstimateGas;
     createLoanApprove(collateral: number | string): Promise<string[]>;
@@ -37,7 +67,6 @@ export declare class LoanBaseModule {
     private _borrowMoreBands;
     borrowMoreBands(collateral: number | string, debt: number | string): Promise<[number, number]>;
     borrowMorePrices(collateral: number | string, debt: number | string): Promise<string[]>;
-    borrowMoreHealth(collateral: number | string, debt: number | string, full?: boolean, address?: string): Promise<string>;
     borrowMoreIsApproved(collateral: number | string): Promise<boolean>;
     private borrowMoreApproveEstimateGas;
     borrowMoreApprove(collateral: number | string): Promise<string[]>;
@@ -48,7 +77,6 @@ export declare class LoanBaseModule {
     private _addCollateralBands;
     addCollateralBands(collateral: number | string, address?: string): Promise<[number, number]>;
     addCollateralPrices(collateral: number | string, address?: string): Promise<string[]>;
-    addCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
     addCollateralIsApproved(collateral: number | string): Promise<boolean>;
     private addCollateralApproveEstimateGas;
     addCollateralApprove(collateral: number | string): Promise<string[]>;
@@ -60,20 +88,24 @@ export declare class LoanBaseModule {
     private _removeCollateralBands;
     removeCollateralBands(collateral: number | string): Promise<[number, number]>;
     removeCollateralPrices(collateral: number | string): Promise<string[]>;
-    removeCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
     private _removeCollateral;
     removeCollateralEstimateGas(collateral: number | string): Promise<TGas>;
     removeCollateral(collateral: number | string): Promise<string>;
     removeCollateralFutureLeverage(collateral: number | string, userAddress?: string): Promise<string>;
-    private _repayBands;
-    repayBands(debt: number | string, address?: string): Promise<[number, number]>;
-    repayPrices(debt: number | string, address?: string): Promise<string[]>;
     repayIsApproved(debt: number | string): Promise<boolean>;
     private repayApproveEstimateGas;
     repayApprove(debt: number | string): Promise<string[]>;
     private _repay;
-    repayEstimateGas(debt: number | string, address?: string): Promise<TGas>;
-    repay(debt: number | string, address?: string): Promise<string>;
+    repayEstimateGas({ debt, address, shrink }: {
+        debt: number | string;
+        address?: string;
+        shrink?: boolean;
+    }): Promise<TGas>;
+    repay({ debt, address, shrink }: {
+        debt: number | string;
+        address?: string;
+        shrink?: boolean;
+    }): Promise<string>;
     repayFutureLeverage(debt: number | string, userAddress?: string): Promise<string>;
     private _fullRepayAmount;
     fullRepayIsApproved(address?: string): Promise<boolean>;
@@ -109,7 +141,11 @@ export declare class LoanBaseModule {
         addCollateral: (collateral: number | string, address?: string) => Promise<TGas>;
         removeCollateral: (collateral: number | string) => Promise<TGas>;
         repayApprove: (debt: number | string) => Promise<TGas>;
-        repay: (debt: number | string, address?: string) => Promise<TGas>;
+        repay: ({ debt, address, shrink }: {
+            debt: number | string;
+            address?: string;
+            shrink?: boolean;
+        }) => Promise<TGas>;
         fullRepayApprove: (address?: string) => Promise<TGas>;
         fullRepay: (address?: string) => Promise<TGas>;
         liquidateApprove: (address?: string) => Promise<TGas>;

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

@@ -16,8 +16,7 @@ export class LoanBaseModule {
             const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
             const calls = [];
             for (let N = this.market.minBands; N <= this.market.maxBands; N++) {
-                // TODO: currentDebt is no longer passed - now we pass user address or zero address, currentDebt is calculated under the hood
-                calls.push(this.llamalend.contracts[this.market.addresses.controller].multicallContract.max_borrowable(_collateral, N, 0));
+                calls.push(this._getMaxBorrowableCall(_collateral, N));
             }
             const _amounts = yield this.llamalend.multicallProvider.all(calls);
             const res = {};
@@ -60,10 +59,7 @@ export class LoanBaseModule {
     createLoanMaxRecv(collateral, range) {
         return __awaiter(this, void 0, void 0, function* () {
             this._checkRange(range);
-            const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
-            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            // TODO: currentDebt is no longer passed - now we pass user address or zero address, currentDebt is calculated under the hood
-            return formatUnits(yield contract.max_borrowable(_collateral, range, 0, this.llamalend.constantOptions), this.market.borrowed_token.decimals);
+            return formatUnits(yield this._maxBorrowable(collateral, range), this.market.borrowed_token.decimals);
         });
     }
     getMaxRange(collateral, debt) {
@@ -76,23 +72,6 @@ export class LoanBaseModule {
             return this.market.maxBands;
         });
     }
-    _calcN1(_collateral, _debt, range) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this._checkRange(range);
-            // TODO: add 4th parameter - user address in calculate_debt_n1
-            return yield this.llamalend.contracts[this.market.addresses.controller].contract.calculate_debt_n1(_collateral, _debt, range, this.llamalend.constantOptions);
-        });
-    }
-    _calcN1AllRanges(_collateral, _debt, maxN) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const calls = [];
-            // TODO: add 4th parameter - user address in calculate_debt_n1
-            for (let N = this.market.minBands; N <= maxN; N++) {
-                calls.push(this.llamalend.contracts[this.market.addresses.controller].multicallContract.calculate_debt_n1(_collateral, _debt, N));
-            }
-            return yield this.llamalend.multicallProvider.all(calls);
-        });
-    }
     _createLoanBands(collateral, debt, range) {
         return __awaiter(this, void 0, void 0, function* () {
             const _n1 = yield this._calcN1(parseUnits(collateral, this.market.collateral_token.decimals), parseUnits(debt, this.market.borrowed_token.decimals), range);
@@ -157,15 +136,6 @@ export class LoanBaseModule {
             return pricesAllRanges;
         });
     }
-    createLoanHealth(collateral_1, debt_1, range_1) {
-        return __awaiter(this, arguments, void 0, function* (collateral, debt, range, full = true) {
-            const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
-            const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
-            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            const _health = yield contract.health_calculator(this.llamalend.constants.ZERO_ADDRESS, _collateral, _debt, full, range, this.llamalend.constantOptions);
-            return formatUnits(_health * BigInt(100));
-        });
-    }
     createLoanIsApproved(collateral) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield hasAllowance.call(this.llamalend, [this.market.collateral_token.address], [collateral], this.llamalend.signerAddress, this.market.addresses.controller);
@@ -188,14 +158,7 @@ export class LoanBaseModule {
             this._checkRange(range);
             const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
             const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
-            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            const gas = yield contract.create_loan.estimateGas(_collateral, _debt, range, Object.assign({}, this.llamalend.constantOptions));
-            if (estimateGas)
-                return smartNumber(gas);
-            yield this.llamalend.updateFeeData();
-            const gasLimit = _mulBy1_3(DIGas(gas));
-            // TODO: ABI has changed (see docs)
-            return (yield contract.create_loan(_collateral, _debt, range, Object.assign(Object.assign({}, this.llamalend.options), { gasLimit }))).hash;
+            return this._createLoanContractCall(_collateral, _debt, range, estimateGas);
         });
     }
     createLoanEstimateGas(collateral, debt, range) {
@@ -214,12 +177,7 @@ export class LoanBaseModule {
     // ---------------- BORROW MORE ----------------
     borrowMoreMaxRecv(collateralAmount) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { _collateral: _currentCollateral, _debt: _currentDebt, _N } = yield this.market.userPosition.userStateBigInt();
-            const _collateral = _currentCollateral + parseUnits(collateralAmount, this.market.collateral_token.decimals);
-            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            const _debt = yield contract.max_borrowable(_collateral, _N, _currentDebt, this.llamalend.constantOptions);
-            // TODO: max_borrowable(deltaCollateral, _N, user) - debt is now calculated under the hood, return as is
-            return formatUnits(_debt - _currentDebt, this.market.borrowed_token.decimals);
+            return formatUnits(yield this._maxBorrowable(collateralAmount), this.market.borrowed_token.decimals);
         });
     }
     _borrowMoreBands(collateral, debt) {
@@ -246,16 +204,6 @@ export class LoanBaseModule {
             return yield this.market.prices.getPrices(_n2, _n1);
         });
     }
-    borrowMoreHealth(collateral_1, debt_1) {
-        return __awaiter(this, arguments, void 0, function* (collateral, debt, full = true, address = "") {
-            address = _getAddress.call(this.llamalend, address);
-            const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
-            const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
-            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            const _health = yield contract.health_calculator(address, _collateral, _debt, full, 0, this.llamalend.constantOptions);
-            return formatUnits(_health * BigInt(100));
-        });
-    }
     borrowMoreIsApproved(collateral) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield hasAllowance.call(this.llamalend, [this.market.addresses.collateral_token], [collateral], this.llamalend.signerAddress, this.market.addresses.controller);
@@ -280,13 +228,7 @@ export class LoanBaseModule {
                 throw Error(`User ${this.llamalend.signerAddress} is already in liquidation mode`);
             const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
             const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
-            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            const gas = yield contract.borrow_more.estimateGas(_collateral, _debt, Object.assign({}, this.llamalend.constantOptions));
-            if (estimateGas)
-                return smartNumber(gas);
-            yield this.llamalend.updateFeeData();
-            const gasLimit = _mulBy1_3(DIGas(gas));
-            return (yield contract.borrow_more(_collateral, _debt, Object.assign(Object.assign({}, this.llamalend.options), { gasLimit }))).hash;
+            return this._borrowMoreContractCall(_collateral, _debt, estimateGas);
         });
     }
     borrowMoreEstimateGas(collateral, debt) {
@@ -337,15 +279,6 @@ export class LoanBaseModule {
             return yield this.market.prices.getPrices(_n2, _n1);
         });
     }
-    addCollateralHealth(collateral_1) {
-        return __awaiter(this, arguments, void 0, function* (collateral, full = true, address = "") {
-            address = _getAddress.call(this.llamalend, address);
-            const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
-            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            const _health = yield contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions);
-            return formatUnits(_health * BigInt(100));
-        });
-    }
     addCollateralIsApproved(collateral) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield hasAllowance.call(this.llamalend, [this.market.addresses.collateral_token], [collateral], this.llamalend.signerAddress, this.market.addresses.controller);
@@ -435,15 +368,6 @@ export class LoanBaseModule {
             return yield this.market.prices.getPrices(_n2, _n1);
         });
     }
-    removeCollateralHealth(collateral_1) {
-        return __awaiter(this, arguments, void 0, function* (collateral, full = true, address = "") {
-            address = _getAddress.call(this.llamalend, address);
-            const _collateral = parseUnits(collateral, this.market.collateral_token.decimals) * BigInt(-1);
-            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            const _health = yield contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions);
-            return formatUnits(_health * BigInt(100));
-        });
-    }
     _removeCollateral(collateral, estimateGas) {
         return __awaiter(this, void 0, void 0, function* () {
             const { borrowed, debt: currentDebt } = yield this.market.userPosition.userState();
@@ -483,35 +407,6 @@ export class LoanBaseModule {
         });
     }
     // ---------------- REPAY ----------------
-    // TODO: add shrink: bool parameter
-    // If bool is true, _N = n2 - n1 + 1 -> _N = n2 - activeBand
-    _repayBands(debt, address) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { _collateral: _currentCollateral, _borrowed, _debt: _currentDebt, _N } = yield this.market.userPosition.userStateBigInt(address);
-            if (_currentDebt === BigInt(0))
-                throw Error(`Loan for ${address} does not exist`);
-            // && shrink === false
-            if (_borrowed > BigInt(0))
-                return yield this.market.userPosition.userBandsBigInt(address);
-            // If shrink == true, then _debt = _currentDebt - parseUnits(debt, this.market.borrowed_token.decimals) - _borrowed
-            const _debt = _currentDebt - parseUnits(debt, this.market.borrowed_token.decimals);
-            const _n1 = yield this._calcN1(_currentCollateral, _debt, Number(_N));
-            const _n2 = _n1 + _N - BigInt(1);
-            return [_n2, _n1];
-        });
-    }
-    repayBands(debt_1) {
-        return __awaiter(this, arguments, void 0, function* (debt, address = "") {
-            const [_n2, _n1] = yield this._repayBands(debt, address);
-            return [Number(_n2), Number(_n1)];
-        });
-    }
-    repayPrices(debt_1) {
-        return __awaiter(this, arguments, void 0, function* (debt, address = "") {
-            const [_n2, _n1] = yield this._repayBands(debt, address);
-            return yield this.market.prices.getPrices(_n2, _n1);
-        });
-    }
     repayIsApproved(debt) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield hasAllowance.call(this.llamalend, [this.market.borrowed_token.address], [debt], this.llamalend.signerAddress, this.market.addresses.controller);
@@ -527,37 +422,30 @@ export class LoanBaseModule {
             return yield ensureAllowance.call(this.llamalend, [this.market.borrowed_token.address], [debt], this.market.addresses.controller);
         });
     }
-    _repay(debt, address, estimateGas) {
-        return __awaiter(this, void 0, void 0, function* () {
+    _repay(debt_1, address_1, estimateGas_1) {
+        return __awaiter(this, arguments, void 0, function* (debt, address, estimateGas, shrink = false) {
             address = _getAddress.call(this.llamalend, address);
             const { debt: currentDebt } = yield this.market.userPosition.userState(address);
             if (Number(currentDebt) === 0)
                 throw Error(`Loan for ${address} does not exist`);
             const _debt = parseUnits(debt);
-            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
             const [, n1] = yield this.market.userPosition.userBands(address);
             const { borrowed } = yield this.market.userPosition.userState(address);
-            const n = (BN(borrowed).gt(0)) ? MAX_ACTIVE_BAND : n1 - 1; // In liquidation mode it doesn't matter if active band moves
-            const gas = yield contract.repay.estimateGas(_debt, address, n, this.llamalend.constantOptions);
-            if (estimateGas)
-                return smartNumber(gas);
-            yield this.llamalend.updateFeeData();
-            const gasLimit = _mulBy1_3(DIGas(gas));
-            // TODO: shrink parameter is added, which changes bands calculation
-            return (yield contract.repay(_debt, address, n, Object.assign(Object.assign({}, this.llamalend.options), { gasLimit }))).hash;
+            const n = (BN(borrowed).gt(0)) ? MAX_ACTIVE_BAND : n1 - 1;
+            return this._repayContractCall({ _debt, address, n, estimateGas, shrink });
         });
     }
-    repayEstimateGas(debt_1) {
-        return __awaiter(this, arguments, void 0, function* (debt, address = "") {
+    repayEstimateGas(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ debt, address = "", shrink = false }) {
             if (!(yield this.repayIsApproved(debt)))
                 throw Error("Approval is needed for gas estimation");
-            return yield this._repay(debt, address, true);
+            return yield this._repay(debt, address, true, shrink);
         });
     }
-    repay(debt_1) {
-        return __awaiter(this, arguments, void 0, function* (debt, address = "") {
+    repay(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ debt, address = "", shrink = false }) {
             yield this.repayApprove(debt);
-            return yield this._repay(debt, address, false);
+            return yield this._repay(debt, address, false, shrink);
         });
     }
     repayFutureLeverage(debt_1) {
@@ -703,13 +591,7 @@ export class LoanBaseModule {
             const expectedBorrowedBN = borrowedBN.times(fracBN);
             const minAmountBN = expectedBorrowedBN.times(100 - slippage).div(100);
             const _minAmount = fromBN(minAmountBN);
-            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            const gas = (yield contract.liquidate_extended.estimateGas(address, _minAmount, frac, this.llamalend.constants.ZERO_ADDRESS, [], this.llamalend.constantOptions));
-            if (estimateGas)
-                return smartNumber(gas);
-            yield this.llamalend.updateFeeData();
-            const gasLimit = _mulBy1_3(DIGas(gas));
-            return (yield contract.liquidate_extended(address, _minAmount, frac, this.llamalend.constants.ZERO_ADDRESS, [], Object.assign(Object.assign({}, this.llamalend.options), { gasLimit }))).hash;
+            return this._partialLiquidateContractCall(address, _minAmount, frac, estimateGas);
         });
     }
     liquidateEstimateGas(address_1) {

package/lib/lendMarkets/modules/v1/loanV1.d.ts

@@ -1,5 +1,41 @@
 import { LoanBaseModule } from "../common/loanBase.js";
 import { ILoanV1 } from "../../interfaces/v1/loanV1";
+import { TGas, TAmount } from "../../../interfaces";
 export declare class LoanV1Module extends LoanBaseModule implements ILoanV1 {
-    repayHealth(debt: number | string, full?: boolean, address?: string): Promise<string>;
+    protected _maxBorrowable: (collateralAmount: TAmount, range?: number) => Promise<bigint>;
+    protected _getMaxBorrowableCall(_collateral: bigint, N: number): any;
+    protected _calcN1(_collateral: bigint, _debt: bigint, range: number): Promise<bigint>;
+    protected _calcN1AllRanges(_collateral: bigint, _debt: bigint, maxN: number): Promise<bigint[]>;
+    createLoanHealth(collateral: number | string, debt: number | string, range: number, full?: boolean): Promise<string>;
+    borrowMoreHealth(collateral: number | string, debt: number | string, full?: boolean, address?: string): Promise<string>;
+    addCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
+    removeCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
+    protected _repayBands({ debt, address }: {
+        debt: number | string;
+        address: string;
+        shrink?: boolean;
+    }): Promise<[bigint, bigint]>;
+    repayBands({ debt, address }: {
+        debt: number | string;
+        address?: string;
+    }): Promise<[number, number]>;
+    repayPrices({ debt, address }: {
+        debt: number | string;
+        address?: string;
+    }): Promise<string[]>;
+    protected _repayContractCall({ _debt, address, n, estimateGas }: {
+        _debt: bigint;
+        address: string;
+        n: number | bigint;
+        estimateGas: boolean;
+        shrink?: boolean;
+    }): Promise<string | TGas>;
+    protected _createLoanContractCall(_collateral: bigint, _debt: bigint, range: number, estimateGas: boolean): Promise<string | TGas>;
+    protected _borrowMoreContractCall(_collateral: bigint, _debt: bigint, estimateGas: boolean): Promise<string | TGas>;
+    protected _partialLiquidateContractCall(address: string, _minAmount: bigint, frac: string, estimateGas: boolean): Promise<string | TGas>;
+    repayHealth({ debt, full, address }: {
+        debt: number | string;
+        full?: boolean;
+        address?: string;
+    }): Promise<string>;
 }