@curvefi/llamalend-api 2.0.28 → 2.1.1

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

@@ -1,3 +1,202 @@
 import { LeverageZapV2BaseModule } from "../common/leverageZapV2Base.js";
+import type { TGas } from "../../../interfaces";
+import {
+    _getAddress,
+    smartNumber,
+    _mulBy1_3,
+    DIGas,
+    MAX_ACTIVE_BAND,
+    buildCalldataForLeverageZapV2Llv2,
+} from "../../../utils";
 
-export class LeverageV2ZapV2Module extends LeverageZapV2BaseModule {}
+export class LeverageV2ZapV2Module extends LeverageZapV2BaseModule {
+    protected override _getLeverageZapAddress(): string {
+        return this.llamalend.constants.ALIASES.leverage_zap_v2_llv2;
+    }
+
+    protected override async _getMaxAdditionalBorrowable(
+        _stateCollateral: bigint, _dCollateral: bigint, _N: bigint, _stateDebt: bigint, address: string
+    ): Promise<bigint> {
+        return await this.llamalend.contracts[this.market.addresses.controller].contract.max_borrowable(
+            _dCollateral, _N, address, this.llamalend.constantOptions
+        );
+    }
+
+    protected override async _calcDebtN1Call(_collateral: bigint, _debt: bigint, N: number | bigint): Promise<bigint> {
+        const address = _getAddress.call(this.llamalend, '');
+        return await this.llamalend.contracts[this.market.addresses.controller].contract.calculate_debt_n1(
+            _collateral, _debt, N, address, this.llamalend.constantOptions
+        );
+    }
+
+    protected override _calcDebtN1MulticallCall(_collateral: bigint, _debt: bigint, N: number | bigint): any {
+        const address = _getAddress.call(this.llamalend, '');
+        return this.llamalend.contracts[this.market.addresses.controller].multicallContract.calculate_debt_n1(
+            _collateral, _debt, N, address
+        );
+    }
+
+    protected override async _calcCreateLoanHealthCall(
+        _collateral: bigint, _dDebt: bigint, N: number | bigint, full: boolean
+    ): Promise<bigint> {
+        const _for = _getAddress.call(this.llamalend, '');
+        return await this.llamalend.contracts[this.market.addresses.controller].contract.create_loan_health_preview(
+            _collateral, _dDebt, N, _for, full, this.llamalend.constantOptions
+        ) as bigint;
+    }
+
+    protected override async _calcBorrowMoreHealthCall(
+        _collateral: bigint, _dDebt: bigint, _N: number | bigint, user: string, full: boolean
+    ): Promise<bigint> {
+        return await this.llamalend.contracts[this.market.addresses.controller].contract.borrow_more_health_preview(
+            _collateral, _dDebt, user, full, this.llamalend.constantOptions
+        ) as bigint;
+    }
+
+    protected override async _calcRepayHealthCall(
+        _dCollateral: bigint, _dDebt: bigint, _N: number | bigint, user: string, full: boolean
+    ): Promise<bigint> {
+        const _dCollateralAbs = _dCollateral < BigInt(0) ? -_dCollateral : _dCollateral;
+        const _dDebtAbs = _dDebt < BigInt(0) ? -_dDebt : _dDebt;
+        const _shrink = false;
+        return await this.llamalend.contracts[this.market.addresses.controller].contract.repay_health_preview(
+            _dCollateralAbs, _dDebtAbs, user, _shrink, full, this.llamalend.constantOptions
+        ) as bigint;
+    }
+
+    protected override async _createLoanContractCall(
+        _userCollateral: bigint,
+        _userBorrowed: bigint,
+        _debt: bigint,
+        _minRecv: bigint,
+        range: number,
+        router: string,
+        exchangeCalldata: string,
+        estimateGas: boolean
+    ): Promise<string | TGas> {
+        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',
+            controllerId: this._getMarketId(),
+            userBorrowed: _userBorrowed,
+            minRecv: _minRecv,
+            router,
+            exchangeCalldata,
+        });
+
+        const gas = await contract.create_loan.estimateGas(
+            _userCollateral,
+            _debt,
+            range,
+            _for,
+            _callbacker,
+            zapCalldata,
+            { ...this.llamalend.constantOptions }
+        );
+        if (estimateGas) return smartNumber(gas);
+
+        await this.llamalend.updateFeeData();
+        const gasLimit = _mulBy1_3(DIGas(gas));
+        return (await contract.create_loan(
+            _userCollateral,
+            _debt,
+            range,
+            _for,
+            _callbacker,
+            zapCalldata,
+            { ...this.llamalend.options, gasLimit }
+        )).hash;
+    }
+
+    protected override async _borrowMoreContractCall(
+        _userCollateral: bigint,
+        _userBorrowed: bigint,
+        _debt: bigint,
+        _minRecv: bigint,
+        router: string,
+        exchangeCalldata: string,
+        estimateGas: boolean
+    ): Promise<string | TGas> {
+        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',
+            controllerId: this._getMarketId(),
+            userBorrowed: _userBorrowed,
+            minRecv: _minRecv,
+            router,
+            exchangeCalldata,
+        });
+
+        const gas = await contract.borrow_more.estimateGas(
+            _userCollateral,
+            _debt,
+            _for,
+            _callbacker,
+            zapCalldata,
+            { ...this.llamalend.constantOptions }
+        );
+        if (estimateGas) return smartNumber(gas);
+
+        await this.llamalend.updateFeeData();
+        const gasLimit = _mulBy1_3(DIGas(gas));
+        return (await contract.borrow_more(
+            _userCollateral,
+            _debt,
+            _for,
+            _callbacker,
+            zapCalldata,
+            { ...this.llamalend.options, gasLimit }
+        )).hash;
+    }
+
+    protected override async _repayContractCall(
+        _userCollateral: bigint,
+        _userBorrowed: bigint,
+        _minRecv: bigint,
+        router: string,
+        exchangeCalldata: string,
+        estimateGas: boolean
+    ): Promise<string | TGas> {
+        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',
+            controllerId: this._getMarketId(),
+            userCollateral: _userCollateral,
+            userBorrowed: _userBorrowed,
+            minRecv: _minRecv,
+            router,
+            exchangeCalldata,
+        });
+
+        const _walletDDebt = BigInt(0);
+
+        const gas = await contract.repay.estimateGas(
+            _walletDDebt,
+            _for,
+            MAX_ACTIVE_BAND,
+            _callbacker,
+            zapCalldata,
+            false,
+            { ...this.llamalend.constantOptions }
+        );
+        if (estimateGas) return smartNumber(gas);
+
+        await this.llamalend.updateFeeData();
+        const gasLimit = _mulBy1_3(DIGas(gas));
+        return (await contract.repay(
+            _walletDDebt,
+            _for,
+            MAX_ACTIVE_BAND,
+            _callbacker,
+            zapCalldata,
+            false,
+            { ...this.llamalend.options, gasLimit }
+        )).hash;
+    }
+}

package/src/llamalend.ts

@@ -288,8 +288,10 @@ class Llamalend implements ILlamalend {
             this.setContract(this.constants.ALIASES['one_way_factory_v2'], OneWayLendingFactoryV2ABI);
         }
         this.setContract(this.constants.ALIASES['gauge_controller'], GaugeControllerABI);
-        this.setContract(this.constants.ALIASES['leverage_zap'], LeverageZapABI);
+        this.setContract(this.constants.ALIASES['leverage_zap_deprecated'], LeverageZapABI);
         this.setContract(this.constants.ALIASES['leverage_zap_v2'], LeverageZapABI);
+        this.setContract(this.constants.ALIASES['leverage_zap_v2_llv2'], LeverageZapABI);
+
         if (this.chainId === 1) {
             this.setContract(this.constants.ALIASES.minter, MinterABI);
             this.setContract(this.constants.ALIASES.gauge_factory, GaugeFactoryMainnetABI);

package/src/mintMarkets/MintMarketTemplate.ts

@@ -1136,6 +1136,7 @@ export class MintMarketTemplate {
     // ---------------- REPAY ----------------
 
     private async _repayBands(debt: number | string, address: string): Promise<[bigint, bigint]> {
+        address = _getAddress.call(this.llamalend, address);
         const { _collateral: _currentCollateral, _debt: _currentDebt, _stablecoin: _currentStablecoin } = await this._userState(address);
         if (_currentDebt === BigInt(0)) throw Error(`Loan for ${address} does not exist`);
 

package/src/mintMarkets/fetch/fetchMintMarkets.ts

@@ -3,7 +3,7 @@ import { _getCrvUsdMarketsData } from "../../external-api.js";
 import ERC20ABI from '../../constants/abis/ERC20.json' with {type: 'json'};
 import llammaABI from "../../constants/abis/crvUSD/llamma.json" with {type: 'json'};
 import controllerABI from "../../constants/abis/crvUSD/controller.json" with {type: 'json'};
-import controllerV2ABI from "../../constants/abis/crvUSD/controller_v2.json";
+import controllerV2ABI from "../../constants/abis/crvUSD/controller_v2.json" with {type: 'json'};
 import FactoryABI from "../../constants/abis/crvUSD/Factory.json" with {type: 'json'};
 import {extractDecimals} from "../../constants/utils.js";
 import {handleMultiCallResponse} from "../../utils.js";

package/src/utils.ts

@@ -486,7 +486,7 @@ 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'],
@@ -494,3 +494,33 @@ export const buildCalldataForLeverageZapV2 = (routerAddress: string, exchangeCal
     );
 };
 
+//   - 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;
+    router: string;
+    exchangeCalldata: string;
+} & (
+    { op: 'create_loan' | 'borrow_more'; userBorrowed: bigint }
+    | {op: 'repay'; userCollateral: bigint; userBorrowed: bigint }
+    );
+
+export const buildCalldataForLeverageZapV2Llv2 = (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]
+    );
+};
+