@aztec/cli 0.0.1-commit.fce3e4f → 0.0.1-commit.ffe5b04ea

package/dest/config/cached_fetch.js

@@ -1,50 +1,105 @@
 import { createLogger } from '@aztec/aztec.js/log';
-import { mkdir, readFile, stat, writeFile } from 'fs/promises';
+import { mkdir, readFile, writeFile } from 'fs/promises';
 import { dirname } from 'path';
+const DEFAULT_MAX_AGE_MS = 5 * 60 * 1000; // 5 minutes
+/** Extracts max-age value in milliseconds from a Response's Cache-Control header. Returns undefined if not present. */ export function parseMaxAge(response) {
+    const cacheControl = response.headers.get('cache-control');
+    if (!cacheControl) {
+        return undefined;
+    }
+    const match = cacheControl.match(/max-age=(\d+)/);
+    if (!match) {
+        return undefined;
+    }
+    return parseInt(match[1], 10) * 1000;
+}
 /**
- * Fetches data from a URL with file-based caching support.
- * This utility can be used by both remote config and bootnodes fetching.
+ * Fetches data from a URL with file-based HTTP conditional caching.
+ *
+ * Data is stored as raw JSON in the cache file (same format as the server returns).
+ * Caching metadata (ETag, expiry) is stored in a separate sidecar `.meta` file.
+ * This keeps the data file human-readable and backward-compatible with older code.
  *
  * @param url - The URL to fetch from
- * @param networkName - Network name for cache directory structure
- * @param options - Caching and error handling options
- * @param cacheDir - Optional cache directory (defaults to no caching)
- * @returns The fetched and parsed JSON data, or undefined if fetch fails and throwOnError is false
+ * @param options - Caching options
+ * @param fetch - Fetch implementation (defaults to globalThis.fetch)
+ * @param log - Logger instance
+ * @returns The fetched and parsed JSON data, or undefined if fetch fails
  */ export async function cachedFetch(url, options, fetch = globalThis.fetch, log = createLogger('cached_fetch')) {
-    const { cacheDurationMs, cacheFile } = options;
-    // Try to read from cache first
+    const { cacheFile, defaultMaxAgeMs = DEFAULT_MAX_AGE_MS } = options;
+    // If no cacheFile, just fetch normally without caching
+    if (!cacheFile) {
+        return fetchAndParse(url, fetch, log);
+    }
+    const metaFile = cacheFile + '.meta';
+    // Try to read metadata
+    let meta;
     try {
-        if (cacheFile) {
-            const info = await stat(cacheFile);
-            if (info.mtimeMs + cacheDurationMs > Date.now()) {
-                const cachedData = JSON.parse(await readFile(cacheFile, 'utf-8'));
-                return cachedData;
-            }
-        }
+        meta = JSON.parse(await readFile(metaFile, 'utf-8'));
     } catch  {
-        log.trace('Failed to read data from cache');
+        log.trace('No usable cache metadata found');
     }
+    // Try to read cached data
+    let cachedData;
     try {
-        const response = await fetch(url);
+        cachedData = JSON.parse(await readFile(cacheFile, 'utf-8'));
+    } catch  {
+        log.trace('No usable cached data found');
+    }
+    // If metadata and data exist and cache is fresh, return directly
+    if (meta && cachedData !== undefined && meta.expiresAt > Date.now()) {
+        return cachedData;
+    }
+    // Cache is stale or missing — make a (possibly conditional) request
+    try {
+        const headers = {};
+        if (meta?.etag && cachedData !== undefined) {
+            headers['If-None-Match'] = meta.etag;
+        }
+        const response = await fetch(url, {
+            headers
+        });
+        if (response.status === 304 && cachedData !== undefined) {
+            // Not modified — recompute expiry from new response headers and return cached data
+            const maxAgeMs = parseMaxAge(response) ?? defaultMaxAgeMs;
+            await writeMetaFile(metaFile, {
+                etag: meta?.etag,
+                expiresAt: Date.now() + maxAgeMs
+            }, log);
+            return cachedData;
+        }
         if (!response.ok) {
             log.warn(`Failed to fetch from ${url}: ${response.status} ${response.statusText}`);
-            return undefined;
+            return cachedData;
         }
+        // 200 — parse new data and cache it
         const data = await response.json();
-        try {
-            if (cacheFile) {
-                await mkdir(dirname(cacheFile), {
-                    recursive: true
-                });
-                await writeFile(cacheFile, JSON.stringify(data), 'utf-8');
-            }
-        } catch (err) {
-            log.warn('Failed to cache data on disk: ' + cacheFile, {
-                cacheFile,
-                err
-            });
-        }
+        const maxAgeMs = parseMaxAge(response) ?? defaultMaxAgeMs;
+        const etag = response.headers.get('etag') ?? undefined;
+        await ensureDir(cacheFile, log);
+        await Promise.all([
+            writeFile(cacheFile, JSON.stringify(data), 'utf-8'),
+            writeFile(metaFile, JSON.stringify({
+                etag,
+                expiresAt: Date.now() + maxAgeMs
+            }), 'utf-8')
+        ]);
         return data;
+    } catch (err) {
+        log.warn(`Failed to fetch from ${url}`, {
+            err
+        });
+        return cachedData;
+    }
+}
+async function fetchAndParse(url, fetch, log) {
+    try {
+        const response = await fetch(url);
+        if (!response.ok) {
+            log.warn(`Failed to fetch from ${url}: ${response.status} ${response.statusText}`);
+            return undefined;
+        }
+        return await response.json();
     } catch (err) {
         log.warn(`Failed to fetch from ${url}`, {
             err
@@ -52,3 +107,26 @@ import { dirname } from 'path';
         return undefined;
     }
 }
+async function ensureDir(filePath, log) {
+    try {
+        await mkdir(dirname(filePath), {
+            recursive: true
+        });
+    } catch (err) {
+        log.warn('Failed to create cache directory for: ' + filePath, {
+            err
+        });
+    }
+}
+async function writeMetaFile(metaFile, meta, log) {
+    try {
+        await mkdir(dirname(metaFile), {
+            recursive: true
+        });
+        await writeFile(metaFile, JSON.stringify(meta), 'utf-8');
+    } catch (err) {
+        log.warn('Failed to write cache metadata: ' + metaFile, {
+            err
+        });
+    }
+}

package/dest/config/chain_l2_config.d.ts

@@ -1,40 +1,14 @@
-import { type L1ContractsConfig, type L1TxUtilsConfig } from '@aztec/ethereum';
 import type { NetworkNames } from '@aztec/foundation/config';
-import type { SharedNodeConfig } from '@aztec/node-lib/config';
-import type { P2PConfig } from '@aztec/p2p';
-import type { SequencerConfig, SlasherConfig } from '@aztec/stdlib/interfaces/server';
-export type L2ChainConfig = Omit<L1ContractsConfig, keyof L1TxUtilsConfig> & Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways' | 'slashOverridePayload' | 'slashSelfAllowed'> & Pick<P2PConfig, 'bootstrapNodes' | 'p2pEnabled' | 'txPoolDeleteTxsAfterReorg'> & Pick<SequencerConfig, 'minTxsPerBlock' | 'maxTxsPerBlock'> & {
-    l1ChainId: number;
-    testAccounts: boolean;
-    sponsoredFPC: boolean;
-    minTxsPerBlock: number;
-    maxTxsPerBlock: number;
-    realProofs: boolean;
-    snapshotsUrls: string[];
-    autoUpdate: SharedNodeConfig['autoUpdate'];
-    autoUpdateUrl?: string;
-    maxTxPoolSize: number;
-    publicMetricsOptOut: boolean;
-    publicIncludeMetrics?: string[];
-    publicMetricsCollectorUrl?: string;
-    publicMetricsCollectFrom?: string[];
-    skipArchiverInitialSync?: boolean;
-    blobAllowEmptySources?: boolean;
-    dataStoreMapSizeKb: number;
-    archiverStoreMapSizeKb: number;
-    noteHashTreeMapSizeKb: number;
-    nullifierTreeMapSizeKb: number;
-    publicDataTreeMapSizeKb: number;
-    sentinelEnabled: boolean;
-    disableTransactions: boolean;
-};
-export declare const stagingIgnitionL2ChainConfig: L2ChainConfig;
-export declare const stagingPublicL2ChainConfig: L2ChainConfig;
-export declare const nextNetL2ChainConfig: L2ChainConfig;
-export declare const testnetL2ChainConfig: L2ChainConfig;
-export declare const mainnetL2ChainConfig: L2ChainConfig;
-export declare const devnetL2ChainConfig: L2ChainConfig;
-export declare function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined;
+/**
+ * Sets up environment for the given network.
+ *
+ * For 'local' network: returns early, using hardcoded defaults from DefaultL1ContractsConfig
+ * and DefaultSlasherConfig (which match the 'defaults' section of defaults.yml).
+ *
+ * For deployed networks: applies network configuration from generated defaults.yml,
+ * merging base defaults with network-specific overrides.
+ *
+ * @param networkName - The network name
+ */
 export declare function enrichEnvironmentWithChainName(networkName: NetworkNames): void;
-export declare function enrichEnvironmentWithChainConfig(config: L2ChainConfig): void;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbDJfY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NoYWluX2wyX2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTRCLEtBQUssaUJBQWlCLEVBQUUsS0FBSyxlQUFlLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6RyxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU3RCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLFlBQVksQ0FBQztBQUM1QyxPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsYUFBYSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFZdEYsTUFBTSxNQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsTUFBTSxlQUFlLENBQUMsR0FDeEUsSUFBSSxDQUFDLGFBQWEsRUFBRSxzQkFBc0IsR0FBRyx1QkFBdUIsR0FBRyxzQkFBc0IsR0FBRyxrQkFBa0IsQ0FBQyxHQUNuSCxJQUFJLENBQUMsU0FBUyxFQUFFLGdCQUFnQixHQUFHLFlBQVksR0FBRywyQkFBMkIsQ0FBQyxHQUM5RSxJQUFJLENBQUMsZUFBZSxFQUFFLGdCQUFnQixHQUFHLGdCQUFnQixDQUFDLEdBQUc7SUFDM0QsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixZQUFZLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLFlBQVksRUFBRSxPQUFPLENBQUM7SUFDdEIsY0FBYyxFQUFFLE1BQU0sQ0FBQztJQUN2QixjQUFjLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLFVBQVUsRUFBRSxPQUFPLENBQUM7SUFDcEIsYUFBYSxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3hCLFVBQVUsRUFBRSxnQkFBZ0IsQ0FBQyxZQUFZLENBQUMsQ0FBQztJQUMzQyxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdkIsYUFBYSxFQUFFLE1BQU0sQ0FBQztJQUN0QixtQkFBbUIsRUFBRSxPQUFPLENBQUM7SUFDN0Isb0JBQW9CLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNoQyx5QkFBeUIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNuQyx3QkFBd0IsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3BDLHVCQUF1QixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBQ2xDLHFCQUFxQixDQUFDLEVBQUUsT0FBTyxDQUFDO0lBSWhDLGtCQUFrQixFQUFFLE1BQU0sQ0FBQztJQUMzQixzQkFBc0IsRUFBRSxNQUFNLENBQUM7SUFDL0IscUJBQXFCLEVBQUUsTUFBTSxDQUFDO0lBQzlCLHNCQUFzQixFQUFFLE1BQU0sQ0FBQztJQUMvQix1QkFBdUIsRUFBRSxNQUFNLENBQUM7SUFHaEMsZUFBZSxFQUFFLE9BQU8sQ0FBQztJQUN6QixtQkFBbUIsRUFBRSxPQUFPLENBQUM7Q0FDOUIsQ0FBQztBQStDSixlQUFPLE1BQU0sNEJBQTRCLEVBQUUsYUFtRjFDLENBQUM7QUFFRixlQUFPLE1BQU0sMEJBQTBCLEVBQUUsYUF1RHhDLENBQUM7QUFFRixlQUFPLE1BQU0sb0JBQW9CLEVBQUUsYUF1RGxDLENBQUM7QUFFRixlQUFPLE1BQU0sb0JBQW9CLEVBQUUsYUF5RmxDLENBQUM7QUFFRixlQUFPLE1BQU0sb0JBQW9CLEVBQUUsYUF3RmxDLENBQUM7QUFFRixlQUFPLE1BQU0sbUJBQW1CLEVBQUUsYUF1RGpDLENBQUM7QUFFRix3QkFBZ0IsZ0JBQWdCLENBQUMsV0FBVyxFQUFFLFlBQVksR0FBRyxhQUFhLEdBQUcsU0FBUyxDQWdCckY7QUFNRCx3QkFBZ0IsOEJBQThCLENBQUMsV0FBVyxFQUFFLFlBQVksUUFhdkU7QUFFRCx3QkFBZ0IsZ0NBQWdDLENBQUMsTUFBTSxFQUFFLGFBQWEsUUFpR3JFIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbDJfY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NoYWluX2wyX2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQTBCN0Q7Ozs7Ozs7Ozs7R0FVRztBQUNILHdCQUFnQiw4QkFBOEIsQ0FBQyxXQUFXLEVBQUUsWUFBWSxRQXFCdkUifQ==

package/dest/config/chain_l2_config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACzG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYtF,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,EAAE,MAAM,eAAe,CAAC,GACxE,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,GAAG,sBAAsB,GAAG,kBAAkB,CAAC,GACnH,IAAI,CAAC,SAAS,EAAE,gBAAgB,GAAG,YAAY,GAAG,2BAA2B,CAAC,GAC9E,IAAI,CAAC,eAAe,EAAE,gBAAgB,GAAG,gBAAgB,CAAC,GAAG;IAC3D,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAIhC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAGhC,eAAe,EAAE,OAAO,CAAC;IACzB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AA+CJ,eAAO,MAAM,4BAA4B,EAAE,aAmF1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAuDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAuDlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAyFlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAwFlC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,aAuDjC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,SAAS,CAgBrF;AAMD,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,YAAY,QAavE;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,aAAa,QAiGrE"}
+{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AA0B7D;;;;;;;;;;GAUG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,YAAY,QAqBvE"}