feat: add leverageZapV2 for lendMarkets

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/llamalend-api",
-  "version": "1.0.42",
+  "version": "1.1.0",
   "description": "JavaScript library for Curve Lending",
   "main": "lib/index.js",
   "author": "Macket",
@@ -16,6 +16,7 @@
   "scripts": {
     "build": "rm -rf lib && tsc --project tsconfig.build.json",
     "lint": "eslint src --ext .ts",
+    "lint:fix": "eslint src --ext .ts --fix",
     "watch": "tsc --watch",
     "watch:lib": "rm -rf lib && tsc --watch --project tsconfig.build.json"
   },

src/cache/index.ts

@@ -1,10 +1,10 @@
 class Cache {
-    // eslint-disable-next-line no-use-before-define
+     
     private static instance: Cache;
     readonly cache: Map<string, any>;
 
     private constructor() {
         this.cache = new Map<string, any>();
     }
 
     public static getInstance(): Cache {
@@ -14,11 +14,11 @@
         return Cache.instance;
     }
 
     public set(key: string, value: any): void {
         this.cache.set(key, value);
     }
 
     public get(key: string): any | undefined {
         return this.cache.get(key);
     }
 

src/constants/aliases.ts

@@ -9,6 +9,7 @@ export const ALIASES_ETHEREUM = lowerCaseValues({
     "gauge_factory": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     // "leverage_zap": "0x3294514B78Df4Bb90132567fcf8E5e99f390B687", // 1inch
     "leverage_zap": "0xC5898606BdB494a994578453B92e7910a90aA873", // odos
+    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
     "leverage_markets_start_id": "9",
     "crvUSD": "0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E",
     "st_crvUSD": "0x0655977FEb2f289A4aB78af67BAB0d17aAb84367",
@@ -20,6 +21,7 @@ export const ALIASES_POLYGON = lowerCaseValues({
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "leverage_zap": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
 });
 
 export const ALIASES_FANTOM = lowerCaseValues({
@@ -28,6 +30,7 @@ export const ALIASES_FANTOM = lowerCaseValues({
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "leverage_zap": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
 });
 
 export const ALIASES_AVALANCHE = lowerCaseValues({
@@ -36,6 +39,7 @@ export const ALIASES_AVALANCHE = lowerCaseValues({
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "leverage_zap": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
 });
 
 export const ALIASES_ARBITRUM = lowerCaseValues({
@@ -45,6 +49,7 @@ export const ALIASES_ARBITRUM = lowerCaseValues({
     "gauge_factory": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     // "leverage_zap": "0x61C404B60ee9c5fB09F70F9A645DD38fE5b3A956", // 1inch
     "leverage_zap": "0xb7b240CFa985306563A301bC417Bc9715059a117", // odos
+    "leverage_zap_v2": "0x5b07Db9a85992c877b9fBeA6DCC4F79292577640",
     "leverage_markets_start_id": "9",
 });
 
@@ -55,6 +60,7 @@ export const ALIASES_OPTIMISM = lowerCaseValues({
     "gauge_factory_old": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "gauge_factory": "0x871fBD4E01012e2E8457346059e8C189d664DbA4",
     "leverage_zap": "0x273e44B9a1841857d9360e8792bB59f9e1FfE9Da",
+    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
     "leverage_markets_start_id": "0",
     "gas_oracle": '0xc0d3C0d3C0d3c0D3C0D3C0d3C0d3C0D3C0D3000f',
     "gas_oracle_blob": '0x420000000000000000000000000000000000000f',
@@ -66,6 +72,7 @@ export const ALIASES_XDAI = lowerCaseValues({
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "leverage_zap": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
 });
 
 export const ALIASES_MOONBEAM = lowerCaseValues({
@@ -74,6 +81,7 @@ export const ALIASES_MOONBEAM = lowerCaseValues({
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "leverage_zap": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
 });
 
 export const ALIASES_AURORA = lowerCaseValues({
@@ -89,6 +97,7 @@ export const ALIASES_KAVA = lowerCaseValues({
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "leverage_zap": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
 });
 
 export const ALIASES_CELO = lowerCaseValues({
@@ -97,6 +106,7 @@ export const ALIASES_CELO = lowerCaseValues({
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "leverage_zap": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
 });
 
 export const ALIASES_ZKSYNC = lowerCaseValues({
@@ -105,6 +115,7 @@ export const ALIASES_ZKSYNC = lowerCaseValues({
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB", // <--- TODO CHANGE
     "gauge_factory": "0x0000000000000000000000000000000000000000",
     "leverage_zap": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
 });
 
 export const ALIASES_BASE = lowerCaseValues({
@@ -113,6 +124,7 @@ export const ALIASES_BASE = lowerCaseValues({
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB", // <--- TODO CHANGE
     "gauge_factory": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "leverage_zap": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
 });
 
 export const ALIASES_BSC = lowerCaseValues({
@@ -121,6 +133,7 @@ export const ALIASES_BSC = lowerCaseValues({
     "gauge_controller": "0x0000000000000000000000000000000000000000", // <--- TODO CHANGE
     "gauge_factory": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "leverage_zap": "0x0000000000000000000000000000000000000000",
+    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
 });
 
 export const ALIASES_FRAXTAL = lowerCaseValues({
@@ -130,6 +143,7 @@ export const ALIASES_FRAXTAL = lowerCaseValues({
     "gauge_factory_old": "0xeF672bD94913CB6f1d2812a6e18c1fFdEd8eFf5c",
     "gauge_factory": "0x0b8d6b6cefc7aa1c2852442e518443b1b22e1c52",
     "leverage_zap": "0x37c5ab57AF7100Bdc9B668d766e193CCbF6614FD", // odos
+    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
     "leverage_markets_start_id": "0",
 });
 
@@ -139,5 +153,6 @@ export const ALIASES_SONIC = lowerCaseValues({
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory": "0xf3A431008396df8A8b2DF492C913706BDB0874ef",
     "leverage_zap": "0x5552b631e2aD801fAa129Aacf4B701071cC9D1f7", // odos
+    "leverage_zap_v2": "0x0000000000000000000000000000000000000000",
     "leverage_markets_start_id": "0",
 });

src/external-api.ts

@@ -118,9 +118,9 @@
 )
 
 export const _getUserCollateralForce = async (
-    network: INetworkName, 
-    controller: string, 
-    user: string, 
+    network: INetworkName,
+    controller: string,
+    user: string,
     newTx: string
 ): Promise<void> => {
     await fetch(`https://prices.curve.finance/v1/lending/collateral_events/${network}/${controller}/${user}?new_tx=${newTx}`);
@@ -218,7 +218,7 @@
     async () => {
         const response = await fetch(`https://api.curve.finance/api/getHiddenPools`)
 
         return (await response.json() as any).data
     },
     {
         promise: true,
@@ -226,7 +226,7 @@
     }
 )
 
 async function fetchJson(url: string): Promise<any> {
     const response = await fetch(url);
     return await response.json() ?? {};
 }
@@ -234,4 +234,4 @@
 async function fetchData(url: string) {
     const {data} = await fetchJson(url);
     return data;
-}
+}

src/interfaces.ts

@@ -13,7 +13,7 @@
 export interface ICurveContract {
     contract: Contract,
     multicallContract: MulticallContract,
     abi: any,
     address: string
 }
 
@@ -40,7 +40,7 @@
     max_bands: number,
     default_bands: number,
     A: number,
     monetary_policy_abi: any
     is_deleverage_supported?: boolean
     index?: number
 }
@@ -186,7 +186,7 @@
     monetaryPolicyAddress: string;
     rates: Rates;
     gaugeAddress: string;
     gaugeRewards: any[];
     assets: Assets;
     vaultShares: VaultShares;
     totalSupplied: Total;
@@ -230,3 +230,22 @@
 export interface IResponseApi {
     data: any
 }
+
+export interface IQuote {
+    outAmount: string,
+    priceImpact: number
+}
+
+export interface ILeverageMetrics {
+    priceImpact: number,
+    bands: [number, number],
+    prices: string[],
+    health: string,
+}
+
+export type GetExpectedFn = (
+    fromToken: string,
+    toToken: string,
+    amountIn: bigint,
+    blacklist: string | string[],
+) => Promise<IQuote>;