@curvefi/llamalend-api 2.2.6 → 2.3.0

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

@@ -25,7 +25,7 @@ export class LeverageZapV2BaseModule {
             return this._getLeverageZapAddress() !== this.llamalend.constants.ZERO_ADDRESS &&
                 this._getMarketId() >= Number(this.llamalend.constants.ALIASES["leverage_markets_start_id"]);
         };
-        this.leverageCreateLoanMaxRecvAllRanges = memoize((_a) => __awaiter(this, [_a], void 0, function* ({ userCollateral, userBorrowed, getExpected }) {
+        this.leverageCreateLoanMaxRecvAllRanges = memoize((_a) => __awaiter(this, [_a], void 0, function* ({ userCollateral, getExpected }) {
             this._checkLeverageZap();
             const _userCollateral = parseUnits(userCollateral, this.market.collateral_token.decimals);
             const contract = this.llamalend.contracts[this._getLeverageZapAddress()].multicallContract;
@@ -41,7 +41,7 @@ export class LeverageZapV2BaseModule {
             for (let i = 0; i < 5; i++) {
                 const pBN = pAvgBN !== null && pAvgBN !== void 0 ? pAvgBN : pAvgApproxBN;
                 maxBorrowablePrevBN = maxBorrowableBN;
-                const _userEffectiveCollateral = _userCollateral + fromBN(BN(userBorrowed).div(pBN), this.market.collateral_token.decimals);
+                const _userEffectiveCollateral = _userCollateral;
                 const calls = [];
                 for (let N = this.market.minBands; N <= this.market.maxBands; N++) {
                     const j = N - this.market.minBands;
@@ -62,7 +62,7 @@ export class LeverageZapV2BaseModule {
                 maxLeverageCollateralBN = maxBorrowableBN.map((mb) => mb.div(pAvgBN));
                 _maxLeverageCollateral = maxLeverageCollateralBN.map((mlc) => fromBN(mlc, this.market.collateral_token.decimals));
             }
-            const userEffectiveCollateralBN = BN(userCollateral).plus(BN(userBorrowed).div(pAvgBN));
+            const userEffectiveCollateralBN = BN(userCollateral);
             const res = {};
             for (let N = this.market.minBands; N <= this.market.maxBands; N++) {
                 const j = N - this.market.minBands;
@@ -70,7 +70,7 @@ export class LeverageZapV2BaseModule {
                     maxDebt: formatNumber(maxBorrowableBN[j].toString(), this.market.borrowed_token.decimals),
                     maxTotalCollateral: formatNumber(maxLeverageCollateralBN[j].plus(userEffectiveCollateralBN).toString(), this.market.collateral_token.decimals),
                     userCollateral: formatNumber(userCollateral, this.market.collateral_token.decimals),
-                    collateralFromUserBorrowed: formatNumber(BN(userBorrowed).div(pAvgBN).toString(), this.market.collateral_token.decimals),
+                    collateralFromUserBorrowed: formatNumber(BN(0).toString(), this.market.collateral_token.decimals),
                     collateralFromMaxDebt: formatNumber(maxLeverageCollateralBN[j].toString(), this.market.collateral_token.decimals),
                     maxLeverage: maxLeverageCollateralBN[j].plus(userEffectiveCollateralBN).div(userEffectiveCollateralBN).toString(),
                     avgPrice: pAvgBN.toString(),
@@ -81,14 +81,12 @@ export class LeverageZapV2BaseModule {
             promise: true,
             maxAge: 60 * 1000, // 1m
         });
-        this._leverageExpectedCollateral = (userCollateral, userBorrowed, debt, quote, user) => __awaiter(this, void 0, void 0, function* () {
+        this._leverageExpectedCollateral = (userCollateral, debt, quote, user) => __awaiter(this, void 0, void 0, function* () {
             const _userCollateral = parseUnits(userCollateral, this.market.collateral_token.decimals);
             const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
-            const _userBorrowed = parseUnits(userBorrowed, this.market.borrowed_token.decimals);
-            // additionalCollateral = (userBorrowed / p) + leverageCollateral
             const _additionalCollateral = BigInt(quote.outAmount);
-            const _collateralFromDebt = _debt * BigInt(Math.pow(10, 18)) / (_debt + _userBorrowed) * _additionalCollateral / BigInt(Math.pow(10, 18));
-            const _collateralFromUserBorrowed = _additionalCollateral - _collateralFromDebt;
+            const _collateralFromDebt = _additionalCollateral;
+            const _collateralFromUserBorrowed = BigInt(0);
             let _stateCollateral = BigInt(0);
             if (user) {
                 const { _collateral, _borrowed } = yield this.market.userPosition.userStateBigInt(user);
@@ -98,10 +96,10 @@ export class LeverageZapV2BaseModule {
             }
             const _totalCollateral = _userCollateral + _additionalCollateral;
             const _futureStateCollateral = _stateCollateral + _totalCollateral;
-            const avgPrice = toBN(_debt + _userBorrowed, this.market.borrowed_token.decimals).div(toBN(_additionalCollateral, this.market.collateral_token.decimals)).toString();
+            const avgPrice = toBN(_debt, this.market.borrowed_token.decimals).div(toBN(_additionalCollateral, this.market.collateral_token.decimals)).toString();
             return { _futureStateCollateral, _totalCollateral, _userCollateral, _collateralFromUserBorrowed, _collateralFromDebt, avgPrice };
         });
-        this._leverageCalcN1 = memoize((userCollateral, userBorrowed, debt, range, quote, user) => __awaiter(this, void 0, void 0, function* () {
+        this._leverageCalcN1 = memoize((userCollateral, debt, range, quote, user) => __awaiter(this, void 0, void 0, function* () {
             if (range > 0)
                 this.market.prices.checkRange(range);
             let _stateDebt = BigInt(0);
@@ -113,15 +111,15 @@ export class LeverageZapV2BaseModule {
                 if (range < 0)
                     range = Number(this.llamalend.formatUnits(_N, 0));
             }
-            const { _futureStateCollateral } = yield this._leverageExpectedCollateral(userCollateral, userBorrowed, debt, quote, user);
+            const { _futureStateCollateral } = yield this._leverageExpectedCollateral(userCollateral, debt, quote, user);
             const _debt = _stateDebt + parseUnits(debt, this.market.borrowed_token.decimals);
             return yield this._calcDebtN1Call(_futureStateCollateral, _debt, range);
         }), {
             promise: true,
             maxAge: 60 * 1000, // 1m
         });
-        this._leverageCalcN1AllRanges = memoize((userCollateral, userBorrowed, debt, maxN, quote) => __awaiter(this, void 0, void 0, function* () {
-            const { _futureStateCollateral } = yield this._leverageExpectedCollateral(userCollateral, userBorrowed, debt, quote);
+        this._leverageCalcN1AllRanges = memoize((userCollateral, debt, maxN, quote) => __awaiter(this, void 0, void 0, function* () {
+            const { _futureStateCollateral } = yield this._leverageExpectedCollateral(userCollateral, debt, quote);
             const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
             const calls = [];
             for (let N = this.market.minBands; N <= maxN; N++) {
@@ -133,7 +131,7 @@ export class LeverageZapV2BaseModule {
             maxAge: 60 * 1000, // 1m
         });
         // ---------------- LEVERAGE REPAY ----------------
-        this._leverageRepayExpectedBorrowed = (stateCollateral, userCollateral, userBorrowed, quote) => {
+        this._leverageRepayExpectedBorrowed = (stateCollateral, userCollateral, quote) => {
             this._checkLeverageZap();
             const _stateCollateral = parseUnits(stateCollateral, this.market.collateral_token.decimals);
             const _userCollateral = parseUnits(userCollateral, this.market.collateral_token.decimals);
@@ -145,24 +143,24 @@ export class LeverageZapV2BaseModule {
                 _borrowedFromStateCollateral = _stateCollateral * BigInt(Math.pow(10, 18)) / (_stateCollateral + _userCollateral) * _borrowedExpected / BigInt(Math.pow(10, 18));
                 _borrowedFromUserCollateral = _borrowedExpected - _borrowedFromStateCollateral;
             }
-            const _totalBorrowed = _borrowedExpected + parseUnits(userBorrowed, this.market.borrowed_token.decimals);
+            const _totalBorrowed = _borrowedExpected;
             const avgPrice = toBN(_borrowedExpected, this.market.borrowed_token.decimals).div(toBN(_stateCollateral + _userCollateral, this.market.collateral_token.decimals)).toString();
             return { _totalBorrowed, _borrowedFromStateCollateral, _borrowedFromUserCollateral, avgPrice };
         };
-        this.leverageRepayExpectedBorrowed = (_a) => __awaiter(this, [_a], void 0, function* ({ stateCollateral, userCollateral, userBorrowed, quote }) {
+        this.leverageRepayExpectedBorrowed = (_a) => __awaiter(this, [_a], void 0, function* ({ stateCollateral, userCollateral, quote }) {
             this._checkLeverageZap();
-            const { _totalBorrowed, _borrowedFromStateCollateral, _borrowedFromUserCollateral, avgPrice } = this._leverageRepayExpectedBorrowed(stateCollateral, userCollateral, userBorrowed, quote);
+            const { _totalBorrowed, _borrowedFromStateCollateral, _borrowedFromUserCollateral, avgPrice } = this._leverageRepayExpectedBorrowed(stateCollateral, userCollateral, quote);
             return {
                 totalBorrowed: formatUnits(_totalBorrowed, this.market.borrowed_token.decimals),
                 borrowedFromStateCollateral: formatUnits(_borrowedFromStateCollateral, this.market.borrowed_token.decimals),
                 borrowedFromUserCollateral: formatUnits(_borrowedFromUserCollateral, this.market.borrowed_token.decimals),
-                userBorrowed: formatNumber(userBorrowed, this.market.borrowed_token.decimals),
+                userBorrowed: formatNumber(0, this.market.borrowed_token.decimals),
                 avgPrice,
             };
         });
-        this._leverageRepayBands = memoize((stateCollateral, userCollateral, userBorrowed, quote, address) => __awaiter(this, void 0, void 0, function* () {
+        this._leverageRepayBands = memoize((stateCollateral, userCollateral, quote, address) => __awaiter(this, void 0, void 0, function* () {
             address = _getAddress.call(this.llamalend, address);
-            if (!(yield this.leverageRepayIsAvailable({ stateCollateral, userCollateral, userBorrowed, quote, address })))
+            if (!(yield this.leverageRepayIsAvailable({ stateCollateral, userCollateral, quote, address })))
                 return [parseUnits(0, 0), parseUnits(0, 0)];
             const _stateRepayCollateral = parseUnits(stateCollateral, this.market.collateral_token.decimals);
             const { _collateral: _stateCollateral, _debt: _stateDebt, _N } = yield this.market.userPosition.userStateBigInt(address);
@@ -172,7 +170,7 @@ export class LeverageZapV2BaseModule {
                 throw Error(`Can't use more collateral than user's position has (${_stateRepayCollateral}) > ${_stateCollateral})`);
             let _n1 = parseUnits(0, 0);
             let _n2 = parseUnits(0, 0);
-            const { _totalBorrowed: _repayExpected } = this._leverageRepayExpectedBorrowed(stateCollateral, userCollateral, userBorrowed, quote);
+            const { _totalBorrowed: _repayExpected } = this._leverageRepayExpectedBorrowed(stateCollateral, userCollateral, quote);
             try {
                 _n1 = yield this._calcDebtN1Call(_stateCollateral - _stateRepayCollateral, _stateDebt - _repayExpected, _N);
                 _n2 = _n1 + (_N - BigInt(1));
@@ -221,13 +219,12 @@ export class LeverageZapV2BaseModule {
         return BN(expected).times(BN(100).minus(slippage)).div(100).toString();
     }
     leverageCreateLoanMaxRecv(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, range, getExpected }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, range, getExpected }) {
             // max_borrowable = userCollateral / (1 / (k_effective * max_p_base) - 1 / p_avg)
             this._checkLeverageZap();
             if (range > 0)
                 this.market.prices.checkRange(range);
             const _userCollateral = parseUnits(userCollateral, this.market.collateral_token.decimals);
-            const _userBorrowed = parseUnits(userBorrowed, this.market.borrowed_token.decimals);
             const oraclePriceBand = yield this.market.prices.oraclePriceBand();
             let pAvgBN = BN(yield this.market.prices.calcTickPrice(oraclePriceBand)); // upper tick of oracle price band
             let maxBorrowablePrevBN = BN(0);
@@ -237,7 +234,7 @@ export class LeverageZapV2BaseModule {
             const contract = this.llamalend.contracts[this._getLeverageZapAddress()].contract;
             for (let i = 0; i < 5; i++) {
                 maxBorrowablePrevBN = maxBorrowableBN;
-                _userEffectiveCollateral = _userCollateral + fromBN(BN(userBorrowed).div(pAvgBN), this.market.collateral_token.decimals);
+                _userEffectiveCollateral = _userCollateral;
                 let _maxBorrowable = yield contract.max_borrowable(this.market.addresses.controller, _userEffectiveCollateral, _maxLeverageCollateral, range, fromBN(pAvgBN));
                 _maxBorrowable = _maxBorrowable * BigInt(970) / BigInt(1000);
                 if (_maxBorrowable === BigInt(0))
@@ -247,10 +244,9 @@ export class LeverageZapV2BaseModule {
                     maxBorrowableBN = maxBorrowablePrevBN;
                     break;
                 }
-                // additionalCollateral = (userBorrowed / p) + leverageCollateral
-                const _maxAdditionalCollateral = BigInt((yield getExpected(this.market.addresses.borrowed_token, this.market.addresses.collateral_token, _maxBorrowable + _userBorrowed, this.market.addresses.amm)).outAmount);
-                pAvgBN = maxBorrowableBN.plus(userBorrowed).div(toBN(_maxAdditionalCollateral, this.market.collateral_token.decimals));
-                _maxLeverageCollateral = _maxAdditionalCollateral - fromBN(BN(userBorrowed).div(pAvgBN), this.market.collateral_token.decimals);
+                const _maxAdditionalCollateral = BigInt((yield getExpected(this.market.addresses.borrowed_token, this.market.addresses.collateral_token, _maxBorrowable, this.market.addresses.amm)).outAmount);
+                pAvgBN = maxBorrowableBN.div(toBN(_maxAdditionalCollateral, this.market.collateral_token.decimals));
+                _maxLeverageCollateral = _maxAdditionalCollateral;
             }
             const userEffectiveCollateralBN = maxBorrowableBN.gt(0) ? toBN(_userEffectiveCollateral, this.market.collateral_token.decimals) : BN(0);
             const maxLeverageCollateralBN = toBN(_maxLeverageCollateral, this.market.collateral_token.decimals);
@@ -259,7 +255,7 @@ export class LeverageZapV2BaseModule {
                 maxDebt: formatNumber(maxBorrowableBN.toString(), this.market.borrowed_token.decimals),
                 maxTotalCollateral: formatNumber(maxLeverageCollateralBN.plus(userEffectiveCollateralBN).toString(), this.market.collateral_token.decimals),
                 userCollateral: formatNumber(userCollateral, this.market.collateral_token.decimals),
-                collateralFromUserBorrowed: formatNumber(BN(userBorrowed).div(pAvgBN).toString(), this.market.collateral_token.decimals),
+                collateralFromUserBorrowed: formatNumber(BN(0).toString(), this.market.collateral_token.decimals),
                 collateralFromMaxDebt: formatNumber(maxLeverageCollateralBN.toString(), this.market.collateral_token.decimals),
                 maxLeverage: maxLeverageCollateralBN.plus(userEffectiveCollateralBN).div(userEffectiveCollateralBN).toString(),
                 avgPrice: pAvgBN.toString(),
@@ -267,9 +263,9 @@ export class LeverageZapV2BaseModule {
         });
     }
     leverageCreateLoanExpectedCollateral(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, debt, quote }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, debt, quote }) {
             this._checkLeverageZap();
-            const { _totalCollateral, _userCollateral, _collateralFromUserBorrowed, _collateralFromDebt, avgPrice } = yield this._leverageExpectedCollateral(userCollateral, userBorrowed, debt, quote);
+            const { _totalCollateral, _userCollateral, _collateralFromUserBorrowed, _collateralFromDebt, avgPrice } = yield this._leverageExpectedCollateral(userCollateral, debt, quote);
             return {
                 totalCollateral: formatUnits(_totalCollateral, this.market.collateral_token.decimals),
                 userCollateral: formatUnits(_userCollateral, this.market.collateral_token.decimals),
@@ -282,11 +278,11 @@ export class LeverageZapV2BaseModule {
         });
     }
     leverageCreateLoanExpectedMetrics(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, debt, range, quote, healthIsFull = true }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, debt, range, quote, healthIsFull = true }) {
             this._checkLeverageZap();
-            const [_n2, _n1] = yield this._leverageBands(userCollateral, userBorrowed, debt, range, quote);
+            const [_n2, _n1] = yield this._leverageBands(userCollateral, debt, range, quote);
             const prices = yield this.market.prices.getPrices(_n2, _n1);
-            const health = yield this._leverageHealth(userCollateral, userBorrowed, debt, range, quote, healthIsFull);
+            const health = yield this._leverageHealth(userCollateral, debt, range, quote, healthIsFull);
             return {
                 priceImpact: quote.priceImpact,
                 bands: [Number(_n2), Number(_n1)],
@@ -296,9 +292,9 @@ export class LeverageZapV2BaseModule {
         });
     }
     leverageCreateLoanMaxRange(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, debt, getExpected }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, debt, getExpected }) {
             this._checkLeverageZap();
-            const maxRecv = yield this.leverageCreateLoanMaxRecvAllRanges({ userCollateral, userBorrowed, getExpected });
+            const maxRecv = yield this.leverageCreateLoanMaxRecvAllRanges({ userCollateral, getExpected });
             for (let N = this.market.minBands; N <= this.market.maxBands; N++) {
                 if (BN(debt).gt(maxRecv[N].maxDebt))
                     return N - 1;
@@ -306,9 +302,9 @@ export class LeverageZapV2BaseModule {
             return this.market.maxBands;
         });
     }
-    _leverageBands(userCollateral, userBorrowed, debt, range, quote, user) {
+    _leverageBands(userCollateral, debt, range, quote, user) {
         return __awaiter(this, void 0, void 0, function* () {
-            const _n1 = yield this._leverageCalcN1(userCollateral, userBorrowed, debt, range, quote, user);
+            const _n1 = yield this._leverageCalcN1(userCollateral, debt, range, quote, user);
             if (range < 0) {
                 const { N } = yield this.market.userPosition.userState(user);
                 range = Number(N);
@@ -317,10 +313,10 @@ export class LeverageZapV2BaseModule {
             return [_n2, _n1];
         });
     }
-    _leverageCreateLoanBandsAllRanges(userCollateral, userBorrowed, debt, getExpected, quote) {
+    _leverageCreateLoanBandsAllRanges(userCollateral, debt, getExpected, quote) {
         return __awaiter(this, void 0, void 0, function* () {
-            const maxN = yield this.leverageCreateLoanMaxRange({ userCollateral, userBorrowed, debt, getExpected });
-            const _n1_arr = yield this._leverageCalcN1AllRanges(userCollateral, userBorrowed, debt, maxN, quote);
+            const maxN = yield this.leverageCreateLoanMaxRange({ userCollateral, debt, getExpected });
+            const _n1_arr = yield this._leverageCalcN1AllRanges(userCollateral, debt, maxN, quote);
             const _n2_arr = [];
             for (let N = this.market.minBands; N <= maxN; N++) {
                 _n2_arr.push(_n1_arr[N - this.market.minBands] + BigInt(N - 1));
@@ -333,9 +329,9 @@ export class LeverageZapV2BaseModule {
         });
     }
     leverageCreateLoanBandsAllRanges(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, debt, getExpected, quote }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, debt, getExpected, quote }) {
             this._checkLeverageZap();
-            const _bands = yield this._leverageCreateLoanBandsAllRanges(userCollateral, userBorrowed, debt, getExpected, quote);
+            const _bands = yield this._leverageCreateLoanBandsAllRanges(userCollateral, debt, getExpected, quote);
             const bands = {};
             for (let N = this.market.minBands; N <= this.market.maxBands; N++) {
                 if (_bands[N]) {
@@ -349,9 +345,9 @@ export class LeverageZapV2BaseModule {
         });
     }
     leverageCreateLoanPricesAllRanges(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, debt, getExpected, quote }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, debt, getExpected, quote }) {
             this._checkLeverageZap();
-            const _bands = yield this._leverageCreateLoanBandsAllRanges(userCollateral, userBorrowed, debt, getExpected, quote);
+            const _bands = yield this._leverageCreateLoanBandsAllRanges(userCollateral, debt, getExpected, quote);
             const prices = {};
             for (let N = this.market.minBands; N <= this.market.maxBands; N++) {
                 if (_bands[N]) {
@@ -364,11 +360,11 @@ export class LeverageZapV2BaseModule {
             return prices;
         });
     }
-    _leverageHealth(userCollateral_1, userBorrowed_1, dDebt_1, range_1, quote_1, full_1) {
-        return __awaiter(this, arguments, void 0, function* (userCollateral, userBorrowed, dDebt, range, quote, full, user = this.llamalend.constants.ZERO_ADDRESS) {
+    _leverageHealth(userCollateral_1, dDebt_1, range_1, quote_1, full_1) {
+        return __awaiter(this, arguments, void 0, function* (userCollateral, dDebt, range, quote, full, user = this.llamalend.constants.ZERO_ADDRESS) {
             if (range > 0)
                 this.market.prices.checkRange(range);
-            const { _totalCollateral } = yield this._leverageExpectedCollateral(userCollateral, userBorrowed, dDebt, quote, user);
+            const { _totalCollateral } = yield this._leverageExpectedCollateral(userCollateral, dDebt, quote, user);
             const { _borrowed, _N } = yield this.market.userPosition.userStateBigInt(user);
             if (_borrowed > BigInt(0))
                 throw Error(`User ${user} is already in liquidation mode`);
@@ -384,64 +380,52 @@ export class LeverageZapV2BaseModule {
         });
     }
     leverageCreateLoanIsApproved(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral }) {
             this._checkLeverageZap();
-            const collateralAllowance = yield hasAllowance.call(this.llamalend, [this.market.collateral_token.address], [userCollateral], this.llamalend.signerAddress, this.market.addresses.controller);
-            const borrowedAllowance = yield hasAllowance.call(this.llamalend, [this.market.borrowed_token.address], [userBorrowed], this.llamalend.signerAddress, this._getLeverageZapAddress());
-            return collateralAllowance && borrowedAllowance;
+            return yield hasAllowance.call(this.llamalend, [this.market.collateral_token.address], [userCollateral], this.llamalend.signerAddress, this.market.addresses.controller);
         });
     }
     leverageCreateLoanApproveEstimateGas(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral }) {
             this._checkLeverageZap();
-            const collateralGas = yield ensureAllowanceEstimateGas.call(this.llamalend, [this.market.collateral_token.address], [userCollateral], this.market.addresses.controller);
-            const borrowedGas = yield ensureAllowanceEstimateGas.call(this.llamalend, [this.market.borrowed_token.address], [userBorrowed], this._getLeverageZapAddress());
-            if (Array.isArray(collateralGas) && Array.isArray(borrowedGas)) {
-                return [collateralGas[0] + borrowedGas[0], collateralGas[1] + borrowedGas[1]];
-            }
-            else {
-                return collateralGas + borrowedGas;
-            }
+            return yield ensureAllowanceEstimateGas.call(this.llamalend, [this.market.collateral_token.address], [userCollateral], this.market.addresses.controller);
         });
     }
     leverageCreateLoanApprove(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral }) {
             this._checkLeverageZap();
-            const collateralApproveTx = yield ensureAllowance.call(this.llamalend, [this.market.collateral_token.address], [userCollateral], this.market.addresses.controller);
-            const borrowedApproveTx = yield ensureAllowance.call(this.llamalend, [this.market.borrowed_token.address], [userBorrowed], this._getLeverageZapAddress());
-            return [...collateralApproveTx, ...borrowedApproveTx];
+            return yield ensureAllowance.call(this.llamalend, [this.market.collateral_token.address], [userCollateral], this.market.addresses.controller);
         });
     }
-    _leverageCreateLoan(userCollateral, userBorrowed, debt, range, minRecv, router, calldata, estimateGas) {
+    _leverageCreateLoan(userCollateral, debt, range, minRecv, router, calldata, estimateGas) {
         return __awaiter(this, void 0, void 0, function* () {
             if (yield this.market.userPosition.userLoanExists())
                 throw Error("Loan already created");
             this.market.prices.checkRange(range);
             const _userCollateral = parseUnits(userCollateral, this.market.collateral_token.decimals);
-            const _userBorrowed = parseUnits(userBorrowed, this.market.borrowed_token.decimals);
             const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
             const _minRecv = parseUnits(minRecv, this.market.collateral_token.decimals);
-            return yield this._createLoanContractCall(_userCollateral, _userBorrowed, _debt, _minRecv, range, router, calldata, estimateGas);
+            return yield this._createLoanContractCall(_userCollateral, _debt, _minRecv, range, router, calldata, estimateGas);
         });
     }
     leverageCreateLoanEstimateGas(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, debt, range, minRecv, router, calldata }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, debt, range, minRecv, router, calldata }) {
             this._checkLeverageZap();
-            if (!(yield this.leverageCreateLoanIsApproved({ userCollateral, userBorrowed })))
+            if (!(yield this.leverageCreateLoanIsApproved({ userCollateral })))
                 throw Error("Approval is needed for gas estimation");
-            return yield this._leverageCreateLoan(userCollateral, userBorrowed, debt, range, minRecv, router, calldata, true);
+            return yield this._leverageCreateLoan(userCollateral, debt, range, minRecv, router, calldata, true);
         });
     }
     leverageCreateLoan(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, debt, range, minRecv, router, calldata }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, debt, range, minRecv, router, calldata }) {
             this._checkLeverageZap();
-            yield this.leverageCreateLoanApprove({ userCollateral, userBorrowed });
-            return yield this._leverageCreateLoan(userCollateral, userBorrowed, debt, range, minRecv, router, calldata, false);
+            yield this.leverageCreateLoanApprove({ userCollateral });
+            return yield this._leverageCreateLoan(userCollateral, debt, range, minRecv, router, calldata, false);
         });
     }
     // ---------------- LEVERAGE BORROW MORE ----------------
     leverageBorrowMoreMaxRecv(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, getExpected, address = "" }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, getExpected, address = "" }) {
             // max_borrowable = userCollateral / (1 / (k_effective * max_p_base) - 1 / p_avg)
             this._checkLeverageZap();
             address = _getAddress.call(this.llamalend, address);
@@ -450,8 +434,8 @@ export class LeverageZapV2BaseModule {
                 throw Error(`User ${address} is already in liquidation mode`);
             const _userCollateral = parseUnits(userCollateral, this.market.collateral_token.decimals);
             const _borrowedFromStateCollateral = yield this._getMaxAdditionalBorrowable(_stateCollateral, BigInt(0), _N, _stateDebt, address);
-            const _userBorrowed = _borrowedFromStateCollateral + parseUnits(userBorrowed, this.market.borrowed_token.decimals);
-            userBorrowed = formatUnits(_userBorrowed, this.market.borrowed_token.decimals);
+            const _userBorrowed = _borrowedFromStateCollateral;
+            const userBorrowed = formatUnits(_userBorrowed, this.market.borrowed_token.decimals);
             const oraclePriceBand = yield this.market.prices.oraclePriceBand();
             let pAvgBN = BN(yield this.market.prices.calcTickPrice(oraclePriceBand)); // upper tick of oracle price band
             let maxBorrowablePrevBN = BN(0);
@@ -492,10 +476,10 @@ export class LeverageZapV2BaseModule {
         });
     }
     leverageBorrowMoreExpectedCollateral(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, dDebt, quote, address = "" }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, dDebt, quote, address = "" }) {
             this._checkLeverageZap();
             address = _getAddress.call(this.llamalend, address);
-            const { _totalCollateral, _userCollateral, _collateralFromUserBorrowed, _collateralFromDebt, avgPrice } = yield this._leverageExpectedCollateral(userCollateral, userBorrowed, dDebt, quote, address);
+            const { _totalCollateral, _userCollateral, _collateralFromUserBorrowed, _collateralFromDebt, avgPrice } = yield this._leverageExpectedCollateral(userCollateral, dDebt, quote, address);
             return {
                 totalCollateral: formatUnits(_totalCollateral, this.market.collateral_token.decimals),
                 userCollateral: formatUnits(_userCollateral, this.market.collateral_token.decimals),
@@ -506,12 +490,12 @@ export class LeverageZapV2BaseModule {
         });
     }
     leverageBorrowMoreExpectedMetrics(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, debt, quote, healthIsFull = true, address = "" }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, debt, quote, healthIsFull = true, address = "" }) {
             this._checkLeverageZap();
             address = _getAddress.call(this.llamalend, address);
-            const [_n2, _n1] = yield this._leverageBands(userCollateral, userBorrowed, debt, -1, quote, address);
+            const [_n2, _n1] = yield this._leverageBands(userCollateral, debt, -1, quote, address);
             const prices = yield this.market.prices.getPrices(_n2, _n1);
-            const health = yield this._leverageHealth(userCollateral, userBorrowed, debt, -1, quote, healthIsFull, address);
+            const health = yield this._leverageHealth(userCollateral, debt, -1, quote, healthIsFull, address);
             return {
                 priceImpact: quote.priceImpact,
                 bands: [Number(_n2), Number(_n1)],
@@ -520,50 +504,48 @@ export class LeverageZapV2BaseModule {
             };
         });
     }
-    _leverageBorrowMore(userCollateral, userBorrowed, debt, minRecv, router, calldata, estimateGas) {
+    _leverageBorrowMore(userCollateral, debt, minRecv, router, calldata, estimateGas) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!(yield this.market.userPosition.userLoanExists()))
                 throw Error("Loan does not exist");
             const _userCollateral = parseUnits(userCollateral, this.market.collateral_token.decimals);
-            const _userBorrowed = parseUnits(userBorrowed, this.market.borrowed_token.decimals);
             const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
             const _minRecv = parseUnits(minRecv, this.market.collateral_token.decimals);
-            return yield this._borrowMoreContractCall(_userCollateral, _userBorrowed, _debt, _minRecv, router, calldata, estimateGas);
+            return yield this._borrowMoreContractCall(_userCollateral, _debt, _minRecv, router, calldata, estimateGas);
         });
     }
     leverageBorrowMoreIsApproved(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed }) {
-            return yield this.leverageCreateLoanIsApproved({ userCollateral, userBorrowed });
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral }) {
+            return yield this.leverageCreateLoanIsApproved({ userCollateral });
         });
     }
     leverageBorrowMoreApprove(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed }) {
-            return yield this.leverageCreateLoanApprove({ userCollateral, userBorrowed });
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral }) {
+            return yield this.leverageCreateLoanApprove({ userCollateral });
         });
     }
     leverageBorrowMoreEstimateGas(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, debt, minRecv, router, calldata }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, debt, minRecv, router, calldata }) {
             this._checkLeverageZap();
-            if (!(yield this.leverageCreateLoanIsApproved({ userCollateral, userBorrowed })))
+            if (!(yield this.leverageCreateLoanIsApproved({ userCollateral })))
                 throw Error("Approval is needed for gas estimation");
-            return yield this._leverageBorrowMore(userCollateral, userBorrowed, debt, minRecv, router, calldata, true);
+            return yield this._leverageBorrowMore(userCollateral, debt, minRecv, router, calldata, true);
         });
     }
     leverageBorrowMore(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, debt, minRecv, router, calldata }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, debt, minRecv, router, calldata }) {
             this._checkLeverageZap();
-            yield this.leverageCreateLoanApprove({ userCollateral, userBorrowed });
-            return yield this._leverageBorrowMore(userCollateral, userBorrowed, debt, minRecv, router, calldata, false);
+            yield this.leverageCreateLoanApprove({ userCollateral });
+            return yield this._leverageBorrowMore(userCollateral, debt, minRecv, router, calldata, false);
         });
     }
     leverageBorrowMoreFutureLeverage(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, debt, quote, address = "" }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, debt, quote, address = "" }) {
             address = _getAddress.call(this.llamalend, address);
             this._checkLeverageZap();
             const { stateCollateral, totalDepositFromUser } = yield this.market.userPosition.getCurrentLeverageParams(address);
             const expected = yield this.leverageBorrowMoreExpectedCollateral({
                 userCollateral,
-                userBorrowed,
                 dDebt: debt,
                 quote,
                 address,
@@ -574,16 +556,16 @@ export class LeverageZapV2BaseModule {
         });
     }
     leverageRepayIsFull(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ stateCollateral, userCollateral, userBorrowed, quote, address = "" }) {
+        return __awaiter(this, arguments, void 0, function* ({ stateCollateral, userCollateral, quote, address = "" }) {
             this._checkLeverageZap();
             address = _getAddress.call(this.llamalend, address);
             const { _borrowed: _stateBorrowed, _debt } = yield this.market.userPosition.userStateBigInt(address);
-            const { _totalBorrowed } = this._leverageRepayExpectedBorrowed(stateCollateral, userCollateral, userBorrowed, quote);
+            const { _totalBorrowed } = this._leverageRepayExpectedBorrowed(stateCollateral, userCollateral, quote);
             return _stateBorrowed + _totalBorrowed > _debt;
         });
     }
     leverageRepayIsAvailable(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ stateCollateral, userCollateral, userBorrowed, quote, address = "" }) {
+        return __awaiter(this, arguments, void 0, function* ({ stateCollateral, userCollateral, quote, address = "" }) {
             // 0. const { collateral, stablecoin, debt } = await this.market.userPosition.userState(address);
             // 1. maxCollateral for deleverage is collateral from line above.
             // 2. If user is underwater (stablecoin > 0), only full repayment is available:
@@ -599,17 +581,17 @@ export class LeverageZapV2BaseModule {
                 return false;
             // Only full repayment and closing the position is available if user is underwater+
             if (BN(borrowed).gt(0))
-                return yield this.leverageRepayIsFull({ stateCollateral, userCollateral, userBorrowed, quote, address });
+                return yield this.leverageRepayIsFull({ stateCollateral, userCollateral, quote, address });
             return true;
         });
     }
     leverageRepayExpectedMetrics(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ stateCollateral, userCollateral, userBorrowed, healthIsFull, quote, address }) {
+        return __awaiter(this, arguments, void 0, function* ({ stateCollateral, userCollateral, healthIsFull, quote, address }) {
             this._checkLeverageZap();
             address = _getAddress.call(this.llamalend, address);
-            const [_n2, _n1] = yield this._leverageRepayBands(stateCollateral, userCollateral, userBorrowed, quote, address);
+            const [_n2, _n1] = yield this._leverageRepayBands(stateCollateral, userCollateral, quote, address);
             const prices = yield this.market.prices.getPrices(_n2, _n1);
-            const health = yield this._leverageRepayHealth(stateCollateral, userCollateral, userBorrowed, quote, healthIsFull, address);
+            const health = yield this._leverageRepayHealth(stateCollateral, userCollateral, quote, healthIsFull, address);
             const _stateCollateral = parseUnits(stateCollateral, this.market.collateral_token.decimals);
             const _userCollateral = parseUnits(userCollateral, this.market.collateral_token.decimals);
             const priceImpact = _stateCollateral + _userCollateral > BigInt(0) ? quote.priceImpact : null;
@@ -621,16 +603,16 @@ export class LeverageZapV2BaseModule {
             };
         });
     }
-    _leverageRepayHealth(stateCollateral_1, userCollateral_1, userBorrowed_1, quote_1) {
-        return __awaiter(this, arguments, void 0, function* (stateCollateral, userCollateral, userBorrowed, quote, full = true, address = "") {
+    _leverageRepayHealth(stateCollateral_1, userCollateral_1, quote_1) {
+        return __awaiter(this, arguments, void 0, function* (stateCollateral, userCollateral, quote, full = true, address = "") {
             this._checkLeverageZap();
             address = _getAddress.call(this.llamalend, address);
             const { _borrowed: _stateBorrowed, _debt, _N } = yield this.market.userPosition.userStateBigInt(address);
             if (_stateBorrowed > BigInt(0))
                 return "0.0";
-            if (!(yield this.leverageRepayIsAvailable({ stateCollateral, userCollateral, userBorrowed, quote, address })))
+            if (!(yield this.leverageRepayIsAvailable({ stateCollateral, userCollateral, quote, address })))
                 return "0.0";
-            const { _totalBorrowed } = this._leverageRepayExpectedBorrowed(stateCollateral, userCollateral, userBorrowed, quote);
+            const { _totalBorrowed } = this._leverageRepayExpectedBorrowed(stateCollateral, userCollateral, quote);
             const _dCollateral = parseUnits(stateCollateral, this.market.collateral_token.decimals) * BigInt(-1);
             const _dDebt = _totalBorrowed * BigInt(-1);
             if (_debt + _dDebt <= BigInt(0))
@@ -641,58 +623,56 @@ export class LeverageZapV2BaseModule {
         });
     }
     leverageRepayIsApproved(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral }) {
             this._checkLeverageZap();
-            return yield hasAllowance.call(this.llamalend, [this.market.collateral_token.address, this.market.borrowed_token.address], [userCollateral, userBorrowed], this.llamalend.signerAddress, this._getLeverageZapAddress());
+            return yield hasAllowance.call(this.llamalend, [this.market.collateral_token.address], [userCollateral], this.llamalend.signerAddress, this._getLeverageZapAddress());
         });
     }
     leverageRepayApproveEstimateGas(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral }) {
             this._checkLeverageZap();
-            return yield ensureAllowanceEstimateGas.call(this.llamalend, [this.market.collateral_token.address, this.market.borrowed_token.address], [userCollateral, userBorrowed], this._getLeverageZapAddress());
+            return yield ensureAllowanceEstimateGas.call(this.llamalend, [this.market.collateral_token.address], [userCollateral], this._getLeverageZapAddress());
         });
     }
     leverageRepayApprove(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed }) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral }) {
             this._checkLeverageZap();
-            return yield ensureAllowance.call(this.llamalend, [this.market.collateral_token.address, this.market.borrowed_token.address], [userCollateral, userBorrowed], this._getLeverageZapAddress());
+            return yield ensureAllowance.call(this.llamalend, [this.market.collateral_token.address], [userCollateral], this._getLeverageZapAddress());
         });
     }
-    _leverageRepay(stateCollateral, userCollateral, userBorrowed, minRecv, router, calldata, estimateGas) {
+    _leverageRepay(stateCollateral, userCollateral, minRecv, router, calldata, estimateGas) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!(yield this.market.userPosition.userLoanExists()))
                 throw Error("Loan does not exist");
             const _stateCollateral = parseUnits(stateCollateral, this.market.collateral_token.decimals);
             const _userCollateral = parseUnits(userCollateral, this.market.collateral_token.decimals);
-            const _userBorrowed = parseUnits(userBorrowed, this.market.borrowed_token.decimals);
             const _minRecv = parseUnits(minRecv, this.market.borrowed_token.decimals);
             const exchangeCalldata = _stateCollateral + _userCollateral > BigInt(0) ? calldata : "0x";
-            return yield this._repayContractCall(_userCollateral, _userBorrowed, _minRecv, router, exchangeCalldata, estimateGas);
+            return yield this._repayContractCall(_userCollateral, _minRecv, router, exchangeCalldata, estimateGas);
         });
     }
     leverageRepayEstimateGas(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ stateCollateral, userCollateral, userBorrowed, minRecv, router, calldata }) {
+        return __awaiter(this, arguments, void 0, function* ({ stateCollateral, userCollateral, minRecv, router, calldata }) {
             this._checkLeverageZap();
-            if (!(yield this.leverageRepayIsApproved({ userCollateral, userBorrowed })))
+            if (!(yield this.leverageRepayIsApproved({ userCollateral })))
                 throw Error("Approval is needed for gas estimation");
-            return yield this._leverageRepay(stateCollateral, userCollateral, userBorrowed, minRecv, router, calldata, true);
+            return yield this._leverageRepay(stateCollateral, userCollateral, minRecv, router, calldata, true);
         });
     }
     leverageRepay(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ stateCollateral, userCollateral, userBorrowed, minRecv, router, calldata }) {
+        return __awaiter(this, arguments, void 0, function* ({ stateCollateral, userCollateral, minRecv, router, calldata }) {
             this._checkLeverageZap();
-            yield this.leverageRepayApprove({ userCollateral, userBorrowed });
-            return yield this._leverageRepay(stateCollateral, userCollateral, userBorrowed, minRecv, router, calldata, false);
+            yield this.leverageRepayApprove({ userCollateral });
+            return yield this._leverageRepay(stateCollateral, userCollateral, minRecv, router, calldata, false);
         });
     }
     leverageRepayFutureLeverage(_a) {
-        return __awaiter(this, arguments, void 0, function* ({ stateCollateral, userCollateral, userBorrowed, address = "" }) {
+        return __awaiter(this, arguments, void 0, function* ({ stateCollateral, userCollateral, address = "" }) {
             address = _getAddress.call(this.llamalend, address);
             this._checkLeverageZap();
             const { stateCollateral: currentStateCollateral, totalDepositFromUser } = yield this.market.userPosition.getCurrentLeverageParams(address);
-            const collateralFromUserBorrowed = yield this.market.amm.swapExpected(0, 1, userBorrowed);
             const futureCollateralState = BN(currentStateCollateral).minus(stateCollateral);
-            const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral).plus(collateralFromUserBorrowed);
+            const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral);
             return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
         });
     }

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

@@ -8,7 +8,7 @@ export declare class LeverageV1ZapV2Module extends LeverageZapV2BaseModule {
     protected _calcCreateLoanHealthCall(_collateral: bigint, _dDebt: bigint, N: number | bigint, full: boolean): Promise<bigint>;
     protected _calcBorrowMoreHealthCall(_collateral: bigint, _dDebt: bigint, N: number | bigint, user: string, full: boolean): Promise<bigint>;
     protected _calcRepayHealthCall(_dCollateral: bigint, _dDebt: bigint, N: number | bigint, user: string, full: boolean): Promise<bigint>;
-    protected _createLoanContractCall(_userCollateral: bigint, _userBorrowed: bigint, _debt: bigint, _minRecv: bigint, range: number, router: string, exchangeCalldata: string, estimateGas: boolean): Promise<string | TGas>;
-    protected _borrowMoreContractCall(_userCollateral: bigint, _userBorrowed: bigint, _debt: bigint, _minRecv: bigint, router: string, exchangeCalldata: string, estimateGas: boolean): Promise<string | TGas>;
-    protected _repayContractCall(_userCollateral: bigint, _userBorrowed: bigint, _minRecv: bigint, router: string, exchangeCalldata: string, estimateGas: boolean): Promise<string | TGas>;
+    protected _createLoanContractCall(_userCollateral: bigint, _debt: bigint, _minRecv: bigint, range: number, router: string, exchangeCalldata: string, estimateGas: boolean): Promise<string | TGas>;
+    protected _borrowMoreContractCall(_userCollateral: bigint, _debt: bigint, _minRecv: bigint, router: string, exchangeCalldata: string, estimateGas: boolean): Promise<string | TGas>;
+    protected _repayContractCall(_userCollateral: bigint, _minRecv: bigint, router: string, exchangeCalldata: string, estimateGas: boolean): Promise<string | TGas>;
 }