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

package/package.json

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

package/src/external-api.ts

@@ -209,13 +209,3 @@ const _assembleTxOdosMemoized = memoize(
 export async function _assembleTxOdos(this: Llamalend, pathId: string): Promise<string> {
     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 as {data: IDict<string[]>}).data),
-    {
-        promise: true,
-        maxAge: 5 * 60 * 1000, // 5m
-    }
-)

package/src/llamalend.ts

@@ -79,7 +79,7 @@ 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: { [index: number]: any } = {
@@ -244,7 +244,7 @@ class Llamalend implements ILlamalend {
         this.options = {};
         this.constants = {
             ONE_WAY_MARKETS: {},
-            LLAMMAS: await this._filterHiddenPools(LLAMMAS),
+            LLAMMAS: {...LLAMMAS},
             COINS: {},
             DECIMALS: {},
             NETWORK_NAME: 'ethereum',
@@ -309,7 +309,7 @@ class Llamalend implements ILlamalend {
 
         const network = await this.provider.getNetwork();
         this.chainId = Number(network.chainId) === 133 || Number(network.chainId) === 31337 ? 1 : Number(network.chainId) as IChainId;
-        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
@@ -455,7 +455,7 @@ class Llamalend implements ILlamalend {
                         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,
@@ -797,11 +797,6 @@ class Llamalend implements ILlamalend {
                 feeData.maxPriorityFeePerGas;
         }
     }
-
-    async _filterHiddenPools(pools: IDict<ILlamma>): Promise<IDict<ILlamma>> {
-        const hiddenPools = (await _getHiddenPools())[this.constants.NETWORK_NAME] || [];
-        return Object.fromEntries(Object.entries(pools).filter(([id]) => !hiddenPools.includes(id))) as IDict<ILlamma>;
-    }
 }
 
 export { Llamalend };

package/src/mintMarkets/MintMarketTemplate.ts

@@ -22,6 +22,8 @@ import {
 } from "../utils";
 import {IDict, TGas} from "../interfaces";
 import {_getUserCollateralCrvUsd} from "../external-api.js";
+import { ILeverageV2 } from "./interfaces/leverage.js";
+import { LeverageV2Module } from "./modules";
 
 
 export class MintMarketTemplate {
@@ -107,6 +109,7 @@ export 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, routeIdx: number }>,
         getRouteName: (routeIdx: number) => Promise<string>,
@@ -201,6 +204,62 @@ 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),
@@ -219,7 +278,7 @@ export class MintMarketTemplate {
 
     // ---------------- STATS ----------------
 
-    private statsParameters = memoize(async (): Promise<{
+    public statsParameters = memoize(async (): Promise<{
         fee: string, // %
         admin_fee: string, // %
         rate: string, // %
@@ -591,7 +650,7 @@ export class MintMarketTemplate {
 
     // ---------------- CREATE LOAN ----------------
 
-    private _checkRange(range: number): void {
+    public _checkRange(range: number): void {
         if (range < this.minBands) throw Error(`range must be >= ${this.minBands}`);
         if (range > this.maxBands) throw Error(`range must be <= ${this.maxBands}`);
     }
@@ -646,7 +705,7 @@ export class MintMarketTemplate {
         return await this.llamalend.multicallProvider.all(calls) as bigint[];
     }
 
-    private async _getPrices(_n2: bigint, _n1: bigint): Promise<string[]> {
+    public async _getPrices(_n2: bigint, _n1: bigint): Promise<string[]> {
         const contract = this.llamalend.contracts[this.address].multicallContract;
         return (await this.llamalend.multicallProvider.all([
             contract.p_oracle_down(_n2),
@@ -654,7 +713,7 @@ export class MintMarketTemplate {
         ]) as bigint[]).map((_p) => formatUnits(_p));
     }
 
-    private async _calcPrices(_n2: bigint, _n1: bigint): Promise<[string, string]> {
+    public async _calcPrices(_n2: bigint, _n1: bigint): Promise<[string, string]> {
         return [await this.calcTickPrice(Number(_n2) + 1), await this.calcTickPrice(Number(_n1))];
     }
 
@@ -1786,4 +1845,8 @@ export class MintMarketTemplate {
         this._checkDeleverageZap();
         return await this._deleverageRepay(collateral, slippage, false) as string;
     }
+
+    public getLlamalend(): Llamalend {
+        return this.llamalend;
+    }
 }

package/src/mintMarkets/interfaces/leverage.ts

@@ -0,0 +1,104 @@
+import {IDict, TAmount, TGas} from "../../interfaces";
+
+export interface ILeverageV2 {
+    hasLeverage: () => boolean,
+
+    maxLeverage: (N: number) => Promise<string>,
+
+    createLoanMaxRecv: (userCollateral: TAmount, userBorrowed: TAmount, range: number) =>
+        Promise<{
+            maxDebt: string,
+            maxTotalCollateral: string,
+            userCollateral: string,
+            collateralFromUserBorrowed: string,
+            collateralFromMaxDebt: string,
+            maxLeverage: string,
+            avgPrice: string,
+        }>,
+    createLoanMaxRecvAllRanges: (userCollateral: TAmount, userBorrowed: TAmount) =>
+        Promise<IDict<{
+            maxDebt: string,
+            maxTotalCollateral: string,
+            userCollateral: string,
+            collateralFromUserBorrowed: string,
+            collateralFromMaxDebt: string,
+            maxLeverage: string,
+            avgPrice: string,
+        }>>,
+    createLoanExpectedCollateral: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, slippage?: number) =>
+        Promise<{
+            totalCollateral: string,
+            userCollateral: string,
+            collateralFromUserBorrowed: string,
+            collateralFromDebt: string,
+            leverage: string,
+            avgPrice: string
+        }>,
+    createLoanPriceImpact: (userBorrowed: TAmount, debt: TAmount) => Promise<string>,
+    createLoanMaxRange: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount) => Promise<number>,
+    createLoanBands: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, range: number) => Promise<[number, number]>,
+    createLoanBandsAllRanges: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount) => Promise<IDict<[number, number] | null>>,
+    createLoanPrices: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, range: number) => Promise<string[]>,
+    createLoanPricesAllRanges: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount) => Promise<IDict<[string, string] | null>>,
+    createLoanHealth: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, range: number, full?: boolean) => Promise<string>,
+    createLoanIsApproved: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<boolean>,
+    createLoanApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<string[]>,
+    createLoanRouteImage: (userBorrowed: TAmount, debt: TAmount) => Promise<string>,
+    createLoan: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, range: number, slippage?: number) => Promise<string>,
+
+    borrowMoreMaxRecv: (userCollateral: TAmount, userBorrowed: TAmount, address?: string) =>
+        Promise<{
+            maxDebt: string,
+            maxTotalCollateral: string,
+            userCollateral: string,
+            collateralFromUserBorrowed: string,
+            collateralFromMaxDebt: string,
+            avgPrice: string,
+        }>,
+    borrowMoreExpectedCollateral: (userCollateral: TAmount, userBorrowed: TAmount, dDebt: TAmount, slippage?: number, address?: string) =>
+        Promise<{
+            totalCollateral: string,
+            userCollateral: string,
+            collateralFromUserBorrowed: string,
+            collateralFromDebt: string,
+            avgPrice: string
+        }>,
+    borrowMorePriceImpact: (userBorrowed: TAmount, dDebt: TAmount, address?: string) => Promise<string>,
+    borrowMoreBands: (userCollateral: TAmount, userBorrowed: TAmount, dDebt: TAmount, address?: string) => Promise<[number, number]>,
+    borrowMorePrices: (userCollateral: TAmount, userBorrowed: TAmount, dDebt: TAmount, address?: string) => Promise<string[]>,
+    borrowMoreHealth: (userCollateral: TAmount, userBorrowed: TAmount, dDebt: TAmount, full?: boolean, address?: string) => Promise<string>,
+    borrowMoreIsApproved: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<boolean>,
+    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>,
+
+    repayExpectedBorrowed: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, slippage?: number) =>
+        Promise<{
+            totalBorrowed: string,
+            borrowedFromStateCollateral: string,
+            borrowedFromUserCollateral: string,
+            userBorrowed: string,
+            avgPrice: string
+        }>,
+    repayPriceImpact: (stateCollateral: TAmount, userCollateral: TAmount) => Promise<string>,
+    repayIsFull: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, address?: string) => Promise<boolean>,
+    repayIsAvailable: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, address?: string) => Promise<boolean>,
+    repayBands: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, address?: string) => Promise<[number, number]>,
+    repayPrices: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, address?: string) => Promise<string[]>,
+    repayHealth: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, full?: boolean, address?: string) => Promise<string>,
+    repayIsApproved: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<boolean>,
+    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>,
+
+    estimateGas: {
+        createLoanApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<TGas>,
+        createLoan: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, range: number, slippage?: number) => Promise<number>,
+
+        borrowMoreApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<TGas>,
+        borrowMore: (userCollateral: TAmount, userBorrowed: TAmount, debt: TAmount, slippage?: number) => Promise<number>,
+
+        repayApprove: (userCollateral: TAmount, userBorrowed: TAmount) => Promise<TGas>,
+        repay: (stateCollateral: TAmount, userCollateral: TAmount, userBorrowed: TAmount, slippage?: number) => Promise<number>,
+    }
+}

package/src/mintMarkets/modules/index.ts

@@ -0,0 +1 @@
+export { LeverageV2Module } from './leverageV2.js';