@curvefi/llamalend-api 2.2.6 → 2.3.1

package/src/lendMarkets/modules/v1/leverageV1ZapV2.ts

@@ -60,7 +60,6 @@ export class LeverageV1ZapV2Module extends LeverageZapV2BaseModule {
 
     protected override async _createLoanContractCall(
         _userCollateral: bigint,
-        _userBorrowed: bigint,
         _debt: bigint,
         _minRecv: bigint,
         range: number,
@@ -68,14 +67,14 @@ export class LeverageV1ZapV2Module extends LeverageZapV2BaseModule {
         exchangeCalldata: string,
         estimateGas: boolean
     ): Promise<string | TGas> {
-        const zapCalldata = buildCalldataForLeverageZapV2(router, exchangeCalldata);
+        const zapCalldata = buildCalldataForLeverageZapV2({controllerId: parseUnits(this._getMarketId(), 0), _minRecv ,router, exchangeCalldata});
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
         const gas = await contract.create_loan_extended.estimateGas(
             _userCollateral,
             _debt,
             range,
             this._getLeverageZapAddress(),
-            [0, parseUnits(this._getMarketId(), 0), _userBorrowed, _minRecv],
+            [],
             zapCalldata,
             { ...this.llamalend.constantOptions }
         );
@@ -88,7 +87,7 @@ export class LeverageV1ZapV2Module extends LeverageZapV2BaseModule {
             _debt,
             range,
             this._getLeverageZapAddress(),
-            [0, parseUnits(this._getMarketId(), 0), _userBorrowed, _minRecv],
+            [],
             zapCalldata,
             { ...this.llamalend.options, gasLimit }
         )).hash;
@@ -96,20 +95,19 @@ export class LeverageV1ZapV2Module extends LeverageZapV2BaseModule {
 
     protected override async _borrowMoreContractCall(
         _userCollateral: bigint,
-        _userBorrowed: bigint,
         _debt: bigint,
         _minRecv: bigint,
         router: string,
         exchangeCalldata: string,
         estimateGas: boolean
     ): Promise<string | TGas> {
-        const zapCalldata = buildCalldataForLeverageZapV2(router, exchangeCalldata);
+        const zapCalldata = buildCalldataForLeverageZapV2({controllerId: parseUnits(this._getMarketId(), 0), _minRecv,router, exchangeCalldata});
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
         const gas = await contract.borrow_more_extended.estimateGas(
             _userCollateral,
             _debt,
             this._getLeverageZapAddress(),
-            [0, parseUnits(this._getMarketId(), 0), _userBorrowed, _minRecv],
+            [],
             zapCalldata,
             { ...this.llamalend.constantOptions }
         );
@@ -121,7 +119,7 @@ export class LeverageV1ZapV2Module extends LeverageZapV2BaseModule {
             _userCollateral,
             _debt,
             this._getLeverageZapAddress(),
-            [0, parseUnits(this._getMarketId(), 0), _userBorrowed, _minRecv],
+            [],
             zapCalldata,
             { ...this.llamalend.options, gasLimit }
         )).hash;
@@ -129,17 +127,16 @@ export class LeverageV1ZapV2Module extends LeverageZapV2BaseModule {
 
     protected override async _repayContractCall(
         _userCollateral: bigint,
-        _userBorrowed: bigint,
         _minRecv: bigint,
         router: string,
         exchangeCalldata: string,
         estimateGas: boolean
     ): Promise<string | TGas> {
-        const zapCalldata = buildCalldataForLeverageZapV2(router, exchangeCalldata);
+        const zapCalldata = buildCalldataForLeverageZapV2({controllerId: parseUnits(this._getMarketId(), 0), _minRecv ,router, exchangeCalldata});
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
         const gas = await contract.repay_extended.estimateGas(
             this._getLeverageZapAddress(),
-            [0, parseUnits(this._getMarketId(), 0), _userCollateral, _userBorrowed, _minRecv],
+            [],
             zapCalldata
         );
         if (estimateGas) return smartNumber(gas);
@@ -148,7 +145,7 @@ export class LeverageV1ZapV2Module extends LeverageZapV2BaseModule {
         const gasLimit = _mulBy1_3(DIGas(gas));
         return (await contract.repay_extended(
             this._getLeverageZapAddress(),
-            [0, parseUnits(this._getMarketId(), 0), _userCollateral, _userBorrowed, _minRecv],
+            [],
             zapCalldata,
             { ...this.llamalend.options, gasLimit }
         )).hash;

package/src/lendMarkets/modules/v2/leverageV2ZapV2.ts

@@ -6,7 +6,7 @@ import {
     _mulBy1_3,
     DIGas,
     MAX_ACTIVE_BAND,
-    buildCalldataForLeverageZapV2Llv2,
+    buildCalldataForLeverageZapV2,
 } from "../../../utils";
 
 export class LeverageV2ZapV2Module extends LeverageZapV2BaseModule {
@@ -66,7 +66,6 @@ export class LeverageV2ZapV2Module extends LeverageZapV2BaseModule {
 
     protected override async _createLoanContractCall(
         _userCollateral: bigint,
-        _userBorrowed: bigint,
         _debt: bigint,
         _minRecv: bigint,
         range: number,
@@ -77,11 +76,9 @@ export class LeverageV2ZapV2Module extends LeverageZapV2BaseModule {
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
         const _for = _getAddress.call(this.llamalend, '');
         const _callbacker = this._getLeverageZapAddress();
-        const zapCalldata = buildCalldataForLeverageZapV2Llv2({
-            op: 'create_loan',
+        const zapCalldata = buildCalldataForLeverageZapV2({
             controllerId: this._getMarketId(),
-            userBorrowed: _userBorrowed,
-            minRecv: _minRecv,
+            _minRecv,
             router,
             exchangeCalldata,
         });
@@ -112,7 +109,6 @@ export class LeverageV2ZapV2Module extends LeverageZapV2BaseModule {
 
     protected override async _borrowMoreContractCall(
         _userCollateral: bigint,
-        _userBorrowed: bigint,
         _debt: bigint,
         _minRecv: bigint,
         router: string,
@@ -122,11 +118,9 @@ export class LeverageV2ZapV2Module extends LeverageZapV2BaseModule {
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
         const _for = _getAddress.call(this.llamalend, '');
         const _callbacker = this._getLeverageZapAddress();
-        const zapCalldata = buildCalldataForLeverageZapV2Llv2({
-            op: 'borrow_more',
+        const zapCalldata = buildCalldataForLeverageZapV2({
             controllerId: this._getMarketId(),
-            userBorrowed: _userBorrowed,
-            minRecv: _minRecv,
+            _minRecv,
             router,
             exchangeCalldata,
         });
@@ -155,7 +149,6 @@ export class LeverageV2ZapV2Module extends LeverageZapV2BaseModule {
 
     protected override async _repayContractCall(
         _userCollateral: bigint,
-        _userBorrowed: bigint,
         _minRecv: bigint,
         router: string,
         exchangeCalldata: string,
@@ -164,12 +157,9 @@ export class LeverageV2ZapV2Module extends LeverageZapV2BaseModule {
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
         const _for = _getAddress.call(this.llamalend, '');
         const _callbacker = this._getLeverageZapAddress();
-        const zapCalldata = buildCalldataForLeverageZapV2Llv2({
-            op: 'repay',
+        const zapCalldata = buildCalldataForLeverageZapV2({
             controllerId: this._getMarketId(),
-            userCollateral: _userCollateral,
-            userBorrowed: _userBorrowed,
-            minRecv: _minRecv,
+            _minRecv,
             router,
             exchangeCalldata,
         });

package/src/utils.ts

@@ -484,43 +484,21 @@ export const calculateFutureLeverage = (
     }
 };
 
-export const buildCalldataForLeverageZapV2 = (routerAddress: string, exchangeCalldata: string): string => {
-    const cleanCalldata = exchangeCalldata.startsWith('0x') ? exchangeCalldata.slice(2) : exchangeCalldata;
-
-    const abiCoder = ethers.AbiCoder.defaultAbiCoder();
-    return abiCoder.encode(
-        ['address', 'bytes'],
-        [routerAddress, '0x' + cleanCalldata]
-    );
-};
-
-//   - create_loan / borrow_more: (uint256 controllerId, uint256 userBorrowed, uint256 minRecv, address router, bytes exchangeCalldata)
-//   - repay:                     (uint256 controllerId, uint256 userCollateral, uint256 userBorrowed, uint256 minRecv, address router, bytes exchangeCalldata)
 export type LeverageZapV2LLv2CalldataParams = {
     controllerId: number | string | bigint;
-    minRecv: bigint;
+    _minRecv: bigint;
     router: string;
     exchangeCalldata: string;
-} & (
-    { op: 'create_loan' | 'borrow_more'; userBorrowed: bigint }
-    | {op: 'repay'; userCollateral: bigint; userBorrowed: bigint }
-    );
+}
 
-export const buildCalldataForLeverageZapV2Llv2 = (params: LeverageZapV2LLv2CalldataParams): string => {
+export const buildCalldataForLeverageZapV2 = (params: LeverageZapV2LLv2CalldataParams): string => {
     const cleanCalldata = params.exchangeCalldata.startsWith('0x') ? params.exchangeCalldata.slice(2) : params.exchangeCalldata;
     const exchangeBytes = '0x' + cleanCalldata;
     const abiCoder = ethers.AbiCoder.defaultAbiCoder();
 
-    if (params.op === 'repay') {
-        return abiCoder.encode(
-            ['uint256', 'uint256', 'uint256', 'uint256', 'address', 'bytes'],
-            [BigInt(params.controllerId), params.userCollateral, params.userBorrowed, params.minRecv, params.router, exchangeBytes]
-        );
-    }
-
     return abiCoder.encode(
-        ['uint256', 'uint256', 'uint256', 'address', 'bytes'],
-        [BigInt(params.controllerId), params.userBorrowed, params.minRecv, params.router, exchangeBytes]
+        ['uint256', 'uint256', 'address', 'bytes'],
+        [BigInt(params.controllerId), params._minRecv, params.router, exchangeBytes]
     );
 };