@curvefi/llamalend-api 1.1.6 → 1.1.8

package/README.md

@@ -891,6 +891,20 @@ import llamalend from "@curvefi/llamalend-api";
 })()
 ```
 
+### Future Leverage methods for lendMarket
+
+Estimate future leverage after an operation
+
+```ts
+    await lendMarket.borrowMoreFutureLeverage(0.1, 500);
+    
+    await lendMarket.repayFutureLeverage(1000);
+    
+    await lendMarket.leverage.borrowMoreFutureLeverage(userCollateral, userBorrowed, debt);
+
+    await lendMarket.leverage.repayFutureLeverage(stateCollateral, userCollateral, userBorrowed);
+```
+
 ### Force Update User State for lendMarket
 
 After executing certain transactions, it's recommended to force update the user's state in the cache to ensure data consistency:

package/lib/interfaces.d.ts

@@ -229,4 +229,10 @@ export interface ILeverageMetrics {
     health: string;
 }
 export type GetExpectedFn = (fromToken: string, toToken: string, amountIn: bigint, blacklist: string | string[]) => Promise<IQuote>;
+export interface IRates {
+    borrowApr: string;
+    lendApr: string;
+    borrowApy: string;
+    lendApy: string;
+}
 export {};

package/lib/lendMarkets/LendMarketTemplate.d.ts

@@ -227,6 +227,7 @@ export declare class LendMarketTemplate {
         borrowMoreApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<string[]>;
         borrowMoreRouteImage: (userBorrowed: TAmount, debt: TAmount) => Promise<string>;
         borrowMore: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, slippage?: number) => Promise<string>;
+        borrowMoreFutureLeverage: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, userAddress?: string, slippage?: number) => Promise<string>;
         repayExpectedBorrowed: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, slippage?: number) => Promise<{
             totalBorrowed: string;
             borrowedFromStateCollateral: string;
@@ -244,6 +245,7 @@ export declare class LendMarketTemplate {
         repayApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<string[]>;
         repayRouteImage: (stateCollateral: TAmount, userCollateral: TAmount) => Promise<string>;
         repay: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, slippage?: number) => Promise<string>;
+        repayFutureLeverage: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, userAddress?: string, slippage?: number) => Promise<string>;
         estimateGas: {
             createLoanApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<TGas>;
             createLoan: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, range: number, slippage?: number) => Promise<number>;
@@ -399,6 +401,11 @@ export declare class LendMarketTemplate {
     private _borrowMore;
     borrowMoreEstimateGas(collateral: number | string, debt: number | string): Promise<TGas>;
     borrowMore(collateral: number | string, debt: number | string): Promise<string>;
+    _getCurrentLeverageParams(userAddress: string): Promise<{
+        stateCollateral: string;
+        totalDepositFromUser: number;
+    }>;
+    borrowMoreFutureLeverage(collateral: number | string, debt: number | string, userAddress?: string): Promise<string>;
     private _addCollateralBands;
     addCollateralBands(collateral: number | string, address?: string): Promise<[number, number]>;
     addCollateralPrices(collateral: number | string, address?: string): Promise<string[]>;
@@ -429,6 +436,7 @@ export declare class LendMarketTemplate {
     private _repay;
     repayEstimateGas(debt: number | string, address?: string): Promise<TGas>;
     repay(debt: number | string, address?: string): Promise<string>;
+    repayFutureLeverage(debt: number | string, userAddress?: string): Promise<string>;
     private _fullRepayAmount;
     fullRepayIsApproved(address?: string): Promise<boolean>;
     private fullRepayApproveEstimateGas;
@@ -504,6 +512,7 @@ export declare class LendMarketTemplate {
     private _leverageBorrowMore;
     private leverageBorrowMoreEstimateGas;
     private leverageBorrowMore;
+    private leverageBorrowMoreFutureLeverage;
     private _leverageRepayExpectedBorrowed;
     private leverageRepayExpectedBorrowed;
     private leverageRepayPriceImpact;
@@ -520,6 +529,7 @@ export declare class LendMarketTemplate {
     private _leverageRepay;
     private leverageRepayEstimateGas;
     private leverageRepay;
+    private leverageRepayFutureLeverage;
     currentLeverage(userAddress?: string): Promise<string>;
     currentPnL(userAddress?: string): Promise<Record<string, string>>;
     userBoost(address?: string): Promise<string>;

package/lib/lendMarkets/LendMarketTemplate.js

@@ -600,6 +600,7 @@ export class LendMarketTemplate {
             borrowMoreApprove: this.leverageCreateLoanApprove.bind(this),
             borrowMoreRouteImage: this.leverageBorrowMoreRouteImage.bind(this),
             borrowMore: this.leverageBorrowMore.bind(this),
+            borrowMoreFutureLeverage: this.leverageBorrowMoreFutureLeverage.bind(this),
             repayExpectedBorrowed: this.leverageRepayExpectedBorrowed.bind(this),
             repayPriceImpact: this.leverageRepayPriceImpact.bind(this),
             repayIsFull: this.leverageRepayIsFull.bind(this),
@@ -611,6 +612,7 @@ export class LendMarketTemplate {
             repayApprove: this.leverageRepayApprove.bind(this),
             repayRouteImage: this.leverageRepayRouteImage.bind(this),
             repay: this.leverageRepay.bind(this),
+            repayFutureLeverage: this.leverageRepayFutureLeverage.bind(this),
             estimateGas: {
                 createLoanApprove: this.leverageCreateLoanApproveEstimateGas.bind(this),
                 createLoan: this.leverageCreateLoanEstimateGas.bind(this),
@@ -640,6 +642,7 @@ export class LendMarketTemplate {
             borrowMoreApprove: leverageZapV2.leverageCreateLoanApprove.bind(leverageZapV2),
             borrowMoreExpectedMetrics: leverageZapV2.leverageBorrowMoreExpectedMetrics.bind(leverageZapV2),
             borrowMore: leverageZapV2.leverageBorrowMore.bind(leverageZapV2),
+            borrowMoreFutureLeverage: leverageZapV2.leverageBorrowMoreFutureLeverage.bind(leverageZapV2),
             repayExpectedBorrowed: leverageZapV2.leverageRepayExpectedBorrowed.bind(leverageZapV2),
             repayIsFull: leverageZapV2.leverageRepayIsFull.bind(leverageZapV2),
             repayIsAvailable: leverageZapV2.leverageRepayIsAvailable.bind(leverageZapV2),
@@ -647,6 +650,7 @@ export class LendMarketTemplate {
             repayIsApproved: leverageZapV2.leverageRepayIsApproved.bind(leverageZapV2),
             repayApprove: leverageZapV2.leverageRepayApprove.bind(leverageZapV2),
             repay: leverageZapV2.leverageRepay.bind(leverageZapV2),
+            repayFutureLeverage: leverageZapV2.leverageRepayFutureLeverage.bind(leverageZapV2),
             estimateGas: {
                 createLoanApprove: leverageZapV2.leverageCreateLoanApproveEstimateGas.bind(leverageZapV2),
                 createLoan: leverageZapV2.leverageCreateLoanEstimateGas.bind(leverageZapV2),
@@ -1638,6 +1642,28 @@ export class LendMarketTemplate {
             return yield this._borrowMore(collateral, debt, false);
         });
     }
+    _getCurrentLeverageParams(userAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const [userCollateralData, { collateral: stateCollateral }] = yield Promise.all([
+                _getUserCollateral(this.llamalend.constants.NETWORK_NAME, this.addresses.controller, userAddress),
+                this.userState(userAddress),
+            ]);
+            return {
+                stateCollateral,
+                totalDepositFromUser: userCollateralData.total_deposit_from_user_precise,
+            };
+        });
+    }
+    borrowMoreFutureLeverage(collateral_1, debt_1) {
+        return __awaiter(this, arguments, void 0, function* (collateral, debt, userAddress = '') {
+            userAddress = _getAddress.call(this.llamalend, userAddress);
+            const { stateCollateral, totalDepositFromUser } = yield this._getCurrentLeverageParams(userAddress);
+            const collateralFromDebt = yield this.swapExpected(0, 1, debt);
+            const futureCollateralState = BN(stateCollateral).plus(collateralFromDebt);
+            const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(collateral);
+            return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+        });
+    }
     // ---------------- ADD COLLATERAL ----------------
     _addCollateralBands(collateral_1) {
         return __awaiter(this, arguments, void 0, function* (collateral, address = "") {
@@ -1723,12 +1749,8 @@ export class LendMarketTemplate {
     addCollateralFutureLeverage(collateral_1) {
         return __awaiter(this, arguments, void 0, function* (collateral, userAddress = '') {
             userAddress = _getAddress.call(this.llamalend, userAddress);
-            const [userCollateral, { collateral: currentCollateral }] = yield Promise.all([
-                _getUserCollateral(this.llamalend.constants.NETWORK_NAME, this.addresses.controller, userAddress),
-                this.userState(userAddress),
-            ]);
-            const total_deposit_from_user = userCollateral.total_deposit_from_user_precise;
-            return calculateFutureLeverage(currentCollateral, total_deposit_from_user, collateral, 'add');
+            const { stateCollateral, totalDepositFromUser } = yield this._getCurrentLeverageParams(userAddress);
+            return calculateFutureLeverage(stateCollateral, totalDepositFromUser, collateral, 'add');
         });
     }
     // ---------------- REMOVE COLLATERAL ----------------
@@ -1802,12 +1824,8 @@ export class LendMarketTemplate {
     removeCollateralFutureLeverage(collateral_1) {
         return __awaiter(this, arguments, void 0, function* (collateral, userAddress = '') {
             userAddress = _getAddress.call(this.llamalend, userAddress);
-            const [userCollateral, { collateral: currentCollateral }] = yield Promise.all([
-                _getUserCollateral(this.llamalend.constants.NETWORK_NAME, this.addresses.controller, userAddress),
-                this.userState(userAddress),
-            ]);
-            const total_deposit_from_user = userCollateral.total_deposit_from_user_precise;
-            return calculateFutureLeverage(currentCollateral, total_deposit_from_user, collateral, 'remove');
+            const { stateCollateral, totalDepositFromUser } = yield this._getCurrentLeverageParams(userAddress);
+            return calculateFutureLeverage(stateCollateral, totalDepositFromUser, collateral, 'remove');
         });
     }
     // ---------------- REPAY ----------------
@@ -1893,6 +1911,16 @@ export class LendMarketTemplate {
             return yield this._repay(debt, address, false);
         });
     }
+    repayFutureLeverage(debt_1) {
+        return __awaiter(this, arguments, void 0, function* (debt, userAddress = '') {
+            userAddress = _getAddress.call(this.llamalend, userAddress);
+            const { stateCollateral, totalDepositFromUser } = yield this._getCurrentLeverageParams(userAddress);
+            const collateralFromDebt = yield this.swapExpected(0, 1, debt);
+            const futureCollateralState = BN(stateCollateral);
+            const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(collateralFromDebt);
+            return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+        });
+    }
     // ---------------- FULL REPAY ----------------
     _fullRepayAmount() {
         return __awaiter(this, arguments, void 0, function* (address = "") {
@@ -2650,6 +2678,17 @@ export class LendMarketTemplate {
             return yield this._leverageBorrowMore(userCollateral, userBorrowed, debt, slippage, false);
         });
     }
+    leverageBorrowMoreFutureLeverage(userCollateral_1, userBorrowed_1, debt_1) {
+        return __awaiter(this, arguments, void 0, function* (userCollateral, userBorrowed, debt, userAddress = '', slippage = 0.1) {
+            userAddress = _getAddress.call(this.llamalend, userAddress);
+            this._checkLeverageZap();
+            const { stateCollateral, totalDepositFromUser } = yield this._getCurrentLeverageParams(userAddress);
+            const expected = yield this.leverageBorrowMoreExpectedCollateral(userCollateral, userBorrowed, debt, slippage, userAddress);
+            const futureCollateralState = BN(stateCollateral).plus(expected.totalCollateral);
+            const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral).plus(expected.collateralFromUserBorrowed);
+            return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+        });
+    }
     leverageRepayPriceImpact(stateCollateral, userCollateral) {
         return __awaiter(this, void 0, void 0, function* () {
             this._checkLeverageZap();
@@ -2791,15 +2830,26 @@ export class LendMarketTemplate {
             return yield this._leverageRepay(stateCollateral, userCollateral, userBorrowed, slippage, false);
         });
     }
-    currentLeverage() {
-        return __awaiter(this, arguments, void 0, function* (userAddress = '') {
+    leverageRepayFutureLeverage(stateCollateral_1, userCollateral_1, userBorrowed_1) {
+        return __awaiter(this, arguments, void 0, function* (stateCollateral, userCollateral, userBorrowed, userAddress = '') {
             userAddress = _getAddress.call(this.llamalend, userAddress);
-            const [userCollateral, { collateral }] = yield Promise.all([
+            this._checkLeverageZap();
+            const [userCollateralData, { collateral: currentStateCollateral }] = yield Promise.all([
                 _getUserCollateral(this.llamalend.constants.NETWORK_NAME, this.addresses.controller, userAddress),
                 this.userState(userAddress),
             ]);
-            const total_deposit_from_user = userCollateral.total_deposit_from_user_precise;
-            return BN(collateral).div(total_deposit_from_user).toString();
+            const totalDepositFromUser = userCollateralData.total_deposit_from_user_precise;
+            const collateralFromUserBorrowed = yield this.swapExpected(0, 1, userBorrowed);
+            const futureCollateralState = BN(currentStateCollateral).minus(stateCollateral);
+            const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral).plus(collateralFromUserBorrowed);
+            return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+        });
+    }
+    currentLeverage() {
+        return __awaiter(this, arguments, void 0, function* (userAddress = '') {
+            userAddress = _getAddress.call(this.llamalend, userAddress);
+            const { stateCollateral, totalDepositFromUser } = yield this._getCurrentLeverageParams(userAddress);
+            return BN(stateCollateral).div(totalDepositFromUser).toString();
         });
     }
     currentPnL() {

package/lib/lendMarkets/interfaces/leverageZapV2.d.ts

@@ -135,6 +135,13 @@ export interface ILeverageZapV2 {
         router: string;
         calldata: string;
     }) => Promise<string>;
+    borrowMoreFutureLeverage: ({ userCollateral, userBorrowed, debt, quote, address }: {
+        userCollateral: TAmount;
+        userBorrowed: TAmount;
+        debt: TAmount;
+        quote: IQuote;
+        address?: string;
+    }) => Promise<string>;
     repayExpectedBorrowed: ({ stateCollateral, userCollateral, userBorrowed, quote }: {
         stateCollateral: TAmount;
         userCollateral: TAmount;
@@ -184,6 +191,13 @@ export interface ILeverageZapV2 {
         router: string;
         calldata: string;
     }) => Promise<string>;
+    repayFutureLeverage: ({ stateCollateral, userCollateral, userBorrowed, quote, address }: {
+        stateCollateral: TAmount;
+        userCollateral: TAmount;
+        userBorrowed: TAmount;
+        quote: IQuote;
+        address?: string;
+    }) => Promise<string>;
     estimateGas: {
         createLoanApprove: ({ userCollateral, userBorrowed }: {
             userCollateral: TAmount;

package/lib/lendMarkets/modules/leverageZapV2.d.ts

@@ -186,6 +186,13 @@ export declare class LeverageZapV2Module {
         router: string;
         calldata: string;
     }): Promise<string>;
+    leverageBorrowMoreFutureLeverage({ userCollateral, userBorrowed, debt, quote, address }: {
+        userCollateral: TAmount;
+        userBorrowed: TAmount;
+        debt: TAmount;
+        quote: IQuote;
+        address?: string;
+    }): Promise<string>;
     private _leverageRepayExpectedBorrowed;
     leverageRepayExpectedBorrowed: ({ stateCollateral, userCollateral, userBorrowed, quote }: {
         stateCollateral: TAmount;
@@ -250,4 +257,10 @@ export declare class LeverageZapV2Module {
         router: string;
         calldata: string;
     }): Promise<string>;
+    leverageRepayFutureLeverage({ stateCollateral, userCollateral, userBorrowed, address }: {
+        stateCollateral: TAmount;
+        userCollateral: TAmount;
+        userBorrowed: TAmount;
+        address?: string;
+    }): Promise<string>;
 }

package/lib/lendMarkets/modules/leverageZapV2.js

@@ -557,6 +557,23 @@ export class LeverageZapV2Module {
             return yield this._leverageBorrowMore(userCollateral, userBorrowed, debt, router, calldata, false);
         });
     }
+    leverageBorrowMoreFutureLeverage(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ userCollateral, userBorrowed, debt, quote, address = "" }) {
+            address = _getAddress.call(this.llamalend, address);
+            this._checkLeverageZap();
+            const { stateCollateral, totalDepositFromUser } = yield this.market._getCurrentLeverageParams(address);
+            const expected = yield this.leverageBorrowMoreExpectedCollateral({
+                userCollateral,
+                userBorrowed,
+                dDebt: debt,
+                quote,
+                address,
+            });
+            const futureCollateralState = BN(stateCollateral).plus(expected.totalCollateral);
+            const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral).plus(expected.collateralFromUserBorrowed);
+            return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+        });
+    }
     leverageRepayIsFull(_a) {
         return __awaiter(this, arguments, void 0, function* ({ stateCollateral, userCollateral, userBorrowed, quote, address = "" }) {
             this._checkLeverageZap();
@@ -678,4 +695,15 @@ export class LeverageZapV2Module {
             return yield this._leverageRepay(stateCollateral, userCollateral, userBorrowed, router, calldata, false);
         });
     }
+    leverageRepayFutureLeverage(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ stateCollateral, userCollateral, userBorrowed, address = "" }) {
+            address = _getAddress.call(this.llamalend, address);
+            this._checkLeverageZap();
+            const { stateCollateral: currentStateCollateral, totalDepositFromUser } = yield this.market._getCurrentLeverageParams(address);
+            const collateralFromUserBorrowed = yield this.market.swapExpected(0, 1, userBorrowed);
+            const futureCollateralState = BN(currentStateCollateral).minus(stateCollateral);
+            const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral).plus(collateralFromUserBorrowed);
+            return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+        });
+    }
 }

package/lib/mintMarkets/MintMarketTemplate.d.ts

@@ -1,6 +1,6 @@
 import memoize from "memoizee";
 import type { Llamalend } from "../llamalend.js";
-import { IDict, ILlamma, TGas } from "../interfaces.js";
+import { IDict, ILlamma, TGas, IRates } from "../interfaces.js";
 import { ILeverageV2 } from "./interfaces/leverage.js";
 export declare class MintMarketTemplate {
     private llamalend;
@@ -46,8 +46,8 @@ export declare class MintMarketTemplate {
         parameters: () => Promise<{
             fee: string;
             admin_fee: string;
-            rate: string;
-            future_rate: string;
+            rates: IRates;
+            future_rates: IRates;
             liquidation_discount: string;
             loan_discount: string;
         }>;
@@ -134,18 +134,19 @@ export declare class MintMarketTemplate {
         };
     };
     constructor(id: string, llammaData: ILlamma, llamalend: Llamalend);
+    private _buildRatesObject;
     statsParameters: (() => Promise<{
         fee: string;
         admin_fee: string;
-        rate: string;
-        future_rate: string;
+        rates: IRates;
+        future_rates: IRates;
         liquidation_discount: string;
         loan_discount: string;
     }>) & memoize.Memoized<() => Promise<{
         fee: string;
         admin_fee: string;
-        rate: string;
-        future_rate: string;
+        rates: IRates;
+        future_rates: IRates;
         liquidation_discount: string;
         loan_discount: string;
     }>>;
@@ -234,6 +235,11 @@ export declare class MintMarketTemplate {
     private _borrowMore;
     borrowMoreEstimateGas(collateral: number | string, debt: number | string): Promise<number>;
     borrowMore(collateral: number | string, debt: number | string): Promise<string>;
+    _getCurrentLeverageParams(userAddress: string): Promise<{
+        stateCollateral: string;
+        totalDepositFromUser: number;
+    }>;
+    borrowMoreFutureLeverage(collateral: number | string, debt: number | string, userAddress?: string): Promise<string>;
     private _addCollateralBands;
     addCollateralBands(collateral: number | string, address?: string): Promise<[number, number]>;
     addCollateralPrices(collateral: number | string, address?: string): Promise<string[]>;
@@ -264,6 +270,7 @@ export declare class MintMarketTemplate {
     private _repay;
     repayEstimateGas(debt: number | string, address?: string): Promise<number>;
     repay(debt: number | string, address?: string): Promise<string>;
+    repayFutureLeverage(debt: number | string, userAddress?: string): Promise<string>;
     private _fullRepayAmount;
     fullRepayIsApproved(address?: string): Promise<boolean>;
     private fullRepayApproveEstimateGas;

package/lib/mintMarkets/MintMarketTemplate.js

@@ -15,7 +15,6 @@ import { LeverageV2Module } from "./modules/index.js";
 export class MintMarketTemplate {
     constructor(id, llammaData, llamalend) {
         var _a;
-        // ---------------- STATS ----------------
         this.statsParameters = memoize(() => __awaiter(this, void 0, void 0, function* () {
             const llammaContract = this.llamalend.contracts[this.address].multicallContract;
             const controllerContract = this.llamalend.contracts[this.controller].multicallContract;
@@ -31,10 +30,9 @@ export class MintMarketTemplate {
             const [_fee, _admin_fee, _rate, _mp_rate, _liquidation_discount, _loan_discount] = yield this.llamalend.multicallProvider.all(calls);
             const [fee, admin_fee, liquidation_discount, loan_discount] = [_fee, _admin_fee, _liquidation_discount, _loan_discount]
                 .map((x) => formatUnits(x * BigInt(100)));
-            // (1+rate)**(365*86400)-1 ~= (e**(rate*365*86400))-1
-            const rate = String(((Math.pow(2.718281828459, Number((toBN(_rate).times(365).times(86400))))) - 1) * 100);
-            const future_rate = String(((Math.pow(2.718281828459, Number((toBN(_mp_rate).times(365).times(86400))))) - 1) * 100);
-            return { fee, admin_fee, rate, future_rate, liquidation_discount, loan_discount };
+            const rates = this._buildRatesObject(_rate);
+            const future_rates = this._buildRatesObject(_mp_rate);
+            return { fee, admin_fee, rates, future_rates, liquidation_discount, loan_discount };
         }), {
             promise: true,
             maxAge: 5 * 60 * 1000, // 5m
@@ -341,6 +339,7 @@ export class MintMarketTemplate {
             borrowMoreApprove: leverageV2.leverageCreateLoanApprove.bind(leverageV2),
             borrowMoreRouteImage: leverageV2.leverageBorrowMoreRouteImage.bind(leverageV2),
             borrowMore: leverageV2.leverageBorrowMore.bind(leverageV2),
+            borrowMoreFutureLeverage: leverageV2.leverageBorrowMoreFutureLeverage.bind(leverageV2),
             repayExpectedBorrowed: leverageV2.leverageRepayExpectedBorrowed.bind(leverageV2),
             repayPriceImpact: leverageV2.leverageRepayPriceImpact.bind(leverageV2),
             repayIsFull: leverageV2.leverageRepayIsFull.bind(leverageV2),
@@ -352,6 +351,7 @@ export class MintMarketTemplate {
             repayApprove: leverageV2.leverageRepayApprove.bind(leverageV2),
             repayRouteImage: leverageV2.leverageRepayRouteImage.bind(leverageV2),
             repay: leverageV2.leverageRepay.bind(leverageV2),
+            repayFutureLeverage: leverageV2.leverageRepayFutureLeverage.bind(leverageV2),
             estimateGas: {
                 createLoanApprove: leverageV2.leverageCreateLoanApproveEstimateGas.bind(leverageV2),
                 createLoan: leverageV2.leverageCreateLoanEstimateGas.bind(leverageV2),
@@ -376,6 +376,18 @@ export class MintMarketTemplate {
             },
         };
     }
+    // ---------------- STATS ----------------
+    _buildRatesObject(rate) {
+        const borrowApr = toBN(rate).times(365).times(86400).times(100).toString();
+        // borrowApy = e**(rate*365*86400) - 1
+        const borrowApy = String(((Math.pow(2.718281828459, (toBN(rate).times(365).times(86400)).toNumber())) - 1) * 100);
+        return {
+            borrowApr,
+            borrowApy,
+            lendApr: "0",
+            lendApy: "0",
+        };
+    }
     statsBalances() {
         return __awaiter(this, void 0, void 0, function* () {
             const crvusdContract = this.llamalend.contracts[this.llamalend.crvUsdAddress].multicallContract;
@@ -875,6 +887,31 @@ export class MintMarketTemplate {
             return yield this._borrowMore(collateral, debt, false);
         });
     }
+    _getCurrentLeverageParams(userAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const [userCollateralData, { collateral: stateCollateral }] = yield Promise.all([
+                _getUserCollateralCrvUsdFull(this.llamalend.constants.NETWORK_NAME, this.controller, userAddress),
+                this.userState(userAddress),
+            ]);
+            return {
+                stateCollateral,
+                totalDepositFromUser: (_a = userCollateralData.total_deposit_from_user_precise) !== null && _a !== void 0 ? _a : userCollateralData.total_deposit_precise,
+            };
+        });
+    }
+    borrowMoreFutureLeverage(collateral_1, debt_1) {
+        return __awaiter(this, arguments, void 0, function* (collateral, debt, userAddress = '') {
+            if (!this.isDeleverageSupported)
+                throw Error("This market does not support borrowMoreFutureLeverage");
+            userAddress = _getAddress.call(this.llamalend, userAddress);
+            const { stateCollateral, totalDepositFromUser } = yield this._getCurrentLeverageParams(userAddress);
+            const collateralFromDebt = yield this.swapExpected(0, 1, debt);
+            const futureCollateralState = BN(stateCollateral).plus(collateralFromDebt);
+            const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(collateral);
+            return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+        });
+    }
     // ---------------- ADD COLLATERAL ----------------
     _addCollateralBands(collateral_1) {
         return __awaiter(this, arguments, void 0, function* (collateral, address = "") {
@@ -962,15 +999,10 @@ export class MintMarketTemplate {
     }
     addCollateralFutureLeverage(collateral_1) {
         return __awaiter(this, arguments, void 0, function* (collateral, userAddress = '') {
-            var _a;
             this._checkLeverageForStats();
             userAddress = _getAddress.call(this.llamalend, userAddress);
-            const [userCollateral, { collateral: currentCollateral }] = yield Promise.all([
-                _getUserCollateralCrvUsdFull(this.llamalend.constants.NETWORK_NAME, this.controller, userAddress),
-                this.userState(userAddress),
-            ]);
-            const total_deposit_from_user = (_a = userCollateral.total_deposit_from_user_precise) !== null && _a !== void 0 ? _a : userCollateral.total_deposit_precise;
-            return calculateFutureLeverage(currentCollateral, total_deposit_from_user, collateral, 'add');
+            const { stateCollateral, totalDepositFromUser } = yield this._getCurrentLeverageParams(userAddress);
+            return calculateFutureLeverage(stateCollateral, totalDepositFromUser, collateral, 'add');
         });
     }
     // ---------------- REMOVE COLLATERAL ----------------
@@ -1046,15 +1078,10 @@ export class MintMarketTemplate {
     }
     removeCollateralFutureLeverage(collateral_1) {
         return __awaiter(this, arguments, void 0, function* (collateral, userAddress = '') {
-            var _a;
             this._checkLeverageForStats();
             userAddress = _getAddress.call(this.llamalend, userAddress);
-            const [userCollateral, { collateral: currentCollateral }] = yield Promise.all([
-                _getUserCollateralCrvUsdFull(this.llamalend.constants.NETWORK_NAME, this.controller, userAddress),
-                this.userState(userAddress),
-            ]);
-            const total_deposit_from_user = (_a = userCollateral.total_deposit_from_user_precise) !== null && _a !== void 0 ? _a : userCollateral.total_deposit_precise;
-            return calculateFutureLeverage(currentCollateral, total_deposit_from_user, collateral, 'remove');
+            const { stateCollateral, totalDepositFromUser } = yield this._getCurrentLeverageParams(userAddress);
+            return calculateFutureLeverage(stateCollateral, totalDepositFromUser, collateral, 'remove');
         });
     }
     // ---------------- REPAY ----------------
@@ -1140,6 +1167,18 @@ export class MintMarketTemplate {
             return yield this._repay(debt, address, false);
         });
     }
+    repayFutureLeverage(debt_1) {
+        return __awaiter(this, arguments, void 0, function* (debt, userAddress = '') {
+            if (!this.isDeleverageSupported)
+                throw Error("This market does not support repayFutureLeverage");
+            userAddress = _getAddress.call(this.llamalend, userAddress);
+            const { stateCollateral, totalDepositFromUser } = yield this._getCurrentLeverageParams(userAddress);
+            const collateralFromDebt = yield this.swapExpected(0, 1, debt);
+            const futureCollateralState = BN(stateCollateral);
+            const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(collateralFromDebt);
+            return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+        });
+    }
     // ---------------- FULL REPAY ----------------
     _fullRepayAmount() {
         return __awaiter(this, arguments, void 0, function* (address = "") {
@@ -1775,15 +1814,10 @@ export class MintMarketTemplate {
     }
     currentLeverage() {
         return __awaiter(this, arguments, void 0, function* (userAddress = '') {
-            var _a;
             this._checkLeverageForStats();
             userAddress = _getAddress.call(this.llamalend, userAddress);
-            const [userCollateral, { collateral }] = yield Promise.all([
-                _getUserCollateralCrvUsdFull(this.llamalend.constants.NETWORK_NAME, this.controller, userAddress),
-                this.userState(userAddress),
-            ]);
-            const total_deposit_from_user = (_a = userCollateral.total_deposit_from_user_precise) !== null && _a !== void 0 ? _a : userCollateral.total_deposit_precise;
-            return BN(collateral).div(total_deposit_from_user).toString();
+            const { stateCollateral, totalDepositFromUser } = yield this._getCurrentLeverageParams(userAddress);
+            return BN(stateCollateral).div(totalDepositFromUser).toString();
         });
     }
     currentPnL() {

package/lib/mintMarkets/interfaces/leverage.d.ts

@@ -62,6 +62,7 @@ export interface ILeverageV2 {
     borrowMoreApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<string[]>;
     borrowMoreRouteImage: (userBorrowed: TAmount, debt: TAmount) => Promise<string>;
     borrowMore: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, slippage?: number) => Promise<string>;
+    borrowMoreFutureLeverage: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, userAddress?: string, slippage?: number) => Promise<string>;
     repayExpectedBorrowed: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, slippage?: number) => Promise<{
         totalBorrowed: string;
         borrowedFromStateCollateral: string;
@@ -79,6 +80,7 @@ export interface ILeverageV2 {
     repayApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<string[]>;
     repayRouteImage: (stateCollateral: TAmount, userCollateral: TAmount) => Promise<string>;
     repay: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, slippage?: number) => Promise<string>;
+    repayFutureLeverage: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, userAddress?: string, slippage?: number) => Promise<string>;
     estimateGas: {
         createLoanApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<TGas>;
         createLoan: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, range: number, slippage?: number) => Promise<number>;

package/lib/mintMarkets/modules/leverageV2.d.ts

@@ -102,6 +102,7 @@ export declare class LeverageV2Module {
     _leverageBorrowMore(userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, slippage: number, estimateGas: boolean): Promise<string | TGas>;
     leverageBorrowMoreEstimateGas(userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, slippage?: number): Promise<number>;
     leverageBorrowMore(userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, slippage?: number): Promise<string>;
+    leverageBorrowMoreFutureLeverage(userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, userAddress?: string, slippage?: number): Promise<string>;
     _leverageRepayExpectedBorrowed: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount) => {
         _totalBorrowed: bigint;
         _borrowedFromStateCollateral: bigint;
@@ -129,4 +130,5 @@ export declare class LeverageV2Module {
     _leverageRepay(stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, slippage: number, estimateGas: boolean): Promise<string | TGas>;
     leverageRepayEstimateGas(stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, slippage?: number): Promise<number>;
     leverageRepay(stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, slippage?: number): Promise<string>;
+    leverageRepayFutureLeverage(stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, userAddress?: string): Promise<string>;
 }

package/lib/mintMarkets/modules/leverageV2.js

@@ -643,6 +643,17 @@ export class LeverageV2Module {
             return yield this._leverageBorrowMore(userCollateral, userBorrowed, debt, slippage, false);
         });
     }
+    leverageBorrowMoreFutureLeverage(userCollateral_1, userBorrowed_1, debt_1) {
+        return __awaiter(this, arguments, void 0, function* (userCollateral, userBorrowed, debt, userAddress = '', slippage = 0.1) {
+            userAddress = _getAddress.call(this.llamalend, userAddress);
+            this._checkLeverageZap();
+            const { stateCollateral, totalDepositFromUser } = yield this.market._getCurrentLeverageParams(userAddress);
+            const expected = yield this.leverageBorrowMoreExpectedCollateral(userCollateral, userBorrowed, debt, slippage, userAddress);
+            const futureCollateralState = BN(stateCollateral).plus(expected.totalCollateral);
+            const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral).plus(expected.collateralFromUserBorrowed);
+            return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+        });
+    }
     leverageRepayPriceImpact(stateCollateral, userCollateral) {
         return __awaiter(this, void 0, void 0, function* () {
             this._checkLeverageZap();
@@ -786,4 +797,15 @@ export class LeverageV2Module {
             return yield this._leverageRepay(stateCollateral, userCollateral, userBorrowed, slippage, false);
         });
     }
+    leverageRepayFutureLeverage(stateCollateral_1, userCollateral_1, userBorrowed_1) {
+        return __awaiter(this, arguments, void 0, function* (stateCollateral, userCollateral, userBorrowed, userAddress = '') {
+            userAddress = _getAddress.call(this.llamalend, userAddress);
+            this._checkLeverageZap();
+            const { stateCollateral: currentStateCollateral, totalDepositFromUser } = yield this.market._getCurrentLeverageParams(userAddress);
+            const collateralFromUserBorrowed = yield this.market.swapExpected(0, 1, userBorrowed);
+            const futureCollateralState = BN(currentStateCollateral).minus(stateCollateral);
+            const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral).plus(collateralFromUserBorrowed);
+            return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+        });
+    }
 }

package/package.json

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

package/src/interfaces.ts

@@ -248,4 +248,11 @@ export type GetExpectedFn = (
     toToken: string,
     amountIn: bigint,
     blacklist: string | string[],
-) => Promise<IQuote>;
+) => Promise<IQuote>;
+
+export interface IRates {
+    borrowApr: string;
+    lendApr: string;
+    borrowApy: string;
+    lendApy: string;
+}

package/src/lendMarkets/LendMarketTemplate.ts

@@ -23,7 +23,7 @@ import {
     smartNumber,
     calculateFutureLeverage,
 } from "../utils.js";
-import {IDict, TGas, TAmount, IReward, IQuoteOdos, IOneWayMarket, IPartialFrac} from "../interfaces.js";
+import {IDict, TGas, TAmount, IReward, IQuoteOdos, IOneWayMarket, IPartialFrac, IRates} from "../interfaces.js";
 import { _getExpectedOdos, _getQuoteOdos, _assembleTxOdos, _getUserCollateral, _getUserCollateralForce, _getMarketsData } from "../external-api.js";
 import ERC20Abi from '../constants/abis/ERC20.json' with {type: 'json'};
 import {cacheKey, cacheStats} from "../cache/index.js";
@@ -214,6 +214,7 @@ export class LendMarketTemplate {
         borrowMoreApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<string[]>,
         borrowMoreRouteImage: (userBorrowed: TAmount, debt: TAmount) => Promise<string>,
         borrowMore: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, slippage?: number) => Promise<string>,
+        borrowMoreFutureLeverage: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, userAddress?: string, slippage?: number) => Promise<string>,
 
         repayExpectedBorrowed: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, slippage?: number) =>
             Promise<{ totalBorrowed: string, borrowedFromStateCollateral: string, borrowedFromUserCollateral: string, userBorrowed: string, avgPrice: string }>,
@@ -227,6 +228,7 @@ export class LendMarketTemplate {
         repayApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<string[]>,
         repayRouteImage: (stateCollateral: TAmount, userCollateral: TAmount) => Promise<string>,
         repay: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, slippage?: number) => Promise<string>,
+        repayFutureLeverage: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, userAddress?: string, slippage?: number) => Promise<string>,
 
         estimateGas: {
             createLoanApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<TGas>,
@@ -365,6 +367,7 @@ export class LendMarketTemplate {
             borrowMoreApprove: this.leverageCreateLoanApprove.bind(this),
             borrowMoreRouteImage: this.leverageBorrowMoreRouteImage.bind(this),
             borrowMore: this.leverageBorrowMore.bind(this),
+            borrowMoreFutureLeverage: this.leverageBorrowMoreFutureLeverage.bind(this),
 
             repayExpectedBorrowed: this.leverageRepayExpectedBorrowed.bind(this),
             repayPriceImpact: this.leverageRepayPriceImpact.bind(this),
@@ -377,6 +380,7 @@ export class LendMarketTemplate {
             repayApprove: this.leverageRepayApprove.bind(this),
             repayRouteImage: this.leverageRepayRouteImage.bind(this),
             repay: this.leverageRepay.bind(this),
+            repayFutureLeverage: this.leverageRepayFutureLeverage.bind(this),
 
             estimateGas: {
                 createLoanApprove: this.leverageCreateLoanApproveEstimateGas.bind(this),
@@ -414,6 +418,7 @@ export class LendMarketTemplate {
             borrowMoreApprove: leverageZapV2.leverageCreateLoanApprove.bind(leverageZapV2),
             borrowMoreExpectedMetrics: leverageZapV2.leverageBorrowMoreExpectedMetrics.bind(leverageZapV2),
             borrowMore: leverageZapV2.leverageBorrowMore.bind(leverageZapV2),
+            borrowMoreFutureLeverage: leverageZapV2.leverageBorrowMoreFutureLeverage.bind(leverageZapV2),
 
             repayExpectedBorrowed: leverageZapV2.leverageRepayExpectedBorrowed.bind(leverageZapV2),
             repayIsFull: leverageZapV2.leverageRepayIsFull.bind(leverageZapV2),
@@ -422,6 +427,7 @@ export class LendMarketTemplate {
             repayIsApproved: leverageZapV2.leverageRepayIsApproved.bind(leverageZapV2),
             repayApprove: leverageZapV2.leverageRepayApprove.bind(leverageZapV2),
             repay: leverageZapV2.leverageRepay.bind(leverageZapV2),
+            repayFutureLeverage: leverageZapV2.leverageRepayFutureLeverage.bind(leverageZapV2),
 
             estimateGas: {
                 createLoanApprove: leverageZapV2.leverageCreateLoanApproveEstimateGas.bind(leverageZapV2),
@@ -1010,7 +1016,7 @@ export class LendMarketTemplate {
         return await mpContract.future_rate(this.addresses.controller, _dReserves, _dDebt);
     }
 
-    private async statsRates(isGetter = true, useAPI = false): Promise<{borrowApr: string, lendApr: string, borrowApy: string, lendApy: string}> {
+    private async statsRates(isGetter = true, useAPI = false): Promise<IRates> {
         if(useAPI) {
             const response = await _getMarketsData(this.llamalend.constants.NETWORK_NAME);
 
@@ -1046,7 +1052,7 @@ export class LendMarketTemplate {
         }
     }
 
-    private async statsFutureRates(dReserves: TAmount, dDebt: TAmount, useAPI = true): Promise<{borrowApr: string, lendApr: string, borrowApy: string, lendApy: string}> {
+    private async statsFutureRates(dReserves: TAmount, dDebt: TAmount, useAPI = true): Promise<IRates> {
         const _dReserves = parseUnits(dReserves, this.borrowed_token.decimals);
         const _dDebt = parseUnits(dDebt, this.borrowed_token.decimals);
         const _rate = await this._getFutureRate(_dReserves, _dDebt);
@@ -1718,6 +1724,30 @@ export class LendMarketTemplate {
         return await this._borrowMore(collateral, debt, false) as string;
     }
 
+    public async _getCurrentLeverageParams(userAddress: string) {
+        const [userCollateralData, { collateral: stateCollateral }] = await Promise.all([
+            _getUserCollateral(this.llamalend.constants.NETWORK_NAME, this.addresses.controller, userAddress),
+            this.userState(userAddress),
+        ]);
+
+        return {
+            stateCollateral,
+            totalDepositFromUser: userCollateralData.total_deposit_from_user_precise,
+        };
+    }
+
+    public async borrowMoreFutureLeverage(collateral: number | string, debt: number | string, userAddress = ''): Promise<string> {
+        userAddress = _getAddress.call(this.llamalend, userAddress);
+        const { stateCollateral, totalDepositFromUser } = await this._getCurrentLeverageParams(userAddress);
+
+        const collateralFromDebt = await this.swapExpected(0, 1, debt);
+
+        const futureCollateralState = BN(stateCollateral).plus(collateralFromDebt);
+        const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(collateral);
+        
+        return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+    }
+
     // ---------------- ADD COLLATERAL ----------------
 
     private async _addCollateralBands(collateral: number | string, address = ""): Promise<[bigint, bigint]> {
@@ -1796,14 +1826,9 @@ export class LendMarketTemplate {
 
     public async addCollateralFutureLeverage(collateral: number | string, userAddress = ''): Promise<string> {
         userAddress = _getAddress.call(this.llamalend, userAddress);
-        const [userCollateral, {collateral: currentCollateral}] = await Promise.all([
-            _getUserCollateral(this.llamalend.constants.NETWORK_NAME, this.addresses.controller, userAddress),
-            this.userState(userAddress),
-        ]);
+        const { stateCollateral, totalDepositFromUser } = await this._getCurrentLeverageParams(userAddress);
 
-        const total_deposit_from_user = userCollateral.total_deposit_from_user_precise;
-
-        return calculateFutureLeverage(currentCollateral, total_deposit_from_user, collateral, 'add');
+        return calculateFutureLeverage(stateCollateral, totalDepositFromUser, collateral, 'add');
     }
 
     // ---------------- REMOVE COLLATERAL ----------------
@@ -1874,14 +1899,9 @@ export class LendMarketTemplate {
 
     public async removeCollateralFutureLeverage(collateral: number | string, userAddress = ''): Promise<string> {
         userAddress = _getAddress.call(this.llamalend, userAddress);
-        const [userCollateral, {collateral: currentCollateral}] = await Promise.all([
-            _getUserCollateral(this.llamalend.constants.NETWORK_NAME, this.addresses.controller, userAddress),
-            this.userState(userAddress),
-        ]);
-
-        const total_deposit_from_user = userCollateral.total_deposit_from_user_precise;
+        const { stateCollateral, totalDepositFromUser } = await this._getCurrentLeverageParams(userAddress);
 
-        return calculateFutureLeverage(currentCollateral, total_deposit_from_user, collateral, 'remove');
+        return calculateFutureLeverage(stateCollateral, totalDepositFromUser, collateral, 'remove');
     }
 
     // ---------------- REPAY ----------------
@@ -1961,6 +1981,18 @@ export class LendMarketTemplate {
         return await this._repay(debt, address, false) as string;
     }
 
+    public async repayFutureLeverage(debt: number | string, userAddress = ''): Promise<string> {
+        userAddress = _getAddress.call(this.llamalend, userAddress);
+        const { stateCollateral, totalDepositFromUser } = await this._getCurrentLeverageParams(userAddress);
+
+        const collateralFromDebt = await this.swapExpected(0, 1, debt);
+
+        const futureCollateralState = BN(stateCollateral);
+        const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(collateralFromDebt);
+
+        return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+    }
+
     // ---------------- FULL REPAY ----------------
 
     private async _fullRepayAmount(address = ""): Promise<string> {
@@ -2930,6 +2962,32 @@ export class LendMarketTemplate {
         return await this._leverageBorrowMore(userCollateral, userBorrowed, debt, slippage, false) as string;
     }
 
+    private async leverageBorrowMoreFutureLeverage(
+        userCollateral: TAmount,
+        userBorrowed: TAmount,
+        debt: TAmount,
+        userAddress = '',
+        slippage = 0.1
+    ): Promise<string> {
+        userAddress = _getAddress.call(this.llamalend, userAddress);
+        this._checkLeverageZap();
+
+        const { stateCollateral, totalDepositFromUser } = await this._getCurrentLeverageParams(userAddress);
+
+        const expected = await this.leverageBorrowMoreExpectedCollateral(
+            userCollateral,
+            userBorrowed,
+            debt,
+            slippage,
+            userAddress
+        );
+
+        const futureCollateralState = BN(stateCollateral).plus(expected.totalCollateral);
+        const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral).plus(expected.collateralFromUserBorrowed);
+
+        return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+    }
+
     // ---------------- LEVERAGE REPAY ----------------
 
     private _leverageRepayExpectedBorrowed = (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount):
@@ -3153,16 +3211,35 @@ export class LendMarketTemplate {
         return await this._leverageRepay(stateCollateral, userCollateral, userBorrowed, slippage, false) as string;
     }
 
-    public async currentLeverage(userAddress = ''): Promise<string> {
+    private async leverageRepayFutureLeverage(
+        stateCollateral: TAmount,
+        userCollateral: TAmount,
+        userBorrowed: TAmount,
+        userAddress = ''
+    ): Promise<string> {
         userAddress = _getAddress.call(this.llamalend, userAddress);
-        const [userCollateral, {collateral}] = await Promise.all([
+        this._checkLeverageZap();
+
+        const [userCollateralData, { collateral: currentStateCollateral }] = await Promise.all([
             _getUserCollateral(this.llamalend.constants.NETWORK_NAME, this.addresses.controller, userAddress),
             this.userState(userAddress),
         ]);
 
-        const total_deposit_from_user = userCollateral.total_deposit_from_user_precise;
+        const totalDepositFromUser = userCollateralData.total_deposit_from_user_precise;
+
+        const collateralFromUserBorrowed = await this.swapExpected(0, 1, userBorrowed);
+
+        const futureCollateralState = BN(currentStateCollateral).minus(stateCollateral);
+        const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral).plus(collateralFromUserBorrowed);
+
+        return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+    }
+
+    public async currentLeverage(userAddress = ''): Promise<string> {
+        userAddress = _getAddress.call(this.llamalend, userAddress);
+        const { stateCollateral, totalDepositFromUser } = await this._getCurrentLeverageParams(userAddress);
 
-        return BN(collateral).div(total_deposit_from_user).toString();
+        return BN(stateCollateral).div(totalDepositFromUser).toString();
     }
 
     public async currentPnL(userAddress = ''): Promise<Record<string, string>> {

package/src/lendMarkets/interfaces/leverageZapV2.ts

@@ -190,6 +190,13 @@ export interface ILeverageZapV2 {
         router: string,
         calldata: string
     }) => Promise<string>,
+    borrowMoreFutureLeverage: ({ userCollateral, userBorrowed, debt, quote, address }: {
+        userCollateral: TAmount,
+        userBorrowed: TAmount,
+        debt: TAmount,
+        quote: IQuote,
+        address?: string
+    }) => Promise<string>,
 
     repayExpectedBorrowed: ({ stateCollateral, userCollateral, userBorrowed, quote }: {
         stateCollateral: TAmount,
@@ -240,6 +247,13 @@ export interface ILeverageZapV2 {
         router: string,
         calldata: string
     }) => Promise<string>,
+    repayFutureLeverage: ({ stateCollateral, userCollateral, userBorrowed, quote, address }: {
+        stateCollateral: TAmount,
+        userCollateral: TAmount,
+        userBorrowed: TAmount,
+        quote: IQuote,
+        address?: string
+    }) => Promise<string>,
 
     estimateGas: {
         createLoanApprove: ({ userCollateral, userBorrowed }: {

package/src/lendMarkets/modules/leverageZapV2.ts

@@ -740,6 +740,32 @@ export class LeverageZapV2Module {
         return await this._leverageBorrowMore(userCollateral, userBorrowed, debt, router, calldata, false) as string;
     }
 
+    public async leverageBorrowMoreFutureLeverage({ userCollateral, userBorrowed, debt, quote, address = "" }: {
+        userCollateral: TAmount,
+        userBorrowed: TAmount,
+        debt: TAmount,
+        quote: IQuote,
+        address?: string
+    }): Promise<string> {
+        address = _getAddress.call(this.llamalend, address);
+        this._checkLeverageZap();
+
+        const { stateCollateral, totalDepositFromUser } = await this.market._getCurrentLeverageParams(address);
+
+        const expected = await this.leverageBorrowMoreExpectedCollateral({
+            userCollateral,
+            userBorrowed,
+            dDebt: debt,
+            quote,
+            address,
+        });
+
+        const futureCollateralState = BN(stateCollateral).plus(expected.totalCollateral);
+        const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral).plus(expected.collateralFromUserBorrowed);
+
+        return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+    }
+
     // ---------------- LEVERAGE REPAY ----------------
 
     private _leverageRepayExpectedBorrowed = (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, quote: IQuote):
@@ -988,4 +1014,23 @@ export class LeverageZapV2Module {
         await this.leverageRepayApprove({ userCollateral, userBorrowed });
         return await this._leverageRepay(stateCollateral, userCollateral, userBorrowed, router, calldata, false) as string;
     }
+
+    public async leverageRepayFutureLeverage({ stateCollateral, userCollateral, userBorrowed, address = "" }: {
+        stateCollateral: TAmount,
+        userCollateral: TAmount,
+        userBorrowed: TAmount,
+        address?: string
+    }): Promise<string> {
+        address = _getAddress.call(this.llamalend, address);
+        this._checkLeverageZap();
+
+        const { stateCollateral: currentStateCollateral, totalDepositFromUser } = await this.market._getCurrentLeverageParams(address);
+
+        const collateralFromUserBorrowed = await this.market.swapExpected(0, 1, userBorrowed);
+
+        const futureCollateralState = BN(currentStateCollateral).minus(stateCollateral);
+        const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral).plus(collateralFromUserBorrowed);
+
+        return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+    }
 }

package/src/mintMarkets/MintMarketTemplate.ts

@@ -21,7 +21,7 @@ import {
     DIGas,
     calculateFutureLeverage,
 } from "../utils.js";
-import {IDict, ILlamma, TGas} from "../interfaces.js";
+import {IDict, ILlamma, TGas, IRates} from "../interfaces.js";
 import {_getUserCollateralCrvUsd, _getUserCollateralCrvUsdFull} from "../external-api.js";
 import { ILeverageV2 } from "./interfaces/leverage.js";
 import { LeverageV2Module } from "./modules/index.js";
@@ -71,8 +71,8 @@ export class MintMarketTemplate {
         parameters: () => Promise<{
             fee: string, // %
             admin_fee: string, // %
-            rate: string, // %
-            future_rate: string, // %
+            rates: IRates,
+            future_rates: IRates,
             liquidation_discount: string, // %
             loan_discount: string, // %
         }>,
@@ -238,6 +238,7 @@ export class MintMarketTemplate {
             borrowMoreApprove: leverageV2.leverageCreateLoanApprove.bind(leverageV2),
             borrowMoreRouteImage: leverageV2.leverageBorrowMoreRouteImage.bind(leverageV2),
             borrowMore: leverageV2.leverageBorrowMore.bind(leverageV2),
+            borrowMoreFutureLeverage: leverageV2.leverageBorrowMoreFutureLeverage.bind(leverageV2),
 
             repayExpectedBorrowed: leverageV2.leverageRepayExpectedBorrowed.bind(leverageV2),
             repayPriceImpact: leverageV2.leverageRepayPriceImpact.bind(leverageV2),
@@ -250,6 +251,7 @@ export class MintMarketTemplate {
             repayApprove: leverageV2.leverageRepayApprove.bind(leverageV2),
             repayRouteImage: leverageV2.leverageRepayRouteImage.bind(leverageV2),
             repay: leverageV2.leverageRepay.bind(leverageV2),
+            repayFutureLeverage: leverageV2.leverageRepayFutureLeverage.bind(leverageV2),
 
             estimateGas: {
                 createLoanApprove: leverageV2.leverageCreateLoanApproveEstimateGas.bind(leverageV2),
@@ -280,11 +282,23 @@ export class MintMarketTemplate {
 
     // ---------------- STATS ----------------
 
+    private _buildRatesObject(rate: bigint): IRates {
+        const borrowApr = toBN(rate).times(365).times(86400).times(100).toString();
+        // borrowApy = e**(rate*365*86400) - 1
+        const borrowApy = String(((2.718281828459 ** (toBN(rate).times(365).times(86400)).toNumber()) - 1) * 100);
+        return {
+            borrowApr,
+            borrowApy,
+            lendApr: "0",
+            lendApy: "0",
+        };
+    }
+
     public statsParameters = memoize(async (): Promise<{
         fee: string, // %
         admin_fee: string, // %
-        rate: string, // %
-        future_rate: string, // %
+        rates: IRates,
+        future_rates: IRates,
         liquidation_discount: string, // %
         loan_discount: string, // %
     }> => {
@@ -305,11 +319,10 @@ export class MintMarketTemplate {
         const [fee, admin_fee, liquidation_discount, loan_discount] = [_fee, _admin_fee, _liquidation_discount, _loan_discount]
             .map((x) => formatUnits(x * BigInt(100)));
 
-        // (1+rate)**(365*86400)-1 ~= (e**(rate*365*86400))-1
-        const rate = String(((2.718281828459 ** Number((toBN(_rate).times(365).times(86400)))) - 1) * 100);
-        const future_rate = String(((2.718281828459 ** Number((toBN(_mp_rate).times(365).times(86400)))) - 1) * 100);
+        const rates = this._buildRatesObject(_rate);
+        const future_rates = this._buildRatesObject(_mp_rate);
 
-        return { fee, admin_fee, rate, future_rate, liquidation_discount, loan_discount }
+        return { fee, admin_fee, rates, future_rates, liquidation_discount, loan_discount }
     },
     {
         promise: true,
@@ -924,6 +937,31 @@ export class MintMarketTemplate {
         return await this._borrowMore(collateral, debt, false) as string;
     }
 
+    public async _getCurrentLeverageParams(userAddress: string) {
+        const [userCollateralData, { collateral: stateCollateral }] = await Promise.all([
+            _getUserCollateralCrvUsdFull(this.llamalend.constants.NETWORK_NAME, this.controller, userAddress),
+            this.userState(userAddress),
+        ]);
+
+        return {
+            stateCollateral,
+            totalDepositFromUser: userCollateralData.total_deposit_from_user_precise ?? userCollateralData.total_deposit_precise,
+        };
+    }
+
+    public async borrowMoreFutureLeverage(collateral: number | string, debt: number | string, userAddress = ''): Promise<string> {
+        if (!this.isDeleverageSupported) throw Error("This market does not support borrowMoreFutureLeverage");
+        userAddress = _getAddress.call(this.llamalend, userAddress);
+        const { stateCollateral, totalDepositFromUser } = await this._getCurrentLeverageParams(userAddress);
+
+        const collateralFromDebt = await this.swapExpected(0, 1, debt);
+
+        const futureCollateralState = BN(stateCollateral).plus(collateralFromDebt);
+        const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(collateral);
+        
+        return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+    }
+
     // ---------------- ADD COLLATERAL ----------------
 
     private async _addCollateralBands(collateral: number | string, address = ""): Promise<[bigint, bigint]> {
@@ -1005,14 +1043,9 @@ export class MintMarketTemplate {
     public async addCollateralFutureLeverage(collateral: number | string, userAddress = ''): Promise<string> {
         this._checkLeverageForStats();
         userAddress = _getAddress.call(this.llamalend, userAddress);
-        const [userCollateral, {collateral: currentCollateral}] = await Promise.all([
-            _getUserCollateralCrvUsdFull(this.llamalend.constants.NETWORK_NAME, this.controller, userAddress),
-            this.userState(userAddress),
-        ]);
+        const { stateCollateral, totalDepositFromUser } = await this._getCurrentLeverageParams(userAddress);
 
-        const total_deposit_from_user = userCollateral.total_deposit_from_user_precise ?? userCollateral.total_deposit_precise;
-
-        return calculateFutureLeverage(currentCollateral, total_deposit_from_user, collateral, 'add');
+        return calculateFutureLeverage(stateCollateral, totalDepositFromUser, collateral, 'add');
     }
 
     // ---------------- REMOVE COLLATERAL ----------------
@@ -1086,14 +1119,9 @@ export class MintMarketTemplate {
     public async removeCollateralFutureLeverage(collateral: number | string, userAddress = ''): Promise<string> {
         this._checkLeverageForStats();
         userAddress = _getAddress.call(this.llamalend, userAddress);
-        const [userCollateral, {collateral: currentCollateral}] = await Promise.all([
-            _getUserCollateralCrvUsdFull(this.llamalend.constants.NETWORK_NAME, this.controller, userAddress),
-            this.userState(userAddress),
-        ]);
+        const { stateCollateral, totalDepositFromUser } = await this._getCurrentLeverageParams(userAddress);
 
-        const total_deposit_from_user = userCollateral.total_deposit_from_user_precise ?? userCollateral.total_deposit_precise;
-
-        return calculateFutureLeverage(currentCollateral, total_deposit_from_user, collateral, 'remove');
+        return calculateFutureLeverage(stateCollateral, totalDepositFromUser, collateral, 'remove');
     }
 
     // ---------------- REPAY ----------------
@@ -1173,6 +1201,19 @@ export class MintMarketTemplate {
         return await this._repay(debt, address, false) as string;
     }
 
+    public async repayFutureLeverage(debt: number | string, userAddress = ''): Promise<string> {
+        if (!this.isDeleverageSupported) throw Error("This market does not support repayFutureLeverage");
+        userAddress = _getAddress.call(this.llamalend, userAddress);
+        const { stateCollateral, totalDepositFromUser } = await this._getCurrentLeverageParams(userAddress);
+
+        const collateralFromDebt = await this.swapExpected(0, 1, debt);
+
+        const futureCollateralState = BN(stateCollateral);
+        const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(collateralFromDebt);
+
+        return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+    }
+
     // ---------------- FULL REPAY ----------------
 
     private async _fullRepayAmount(address = ""): Promise<string> {
@@ -1911,14 +1952,9 @@ export class MintMarketTemplate {
         this._checkLeverageForStats();
         userAddress = _getAddress.call(this.llamalend, userAddress);
         
-        const [userCollateral, {collateral}] = await Promise.all([
-            _getUserCollateralCrvUsdFull(this.llamalend.constants.NETWORK_NAME, this.controller, userAddress),
-            this.userState(userAddress),
-        ]);
-
-        const total_deposit_from_user = userCollateral.total_deposit_from_user_precise ?? userCollateral.total_deposit_precise;
+        const { stateCollateral, totalDepositFromUser } = await this._getCurrentLeverageParams(userAddress);
 
-        return BN(collateral).div(total_deposit_from_user).toString();
+        return BN(stateCollateral).div(totalDepositFromUser).toString();
     }
 
     public async currentPnL(userAddress = ''): Promise<Record<string, string>> {

package/src/mintMarkets/interfaces/leverage.ts

@@ -71,6 +71,7 @@ export interface ILeverageV2 {
     borrowMoreApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<string[]>,
     borrowMoreRouteImage: (userBorrowed: TAmount, debt: TAmount) => Promise<string>,
     borrowMore: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, slippage?: number) => Promise<string>,
+    borrowMoreFutureLeverage: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, userAddress?: string, slippage?: number) => Promise<string>,
 
     repayExpectedBorrowed: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, slippage?: number) =>
         Promise<{
@@ -90,6 +91,7 @@ export interface ILeverageV2 {
     repayApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<string[]>,
     repayRouteImage: (stateCollateral: TAmount, userCollateral: TAmount) => Promise<string>,
     repay: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, slippage?: number) => Promise<string>,
+    repayFutureLeverage: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, userAddress?: string, slippage?: number) => Promise<string>,
 
     estimateGas: {
         createLoanApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<TGas>,

package/src/mintMarkets/modules/leverageV2.ts

@@ -704,6 +704,26 @@ export class LeverageV2Module {
         return await this._leverageBorrowMore(userCollateral, userBorrowed, debt, slippage, false) as string;
     }
 
+    public async leverageBorrowMoreFutureLeverage(
+        userCollateral: TAmount,
+        userBorrowed: TAmount,
+        debt: TAmount,
+        userAddress = '',
+        slippage = 0.1
+    ): Promise<string> {
+        userAddress = _getAddress.call(this.llamalend, userAddress);
+        this._checkLeverageZap();
+
+        const { stateCollateral, totalDepositFromUser } = await this.market._getCurrentLeverageParams(userAddress);
+
+        const expected = await this.leverageBorrowMoreExpectedCollateral(userCollateral, userBorrowed, debt, slippage, userAddress);
+
+        const futureCollateralState = BN(stateCollateral).plus(expected.totalCollateral);
+        const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral).plus(expected.collateralFromUserBorrowed);
+
+        return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+    }
+
     // ---------------- LEVERAGE REPAY ----------------
 
     public _leverageRepayExpectedBorrowed = (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount):
@@ -929,4 +949,23 @@ export class LeverageV2Module {
         await this.leverageRepayApprove(userCollateral, userBorrowed);
         return await this._leverageRepay(stateCollateral, userCollateral, userBorrowed, slippage, false) as string;
     }
+
+    public async leverageRepayFutureLeverage(
+        stateCollateral: TAmount,
+        userCollateral: TAmount,
+        userBorrowed: TAmount,
+        userAddress = ''
+    ): Promise<string> {
+        userAddress = _getAddress.call(this.llamalend, userAddress);
+        this._checkLeverageZap();
+
+        const { stateCollateral: currentStateCollateral, totalDepositFromUser } = await this.market._getCurrentLeverageParams(userAddress);
+
+        const collateralFromUserBorrowed = await this.market.swapExpected(0, 1, userBorrowed);
+
+        const futureCollateralState = BN(currentStateCollateral).minus(stateCollateral);
+        const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral).plus(collateralFromUserBorrowed);
+
+        return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+    }
 }