@curvefi/llamalend-api 1.0.22-beta.2 → 1.0.23

package/.github/workflows/publish.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - feat/hide-pools
+      - feat/init
 
 jobs:
   release:

package/README.md

@@ -1976,4 +1976,350 @@ import llamalend from "@curvefi/llamalend-api";
     //     '344': { stablecoin: '0.0', collateral: '0.206573194768962407' }
     // }
 })()
+```
+
+### LeverageV2 (createLoan, borrowMore, repay) for mintMarket
+```ts
+(async () => {
+    await llamalend.init('JsonRpc', {}, {});
+
+    const mintMarket = llamalend.getMintMarket('cbbtc');
+    console.log(await mintMarket.wallet.balances());
+    // {
+    //     collateral: '100.0',
+    //     borrowed: '2000000.0',
+    //     vaultShares: '0.0',
+    //     gauge: '0'
+    // }
+
+    
+    // - Create Loan -
+
+    //        Creates leveraged position (userCollateral + collateralFromUserBorrowed + leverage_collateral)
+    //                          ^
+    //                          | 
+    //        userCollateral    |        debt               debt + userBorrowed 
+    // user      --->      controller    ---->    leverage_zap   ---->      router
+    //           |              ^                  |   ^   ^                   |
+    //           |              |__________________|   |   |___________________|
+    //           |              leverageCollateral + collateralFromUserBorrowed
+    //           |_____________________________________|                 
+    //                        userBorrowed
+    
+    let userCollateral = 1;
+    let userBorrowed = 1000;
+    let debt = 2000;
+    const range = 10;
+    const slippage = 0.5; // %
+    await mintMarket.leverageV2.maxLeverage(range);
+    // 7.4728229145282742179
+    await mintMarket.leverageV2.createLoanMaxRecv(userCollateral, userBorrowed, range);
+    // {
+    //     maxDebt: '26089.494406081862861214',
+    //     maxTotalCollateral: '9.539182089833411347',
+    //     userCollateral: '1',
+    //     collateralFromUserBorrowed: '0.315221168834966496',
+    //     collateralFromMaxDebt: '8.223960920998444851',
+    //     maxLeverage: '7.25291100528992828612',
+    //     avgPrice: '3172.3757757003568790858'
+    // }
+    await mintMarket.leverageV2.createLoanExpectedCollateral(userCollateral, userBorrowed, debt, slippage);
+    // {
+    //     totalCollateral: '1.946422996710829',
+    //     userCollateral: '1.0',
+    //     collateralFromUserBorrowed: '0.315474332236942984',
+    //     collateralFromDebt: '0.630948664473886',
+    //     leverage: '1.4796358613861877'
+    //     avgPrice: '3169.8299919022623523421'
+    // }
+    await mintMarket.leverageV2.createLoanPriceImpact(userBorrowed, debt);
+    // 0.08944411854377342 %
+    await mintMarket.leverageV2.createLoanMaxRange(userCollateral, userBorrowed, debt);
+    // 50
+    await mintMarket.leverageV2.createLoanBands(userCollateral, userBorrowed, debt, range);
+    // [ 76, 67 ]
+    await mintMarket.leverageV2.createLoanPrices(userCollateral, userBorrowed, debt, range);
+    // [ '1027.977701011670136614', '1187.061409925215211173' ]
+    await mintMarket.leverageV2.createLoanHealth(userCollateral, userBorrowed, debt, range);
+    // 195.8994783042570637
+    await mintMarket.leverageV2.createLoanHealth(userCollateral, userBorrowed, debt, range, false);
+    // 3.2780908310686365
+    await mintMarket.leverageV2.createLoanIsApproved(userCollateral, userBorrowed);
+    // false
+    await mintMarket.leverageV2.createLoanApprove(userCollateral, userBorrowed);
+    // [
+    //     '0xd5491d9f1e9d8ac84b03867494e35b25efad151c597d2fa4211d7bf5d540c98e',
+    //     '0x93565f37ec5be902a824714a30bddc25cf9cd9ed39b4c0e8de61fab44af5bc8c'
+    // ]
+    await mintMarket.leverageV2.createLoanRouteImage(userBorrowed, debt);
+    // 'data:image/svg+xml;base64,PHN2ZyBpZD0ic2Fua2V5UGFyZW50U3ZnIiB4bWxucz...'
+
+    
+    // You must call mintMarket.leverageV2.createLoanExpectedCollateral() with the same args before
+    await mintMarket.leverageV2.createLoan(userCollateral, userBorrowed, debt, range);
+    // 0xeb1b7a92bcb02598f00dc8bbfe8fa3a554e7a2b1ca764e0ee45e2bf583edf731
+
+    await mintMarket.wallet.balances();
+    // {
+    //     collateral: '99.0',
+    //     borrowed: '599000.0',
+    //     vaultShares: '1400000000.0',
+    //     gauge: '0'
+    // }
+    await mintMarket.userState();
+    // {
+    //     collateral: '1.945616160868693648',
+    //     borrowed: '0.0',
+    //     debt: '2000.0',
+    //     N: '10'
+    // }
+    await mintMarket.userBands();
+    // [ 76, 67 ]
+    await mintMarket.userPrices();
+    // [ '1027.977718614028011906', '1187.061430251609195098' ]
+    await mintMarket.userHealth();
+    // 195.8372633833293605
+    await mintMarket.userHealth(false);
+    // 3.2518122092914609
+
+    
+    // - Borrow More -
+
+    //        Updates leveraged position (dCollateral = userCollateral + collateralFromUserBorrowed + leverageCollateral)
+    //                          ^
+    //                          | 
+    //        userCollateral    |        dDebt             dDebt + userBorrowed
+    // user      --->      controller    ---->    leverage_zap   ---->      router
+    //           |              ^                  |   ^   ^                   |
+    //           |              |__________________|   |   |___________________|
+    //           |              leverageCollateral + collateralFromUSerBorrowed
+    //           |_____________________________________|                 
+    //                        userBorrowed
+    
+    userCollateral = 2;
+    userBorrowed = 2000;
+    debt = 10000;
+    await mintMarket.leverageV2.borrowMoreMaxRecv(userCollateral, userBorrowed);
+    // {
+    //     maxDebt: '76182.8497941193262889',
+    //     maxTotalCollateral: '26.639775583730298462',
+    //     userCollateral: '2',
+    //     collateralFromUserBorrowed: '1.677318306610359627',
+    //     collateralFromMaxDebt: '22.962457277119938834',
+    //     avgPrice: '3172.55402418338331369083'
+    // }
+    await mintMarket.leverageV2.borrowMoreExpectedCollateral(userCollateral, userBorrowed, debt, slippage);
+    // {
+    //     totalCollateral: '5.783452104143246413',
+    //     userCollateral: '2.0',
+    //     collateralFromUserBorrowed: '0.630575350690541071',
+    //     collateralFromDebt: '3.152876753452705342'
+    //     avgPrice: '3171.70659749038129067231'
+    // }
+    await mintMarket.leverageV2.borrowMorePriceImpact(userBorrowed, debt);
+    // 0.010784277354269765 %
+    await mintMarket.leverageV2.borrowMoreBands(userCollateral, userBorrowed, debt);
+    // [ 47, 38 ]
+    await mintMarket.leverageV2.borrowMorePrices(userCollateral, userBorrowed, debt);
+    // [ '1560.282474721398939216', '1801.742501325928269008' ]
+    await mintMarket.leverageV2.borrowMoreHealth(userCollateral, userBorrowed, debt, true);
+    // 91.6798951784708552
+    await mintMarket.leverageV2.borrowMoreHealth(userCollateral, userBorrowed, debt, false);
+    // 3.7614279042995641
+    await mintMarket.leverageV2.borrowMoreIsApproved(userCollateral, userBorrowed);
+    // true
+    await mintMarket.leverageV2.borrowMoreApprove(userCollateral, userBorrowed);
+    // []
+    await mintMarket.leverageV2.borrowMoreRouteImage(userBorrowed, debt);
+    // 'data:image/svg+xml;base64,PHN2ZyBpZD0ic2Fua2V5UGFyZW50U3ZnIiB4bWxucz...'
+
+    // You must call mintMarket.leverageV2.borrowMoreExpectedCollateral() with the same args before
+    await mintMarket.leverageV2.borrowMore(userCollateral, userBorrowed, debt, slippage);
+    // 0x6357dd6ea7250d7adb2344cd9295f8255fd8fbbe85f00120fbcd1ebf139e057c
+
+    await mintMarket.wallet.balances();
+    // {
+    //     collateral: '97.0',
+    //     borrowed: '597000.0',
+    //     vaultShares: '1400000000.0',
+    //     gauge: '0'
+    // }
+    await mintMarket.userState();
+    // {
+    //     collateral: '7.727839965845165558',
+    //     borrowed: '0.0',
+    //     debt: '12000.000010193901375446',
+    //     N: '10'
+    // }
+    await mintMarket.userBands();
+    // [ 47, 38 ]
+    await mintMarket.userPrices();
+    // [ '1560.28248267408177179', '1801.742510509320950242' ]
+    await mintMarket.userHealth();
+    // 91.6519475547753288
+    await lendMarket.userHealth(false);
+    // 3.7449386373872907
+    
+    
+    // - Repay -
+
+    
+    //      Deleveraged position (-dDebt = borrowedFromStateCollateral + borrowedFromUSerCollateral + userBorrowed)
+    //          ^
+    //          |       userCollateral
+    //  user ___|__________________________
+    //   |                                 |
+    //   |      |     stateCollateral      ↓  userCollateral + stateCollateral    
+    //   |    controller     -->     leverage_zap    -->      router
+    //   |       ^                      | ^  ^                   |
+    //   |       |______________________| |  |___________________|
+    //   |                                |  borrowedFromStateCollateral
+    //   |________________________________|               +
+    //              userBorrowed             borrowedFromUSerCollateral
+    
+    const stateCollateral = 2;
+    userCollateral = 1;
+    userBorrowed = 1500;
+    await mintMarket.leverageV2.repayExpectedBorrowed(stateCollateral, userCollateral, userBorrowed, slippage);
+    // {
+    //     totalBorrowed: '10998.882838599741571472',
+    //     borrowedFromStateCollateral: '6332.588559066494374648',
+    //     borrowedFromUserCollateral: '3166.294279533247196824',
+    //     userBorrowed: '1500'
+    //     avgPrice: '3166.29427953324743125312'
+    // }
+
+    await mintMarket.leverageV2.repayPriceImpact(stateCollateral, userCollateral);
+    // 0.013150142802201724 %
+    await mintMarket.leverageV2.repayIsFull(stateCollateral, userCollateral, userBorrowed);
+    // false
+    await mintMarket.leverageV2.repayIsAvailable(stateCollateral, userCollateral, userBorrowed);
+    // true
+    await mintMarket.leverageV2.repayBands(stateCollateral, userCollateral, userBorrowed);
+    // [ 199, 190 ]
+    await mintMarket.leverageV2.repayPrices(stateCollateral, userCollateral, userBorrowed);
+    // [ '175.130965754280721633', '202.233191367561902757' ]
+    await mintMarket.leverageV2.repayHealth(stateCollateral, userCollateral, userBorrowed, true);
+    // 1699.6097751079226865
+    await mintMarket.leverageV2.repayHealth(stateCollateral, userCollateral, userBorrowed, false);
+    // 3.4560086962806991
+    await mintMarket.leverageV2.repayIsApproved(userCollateral, userBorrowed);
+    // false
+    await mintMarket.leverageV2.repayApprove(userCollateral, userBorrowed);
+    // ['0xd8a8d3b3f67395e1a4f4d4f95b041edcaf1c9f7bab5eb8a8a767467678295498']
+    await mintMarket.leverageV2.repayRouteImage(stateCollateral, userCollateral);
+    // 'data:image/svg+xml;base64,PHN2ZyBpZD0ic2Fua2V5UGFyZW50U3ZnIiB4bWxucz...'
+
+    // You must call mintMarket.leverageV2.repayExpectedBorrowed() with the same args before
+    await mintMarket.leverageV2.repay(stateCollateral, userCollateral, userBorrowed, slippage);
+    // 0xe48a97fef1c54180a2c7d104d210a95ac1a516fdd22109682179f1582da23a82
+
+    await mintMarket.wallet.balances();
+    // {
+    //     collateral: '96.0',
+    //     borrowed: '595500.0',
+    //     vaultShares: '1400000000.0',
+    //     gauge: '0'
+    // }
+    await mintMarket.userState();
+    // {
+    //     collateral: '5.727839965845165558',
+    //     borrowed: '0.0',
+    //     debt: '992.083214663467727334',
+    //     N: '10'
+    // }
+    await mintMarket.userBands();
+    // [ 199, 190 ]
+    await mintMarket.userPrices();
+    // [ '175.13096689602455189', '202.233192685995210783' ]
+    await mintMarket.userHealth();
+    // 1716.0249924305707883
+    await mintMarket.userHealth(false);
+    // 3.6389352509210336
+})()
+```
+
+### Leverage createLoan all ranges methods for mintMarket
+```ts
+    await llamalend.init('JsonRpc', {}, {}, API_KEY_1INCH);
+    
+    const mintMarket = llamalend.getMintMarket('cbbtc');
+    
+    const userCollateral = 1;
+    const userBorrowed = 1000;
+    const debt = 2000;
+    await mintMarket.leverageV2.createLoanMaxRecvAllRanges(userCollateral, userBorrowed);
+    // {
+    //     '4': {
+    //         maxDebt: '37916.338071504823875251',
+    //         maxTotalCollateral: '13.286983617364703479',
+    //         userCollateral: '1',
+    //         collateralFromUserBorrowed: '0.315728154966395280',
+    //         collateralFromMaxDebt: '11.971255462398308199',
+    //         maxLeverage: '10.09857816541446843865',
+    //         avgPrice: '3167.28167656266072703689'
+    //     },
+    //     '5': {
+    //         maxDebt: '35363.440522143354729759',
+    //         maxTotalCollateral: '12.480961984286574804',
+    //         userCollateral: '1',
+    //         collateralFromUserBorrowed: '0.315728154966395280',
+    //         collateralFromMaxDebt: '11.165233829320179524',
+    //         maxLeverage: '9.48597317551918486951',
+    //         avgPrice: '3167.28167656266072703689'
+    //     },
+    //     '6': {
+    //         maxDebt: '33122.824118147617102062',
+    //         maxTotalCollateral: '11.773536301065561222',
+    //         userCollateral: '1',
+    //         collateralFromUserBorrowed: '0.315728154966395280',
+    //         collateralFromMaxDebt: '10.457808146099165942',
+    //         maxLeverage: '8.94830459971897955699',
+    //         avgPrice: '3167.28167656266072703689'
+    //     },
+    //     '7': {
+    //         maxDebt: '31140.555201395785060968',
+    //         maxTotalCollateral: '11.147678193332270290',
+    //         userCollateral: '1',
+    //         collateralFromUserBorrowed: '0.315728154966395280',
+    //         collateralFromMaxDebt: '9.831950038365875010',
+    //         maxLeverage: '8.47263027035929823721',
+    //         avgPrice: '3167.28167656266072703689'
+    //     },
+    //      
+    //      ...
+    //
+    //     '50': {
+    //         maxDebt: '8122.705063645852013929',
+    //         maxTotalCollateral: '3.880294838047496482',
+    //         userCollateral: '1',
+    //         collateralFromUserBorrowed: '0.315728154966395280',
+    //         collateralFromMaxDebt: '2.564566683081101202',
+    //         maxLeverage: '2.94916151440614435181',
+    //         avgPrice: '3167.28167656266072703689'
+    //     }
+
+    await mintMarket.leverageV2.createLoanBandsAllRanges(userCollateral, userBorrowed, debt);
+    // {
+    //     '4': [ 73, 70 ],
+    //     '5': [ 73, 69 ],
+    //     '6': [ 74, 69 ],
+    //     '7': [ 74, 68 ],
+    //
+    //      ...
+    //
+    //     '50': [ 97, 48 ]
+    // }
+
+    await mintMarket.leverageV2.createLoanPricesAllRanges(userCollateral, userBorrowed, debt);
+    // {
+    //     '4': [ '1073.323292757532604807', '1136.910693647788699808' ],
+    //     '5': [ '1073.323292757532604807', '1153.387660222394333133' ],
+    //     '6': [ '1057.990102860996424743', '1153.387660222394333133' ],
+    //     '7': [ '1057.990102860996424743', '1170.103423414023236507' ],
+    //
+    //      ...
+    //
+    //     '50': [ '759.898822708156242647', '1560.282492846180089068' ]
+    // }
 ```

package/lib/constants/llammas.js

@@ -1,5 +1,5 @@
-import MonetaryPolicyABI from './abis/crvUSD/MonetaryPolicy.json' assert { type: 'json' };
-import MonetaryPolicy2ABI from './abis/crvUSD/MonetaryPolicy2.json' assert { type: 'json' };
+import MonetaryPolicyABI from './abis/crvUSD/MonetaryPolicy.json' with { type: 'json' };
+import MonetaryPolicy2ABI from './abis/crvUSD/MonetaryPolicy2.json' with { type: 'json' };
 import { lowerCaseLlammasAddresses } from "./utils";
 export const LLAMMAS = lowerCaseLlammasAddresses({
     sfrxeth: {

package/lib/external-api.d.ts

@@ -16,5 +16,4 @@ export declare const _getMarketsData: ((network: INetworkName) => Promise<IMarke
 export declare function _getQuoteOdos(this: Llamalend, fromToken: string, toToken: string, _amount: bigint, blacklist: string, pathVizImage: boolean, slippage?: number): Promise<IQuoteOdos>;
 export declare function _getExpectedOdos(this: Llamalend, fromToken: string, toToken: string, _amount: bigint, blacklist: string): Promise<string>;
 export declare function _assembleTxOdos(this: Llamalend, pathId: string): Promise<string>;
-export declare const _getHiddenPools: (() => Promise<IDict<string[]>>) & memoize.Memoized<() => Promise<IDict<string[]>>>;
 export {};

package/lib/external-api.js

@@ -188,9 +188,3 @@ export function _assembleTxOdos(pathId) {
         return _assembleTxOdosMemoized(this.constants.ALIASES.leverage_zap, pathId);
     });
 }
-export const _getHiddenPools = memoize(() => fetch(`https://api.curve.finance/api/getHiddenPools`)
-    .then((r) => (r.json()))
-    .then((json) => json.data), {
-    promise: true,
-    maxAge: 5 * 60 * 1000, // 5m
-});

package/lib/lendMarkets/LendMarketTemplate.js

@@ -11,7 +11,7 @@ import memoize from "memoizee";
 import BigNumber from "bignumber.js";
 import { _getAddress, parseUnits, BN, toBN, fromBN, getBalances, _ensureAllowance, ensureAllowance, hasAllowance, ensureAllowanceEstimateGas, _cutZeros, formatUnits, formatNumber, MAX_ALLOWANCE, MAX_ACTIVE_BAND, _mulBy1_3, _getUsdRate, DIGas, smartNumber, } from "../utils.js";
 import { _getExpectedOdos, _getQuoteOdos, _assembleTxOdos, _getUserCollateral, _getMarketsData } from "../external-api.js";
-import ERC20Abi from '../constants/abis/ERC20.json' assert { type: 'json' };
+import ERC20Abi from '../constants/abis/ERC20.json' with { type: 'json' };
 import { cacheKey, cacheStats } from "../cache/index.js";
 const DAY = 86400;
 const WEEK = 7 * DAY;

package/lib/llamalend.d.ts

@@ -76,6 +76,5 @@ declare class Llamalend implements ILlamalend {
     formatUnits(value: BigNumberish, unit?: string | Numeric): string;
     parseUnits(value: string, unit?: string | Numeric): bigint;
     updateFeeData(): Promise<void>;
-    _filterHiddenPools(pools: IDict<ILlamma>): Promise<IDict<ILlamma>>;
 }
 export { Llamalend };

package/lib/llamalend.js

@@ -10,39 +10,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { ethers, Contract, AbstractProvider } from "ethers";
 import { Provider as MulticallProvider, Contract as MulticallContract } from '@curvefi/ethcall';
 // OneWayMarket ABIs
-import OneWayLendingFactoryABI from "./constants/abis/OneWayLendingFactoryABI.json" assert { type: 'json' };
-import ERC20ABI from './constants/abis/ERC20.json' assert { type: 'json' };
-import ERC4626ABI from './constants/abis/ERC4626.json' assert { type: 'json' };
-import LlammaABI from './constants/abis/Llamma.json' assert { type: 'json' };
-import ControllerABI from './constants/abis/Controller.json' assert { type: 'json' };
-import MonetaryPolicyABI from './constants/abis/MonetaryPolicy.json' assert { type: 'json' };
-import VaultABI from './constants/abis/Vault.json' assert { type: 'json' };
-import GaugeABI from './constants/abis/GaugeV5.json' assert { type: 'json' };
-import SidechainGaugeABI from './constants/abis/SidechainGauge.json' assert { type: 'json' };
-import GaugeControllerABI from './constants/abis/GaugeController.json' assert { type: 'json' };
-import GaugeFactoryMainnetABI from './constants/abis/GaugeFactoryMainnet.json' assert { type: 'json' };
-import GaugeFactorySidechainABI from './constants/abis/GaugeFactorySidechain.json' assert { type: 'json' };
-import MinterABI from './constants/abis/Minter.json' assert { type: 'json' };
-import LeverageZapABI from './constants/abis/LeverageZap.json' assert { type: 'json' };
-import gasOracleABI from './constants/abis/gas_oracle_optimism.json' assert { type: 'json' };
-import gasOracleBlobABI from './constants/abis/gas_oracle_optimism_blob.json' assert { type: 'json' };
+import OneWayLendingFactoryABI from "./constants/abis/OneWayLendingFactoryABI.json" with { type: 'json' };
+import ERC20ABI from './constants/abis/ERC20.json' with { type: 'json' };
+import ERC4626ABI from './constants/abis/ERC4626.json' with { type: 'json' };
+import LlammaABI from './constants/abis/Llamma.json' with { type: 'json' };
+import ControllerABI from './constants/abis/Controller.json' with { type: 'json' };
+import MonetaryPolicyABI from './constants/abis/MonetaryPolicy.json' with { type: 'json' };
+import VaultABI from './constants/abis/Vault.json' with { type: 'json' };
+import GaugeABI from './constants/abis/GaugeV5.json' with { type: 'json' };
+import SidechainGaugeABI from './constants/abis/SidechainGauge.json' with { type: 'json' };
+import GaugeControllerABI from './constants/abis/GaugeController.json' with { type: 'json' };
+import GaugeFactoryMainnetABI from './constants/abis/GaugeFactoryMainnet.json' with { type: 'json' };
+import GaugeFactorySidechainABI from './constants/abis/GaugeFactorySidechain.json' with { type: 'json' };
+import MinterABI from './constants/abis/Minter.json' with { type: 'json' };
+import LeverageZapABI from './constants/abis/LeverageZap.json' with { type: 'json' };
+import gasOracleABI from './constants/abis/gas_oracle_optimism.json' with { type: 'json' };
+import gasOracleBlobABI from './constants/abis/gas_oracle_optimism_blob.json' with { type: 'json' };
 // crvUSD ABIs
-import llammaABI from "./constants/abis/crvUSD/llamma.json" assert { type: 'json' };
-import controllerABI from "./constants/abis/crvUSD/controller.json" assert { 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 PegKeeper from "./constants/abis/crvUSD/PegKeeper.json" assert { type: 'json' };
-import FactoryABI from "./constants/abis/crvUSD/Factory.json" assert { type: 'json' };
-import MonetaryPolicy2ABI from "./constants/abis/crvUSD/MonetaryPolicy2.json" assert { type: 'json' };
-import HealthCalculatorZapABI from "./constants/abis/crvUSD/HealthCalculatorZap.json" assert { type: 'json' };
-import LeverageZapCrvUSDABI from "./constants/abis/crvUSD/LeverageZap.json" assert { type: 'json' };
-import DeleverageZapABI from "./constants/abis/crvUSD/DeleverageZap.json" assert { type: 'json' };
+import PegKeeper from "./constants/abis/crvUSD/PegKeeper.json" with { type: 'json' };
+import FactoryABI from "./constants/abis/crvUSD/Factory.json" with { type: 'json' };
+import MonetaryPolicy2ABI from "./constants/abis/crvUSD/MonetaryPolicy2.json" with { type: 'json' };
+import HealthCalculatorZapABI from "./constants/abis/crvUSD/HealthCalculatorZap.json" with { type: 'json' };
+import LeverageZapCrvUSDABI from "./constants/abis/crvUSD/LeverageZap.json" with { type: 'json' };
+import DeleverageZapABI from "./constants/abis/crvUSD/DeleverageZap.json" with { type: 'json' };
 import { ALIASES_ETHEREUM, ALIASES_OPTIMISM, ALIASES_POLYGON, ALIASES_FANTOM, ALIASES_AVALANCHE, ALIASES_ARBITRUM, ALIASES_XDAI, ALIASES_MOONBEAM, ALIASES_AURORA, ALIASES_KAVA, ALIASES_CELO, ALIASES_ZKSYNC, ALIASES_BASE, ALIASES_BSC, ALIASES_FRAXTAL, ALIASES_SONIC, } from "./constants/aliases.js";
 import { COINS_ETHEREUM, COINS_OPTIMISM, COINS_POLYGON, COINS_FANTOM, COINS_AVALANCHE, COINS_ARBITRUM, COINS_XDAI, COINS_MOONBEAM, COINS_AURORA, COINS_KAVA, COINS_CELO, COINS_ZKSYNC, COINS_BASE, COINS_BSC, COINS_FRAXTAL, COINS_SONIC, } from "./constants/coins.js";
 import { LLAMMAS } from "./constants/llammas";
 import { L2Networks } from "./constants/L2Networks.js";
 import { createCall, handleMultiCallResponse } from "./utils.js";
 import { cacheKey, cacheStats } from "./cache/index.js";
-import { _getHiddenPools, _getMarketsData } from "./external-api.js";
+import { _getMarketsData } from "./external-api.js";
 import { extractDecimals } from "./constants/utils.js";
 export const NETWORK_CONSTANTS = {
     1: {
@@ -388,7 +388,7 @@ class Llamalend {
             this.options = {};
             this.constants = {
                 ONE_WAY_MARKETS: {},
-                LLAMMAS: yield this._filterHiddenPools(LLAMMAS),
+                LLAMMAS: Object.assign({}, LLAMMAS),
                 COINS: {},
                 DECIMALS: {},
                 NETWORK_NAME: 'ethereum',
@@ -455,7 +455,7 @@ class Llamalend {
             }
             const network = yield this.provider.getNetwork();
             this.chainId = Number(network.chainId) === 133 || Number(network.chainId) === 31337 ? 1 : Number(network.chainId);
-            console.log("CURVE-LENDING-JS IS CONNECTED TO NETWORK:", { name: network.name.toUpperCase(), chainId: Number(this.chainId) });
+            console.log("CURVE-LLAMALEND-JS IS CONNECTED TO NETWORK:", { name: network.name.toUpperCase(), chainId: Number(this.chainId) });
             if (this.chainId === 42161) {
                 this.constantOptions = { gasLimit: 1125899906842624 }; // https://arbiscan.io/chart/gaslimit
             }
@@ -584,7 +584,7 @@ class Llamalend {
                             controller_address: controllers[i],
                             monetary_policy_address,
                             collateral_address: is_eth ? "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" : collaterals[i],
-                            leverage_zap: "0x0000000000000000000000000000000000000000",
+                            leverage_zap: this.constants.ALIASES.leverage_zap,
                             deleverage_zap: "0x0000000000000000000000000000000000000000",
                             collateral_symbol: is_eth ? "ETH" : collateral_symbol,
                             collateral_decimals,
@@ -676,11 +676,5 @@ class Llamalend {
             }
         });
     }
-    _filterHiddenPools(pools) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const hiddenPools = (yield _getHiddenPools())[this.constants.NETWORK_NAME] || [];
-            return Object.fromEntries(Object.entries(pools).filter(([id]) => !hiddenPools.includes(id)));
-        });
-    }
 }
 export { Llamalend };

package/lib/mintMarkets/MintMarketTemplate.d.ts

@@ -1,6 +1,7 @@
 import memoize from "memoizee";
 import type { Llamalend } from "../llamalend.js";
 import { IDict, TGas } from "../interfaces";
+import { ILeverageV2 } from "./interfaces/leverage.js";
 export declare class MintMarketTemplate {
     private llamalend;
     id: string;
@@ -112,6 +113,7 @@ export declare class MintMarketTemplate {
             createLoan: (collateral: number | string, debt: number | string, range: number, slippage?: number) => Promise<TGas>;
         };
     };
+    leverageV2: ILeverageV2;
     deleverage: {
         repayStablecoins: (collateral: number | string) => Promise<{
             stablecoins: string;
@@ -130,7 +132,21 @@ export declare class MintMarketTemplate {
         };
     };
     constructor(id: string, llamalend: Llamalend);
-    private statsParameters;
+    statsParameters: (() => Promise<{
+        fee: string;
+        admin_fee: string;
+        rate: string;
+        future_rate: string;
+        liquidation_discount: string;
+        loan_discount: string;
+    }>) & memoize.Memoized<() => Promise<{
+        fee: string;
+        admin_fee: string;
+        rate: string;
+        future_rate: string;
+        liquidation_discount: string;
+        loan_discount: string;
+    }>>;
     private statsBalances;
     private statsMaxMinBands;
     private statsActiveBand;
@@ -176,7 +192,7 @@ export declare class MintMarketTemplate {
     calcBandPrices(n: number): Promise<[string, string]>;
     calcRangePct(range: number): string;
     private walletBalances;
-    private _checkRange;
+    _checkRange(range: number): void;
     createLoanMaxRecv(collateral: number | string, range: number): Promise<string>;
     createLoanMaxRecvAllRanges: ((collateral: number | string) => Promise<{
         [index: number]: string;
@@ -186,8 +202,8 @@ export declare class MintMarketTemplate {
     getMaxRange(collateral: number | string, debt: number | string): Promise<number>;
     private _calcN1;
     private _calcN1AllRanges;
-    private _getPrices;
-    private _calcPrices;
+    _getPrices(_n2: bigint, _n1: bigint): Promise<string[]>;
+    _calcPrices(_n2: bigint, _n1: bigint): Promise<[string, string]>;
     private _createLoanBands;
     private _createLoanBandsAllRanges;
     createLoanBands(collateral: number | string, debt: number | string, range: number): Promise<[number, number]>;
@@ -309,4 +325,5 @@ export declare class MintMarketTemplate {
     private _deleverageRepay;
     private deleverageRepayEstimateGas;
     private deleverageRepay;
+    getLlamalend(): Llamalend;
 }

package/lib/mintMarkets/MintMarketTemplate.js

@@ -11,6 +11,7 @@ import memoize from "memoizee";
 import BigNumber from "bignumber.js";
 import { _getAddress, parseUnits, BN, toBN, fromBN, getBalances, ensureAllowance, hasAllowance, ensureAllowanceEstimateGas, isEth, _cutZeros, formatUnits, smartNumber, MAX_ALLOWANCE, MAX_ACTIVE_BAND, _mulBy1_3, DIGas, } from "../utils";
 import { _getUserCollateralCrvUsd } from "../external-api.js";
+import { LeverageV2Module } from "./modules";
 export class MintMarketTemplate {
     constructor(id, llamalend) {
         var _a;
@@ -312,6 +313,54 @@ export class MintMarketTemplate {
                 createLoan: this.leverageCreateLoanEstimateGas.bind(this),
             },
         };
+        const leverageV2 = new LeverageV2Module(this);
+        this.leverageV2 = {
+            hasLeverage: leverageV2.hasLeverage,
+            maxLeverage: leverageV2.maxLeverage,
+            createLoanMaxRecv: leverageV2.leverageCreateLoanMaxRecv,
+            createLoanMaxRecvAllRanges: leverageV2.leverageCreateLoanMaxRecvAllRanges,
+            createLoanExpectedCollateral: leverageV2.leverageCreateLoanExpectedCollateral,
+            createLoanPriceImpact: leverageV2.leverageCreateLoanPriceImpact,
+            createLoanMaxRange: leverageV2.leverageCreateLoanMaxRange,
+            createLoanBands: leverageV2.leverageCreateLoanBands,
+            createLoanBandsAllRanges: leverageV2.leverageCreateLoanBandsAllRanges,
+            createLoanPrices: leverageV2.leverageCreateLoanPrices,
+            createLoanPricesAllRanges: leverageV2.leverageCreateLoanPricesAllRanges,
+            createLoanHealth: leverageV2.leverageCreateLoanHealth,
+            createLoanIsApproved: leverageV2.leverageCreateLoanIsApproved,
+            createLoanApprove: leverageV2.leverageCreateLoanApprove,
+            createLoanRouteImage: leverageV2.leverageCreateLoanRouteImage,
+            createLoan: leverageV2.leverageCreateLoan,
+            borrowMoreMaxRecv: leverageV2.leverageBorrowMoreMaxRecv,
+            borrowMoreExpectedCollateral: leverageV2.leverageBorrowMoreExpectedCollateral,
+            borrowMorePriceImpact: leverageV2.leverageBorrowMorePriceImpact,
+            borrowMoreBands: leverageV2.leverageBorrowMoreBands,
+            borrowMorePrices: leverageV2.leverageBorrowMorePrices,
+            borrowMoreHealth: leverageV2.leverageBorrowMoreHealth,
+            borrowMoreIsApproved: leverageV2.leverageCreateLoanIsApproved,
+            borrowMoreApprove: leverageV2.leverageCreateLoanApprove,
+            borrowMoreRouteImage: leverageV2.leverageBorrowMoreRouteImage,
+            borrowMore: leverageV2.leverageBorrowMore,
+            repayExpectedBorrowed: leverageV2.leverageRepayExpectedBorrowed,
+            repayPriceImpact: leverageV2.leverageRepayPriceImpact,
+            repayIsFull: leverageV2.leverageRepayIsFull,
+            repayIsAvailable: leverageV2.leverageRepayIsAvailable,
+            repayBands: leverageV2.leverageRepayBands,
+            repayPrices: leverageV2.leverageRepayPrices,
+            repayHealth: leverageV2.leverageRepayHealth,
+            repayIsApproved: leverageV2.leverageRepayIsApproved,
+            repayApprove: leverageV2.leverageRepayApprove,
+            repayRouteImage: leverageV2.leverageRepayRouteImage,
+            repay: leverageV2.leverageRepay,
+            estimateGas: {
+                createLoanApprove: leverageV2.leverageCreateLoanApproveEstimateGas,
+                createLoan: leverageV2.leverageCreateLoanEstimateGas,
+                borrowMoreApprove: leverageV2.leverageCreateLoanApproveEstimateGas,
+                borrowMore: leverageV2.leverageBorrowMoreEstimateGas,
+                repayApprove: leverageV2.leverageRepayApproveEstimateGas,
+                repay: leverageV2.leverageRepayEstimateGas,
+            },
+        };
         this.deleverage = {
             repayStablecoins: this.deleverageRepayStablecoins.bind(this),
             getRouteName: this.deleverageGetRouteName.bind(this),
@@ -1668,4 +1717,7 @@ export class MintMarketTemplate {
             return yield this._deleverageRepay(collateral, slippage, false);
         });
     }
+    getLlamalend() {
+        return this.llamalend;
+    }
 }