@curvefi/llamalend-api 2.0.22 → 2.0.23

package/lib/external-api.d.ts

@@ -16,8 +16,19 @@ export declare const _getUserCollateralForce: (network: INetworkName, controller
 export declare const _getUserCollateralCrvUsd: ((network: INetworkName, controller: string, user: string) => Promise<string>) & memoize.Memoized<(network: INetworkName, controller: string, user: string) => Promise<string>>;
 export declare const _getUserCollateralCrvUsdFull: ((network: INetworkName, controller: string, user: string) => Promise<UserCollateral>) & memoize.Memoized<(network: INetworkName, controller: string, user: string) => Promise<UserCollateral>>;
 export declare const _getMarketsData: ((network: INetworkName) => Promise<IMarketData>) & memoize.Memoized<(network: INetworkName) => Promise<IMarketData>>;
+export interface ICrvUsdMarketAPI {
+    address: string;
+    llamma: string;
+    amm_a: number;
+    monetary_policy_address: string;
+    collateral_token: {
+        symbol: string;
+        address: string;
+        decimals: number;
+    };
+}
+export declare const _getCrvUsdMarketsData: (() => Promise<ICrvUsdMarketAPI[]>) & memoize.Memoized<() => Promise<ICrvUsdMarketAPI[]>>;
 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<any>) & memoize.Memoized<() => Promise<any>>;
 export {};

package/lib/external-api.js

@@ -138,6 +138,18 @@ export const _getMarketsData = memoize((network) => __awaiter(void 0, void 0, vo
     promise: true,
     maxAge: 10 * 1000, // 10s
 });
+export const _getCrvUsdMarketsData = memoize(() => __awaiter(void 0, void 0, void 0, function* () {
+    const url = 'https://prices.curve.finance/v1/crvusd/markets/ethereum';
+    const response = yield fetch(url, { headers: { "accept": "application/json" } });
+    if (response.status !== 200) {
+        throw Error(`Fetch error: ${response.status} ${response.statusText}`);
+    }
+    const { data } = yield response.json();
+    return data;
+}), {
+    promise: true,
+    maxAge: 10 * 1000, // 10s
+});
 // --- ODOS ---
 export function _getQuoteOdos(fromToken_1, toToken_1, _amount_1, blacklist_1, pathVizImage_1) {
     return __awaiter(this, arguments, void 0, function* (fromToken, toToken, _amount, blacklist, pathVizImage, slippage = 0.5) {
@@ -182,13 +194,6 @@ export function _assembleTxOdos(pathId) {
         return _assembleTxOdosMemoized(this.constants.ALIASES.leverage_zap, pathId);
     });
 }
-export const _getHiddenPools = memoize(() => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield fetch(`https://api.curve.finance/api/getHiddenPools`);
-    return (yield response.json()).data;
-}), {
-    promise: true,
-    maxAge: 5 * 60 * 1000, // 5m
-});
 function fetchJson(url) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;

package/lib/index.d.ts

@@ -50,9 +50,11 @@ export declare function createLlamalend(): {
     getGasPriceFromL1: () => Promise<number>;
     getGasPriceFromL2: () => Promise<number>;
     getGasInfoForL2: () => Promise<Record<string, number>>;
-    fetchStats: (amms: string[], controllers: string[], vaults: string[], borrowed_tokens: string[], collateral_tokens: string[], version?: "v1" | "v2") => Promise<void>;
     mintMarkets: {
         getMarketList: () => string[];
+        fetchMintMarkets: ({ useApi }?: {
+            useApi?: boolean;
+        }) => Promise<void>;
     };
     lendMarkets: {
         fetchMarkets: ({ useApi, version }?: {
@@ -152,9 +154,11 @@ declare const _default: {
     getGasPriceFromL1: () => Promise<number>;
     getGasPriceFromL2: () => Promise<number>;
     getGasInfoForL2: () => Promise<Record<string, number>>;
-    fetchStats: (amms: string[], controllers: string[], vaults: string[], borrowed_tokens: string[], collateral_tokens: string[], version?: "v1" | "v2") => Promise<void>;
     mintMarkets: {
         getMarketList: () => string[];
+        fetchMintMarkets: ({ useApi }?: {
+            useApi?: boolean;
+        }) => Promise<void>;
     };
     lendMarkets: {
         fetchMarkets: ({ useApi, version }?: {

package/lib/index.js

@@ -43,11 +43,10 @@ export function createLlamalend() {
         getGasPriceFromL1: getGasPriceFromL1.bind(llamalend),
         getGasPriceFromL2: getGasPriceFromL2.bind(llamalend),
         getGasInfoForL2: getGasInfoForL2.bind(llamalend),
-        // Core methods
-        fetchStats: llamalend.fetchStats.bind(llamalend),
         // Market lists
         mintMarkets: {
             getMarketList: llamalend.getMintMarketList.bind(llamalend),
+            fetchMintMarkets: llamalend.fetchMintMarkets.bind(llamalend),
         },
         lendMarkets: {
             fetchMarkets: llamalend.fetchLendMarkets.bind(llamalend),

package/lib/lendMarkets/fetch/fetchLendMarkets.js

@@ -75,13 +75,6 @@ export const fetchOneWayMarketsByBlockchain = (llamalend_1, ...args_1) => __awai
         llamalend.constants.DECIMALS[c] = COIN_DATA[c].decimals;
     }
     registerMarkets(llamalend, names, amms, controllers, borrowed_tokens, collateral_tokens, monetary_policies, vaults, gauges, COIN_DATA, version);
-    if (version === 'v2') {
-        llamalend.constants.ONE_WAY_MARKETS_V2 = yield llamalend._filterHiddenMarkets(llamalend.constants.ONE_WAY_MARKETS_V2);
-    }
-    else {
-        llamalend.constants.ONE_WAY_MARKETS = yield llamalend._filterHiddenMarkets(llamalend.constants.ONE_WAY_MARKETS);
-    }
-    yield llamalend.fetchStats(amms, controllers, vaults, borrowed_tokens, collateral_tokens, version);
 });
 export const fetchOneWayMarketsByAPI = (llamalend_1, ...args_1) => __awaiter(void 0, [llamalend_1, ...args_1], void 0, function* (llamalend, version = 'v1') {
     const { names, amms, controllers, borrowed_tokens, collateral_tokens, monetary_policies, vaults, gauges } = yield getFactoryMarketDataByAPI(llamalend);
@@ -90,10 +83,4 @@ export const fetchOneWayMarketsByAPI = (llamalend_1, ...args_1) => __awaiter(voi
         llamalend.constants.DECIMALS[c] = COIN_DATA[c].decimals;
     }
     registerMarkets(llamalend, names, amms, controllers, borrowed_tokens, collateral_tokens, monetary_policies, vaults, gauges, COIN_DATA, version);
-    if (version === 'v2') {
-        llamalend.constants.ONE_WAY_MARKETS_V2 = yield llamalend._filterHiddenMarkets(llamalend.constants.ONE_WAY_MARKETS_V2);
-    }
-    else {
-        llamalend.constants.ONE_WAY_MARKETS = yield llamalend._filterHiddenMarkets(llamalend.constants.ONE_WAY_MARKETS);
-    }
 });

package/lib/llamalend.d.ts

@@ -1,5 +1,5 @@
 import { ethers, Networkish, BigNumberish, Numeric } from "ethers";
-import { Provider as MulticallProvider } from '@curvefi/ethcall';
+import { Provider as MulticallProvider, Contract as MulticallContract } from '@curvefi/ethcall';
 import { IChainId, ILlamalend, ILlamma, IDict, INetworkName, ICurveContract, IOneWayMarket, ICoin } from "./interfaces.js";
 import { MintMarketTemplate } from "./mintMarkets";
 import { LendMarketTemplate } from "./lendMarkets";
@@ -67,21 +67,25 @@ declare class Llamalend implements ILlamalend {
         maxPriorityFeePerGas?: number;
         chainId?: number;
     }): Promise<void>;
-    setContract(address: string, abi: any): void;
+    initContract: (address: string, abi: any, provider: ethers.BrowserProvider | ethers.JsonRpcProvider | ethers.Signer) => ethers.Contract;
+    initMulticallContract: (address: string, abi: any) => MulticallContract;
+    setContract(address: string | undefined, abi: any): void;
     setCustomFeeData(customFeeData: {
         gasPrice?: number;
         maxFeePerGas?: number;
         maxPriorityFeePerGas?: number;
     }): void;
-    _filterHiddenMarkets(markets: IDict<IOneWayMarket>): Promise<IDict<IOneWayMarket>>;
+    _setupMintMarketContracts(useApi?: boolean): Promise<void>;
     getLendMarketList: () => string[];
     getMintMarketList: () => string[];
     fetchLendMarkets: ({ useApi, version }?: {
         useApi?: boolean;
         version?: "v1" | "v2";
     }) => Promise<void>;
+    fetchMintMarkets: ({ useApi }?: {
+        useApi?: boolean;
+    }) => Promise<void>;
     getCoins: (collateral_tokens: string[], borrowed_tokens: string[], useApi?: boolean) => Promise<IDict<ICoin>>;
-    fetchStats: (amms: string[], controllers: string[], vaults: string[], borrowed_tokens: string[], collateral_tokens: string[], version?: "v1" | "v2") => Promise<void>;
     formatUnits(value: BigNumberish, unit?: string | Numeric): string;
     parseUnits(value: string, unit?: string | Numeric): bigint;
     updateFeeData(): Promise<void>;

package/lib/llamalend.js

@@ -24,10 +24,7 @@ import gasOracleBlobABI from './constants/abis/gas_oracle_optimism_blob.json' wi
 // crvUSD ABIs
 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" 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' };
@@ -36,10 +33,25 @@ import { COINS_ETHEREUM, COINS_OPTIMISM, COINS_ARBITRUM, COINS_FRAXTAL, COINS_SO
 import { LLAMMAS } from "./constants/llammas.js";
 import { L2Networks } from "./constants/L2Networks.js";
 import { createCall, handleMultiCallResponse } from "./utils.js";
-import { cacheKey, cacheStats } from "./cache/index.js";
-import { _getMarketsData, _getHiddenPools } from "./external-api.js";
+import { _getMarketsData, _getCrvUsdMarketsData } from "./external-api.js";
 import { extractDecimals } from "./constants/utils.js";
 import { fetchOneWayMarketsByBlockchain, fetchOneWayMarketsByAPI } from "./lendMarkets/fetch/fetchLendMarkets.js";
+import { fetchMintMarketsByBlockchain, fetchMintMarketsByAPI } from "./mintMarkets/fetch/fetchMintMarkets.js";
+const memoizeByAddress = (factory) => {
+    return () => {
+        const cache = {};
+        return (address, abi, ...args) => {
+            if (address in cache) {
+                return cache[address];
+            }
+            const result = factory(address, abi, ...args);
+            cache[address] = result;
+            return result;
+        };
+    };
+};
+const memoizedContract = memoizeByAddress((address, abi, provider) => new Contract(address, abi, provider));
+const memoizedMulticallContract = memoizeByAddress((address, abi) => new MulticallContract(address, abi));
 export const NETWORK_CONSTANTS = {
     1: {
         NAME: 'ethereum',
@@ -71,6 +83,8 @@ export const NETWORK_CONSTANTS = {
 };
 class Llamalend {
     constructor() {
+        this.initContract = memoizedContract();
+        this.initMulticallContract = memoizedMulticallContract();
         this.getLendMarketList = () => Object.keys(Object.assign(Object.assign({}, this.constants.ONE_WAY_MARKETS), this.constants.ONE_WAY_MARKETS_V2));
         this.getMintMarketList = () => Object.keys(this.constants.LLAMMAS);
         this.fetchLendMarkets = (...args_1) => __awaiter(this, [...args_1], void 0, function* ({ useApi = true, version = 'v1' } = {}) {
@@ -84,6 +98,12 @@ class Llamalend {
                 yield fetchOneWayMarketsByBlockchain(this, version);
             }
         });
+        this.fetchMintMarkets = (...args_1) => __awaiter(this, [...args_1], void 0, function* ({ useApi = true } = {}) {
+            yield Promise.all([
+                this._setupMintMarketContracts(useApi),
+                useApi ? fetchMintMarketsByAPI(this) : fetchMintMarketsByBlockchain(this),
+            ]);
+        });
         this.getCoins = (collateral_tokens_1, borrowed_tokens_1, ...args_1) => __awaiter(this, [collateral_tokens_1, borrowed_tokens_1, ...args_1], void 0, function* (collateral_tokens, borrowed_tokens, useApi = false) {
             const coins = new Set([...collateral_tokens, ...borrowed_tokens]);
             const COINS_DATA = {};
@@ -134,46 +154,6 @@ class Llamalend {
             }
             return COINS_DATA;
         });
-        this.fetchStats = (amms_1, controllers_1, vaults_1, borrowed_tokens_1, collateral_tokens_1, ...args_1) => __awaiter(this, [amms_1, controllers_1, vaults_1, borrowed_tokens_1, collateral_tokens_1, ...args_1], void 0, function* (amms, controllers, vaults, borrowed_tokens, collateral_tokens, version = 'v1') {
-            cacheStats.clear();
-            const marketCount = controllers.length;
-            const calls = [];
-            for (let i = 0; i < marketCount; i++) {
-                calls.push(createCall(this.contracts[controllers[i]], 'total_debt', []));
-                calls.push(createCall(this.contracts[vaults[i]], 'totalAssets', []));
-                calls.push(createCall(this.contracts[borrowed_tokens[i]], 'balanceOf', [controllers[i]]));
-                calls.push(createCall(this.contracts[amms[i]], 'rate', []));
-                calls.push(createCall(this.contracts[borrowed_tokens[i]], 'balanceOf', [amms[i]]));
-                if (version === 'v1') {
-                    calls.push(createCall(this.contracts[amms[i]], 'admin_fees_x', []));
-                    calls.push(createCall(this.contracts[amms[i]], 'admin_fees_y', []));
-                }
-                calls.push(createCall(this.contracts[collateral_tokens[i]], 'balanceOf', [amms[i]]));
-            }
-            const res = yield this.multicallProvider.all(calls);
-            for (let i = 0; i < marketCount; i++) {
-                if (version === 'v1') {
-                    cacheStats.set(cacheKey(controllers[i], 'total_debt'), res[(i * 8) + 0]);
-                    cacheStats.set(cacheKey(vaults[i], 'totalAssets', controllers[i]), res[(i * 8) + 1]);
-                    cacheStats.set(cacheKey(borrowed_tokens[i], 'balanceOf', controllers[i]), res[(i * 8) + 2]);
-                    cacheStats.set(cacheKey(amms[i], 'rate'), res[(i * 8) + 3]);
-                    cacheStats.set(cacheKey(borrowed_tokens[i], 'balanceOf', amms[i]), res[(i * 8) + 4]);
-                    cacheStats.set(cacheKey(amms[i], 'admin_fees_x'), res[(i * 8) + 5]);
-                    cacheStats.set(cacheKey(amms[i], 'admin_fees_y'), res[(i * 8) + 6]);
-                    cacheStats.set(cacheKey(collateral_tokens[i], 'balanceOf', amms[i]), res[(i * 8) + 7]);
-                }
-                else {
-                    cacheStats.set(cacheKey(controllers[i], 'total_debt'), res[(i * 6) + 0]);
-                    cacheStats.set(cacheKey(vaults[i], 'totalAssets', controllers[i]), res[(i * 6) + 1]);
-                    cacheStats.set(cacheKey(borrowed_tokens[i], 'balanceOf', controllers[i]), res[(i * 6) + 2]);
-                    cacheStats.set(cacheKey(amms[i], 'rate'), res[(i * 6) + 3]);
-                    cacheStats.set(cacheKey(borrowed_tokens[i], 'balanceOf', amms[i]), res[(i * 6) + 4]);
-                    cacheStats.set(cacheKey(amms[i], 'admin_fees_x'), BigInt(0)); // Always 0 for v2
-                    cacheStats.set(cacheKey(amms[i], 'admin_fees_y'), BigInt(0)); // Always 0 for v2
-                    cacheStats.set(cacheKey(collateral_tokens[i], 'balanceOf', amms[i]), res[(i * 6) + 5]);
-                }
-            }
-        });
         this.address = '00000';
         this.crvUsdAddress = COINS_ETHEREUM.crvusd;
         this.provider = null;
@@ -241,55 +221,47 @@ class Llamalend {
                 ],
                 WETH: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2".toLowerCase(),
             };
-            // JsonRpc provider
+            let signerPromise;
             if (providerType.toLowerCase() === 'JsonRpc'.toLowerCase()) {
                 providerSettings = providerSettings;
                 let jsonRpcApiProviderOptions;
                 if (providerSettings.batchMaxCount) {
-                    jsonRpcApiProviderOptions = {
-                        batchMaxCount: providerSettings.batchMaxCount,
-                    };
-                }
-                if (providerSettings.url) {
-                    this.provider = new ethers.JsonRpcProvider(providerSettings.url, undefined, jsonRpcApiProviderOptions);
-                }
-                else {
-                    this.provider = new ethers.JsonRpcProvider('http://localhost:8545/', undefined, jsonRpcApiProviderOptions);
+                    jsonRpcApiProviderOptions = { batchMaxCount: providerSettings.batchMaxCount };
                 }
+                this.provider = new ethers.JsonRpcProvider(providerSettings.url || 'http://localhost:8545/', undefined, jsonRpcApiProviderOptions);
                 if (providerSettings.privateKey) {
-                    this.signer = new ethers.Wallet(providerSettings.privateKey, this.provider);
+                    signerPromise = Promise.resolve(new ethers.Wallet(providerSettings.privateKey, this.provider));
                 }
                 else if (!((_a = providerSettings.url) === null || _a === void 0 ? void 0 : _a.startsWith("https://rpc.gnosischain.com"))) {
-                    try {
-                        this.signer = yield this.provider.getSigner();
-                    }
-                    catch (_b) {
-                        this.signer = null;
-                    }
+                    signerPromise = this.provider.getSigner().catch(() => null);
+                }
+                else {
+                    signerPromise = Promise.resolve(null);
                 }
-                // Web3 provider
             }
             else if (providerType.toLowerCase() === 'Web3'.toLowerCase()) {
                 providerSettings = providerSettings;
                 this.provider = new ethers.BrowserProvider(providerSettings.externalProvider);
-                this.signer = yield this.provider.getSigner();
-                // Infura provider
+                signerPromise = this.provider.getSigner();
             }
             else if (providerType.toLowerCase() === 'Infura'.toLowerCase()) {
                 providerSettings = providerSettings;
                 this.provider = new ethers.InfuraProvider(providerSettings.network, providerSettings.apiKey);
-                this.signer = null;
-                // Alchemy provider
+                signerPromise = Promise.resolve(null);
             }
             else if (providerType.toLowerCase() === 'Alchemy'.toLowerCase()) {
                 providerSettings = providerSettings;
                 this.provider = new ethers.AlchemyProvider(providerSettings.network, providerSettings.apiKey);
-                this.signer = null;
+                signerPromise = Promise.resolve(null);
             }
             else {
                 throw Error('Wrong providerType');
             }
-            const network = yield this.provider.getNetwork();
+            const [signer, network] = yield Promise.all([
+                signerPromise,
+                this.provider.getNetwork(),
+            ]);
+            this.signer = signer;
             this.chainId = Number(network.chainId) === 133 || Number(network.chainId) === 31337 ? 1 : Number(network.chainId);
             console.log("CURVE-LLAMALEND-JS IS CONNECTED TO NETWORK:", { name: network.name.toUpperCase(), chainId: Number(this.chainId) });
             if (this.chainId === 42161) {
@@ -307,7 +279,7 @@ class Llamalend {
                 try {
                     this.signerAddress = yield this.signer.getAddress();
                 }
-                catch (_c) {
+                catch (_b) {
                     this.signer = null;
                 }
             }
@@ -315,7 +287,6 @@ class Llamalend {
                 this.signerAddress = '';
             }
             this.feeData = { gasPrice: options.gasPrice, maxFeePerGas: options.maxFeePerGas, maxPriorityFeePerGas: options.maxPriorityFeePerGas };
-            yield this.updateFeeData();
             // oneWayMarkets contracts
             this.setContract(this.constants.ALIASES['one_way_factory'], OneWayLendingFactoryABI);
             if (this.constants.ALIASES['one_way_factory_v2'] && this.constants.ALIASES['one_way_factory_v2'] !== this.constants.ZERO_ADDRESS) {
@@ -342,103 +313,6 @@ class Llamalend {
                     this.setContract(this.constants.ALIASES.gauge_factory, GaugeFactorySidechainABI);
                 }
             }
-            // crvUSD contracts
-            this.setContract(this.crvUsdAddress, ERC20ABI);
-            if (this.chainId === 1) {
-                this.setContract(this.constants.COINS.crvusd.toLowerCase(), ERC20ABI);
-                for (const llamma of Object.values(this.constants.LLAMMAS)) {
-                    this.setContract(llamma.amm_address, llammaABI);
-                    this.setContract(llamma.controller_address, controllerABI);
-                    const monetary_policy_address = yield this.contracts[llamma.controller_address].contract.monetary_policy(this.constantOptions);
-                    llamma.monetary_policy_address = monetary_policy_address.toLowerCase();
-                    this.setContract(llamma.monetary_policy_address, llamma.monetary_policy_abi);
-                    if (llamma.collateral_address === "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee") {
-                        this.setContract(this.constants.WETH, ERC20ABI);
-                    }
-                    else {
-                        this.setContract(llamma.collateral_address, ERC20ABI);
-                    }
-                    this.setContract(llamma.leverage_zap, LeverageZapCrvUSDABI);
-                    this.setContract(llamma.deleverage_zap, DeleverageZapABI);
-                    if (llamma.health_calculator_zap)
-                        this.setContract(llamma.health_calculator_zap, HealthCalculatorZapABI);
-                }
-                for (const pegKeeper of this.constants.PEG_KEEPERS) {
-                    this.setContract(pegKeeper, PegKeeper);
-                }
-            }
-            // TODO Put it in a separate method
-            // Fetch new llammas
-            if (this.chainId === 1) {
-                this.setContract(this.constants.FACTORY, FactoryABI);
-                const factoryContract = this.contracts[this.constants.FACTORY].contract;
-                const factoryMulticallContract = this.contracts[this.constants.FACTORY].multicallContract;
-                const N1 = Object.keys(this.constants.LLAMMAS).length;
-                const N2 = yield factoryContract.n_collaterals(this.constantOptions);
-                let calls = [];
-                for (let i = N1; i < N2; i++) {
-                    calls.push(factoryMulticallContract.collaterals(i), factoryMulticallContract.amms(i), factoryMulticallContract.controllers(i));
-                }
-                const res = (yield this.multicallProvider.all(calls)).map((c) => c.toLowerCase());
-                const collaterals = res.filter((a, i) => i % 3 == 0);
-                const amms = res.filter((a, i) => i % 3 == 1);
-                const controllers = res.filter((a, i) => i % 3 == 2);
-                if (collaterals.length > 0) {
-                    for (const collateral of collaterals)
-                        this.setContract(collateral, ERC20ABI);
-                    calls = [];
-                    for (const collateral of collaterals) {
-                        calls.push(this.contracts[collateral].multicallContract.symbol(), this.contracts[collateral].multicallContract.decimals());
-                    }
-                    const res = (yield this.multicallProvider.all(calls)).map((x) => {
-                        if (typeof x === "string")
-                            return x.toLowerCase();
-                        return x;
-                    });
-                    calls = [];
-                    for (const amm of amms) {
-                        this.setContract(amm, llammaABI);
-                        calls.push(this.contracts[amm].multicallContract.A());
-                    }
-                    const AParams = (yield this.multicallProvider.all(calls)).map((x) => {
-                        return Number(x);
-                    });
-                    for (let i = 0; i < collaterals.length; i++) {
-                        const is_eth = collaterals[i] === this.constants.WETH;
-                        const [collateral_symbol, collateral_decimals] = res.splice(0, 2);
-                        if (i >= collaterals.length - 3) {
-                            this.setContract(controllers[i], controllerV2ABI);
-                        }
-                        else {
-                            this.setContract(controllers[i], controllerABI);
-                        }
-                        const monetary_policy_address = (yield this.contracts[controllers[i]].contract.monetary_policy(this.constantOptions)).toLowerCase();
-                        this.setContract(monetary_policy_address, MonetaryPolicy2ABI);
-                        const _llammaId = is_eth ? "eth" : collateral_symbol.toLowerCase();
-                        let llammaId = _llammaId;
-                        let j = 2;
-                        while (llammaId in this.constants.LLAMMAS)
-                            llammaId = _llammaId + j++;
-                        this.constants.LLAMMAS[llammaId] = {
-                            amm_address: amms[i],
-                            controller_address: controllers[i],
-                            monetary_policy_address,
-                            collateral_address: is_eth ? "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" : collaterals[i],
-                            leverage_zap: this.constants.ALIASES.leverage_zap,
-                            deleverage_zap: "0x0000000000000000000000000000000000000000",
-                            collateral_symbol: is_eth ? "ETH" : collateral_symbol,
-                            collateral_decimals,
-                            min_bands: 4,
-                            max_bands: 50,
-                            default_bands: 10,
-                            A: AParams[i],
-                            monetary_policy_abi: MonetaryPolicy2ABI,
-                            is_deleverage_supported: true,
-                            index: N1 + i,
-                        };
-                    }
-                }
-            }
             this.constants.DECIMALS = Object.assign(Object.assign({}, extractDecimals(this.constants.LLAMMAS)), { [this.crvUsdAddress]: 18, [this.constants.ALIASES.crv]: 18, [this.constants.ALIASES.crvUSD]: 18, [this.constants.ALIASES.st_crvUSD]: 18 });
             if (L2Networks.includes(this.chainId)) {
                 // eslint-disable-next-line @typescript-eslint/no-this-alias
@@ -479,20 +353,70 @@ class Llamalend {
     setContract(address, abi) {
         if (address === this.constants.ZERO_ADDRESS || address === undefined)
             return;
-        this.contracts[address] = {
-            contract: new Contract(address, abi, this.signer || this.provider),
-            multicallContract: new MulticallContract(address, abi),
-            address: address,
-            abi: abi,
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const llamalendInstance = this;
+        const proxyHandler = {
+            get: function (target, name) {
+                if (name === 'contract') {
+                    return llamalendInstance.initContract(target['address'], target['abi'], llamalendInstance.signer || llamalendInstance.provider);
+                }
+                else if (name === 'multicallContract') {
+                    return llamalendInstance.initMulticallContract(target['address'], target['abi']);
+                }
+                else {
+                    return target[name];
+                }
+            },
+        };
+        const coreContract = {
+            address,
+            abi,
         };
+        this.contracts[address] = new Proxy(coreContract, proxyHandler);
     }
     setCustomFeeData(customFeeData) {
         this.feeData = Object.assign(Object.assign({}, this.feeData), customFeeData);
     }
-    _filterHiddenMarkets(markets) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const hiddenMarkets = (yield _getHiddenPools())[this.constants.NETWORK_NAME] || [];
-            return Object.fromEntries(Object.entries(markets).filter(([id]) => !hiddenMarkets.includes(id)));
+    _setupMintMarketContracts() {
+        return __awaiter(this, arguments, void 0, function* (useApi = true) {
+            this.setContract(this.crvUsdAddress, ERC20ABI);
+            if (this.chainId !== 1)
+                return;
+            this.setContract(this.constants.COINS.crvusd.toLowerCase(), ERC20ABI);
+            const llammas = Object.values(this.constants.LLAMMAS);
+            for (const llamma of llammas) {
+                this.setContract(llamma.amm_address, llammaABI);
+                this.setContract(llamma.controller_address, controllerABI);
+            }
+            if (useApi) {
+                const apiData = yield _getCrvUsdMarketsData();
+                const monetaryPolicyMap = new Map(apiData.map((m) => [m.address.toLowerCase(), m.monetary_policy_address.toLowerCase()]));
+                for (const llamma of llammas) {
+                    const fresh = monetaryPolicyMap.get(llamma.controller_address);
+                    if (fresh)
+                        llamma.monetary_policy_address = fresh;
+                }
+            }
+            else {
+                const monetaryPolicies = (yield this.multicallProvider.all(llammas.map((l) => this.contracts[l.controller_address].multicallContract.monetary_policy()))).map((a) => a.toLowerCase());
+                llammas.forEach((llamma, i) => { llamma.monetary_policy_address = monetaryPolicies[i]; });
+            }
+            for (const llamma of llammas) {
+                this.setContract(llamma.monetary_policy_address, llamma.monetary_policy_abi);
+                if (llamma.collateral_address === "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee") {
+                    this.setContract(this.constants.WETH, ERC20ABI);
+                }
+                else {
+                    this.setContract(llamma.collateral_address, ERC20ABI);
+                }
+                this.setContract(llamma.leverage_zap, LeverageZapCrvUSDABI);
+                this.setContract(llamma.deleverage_zap, DeleverageZapABI);
+                if (llamma.health_calculator_zap)
+                    this.setContract(llamma.health_calculator_zap, HealthCalculatorZapABI);
+            }
+            for (const pegKeeper of this.constants.PEG_KEEPERS) {
+                this.setContract(pegKeeper, PegKeeper);
+            }
         });
     }
     formatUnits(value, unit) {

package/lib/mintMarkets/fetch/fetchMintMarkets.d.ts

@@ -0,0 +1,3 @@
+import type { Llamalend } from "../../llamalend.js";
+export declare const fetchMintMarketsByAPI: (llamalend: Llamalend) => Promise<void>;
+export declare const fetchMintMarketsByBlockchain: (llamalend: Llamalend) => Promise<void>;