@aztec/cli 0.0.1-commit.96dac018d → 0.0.1-commit.9badcec54

package/dest/config/generated/networks.js

@@ -2,7 +2,7 @@
 // Do not edit manually - run yarn generate to regenerate
 export const devnetConfig = {
     ETHEREUM_SLOT_DURATION: 12,
-    AZTEC_SLOT_DURATION: 36,
+    AZTEC_SLOT_DURATION: 72,
     AZTEC_TARGET_COMMITTEE_SIZE: 48,
     AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000,
     AZTEC_EJECTION_THRESHOLD: 50000000000000000000,
@@ -13,7 +13,7 @@ export const devnetConfig = {
     AZTEC_MANA_TARGET: 100000000,
     AZTEC_PROVING_COST_PER_MANA: 100,
     AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
-    AZTEC_SLASHER_FLAVOR: 'tally',
+    AZTEC_SLASHER_ENABLED: true,
     AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
     AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
     AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
@@ -23,15 +23,15 @@ export const devnetConfig = {
     AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
     AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
     AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
-    SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
-    SLASH_MAX_PENALTY_PERCENTAGE: 2,
     SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
-    SLASH_MAX_PAYLOAD_SIZE: 50,
+    SLASH_MAX_PAYLOAD_SIZE: 80,
     SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
     P2P_ENABLED: true,
     BOOTSTRAP_NODES: '',
-    SEQ_MIN_TX_PER_BLOCK: 0,
+    SEQ_MIN_TX_PER_BLOCK: 1,
     SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
+    SEQ_BLOCK_DURATION_MS: 6000,
+    SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
     DATA_STORE_MAP_SIZE_KB: 134217728,
     ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
     NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -47,7 +47,7 @@ export const devnetConfig = {
     TEST_ACCOUNTS: true,
     SPONSORED_FPC: true,
     TRANSACTIONS_DISABLED: false,
-    SEQ_MAX_TX_PER_BLOCK: 32,
+    SEQ_MAX_TX_PER_BLOCK: 18,
     PROVER_REAL_PROOFS: false,
     PXE_PROVER_ENABLED: false,
     SYNC_SNAPSHOTS_URLS: '',
@@ -55,8 +55,6 @@ export const devnetConfig = {
     BLOB_ALLOW_EMPTY_SOURCES: false,
     P2P_MAX_PENDING_TX_COUNT: 1000,
     P2P_TX_POOL_DELETE_TXS_AFTER_REORG: false,
-    AUTO_UPDATE: 'none',
-    AUTO_UPDATE_URL: '',
     PUBLIC_OTEL_OPT_OUT: true,
     PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
     PUBLIC_OTEL_COLLECT_FROM: '',
@@ -71,7 +69,8 @@ export const devnetConfig = {
     SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
     SLASH_UNKNOWN_PENALTY: 10000000000000000000,
     SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
-    SLASH_GRACE_PERIOD_L2_SLOTS: 0
+    SLASH_GRACE_PERIOD_L2_SLOTS: 0,
+    ENABLE_VERSION_CHECK: true
 };
 export const testnetConfig = {
     ETHEREUM_SLOT_DURATION: 12,
@@ -82,25 +81,21 @@ export const testnetConfig = {
     AZTEC_EXIT_DELAY_SECONDS: 172800,
     AZTEC_INBOX_LAG: 1,
     AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
-    AZTEC_PROVING_COST_PER_MANA: 100,
     AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
-    AZTEC_SLASHER_FLAVOR: 'tally',
+    AZTEC_SLASHER_ENABLED: true,
     AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
     AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
     AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
     AZTEC_SLASHING_DISABLE_DURATION: 432000,
-    AZTEC_SLASH_AMOUNT_SMALL: 10000000000000000000,
-    AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
-    AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
-    SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
-    SLASH_MAX_PENALTY_PERCENTAGE: 2,
     SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
-    SLASH_MAX_PAYLOAD_SIZE: 50,
+    SLASH_MAX_PAYLOAD_SIZE: 80,
     SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
     P2P_ENABLED: true,
     BOOTSTRAP_NODES: '',
-    SEQ_MIN_TX_PER_BLOCK: 0,
+    SEQ_MIN_TX_PER_BLOCK: 1,
     SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
+    SEQ_BLOCK_DURATION_MS: 6000,
+    SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
     DATA_STORE_MAP_SIZE_KB: 134217728,
     ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
     NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -117,13 +112,18 @@ export const testnetConfig = {
     AZTEC_SLASHING_QUORUM: 33,
     AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 100,
     AZTEC_GOVERNANCE_PROPOSER_QUORUM: 60,
-    AZTEC_MANA_TARGET: 150000000,
+    AZTEC_MANA_TARGET: 75000000,
+    AZTEC_PROVING_COST_PER_MANA: 25000000,
+    AZTEC_SLASH_AMOUNT_SMALL: 1E+23,
+    AZTEC_SLASH_AMOUNT_MEDIUM: 1E+23,
+    AZTEC_SLASH_AMOUNT_LARGE: 1E+23,
     L1_CHAIN_ID: 11155111,
     TEST_ACCOUNTS: false,
-    SPONSORED_FPC: true,
+    SPONSORED_FPC: false,
     TRANSACTIONS_DISABLED: false,
-    SEQ_MAX_TX_PER_BLOCK: 8,
+    SEQ_MAX_TX_PER_CHECKPOINT: 72,
     PROVER_REAL_PROOFS: true,
+    P2P_MAX_PENDING_TX_COUNT: 1000,
     P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
     SLASH_PRUNE_PENALTY: 10000000000000000000,
     SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
@@ -136,28 +136,30 @@ export const testnetConfig = {
     SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
     SLASH_UNKNOWN_PENALTY: 10000000000000000000,
     SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
-    SLASH_GRACE_PERIOD_L2_SLOTS: 64
+    SLASH_GRACE_PERIOD_L2_SLOTS: 64,
+    ENABLE_VERSION_CHECK: true
 };
 export const mainnetConfig = {
     ETHEREUM_SLOT_DURATION: 12,
     AZTEC_EPOCH_DURATION: 32,
+    AZTEC_TARGET_COMMITTEE_SIZE: 48,
     AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
     AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
     AZTEC_INBOX_LAG: 1,
     AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
     AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
-    AZTEC_SLASHER_FLAVOR: 'tally',
+    AZTEC_SLASHER_ENABLED: true,
     AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
     AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
-    SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
-    SLASH_MAX_PENALTY_PERCENTAGE: 2,
     SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
-    SLASH_MAX_PAYLOAD_SIZE: 50,
+    SLASH_MAX_PAYLOAD_SIZE: 80,
     SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
     P2P_ENABLED: true,
     BOOTSTRAP_NODES: '',
-    SEQ_MIN_TX_PER_BLOCK: 0,
+    SEQ_MIN_TX_PER_BLOCK: 1,
     SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
+    SEQ_BLOCK_DURATION_MS: 6000,
+    SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
     DATA_STORE_MAP_SIZE_KB: 134217728,
     ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
     NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -166,10 +168,9 @@ export const mainnetConfig = {
     PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
     SENTINEL_ENABLED: true,
     AZTEC_SLOT_DURATION: 72,
-    AZTEC_TARGET_COMMITTEE_SIZE: 24,
     AZTEC_ACTIVATION_THRESHOLD: 2E+23,
     AZTEC_EJECTION_THRESHOLD: 1E+23,
-    AZTEC_LOCAL_EJECTION_THRESHOLD: 1.96E+23,
+    AZTEC_LOCAL_EJECTION_THRESHOLD: 1.9E+23,
     AZTEC_SLASH_AMOUNT_SMALL: 2E+21,
     AZTEC_SLASH_AMOUNT_MEDIUM: 2E+21,
     AZTEC_SLASH_AMOUNT_LARGE: 2E+21,
@@ -179,24 +180,27 @@ export const mainnetConfig = {
     AZTEC_SLASHING_QUORUM: 65,
     AZTEC_GOVERNANCE_PROPOSER_QUORUM: 600,
     AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 1000,
-    AZTEC_MANA_TARGET: 0,
-    AZTEC_PROVING_COST_PER_MANA: 0,
+    AZTEC_MANA_TARGET: 75000000,
+    AZTEC_PROVING_COST_PER_MANA: 25000000,
     AZTEC_EXIT_DELAY_SECONDS: 345600,
     AZTEC_SLASHING_DISABLE_DURATION: 259200,
+    AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 500,
+    AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 500,
+    AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 1,
+    AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 400,
+    AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 4,
     L1_CHAIN_ID: 1,
     TEST_ACCOUNTS: false,
     SPONSORED_FPC: false,
-    TRANSACTIONS_DISABLED: true,
-    SEQ_MAX_TX_PER_BLOCK: 0,
+    TRANSACTIONS_DISABLED: false,
+    SEQ_MAX_TX_PER_CHECKPOINT: 72,
     PROVER_REAL_PROOFS: true,
-    SYNC_SNAPSHOTS_URLS: 'https://aztec-labs-snapshots.com/mainnet/',
     BLOB_ALLOW_EMPTY_SOURCES: true,
-    P2P_MAX_PENDING_TX_COUNT: 0,
+    P2P_MAX_PENDING_TX_COUNT: 1000,
     P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
-    AUTO_UPDATE: 'notify',
-    AUTO_UPDATE_URL: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
-    PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
-    PUBLIC_OTEL_COLLECT_FROM: 'sequencer',
+    PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: '',
+    PUBLIC_OTEL_COLLECT_FROM: '',
+    ENABLE_VERSION_CHECK: false,
     SLASH_PRUNE_PENALTY: 0,
     SLASH_DATA_WITHHOLDING_PENALTY: 0,
     SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8,

package/dest/config/network_config.d.ts

@@ -19,4 +19,4 @@ export declare function getNetworkConfig(networkName: NetworkNames, cacheDir?: s
  * Does not throw if the network simply doesn't exist in the config - just returns without enriching
  */
 export declare function enrichEnvironmentWithNetworkConfig(networkName: NetworkNames): Promise<void>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya19jb25maWcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvbmV0d29ya19jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUEwQixLQUFLLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBYXpHOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGdCQUFnQixDQUNwQyxXQUFXLEVBQUUsWUFBWSxFQUN6QixRQUFRLENBQUMsRUFBRSxNQUFNLEdBQ2hCLE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDLENBOEJwQztBQXVERDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFzQixrQ0FBa0MsQ0FBQyxXQUFXLEVBQUUsWUFBWSxpQkEyQmpGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya19jb25maWcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvbmV0d29ya19jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUEwQixLQUFLLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBWXpHOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGdCQUFnQixDQUNwQyxXQUFXLEVBQUUsWUFBWSxFQUN6QixRQUFRLENBQUMsRUFBRSxNQUFNLEdBQ2hCLE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDLENBOEJwQztBQXNERDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFzQixrQ0FBa0MsQ0FBQyxXQUFXLEVBQUUsWUFBWSxpQkFpQ2pGIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"network_config.d.ts","sourceRoot":"","sources":["../../src/config/network_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA0B,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAazG;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA8BpC;AAuDD;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CAAC,WAAW,EAAE,YAAY,iBA2BjF"}
+{"version":3,"file":"network_config.d.ts","sourceRoot":"","sources":["../../src/config/network_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA0B,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAYzG;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA8BpC;AAsDD;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CAAC,WAAW,EAAE,YAAY,iBAiCjF"}

package/dest/config/network_config.js

@@ -5,7 +5,6 @@ import { cachedFetch } from './cached_fetch.js';
 import { enrichEthAddressVar, enrichVar } from './enrich_env.js';
 const DEFAULT_CONFIG_URL = 'https://raw.githubusercontent.com/AztecProtocol/networks/refs/heads/main/network_config.json';
 const FALLBACK_CONFIG_URL = 'https://metadata.aztec.network/network_config.json';
-const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
 /**
  * Fetches remote network configuration from GitHub with caching support.
  * Uses the reusable cachedFetch utility. Falls back to metadata.aztec.network if the default URL fails.
@@ -64,7 +63,6 @@ const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
     let rawConfig;
     if (url.protocol === 'http:' || url.protocol === 'https:') {
         rawConfig = await cachedFetch(url.href, {
-            cacheDurationMs: NETWORK_CONFIG_CACHE_DURATION_MS,
             cacheFile: cacheDir ? join(cacheDir, networkName, 'network_config.json') : undefined
         });
     } else if (url.protocol === 'file:') {
@@ -109,7 +107,13 @@ const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
     if (networkConfig.blobFileStoreUrls?.length) {
         enrichVar('BLOB_FILE_STORE_URLS', networkConfig.blobFileStoreUrls.join(','));
     }
+    if (networkConfig.txCollectionFileStoreUrls?.length) {
+        enrichVar('TX_COLLECTION_FILE_STORE_URLS', networkConfig.txCollectionFileStoreUrls.join(','));
+    }
     if (networkConfig.blockDurationMs !== undefined) {
         enrichVar('SEQ_BLOCK_DURATION_MS', String(networkConfig.blockDurationMs));
     }
+    if (networkConfig.txPublicSetupAllowListExtend) {
+        enrichVar('TX_PUBLIC_SETUP_ALLOWLIST', networkConfig.txPublicSetupAllowListExtend);
+    }
 }

package/dest/utils/aztec.d.ts

@@ -15,7 +15,6 @@ import type { NoirPackageConfig } from '@aztec/foundation/noir';
 export declare function getFunctionAbi(artifact: ContractArtifact, fnName: string): FunctionAbi;
 export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], privateKey: string | undefined, chainId: number, mnemonic: string, mnemonicIndex: number, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, config: L1ContractsConfig, realVerifier: boolean): Promise<{
     rollup: RollupContract;
-    slashFactoryAddress: EthAddress;
 }>;
 /**
  * Gets all contracts available in \@aztec/noir-contracts.js.
@@ -54,4 +53,4 @@ export declare const stripLeadingHex: (hex: string) => string;
  */
 export declare const addLeadingHex: (hex: string) => `0x${string}`;
 export declare function prettyPrintNargoToml(config: NoirPackageConfig): string;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9henRlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBSWpCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBRTFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxLQUFLLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQVdoRTs7Ozs7R0FLRztBQUNILHdCQUFnQixjQUFjLENBQUMsUUFBUSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsV0FBVyxDQU10RjtBQUVELHdCQUFzQix3QkFBd0IsQ0FDNUMsZUFBZSxFQUFFLFVBQVUsRUFDM0IsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUNqQixVQUFVLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDOUIsT0FBTyxFQUFFLE1BQU0sRUFDZixRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsTUFBTSxFQUNyQixpQkFBaUIsRUFBRSxRQUFRLEVBQUUsRUFDN0Isa0JBQWtCLEVBQUUsRUFBRSxFQUN0Qiw0QkFBNEIsRUFBRSxNQUFNLEVBQ3BDLE1BQU0sRUFBRSxpQkFBaUIsRUFDekIsWUFBWSxFQUFFLE9BQU8sR0FDcEIsT0FBTyxDQUFDO0lBQUUsTUFBTSxFQUFFLGNBQWMsQ0FBQztJQUFDLG1CQUFtQixFQUFFLFVBQVUsQ0FBQTtDQUFFLENBQUMsQ0FnRHRFO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLHVCQUF1QixJQUFJLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUtqRTtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsS0FBSyw2QkE0QnBFO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixNQUFNLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsS0FBSzs7OztHQU8zRztBQUVEOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sZUFBZSx5QkFLM0IsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sYUFBYSxnQ0FLekIsQ0FBQztBQU9GLHdCQUFnQixvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsaUJBQWlCLEdBQUcsTUFBTSxDQVV0RSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9henRlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBSWpCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBRTFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxLQUFLLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQVdoRTs7Ozs7R0FLRztBQUNILHdCQUFnQixjQUFjLENBQUMsUUFBUSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsV0FBVyxDQU10RjtBQUVELHdCQUFzQix3QkFBd0IsQ0FDNUMsZUFBZSxFQUFFLFVBQVUsRUFDM0IsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUNqQixVQUFVLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDOUIsT0FBTyxFQUFFLE1BQU0sRUFDZixRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsTUFBTSxFQUNyQixpQkFBaUIsRUFBRSxRQUFRLEVBQUUsRUFDN0Isa0JBQWtCLEVBQUUsRUFBRSxFQUN0Qiw0QkFBNEIsRUFBRSxNQUFNLEVBQ3BDLE1BQU0sRUFBRSxpQkFBaUIsRUFDekIsWUFBWSxFQUFFLE9BQU8sR0FDcEIsT0FBTyxDQUFDO0lBQUUsTUFBTSxFQUFFLGNBQWMsQ0FBQTtDQUFFLENBQUMsQ0EwQ3JDO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLHVCQUF1QixJQUFJLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUtqRTtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsS0FBSyw2QkE0QnBFO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixNQUFNLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsS0FBSzs7OztHQU8zRztBQUVEOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sZUFBZSx5QkFLM0IsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sYUFBYSxnQ0FLekIsQ0FBQztBQU9GLHdCQUFnQixvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsaUJBQWlCLEdBQUcsTUFBTSxDQVV0RSJ9

package/dest/utils/aztec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAE1E,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAWhE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CAgDtE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,yBAK3B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,gCAKzB,CAAC;AAOF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE"}
+{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAE1E,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAWhE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAA;CAAE,CAAC,CA0CrC;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,yBAK3B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,gCAKzB,CAAC;AAOF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE"}

package/dest/utils/aztec.js

@@ -51,7 +51,7 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, private
             initialValidators
         });
     }
-    const { rollup, slashFactoryAddress } = await deployRollupForUpgrade(privateKey, rpcUrls[0], chainId, registryAddress, {
+    const { rollup } = await deployRollupForUpgrade(privateKey, rpcUrls[0], chainId, registryAddress, {
         vkTreeRoot: getVKTreeRoot(),
         protocolContractsHash,
         genesisArchiveRoot,
@@ -61,8 +61,7 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, private
         ...config
     });
     return {
-        rollup,
-        slashFactoryAddress: EthAddress.fromString(slashFactoryAddress)
+        rollup
     };
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "0.0.1-commit.96dac018d",
+  "version": "0.0.1-commit.9badcec54",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -77,23 +77,23 @@
     ]
   },
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.96dac018d",
-    "@aztec/archiver": "0.0.1-commit.96dac018d",
-    "@aztec/aztec.js": "0.0.1-commit.96dac018d",
-    "@aztec/constants": "0.0.1-commit.96dac018d",
-    "@aztec/entrypoints": "0.0.1-commit.96dac018d",
-    "@aztec/ethereum": "0.0.1-commit.96dac018d",
-    "@aztec/foundation": "0.0.1-commit.96dac018d",
-    "@aztec/l1-artifacts": "0.0.1-commit.96dac018d",
-    "@aztec/node-keystore": "0.0.1-commit.96dac018d",
-    "@aztec/node-lib": "0.0.1-commit.96dac018d",
-    "@aztec/p2p": "0.0.1-commit.96dac018d",
-    "@aztec/protocol-contracts": "0.0.1-commit.96dac018d",
-    "@aztec/sequencer-client": "0.0.1-commit.96dac018d",
-    "@aztec/slasher": "0.0.1-commit.96dac018d",
-    "@aztec/stdlib": "0.0.1-commit.96dac018d",
-    "@aztec/wallets": "0.0.1-commit.96dac018d",
-    "@aztec/world-state": "0.0.1-commit.96dac018d",
+    "@aztec/accounts": "0.0.1-commit.9badcec54",
+    "@aztec/archiver": "0.0.1-commit.9badcec54",
+    "@aztec/aztec.js": "0.0.1-commit.9badcec54",
+    "@aztec/constants": "0.0.1-commit.9badcec54",
+    "@aztec/entrypoints": "0.0.1-commit.9badcec54",
+    "@aztec/ethereum": "0.0.1-commit.9badcec54",
+    "@aztec/foundation": "0.0.1-commit.9badcec54",
+    "@aztec/l1-artifacts": "0.0.1-commit.9badcec54",
+    "@aztec/node-keystore": "0.0.1-commit.9badcec54",
+    "@aztec/node-lib": "0.0.1-commit.9badcec54",
+    "@aztec/p2p": "0.0.1-commit.9badcec54",
+    "@aztec/protocol-contracts": "0.0.1-commit.9badcec54",
+    "@aztec/sequencer-client": "0.0.1-commit.9badcec54",
+    "@aztec/slasher": "0.0.1-commit.9badcec54",
+    "@aztec/stdlib": "0.0.1-commit.9badcec54",
+    "@aztec/wallets": "0.0.1-commit.9badcec54",
+    "@aztec/world-state": "0.0.1-commit.9badcec54",
     "@ethersproject/wallet": "^5.8.0",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
@@ -107,9 +107,9 @@
     "viem": "npm:@aztec/viem@2.38.2"
   },
   "devDependencies": {
-    "@aztec/aztec-node": "0.0.1-commit.96dac018d",
-    "@aztec/kv-store": "0.0.1-commit.96dac018d",
-    "@aztec/telemetry-client": "0.0.1-commit.96dac018d",
+    "@aztec/aztec-node": "0.0.1-commit.9badcec54",
+    "@aztec/kv-store": "0.0.1-commit.9badcec54",
+    "@aztec/telemetry-client": "0.0.1-commit.9badcec54",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -126,15 +126,15 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "0.0.1-commit.96dac018d",
-    "@aztec/bb-prover": "0.0.1-commit.96dac018d",
-    "@aztec/ethereum": "0.0.1-commit.96dac018d",
-    "@aztec/l1-artifacts": "0.0.1-commit.96dac018d",
-    "@aztec/noir-contracts.js": "0.0.1-commit.96dac018d",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.96dac018d",
-    "@aztec/noir-test-contracts.js": "0.0.1-commit.96dac018d",
-    "@aztec/protocol-contracts": "0.0.1-commit.96dac018d",
-    "@aztec/stdlib": "0.0.1-commit.96dac018d"
+    "@aztec/accounts": "0.0.1-commit.9badcec54",
+    "@aztec/bb-prover": "0.0.1-commit.9badcec54",
+    "@aztec/ethereum": "0.0.1-commit.9badcec54",
+    "@aztec/l1-artifacts": "0.0.1-commit.9badcec54",
+    "@aztec/noir-contracts.js": "0.0.1-commit.9badcec54",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.9badcec54",
+    "@aztec/noir-test-contracts.js": "0.0.1-commit.9badcec54",
+    "@aztec/protocol-contracts": "0.0.1-commit.9badcec54",
+    "@aztec/stdlib": "0.0.1-commit.9badcec54"
   },
   "files": [
     "dest",

package/src/cmds/aztec_node/get_node_info.ts

@@ -23,7 +23,6 @@ export async function getNodeInfo(nodeUrl: string, json: boolean, log: LogFn, lo
         rewardDistributor: info.l1ContractAddresses.rewardDistributorAddress.toString(),
         governanceProposer: info.l1ContractAddresses.governanceProposerAddress.toString(),
         governance: info.l1ContractAddresses.governanceAddress.toString(),
-        slashFactory: info.l1ContractAddresses.slashFactoryAddress?.toString(),
         feeAssetHandler: info.l1ContractAddresses.feeAssetHandlerAddress?.toString(),
         stakingAssetHandler: info.l1ContractAddresses.stakingAssetHandlerAddress?.toString(),
       },
@@ -51,7 +50,6 @@ export async function getNodeInfo(nodeUrl: string, json: boolean, log: LogFn, lo
     log(` RewardDistributor Address: ${info.l1ContractAddresses.rewardDistributorAddress.toString()}`);
     log(` GovernanceProposer Address: ${info.l1ContractAddresses.governanceProposerAddress.toString()}`);
     log(` Governance Address: ${info.l1ContractAddresses.governanceAddress.toString()}`);
-    log(` SlashFactory Address: ${info.l1ContractAddresses.slashFactoryAddress?.toString()}`);
     log(` FeeAssetHandler Address: ${info.l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
     log(` StakingAssetHandler Address: ${info.l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
     log(`L2 Contract Addresses:`);

package/src/cmds/l1/deploy_l1_contracts_cmd.ts

@@ -96,7 +96,6 @@ export async function deployL1ContractsCmd(
     log(`RewardDistributor Address: ${l1ContractAddresses.rewardDistributorAddress.toString()}`);
     log(`GovernanceProposer Address: ${l1ContractAddresses.governanceProposerAddress.toString()}`);
     log(`Governance Address: ${l1ContractAddresses.governanceAddress.toString()}`);
-    log(`SlashFactory Address: ${l1ContractAddresses.slashFactoryAddress?.toString()}`);
     log(`FeeAssetHandler Address: ${l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
     log(`StakingAssetHandler Address: ${l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
     log(`ZK Passport Verifier Address: ${l1ContractAddresses.zkPassportVerifierAddress?.toString()}`);

package/src/cmds/l1/deploy_new_rollup.ts

@@ -29,7 +29,7 @@ export async function deployNewRollup(
   const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
   const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
 
-  const { rollup, slashFactoryAddress } = await deployNewRollupContracts(
+  const { rollup } = await deployNewRollupContracts(
     registryAddress,
     rpcUrls,
     privateKey,
@@ -51,7 +51,6 @@ export async function deployNewRollup(
           initialFundedAccounts: initialFundedAccounts.map(a => a.toString()),
           initialValidators: initialValidators.map(a => a.attester.toString()),
           genesisArchiveRoot: genesisArchiveRoot.toString(),
-          slashFactoryAddress: slashFactoryAddress.toString(),
         },
         null,
         2,
@@ -62,6 +61,5 @@ export async function deployNewRollup(
     log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
     log(`Initial validators: ${initialValidators.map(a => a.attester.toString()).join(', ')}`);
     log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
-    log(`Slash Factory Address: ${slashFactoryAddress.toString()}`);
   }
 }

package/src/config/cached_fetch.ts

@@ -1,24 +1,48 @@
 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';
 
 export interface CachedFetchOptions {
-  /** Cache duration in milliseconds */
-  cacheDurationMs: number;
-  /** The cache file */
+  /** The cache file path for storing data. If not provided, no caching is performed. */
   cacheFile?: string;
+  /** Fallback max-age in milliseconds when server sends no Cache-Control header. Defaults to 5 minutes. */
+  defaultMaxAgeMs?: number;
+}
+
+/** Cache metadata stored in a sidecar .meta file alongside the data file. */
+interface CacheMeta {
+  etag?: string;
+  expiresAt: number;
+}
+
+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: { headers: { get(name: string): string | null } }): number | undefined {
+  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<T = any>(
   url: string,
@@ -26,42 +50,106 @@ export async function cachedFetch<T = any>(
   fetch = globalThis.fetch,
   log = createLogger('cached_fetch'),
 ): Promise<T | undefined> {
-  const { cacheDurationMs, cacheFile } = options;
+  const { cacheFile, defaultMaxAgeMs = DEFAULT_MAX_AGE_MS } = options;
+
+  // If no cacheFile, just fetch normally without caching
+  if (!cacheFile) {
+    return fetchAndParse<T>(url, fetch, log);
+  }
+
+  const metaFile = cacheFile + '.meta';
 
-  // Try to read from cache first
+  // Try to read metadata
+  let meta: CacheMeta | undefined;
   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: T | undefined;
   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: Record<string, string> = {};
+    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;
     }
 
-    const data = await response.json();
+    // 200 — parse new data and cache it
+    const data = (await response.json()) as T;
+    const maxAgeMs = parseMaxAge(response) ?? defaultMaxAgeMs;
+    const etag = response.headers.get('etag') ?? undefined;
 
-    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 });
-    }
+    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<T>(
+  url: string,
+  fetch: typeof globalThis.fetch,
+  log: ReturnType<typeof createLogger>,
+): Promise<T | undefined> {
+  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()) as T;
   } catch (err) {
     log.warn(`Failed to fetch from ${url}`, { err });
     return undefined;
   }
 }
+
+async function ensureDir(filePath: string, log: ReturnType<typeof createLogger>) {
+  try {
+    await mkdir(dirname(filePath), { recursive: true });
+  } catch (err) {
+    log.warn('Failed to create cache directory for: ' + filePath, { err });
+  }
+}
+
+async function writeMetaFile(metaFile: string, meta: CacheMeta, log: ReturnType<typeof createLogger>) {
+  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 });
+  }
+}