@curvefi/llamalend-api 2.2.1 → 2.2.3

package/lib/constants/aliases.js

@@ -25,14 +25,14 @@ export const ALIASES_ARBITRUM = lowerCaseValues({
 export const ALIASES_OPTIMISM = lowerCaseValues({
     "crv": "0x0994206dfE8De6Ec6920FF4D779B0d950605Fb53",
     "one_way_factory": "0x5EA8f3D674C70b020586933A0a5b250734798BeF",
-    "one_way_factory_v2": "0xb0cEE7943A9B840ca2670d4B9f705B9b578ed1af",
+    "one_way_factory_v2": "0x5F94073E3f51c1FFf92ffc6b4B06b7Af193B3640",
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory_old": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "gauge_factory": "0x871fBD4E01012e2E8457346059e8C189d664DbA4",
     "old_gauge_end_index": "4",
     "leverage_zap_deprecated": "0xBFab8ebc836E1c4D81837798FC076D219C9a1855", // odos v3
     "leverage_zap_v2": "0xE94d1fBF399c27CCBf0185b2Dd11Bf0FA0f0D95C",
-    "leverage_zap_v2_llv2": "0x29837e7a58436D91cC25Cf487dBed0EBF3865c00",
+    "leverage_zap_v2_llv2": "0x4b10E1774521c077a2887806fa60C56CeFa94cCC",
     "leverage_markets_start_id": "0",
     "gas_oracle": '0xc0d3C0d3C0d3c0D3C0D3C0d3C0d3C0D3C0D3000f',
     "gas_oracle_blob": '0x420000000000000000000000000000000000000f',

package/lib/lendMarkets/LendMarketTemplate.d.ts

@@ -50,5 +50,6 @@ export declare class LendMarketTemplate<V extends 'v1' | 'v2' = 'v1' | 'v2'> {
     leverageZapV2: ILeverageZapV2;
     constructor(id: string, marketData: IOneWayMarket, llamalend: Llamalend);
     getLlamalend(): Llamalend;
+    getZapAddress(): string;
 }
 export {};

package/lib/lendMarkets/LendMarketTemplate.js

@@ -25,6 +25,10 @@ const versionModules = {
         LeverageZapV2: LeverageV2ZapV2Module,
     },
 };
+const ZAP_ALIAS_BY_VERSION = {
+    v1: 'leverage_zap_v2',
+    v2: 'leverage_zap_v2_llv2',
+};
 export class LendMarketTemplate {
     constructor(id, marketData, llamalend) {
         this.swapDataCache = {};
@@ -318,4 +322,7 @@ export class LendMarketTemplate {
     getLlamalend() {
         return this.llamalend;
     }
+    getZapAddress() {
+        return this.llamalend.constants.ALIASES[ZAP_ALIAS_BY_VERSION[this.version]];
+    }
 }

package/lib/lendMarkets/fetch/fetchFactoryData.js

@@ -83,7 +83,7 @@ export const getFactoryMarketDataV2 = (llamalend) => __awaiter(void 0, void 0, v
     const collateral_tokens = [];
     const borrowed_tokens = [];
     const monetary_policies = [];
-    const gauges = [];
+    const gauges = new Array(Number(markets_count)).fill(llamalend.constants.ZERO_ADDRESS);
     for (let i = 0; i < markets_count; i++) {
         const marketData = res[i];
         vaults.push(marketData[0].toLowerCase());
@@ -93,7 +93,12 @@ export const getFactoryMarketDataV2 = (llamalend) => __awaiter(void 0, void 0, v
         borrowed_tokens.push(marketData[4].toLowerCase());
         monetary_policies.push(marketData[6].toLowerCase());
         names.push(''); // new factory does not give names, it's generated at the market creation level
-        gauges.push(llamalend.constants.ZERO_ADDRESS);
+    }
+    // Fetch gauges for non-mainnet chains. Mainnet will use the new approach of fetching gauges from the new factory.
+    const gaugeFactoryAddress = llamalend.constants.ALIASES.gauge_factory;
+    if (llamalend.chainId !== 1 && gaugeFactoryAddress && gaugeFactoryAddress !== llamalend.constants.ZERO_ADDRESS) {
+        const gaugeFactory = llamalend.contracts[gaugeFactoryAddress];
+        (yield llamalend.multicallProvider.all(vaults.map((vault) => createCall(gaugeFactory, "get_gauge_from_lp_token", [vault])))).forEach((gauge, i) => { gauges[i] = gauge.toLowerCase(); });
     }
     return {
         names,

package/lib/mintMarkets/MintMarketTemplate.d.ts

@@ -344,4 +344,5 @@ export declare class MintMarketTemplate {
     currentLeverage(userAddress?: string): Promise<string>;
     currentPnL(userAddress?: string): Promise<Record<string, string>>;
     getLlamalend(): Llamalend;
+    getZapAddress(): string;
 }

package/lib/mintMarkets/MintMarketTemplate.js

@@ -1866,4 +1866,7 @@ export class MintMarketTemplate {
     getLlamalend() {
         return this.llamalend;
     }
+    getZapAddress() {
+        return this.leverageZap;
+    }
 }

package/package.json

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

package/src/constants/aliases.ts

@@ -29,14 +29,14 @@ export const ALIASES_ARBITRUM = lowerCaseValues({
 export const ALIASES_OPTIMISM = lowerCaseValues({
     "crv": "0x0994206dfE8De6Ec6920FF4D779B0d950605Fb53",
     "one_way_factory": "0x5EA8f3D674C70b020586933A0a5b250734798BeF",
-    "one_way_factory_v2": "0xb0cEE7943A9B840ca2670d4B9f705B9b578ed1af",
+    "one_way_factory_v2": "0x5F94073E3f51c1FFf92ffc6b4B06b7Af193B3640",
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory_old": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "gauge_factory": "0x871fBD4E01012e2E8457346059e8C189d664DbA4",
     "old_gauge_end_index": "4",
     "leverage_zap_deprecated": "0xBFab8ebc836E1c4D81837798FC076D219C9a1855", // odos v3
     "leverage_zap_v2": "0xE94d1fBF399c27CCBf0185b2Dd11Bf0FA0f0D95C",
-    "leverage_zap_v2_llv2": "0x29837e7a58436D91cC25Cf487dBed0EBF3865c00",
+    "leverage_zap_v2_llv2": "0x4b10E1774521c077a2887806fa60C56CeFa94cCC",
     "leverage_markets_start_id": "0",
     "gas_oracle": '0xc0d3C0d3C0d3c0D3C0D3C0d3C0d3C0D3C0D3000f',
     "gas_oracle_blob": '0x420000000000000000000000000000000000000f',

package/src/lendMarkets/LendMarketTemplate.ts

@@ -77,6 +77,11 @@ const versionModules: { v1: V1ModuleConstructors; v2: V2ModuleConstructors } = {
     },
 };
 
+const ZAP_ALIAS_BY_VERSION: Record<'v1' | 'v2', string> = {
+    v1: 'leverage_zap_v2',
+    v2: 'leverage_zap_v2_llv2',
+};
+
 export class LendMarketTemplate<V extends 'v1' | 'v2' = 'v1' | 'v2'> {
     private llamalend: Llamalend;
     id: string;
@@ -449,4 +454,8 @@ export class LendMarketTemplate<V extends 'v1' | 'v2' = 'v1' | 'v2'> {
     public getLlamalend(): Llamalend {
         return this.llamalend;
     }
+
+    public getZapAddress(): string {
+        return this.llamalend.constants.ALIASES[ZAP_ALIAS_BY_VERSION[this.version]];
+    }
 }

package/src/lendMarkets/fetch/fetchFactoryData.ts

@@ -95,7 +95,7 @@ export const getFactoryMarketDataV2 = async (llamalend: Llamalend) => {
     const collateral_tokens: string[] = [];
     const borrowed_tokens: string[] = [];
     const monetary_policies: string[] = [];
-    const gauges: string[] = [];
+    const gauges: string[] = new Array(Number(markets_count)).fill(llamalend.constants.ZERO_ADDRESS);
 
     for (let i = 0; i < markets_count; i++) {
         const marketData = res[i] as any;
@@ -107,7 +107,15 @@ export const getFactoryMarketDataV2 = async (llamalend: Llamalend) => {
         borrowed_tokens.push(marketData[4].toLowerCase());
         monetary_policies.push(marketData[6].toLowerCase());
         names.push(''); // new factory does not give names, it's generated at the market creation level
-        gauges.push(llamalend.constants.ZERO_ADDRESS);
+    }
+
+    // Fetch gauges for non-mainnet chains. Mainnet will use the new approach of fetching gauges from the new factory.
+    const gaugeFactoryAddress = llamalend.constants.ALIASES.gauge_factory;
+    if (llamalend.chainId !== 1 && gaugeFactoryAddress && gaugeFactoryAddress !== llamalend.constants.ZERO_ADDRESS) {
+        const gaugeFactory = llamalend.contracts[gaugeFactoryAddress];
+        (await llamalend.multicallProvider.all(
+            vaults.map((vault: string) => createCall(gaugeFactory, "get_gauge_from_lp_token", [vault]))
+        ) as string[]).forEach((gauge, i) => { gauges[i] = gauge.toLowerCase(); });
     }
 
     return {

package/src/mintMarkets/MintMarketTemplate.ts

@@ -2013,4 +2013,8 @@ export class MintMarketTemplate {
     public getLlamalend(): Llamalend {
         return this.llamalend;
     }
+
+    public getZapAddress(): string {
+        return this.leverageZap;
+    }
 }