@curvefi/llamalend-api 2.0.1 → 2.0.2

package/lib/lendMarkets/LendMarketTemplate.js

@@ -251,6 +251,7 @@ export class LendMarketTemplate {
             borrowMoreApprove: leverageZapV1.leverageCreateLoanApprove.bind(leverageZapV1),
             borrowMoreRouteImage: leverageZapV1.leverageBorrowMoreRouteImage.bind(leverageZapV1),
             borrowMore: leverageZapV1.leverageBorrowMore.bind(leverageZapV1),
+            borrowMoreFutureLeverage: leverageZapV1.leverageBorrowMoreFutureLeverage.bind(leverageZapV1),
             repayExpectedBorrowed: leverageZapV1.leverageRepayExpectedBorrowed.bind(leverageZapV1),
             repayPriceImpact: leverageZapV1.leverageRepayPriceImpact.bind(leverageZapV1),
             repayIsFull: leverageZapV1.leverageRepayIsFull.bind(leverageZapV1),
@@ -262,6 +263,7 @@ export class LendMarketTemplate {
             repayApprove: leverageZapV1.leverageRepayApprove.bind(leverageZapV1),
             repayRouteImage: leverageZapV1.leverageRepayRouteImage.bind(leverageZapV1),
             repay: leverageZapV1.leverageRepay.bind(leverageZapV1),
+            repayFutureLeverage: leverageZapV1.leverageRepayFutureLeverage.bind(leverageZapV1),
             estimateGas: {
                 createLoanApprove: leverageZapV1.leverageCreateLoanApproveEstimateGas.bind(leverageZapV1),
                 createLoan: leverageZapV1.leverageCreateLoanEstimateGas.bind(leverageZapV1),

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

@@ -62,6 +62,7 @@ export interface ILeverageV1 {
     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 ILeverageV1 {
     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/lendMarkets/interfaces/v2/leverageV2.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/lendMarkets/modules/common/leverageZapV1Base.d.ts

@@ -93,6 +93,7 @@ export declare class LeverageZapV1BaseModule {
     private _leverageBorrowMore;
     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>;
     private _leverageRepayExpectedBorrowed;
     leverageRepayExpectedBorrowed: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, slippage?: number) => Promise<{
         totalBorrowed: string;
@@ -115,4 +116,5 @@ export declare class LeverageZapV1BaseModule {
     private _leverageRepay;
     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/lendMarkets/modules/common/leverageZapV1Base.js

@@ -626,6 +626,17 @@ export class LeverageZapV1BaseModule {
             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.userPosition.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();
@@ -767,4 +778,15 @@ export class LeverageZapV1BaseModule {
             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.userPosition.getCurrentLeverageParams(userAddress);
+            const collateralFromUserBorrowed = yield this.market.amm.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": "2.0.1",
+  "version": "2.0.2",
   "description": "JavaScript library for Curve Lending",
   "main": "lib/index.js",
   "author": "Macket",

package/src/lendMarkets/LendMarketTemplate.ts

@@ -364,6 +364,7 @@ export class LendMarketTemplate {
             borrowMoreApprove: leverageZapV1.leverageCreateLoanApprove.bind(leverageZapV1),
             borrowMoreRouteImage: leverageZapV1.leverageBorrowMoreRouteImage.bind(leverageZapV1),
             borrowMore: leverageZapV1.leverageBorrowMore.bind(leverageZapV1),
+            borrowMoreFutureLeverage: leverageZapV1.leverageBorrowMoreFutureLeverage.bind(leverageZapV1),
 
             repayExpectedBorrowed: leverageZapV1.leverageRepayExpectedBorrowed.bind(leverageZapV1),
             repayPriceImpact: leverageZapV1.leverageRepayPriceImpact.bind(leverageZapV1),
@@ -376,6 +377,7 @@ export class LendMarketTemplate {
             repayApprove: leverageZapV1.leverageRepayApprove.bind(leverageZapV1),
             repayRouteImage: leverageZapV1.leverageRepayRouteImage.bind(leverageZapV1),
             repay: leverageZapV1.leverageRepay.bind(leverageZapV1),
+            repayFutureLeverage: leverageZapV1.leverageRepayFutureLeverage.bind(leverageZapV1),
 
             estimateGas: {
                 createLoanApprove: leverageZapV1.leverageCreateLoanApproveEstimateGas.bind(leverageZapV1),

package/src/lendMarkets/interfaces/v1/leverageV1.ts

@@ -57,6 +57,7 @@ export interface ILeverageV1 {
     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 }>;
@@ -70,6 +71,7 @@ export interface ILeverageV1 {
     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/lendMarkets/interfaces/v2/leverageV2.ts

@@ -57,6 +57,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, borrowedFromUserCollateral: string, userBorrowed: string, avgPrice: string }>;
@@ -70,6 +71,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/lendMarkets/modules/common/leverageZapV1Base.ts

@@ -687,6 +687,20 @@ export class LeverageZapV1BaseModule {
         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.userPosition.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):
@@ -909,4 +923,18 @@ export class LeverageZapV1BaseModule {
         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.userPosition.getCurrentLeverageParams(userAddress);
+
+        const collateralFromUserBorrowed = await this.market.amm.swapExpected(0, 1, userBorrowed);
+
+        const futureCollateralState = BN(currentStateCollateral).minus(stateCollateral);
+        const futureTotalDepositFromUserPrecise = BN(totalDepositFromUser).plus(userCollateral).plus(collateralFromUserBorrowed);
+
+        return futureCollateralState.div(futureTotalDepositFromUserPrecise).toString();
+    }
 }