@aztec/cli 0.0.1-commit.3469e52 → 0.0.1-commit.3895657bc

package/dest/cmds/infrastructure/setup_l2_contract.d.ts

@@ -1,3 +1,3 @@
 import type { LogFn } from '@aztec/foundation/log';
 export declare function setupL2Contracts(nodeUrl: string, testAccounts: boolean, json: boolean, log: LogFn): Promise<void>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBfbDJfY29udHJhY3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2luZnJhc3RydWN0dXJlL3NldHVwX2wyX2NvbnRyYWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSW5ELHdCQUFzQixnQkFBZ0IsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxpQkF3QnZHIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBfbDJfY29udHJhY3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2luZnJhc3RydWN0dXJlL3NldHVwX2wyX2NvbnRyYWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBS25ELHdCQUFzQixnQkFBZ0IsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxpQkF3QnZHIn0=

package/dest/cmds/infrastructure/setup_l2_contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup_l2_contract.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/setup_l2_contract.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,iBAwBvG"}
+{"version":3,"file":"setup_l2_contract.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/setup_l2_contract.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAKnD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,iBAwBvG"}

package/dest/cmds/infrastructure/setup_l2_contract.js

@@ -2,7 +2,8 @@ import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
+import { EmbeddedWallet } from '@aztec/wallets/embedded';
+import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
 export async function setupL2Contracts(nodeUrl, testAccounts, json, log) {
     const waitOpts = {
         timeout: 180,
@@ -11,12 +12,12 @@ export async function setupL2Contracts(nodeUrl, testAccounts, json, log) {
     log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
     log('setupL2Contracts: Creating PXE client...');
     const node = createAztecNodeClient(nodeUrl);
-    const wallet = await TestWallet.create(node);
+    const wallet = await EmbeddedWallet.create(node);
     let deployedAccountManagers = [];
     if (testAccounts) {
         log('setupL2Contracts: Deploying test accounts...');
         const initialAccountsData = await getInitialTestAccountsData();
-        deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, node, initialAccountsData, waitOpts);
+        deployedAccountManagers = await deployFundedSchnorrAccounts(wallet, initialAccountsData, waitOpts);
     }
     if (json) {
         const toPrint = {

package/dest/cmds/l1/assume_proven_through.d.ts

@@ -1,3 +1,4 @@
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import type { LogFn } from '@aztec/foundation/log';
-export declare function assumeProvenThrough(blockNumberOrLatest: number | undefined, l1RpcUrls: string[], nodeUrl: string, log: LogFn): Promise<void>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXNzdW1lX3Byb3Zlbl90aHJvdWdoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy9sMS9hc3N1bWVfcHJvdmVuX3Rocm91Z2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkQsd0JBQXNCLG1CQUFtQixDQUN2QyxtQkFBbUIsRUFBRSxNQUFNLEdBQUcsU0FBUyxFQUN2QyxTQUFTLEVBQUUsTUFBTSxFQUFFLEVBQ25CLE9BQU8sRUFBRSxNQUFNLEVBQ2YsR0FBRyxFQUFFLEtBQUssaUJBWVgifQ==
+export declare function assumeProvenThrough(checkpointOrLatest: CheckpointNumber | undefined, l1RpcUrls: string[], nodeUrl: string, log: LogFn): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXNzdW1lX3Byb3Zlbl90aHJvdWdoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy9sMS9hc3N1bWVfcHJvdmVuX3Rocm91Z2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDbkUsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkQsd0JBQXNCLG1CQUFtQixDQUN2QyxrQkFBa0IsRUFBRSxnQkFBZ0IsR0FBRyxTQUFTLEVBQ2hELFNBQVMsRUFBRSxNQUFNLEVBQUUsRUFDbkIsT0FBTyxFQUFFLE1BQU0sRUFDZixHQUFHLEVBQUUsS0FBSyxpQkFTWCJ9

package/dest/cmds/l1/assume_proven_through.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assume_proven_through.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/assume_proven_through.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,wBAAsB,mBAAmB,CACvC,mBAAmB,EAAE,MAAM,GAAG,SAAS,EACvC,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,KAAK,iBAYX"}
+{"version":3,"file":"assume_proven_through.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/assume_proven_through.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,wBAAsB,mBAAmB,CACvC,kBAAkB,EAAE,gBAAgB,GAAG,SAAS,EAChD,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,KAAK,iBASX"}

package/dest/cmds/l1/assume_proven_through.js

@@ -1,14 +1,12 @@
 import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import { RollupCheatCodes } from '@aztec/ethereum/test';
-import { BlockNumber } from '@aztec/foundation/branded-types';
 import { DateProvider } from '@aztec/foundation/timer';
-export async function assumeProvenThrough(blockNumberOrLatest, l1RpcUrls, nodeUrl, log) {
+export async function assumeProvenThrough(checkpointOrLatest, l1RpcUrls, nodeUrl, log) {
     const aztecNode = createAztecNodeClient(nodeUrl);
     const rollupAddress = await aztecNode.getNodeInfo().then((i)=>i.l1ContractAddresses.rollupAddress);
-    const blockNumber = blockNumberOrLatest ? BlockNumber(blockNumberOrLatest) : await aztecNode.getBlockNumber();
     const rollupCheatCodes = RollupCheatCodes.create(l1RpcUrls, {
         rollupAddress
     }, new DateProvider());
-    await rollupCheatCodes.markAsProven(blockNumber);
-    log(`Assumed proven through block ${blockNumber}`);
+    await rollupCheatCodes.markAsProven(checkpointOrLatest);
+    log(`Assumed proven through checkpoint ${checkpointOrLatest ?? 'latest'}`);
 }

package/dest/cmds/l1/compute_genesis_values.d.ts

@@ -0,0 +1,4 @@
+import type { LogFn } from '@aztec/foundation/log';
+/** Computes and prints genesis values needed for L1 contract deployment. */
+export declare function computeGenesisValuesCmd(testAccounts: boolean, sponsoredFPC: boolean, log: LogFn): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcHV0ZV9nZW5lc2lzX3ZhbHVlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NtZHMvbDEvY29tcHV0ZV9nZW5lc2lzX3ZhbHVlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQU1uRCw0RUFBNEU7QUFDNUUsd0JBQXNCLHVCQUF1QixDQUFDLFlBQVksRUFBRSxPQUFPLEVBQUUsWUFBWSxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxpQkFvQnJHIn0=

package/dest/cmds/l1/compute_genesis_values.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compute_genesis_values.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/compute_genesis_values.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAMnD,4EAA4E;AAC5E,wBAAsB,uBAAuB,CAAC,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,iBAoBrG"}

package/dest/cmds/l1/compute_genesis_values.js

@@ -0,0 +1,17 @@
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
+import { getGenesisValues } from '@aztec/world-state/testing';
+import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
+/** Computes and prints genesis values needed for L1 contract deployment. */ export async function computeGenesisValuesCmd(testAccounts, sponsoredFPC, log) {
+    const initialAccounts = testAccounts ? await getInitialTestAccountsData() : [];
+    const sponsoredFPCAddresses = sponsoredFPC ? await getSponsoredFPCAddress() : [];
+    const initialFundedAccounts = initialAccounts.map((a)=>a.address).concat(sponsoredFPCAddresses);
+    const { genesisArchiveRoot } = await getGenesisValues(initialFundedAccounts);
+    const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
+    const vkTreeRoot = getVKTreeRoot();
+    log(JSON.stringify({
+        vkTreeRoot: vkTreeRoot.toString(),
+        protocolContractsHash: protocolContractsHash.toString(),
+        genesisArchiveRoot: genesisArchiveRoot.toString()
+    }, null, 2));
+}

package/dest/cmds/l1/index.d.ts

@@ -1,4 +1,4 @@
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { type Command } from 'commander';
 export declare function injectCommands(program: Command, log: LogFn, debugLogger: Logger): Command;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2wxL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUUzRCxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQVUsTUFBTSxXQUFXLENBQUM7QUF3QmpELHdCQUFnQixjQUFjLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLFdBNmUvRSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2wxL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUUzRCxPQUFPLEVBQUUsS0FBSyxPQUFPLEVBQVUsTUFBTSxXQUFXLENBQUM7QUF3QmpELHdCQUFnQixjQUFjLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxFQUFFLFdBQVcsRUFBRSxNQUFNLFdBK2YvRSJ9

package/dest/cmds/l1/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAwBjD,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WA6e/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAwBjD,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WA+f/E"}

package/dest/cmds/l1/index.js

@@ -1,3 +1,4 @@
+import { CheckpointNumber } from '@aztec/foundation/branded-types';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Option } from 'commander';
 import { ETHEREUM_HOSTS, MNEMONIC, PRIVATE_KEY, l1ChainIdOption, nodeOption, parseAztecAddress, parseBigint, parseEthereumAddress } from '../../utils/commands.js';
@@ -16,6 +17,10 @@ export function injectCommands(program, log, debugLogger) {
         const initialValidators = options.validators?.split(',').map((validator)=>EthAddress.fromString(validator)) || [];
         await deployNewRollup(options.registryAddress, options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.testAccounts, options.sponsoredFpc, options.json, initialValidators, options.realVerifier, log);
     });
+    program.command('compute-genesis-values').description('Computes genesis values (VK tree root, protocol contracts hash, genesis archive root).').addOption(new Option('--test-accounts <boolean>', 'Include initial test accounts in genesis state').env('TEST_ACCOUNTS').argParser((arg)=>arg === 'true')).addOption(new Option('--sponsored-fpc <boolean>', 'Include sponsored FPC contract in genesis state').env('SPONSORED_FPC').argParser((arg)=>arg === 'true')).action(async (options)=>{
+        const { computeGenesisValuesCmd } = await import('./compute_genesis_values.js');
+        await computeGenesisValuesCmd(options.testAccounts, options.sponsoredFpc, log);
+    });
     program.command('deposit-governance-tokens').description('Deposits governance tokens to the governance contract.').requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress).requiredOption('--recipient <string>', 'The recipient of the tokens', parseEthereumAddress).requiredOption('-a, --amount <string>', 'The amount of tokens to deposit', parseBigint).option('--mint', 'Mint the tokens on L1', false).addOption(l1RpcUrlsOption).addOption(l1ChainIdOption).option('-p, --private-key <string>', 'The private key to use to deposit', PRIVATE_KEY).option('-m, --mnemonic <string>', 'The mnemonic to use to deposit', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use to deposit', (arg)=>parseInt(arg), 0).action(async (options)=>{
         const { depositGovernanceTokens } = await import('./governance_utils.js');
         await depositGovernanceTokens({
@@ -188,9 +193,9 @@ export function injectCommands(program, log, debugLogger) {
     });
     program.command('set-proven-through', {
         hidden: true
-    }).description('Instructs the L1 rollup contract to assume all blocks until the given number are automatically proven.').argument('[blockNumber]', 'The target block number, defaults to the latest pending block number.', parseBigint).addOption(l1RpcUrlsOption).addOption(nodeOption).action(async (blockNumber, options)=>{
+    }).description('Instructs the L1 rollup contract to assume all blocks until the given checkpoint are automatically proven.').argument('[checkpoint]', 'The target checkpoint, defaults to the latest pending checkpoint.', parseBigint).addOption(l1RpcUrlsOption).addOption(nodeOption).action(async (checkpoint, options)=>{
         const { assumeProvenThrough } = await import('./assume_proven_through.js');
-        await assumeProvenThrough(blockNumber, options.l1RpcUrls, options.nodeUrl, log);
+        await assumeProvenThrough(CheckpointNumber.fromBigInt(checkpoint), options.l1RpcUrls, options.nodeUrl, log);
     });
     program.command('advance-epoch').description('Use L1 cheat codes to warp time until the next epoch.').addOption(l1RpcUrlsOption).addOption(nodeOption).action(async (options)=>{
         const { advanceEpoch } = await import('./advance_epoch.js');

package/dest/cmds/l1/update_l1_validators.js

@@ -2,7 +2,7 @@ import { createEthereumChain, isAnvilTestChain } from '@aztec/ethereum/chain';
 import { createExtendedL1Client, getPublicClient } from '@aztec/ethereum/client';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
 import { GSEContract, RollupContract } from '@aztec/ethereum/contracts';
-import { createL1TxUtilsFromViemWallet } from '@aztec/ethereum/l1-tx-utils';
+import { createL1TxUtils } from '@aztec/ethereum/l1-tx-utils';
 import { EthCheatCodes } from '@aztec/ethereum/test';
 import { DateProvider } from '@aztec/foundation/timer';
 import { RollupAbi, StakingAssetHandlerAbi, TestERC20Abi } from '@aztec/l1-artifacts';
@@ -38,7 +38,7 @@ export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, a
     const gseAddress = await rollup.read.getGSE();
     const gse = new GSEContract(l1Client, gseAddress);
     const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
-    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+    const l1TxUtils = createL1TxUtils(l1Client, {
         logger: debugLogger
     });
     const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
@@ -130,7 +130,7 @@ export async function addL1ValidatorViaRollup({ rpcUrls, chainId, privateKey, mn
     const gseAddress = await rollup.read.getGSE();
     const gse = new GSEContract(l1Client, gseAddress);
     const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
-    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+    const l1TxUtils = createL1TxUtils(l1Client, {
         logger: debugLogger
     });
     const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
@@ -172,7 +172,7 @@ export async function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic
     const account = getAccount(privateKey, mnemonic);
     const chain = createEthereumChain(rpcUrls, chainId);
     const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
-    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+    const l1TxUtils = createL1TxUtils(l1Client, {
         logger: debugLogger
     });
     dualLog(`Removing validator ${validatorAddress.toString()} from rollup ${rollupAddress.toString()}`);
@@ -194,7 +194,7 @@ export async function pruneRollup({ rpcUrls, chainId, privateKey, mnemonic, roll
     const account = getAccount(privateKey, mnemonic);
     const chain = createEthereumChain(rpcUrls, chainId);
     const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
-    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+    const l1TxUtils = createL1TxUtils(l1Client, {
         logger: debugLogger
     });
     dualLog(`Trying prune`);

package/dest/config/cached_fetch.d.ts

@@ -1,18 +1,27 @@
 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;
 }
+/** Extracts max-age value in milliseconds from a Response's Cache-Control header. Returns undefined if not present. */
+export declare function parseMaxAge(response: {
+    headers: {
+        get(name: string): string | null;
+    };
+}): number | undefined;
 /**
- * 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 declare function cachedFetch<T = any>(url: string, options: CachedFetchOptions, fetch?: typeof globalThis.fetch, log?: import("@aztec/aztec.js/log").Logger): Promise<T | undefined>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGVkX2ZldGNoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NhY2hlZF9mZXRjaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxNQUFNLFdBQVcsa0JBQWtCO0lBQ2pDLHFDQUFxQztJQUNyQyxlQUFlLEVBQUUsTUFBTSxDQUFDO0lBQ3hCLHFCQUFxQjtJQUNyQixTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDcEI7QUFFRDs7Ozs7Ozs7O0dBU0c7QUFDSCx3QkFBc0IsV0FBVyxDQUFDLENBQUMsR0FBRyxHQUFHLEVBQ3ZDLEdBQUcsRUFBRSxNQUFNLEVBQ1gsT0FBTyxFQUFFLGtCQUFrQixFQUMzQixLQUFLLDBCQUFtQixFQUN4QixHQUFHLHVDQUErQixHQUNqQyxPQUFPLENBQUMsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxDQXVDeEIifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FjaGVkX2ZldGNoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NhY2hlZF9mZXRjaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFLQSxNQUFNLFdBQVcsa0JBQWtCO0lBQ2pDLHNGQUFzRjtJQUN0RixTQUFTLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbkIseUdBQXlHO0lBQ3pHLGVBQWUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUMxQjtBQVVELHVIQUF1SDtBQUN2SCx3QkFBZ0IsV0FBVyxDQUFDLFFBQVEsRUFBRTtJQUFFLE9BQU8sRUFBRTtRQUFFLEdBQUcsQ0FBQyxJQUFJLEVBQUUsTUFBTSxHQUFHLE1BQU0sR0FBRyxJQUFJLENBQUE7S0FBRSxDQUFBO0NBQUUsR0FBRyxNQUFNLEdBQUcsU0FBUyxDQVUzRztBQUVEOzs7Ozs7Ozs7Ozs7R0FZRztBQUNILHdCQUFzQixXQUFXLENBQUMsQ0FBQyxHQUFHLEdBQUcsRUFDdkMsR0FBRyxFQUFFLE1BQU0sRUFDWCxPQUFPLEVBQUUsa0JBQWtCLEVBQzNCLEtBQUssMEJBQW1CLEVBQ3hCLEdBQUcsdUNBQStCLEdBQ2pDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsU0FBUyxDQUFDLENBb0V4QiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"cached_fetch.d.ts","sourceRoot":"","sources":["../../src/config/cached_fetch.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,kBAAkB;IACjC,qCAAqC;IACrC,eAAe,EAAE,MAAM,CAAC;IACxB,qBAAqB;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;GASG;AACH,wBAAsB,WAAW,CAAC,CAAC,GAAG,GAAG,EACvC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,kBAAkB,EAC3B,KAAK,0BAAmB,EACxB,GAAG,uCAA+B,GACjC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAuCxB"}
+{"version":3,"file":"cached_fetch.d.ts","sourceRoot":"","sources":["../../src/config/cached_fetch.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,kBAAkB;IACjC,sFAAsF;IACtF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yGAAyG;IACzG,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAUD,uHAAuH;AACvH,wBAAgB,WAAW,CAAC,QAAQ,EAAE;IAAE,OAAO,EAAE;QAAE,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;KAAE,CAAA;CAAE,GAAG,MAAM,GAAG,SAAS,CAU3G;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,WAAW,CAAC,CAAC,GAAG,GAAG,EACvC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,kBAAkB,EAC3B,KAAK,0BAAmB,EACxB,GAAG,uCAA+B,GACjC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAoExB"}

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

@@ -11,4 +11,4 @@ import type { NetworkNames } from '@aztec/foundation/config';
  * @param networkName - The network name
  */
 export declare function enrichEnvironmentWithChainName(networkName: NetworkNames): void;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbDJfY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NoYWluX2wyX2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQTBCN0Q7Ozs7Ozs7Ozs7R0FVRztBQUNILHdCQUFnQiw4QkFBOEIsQ0FBQyxXQUFXLEVBQUUsWUFBWSxRQW1CdkUifQ==
+//# 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,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AA0B7D;;;;;;;;;;GAUG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,YAAY,QAmBvE"}
+{"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"}

package/dest/config/chain_l2_config.js

@@ -34,7 +34,9 @@ function getDefaultDataDir(networkName) {
         return;
     }
     // Apply generated network config from defaults.yml
-    const generatedConfig = NetworkConfigs[networkName];
+    // For devnet iterations (v4-devnet-1, etc.), use the base devnet config
+    const configKey = /^v\d+-devnet-\d+$/.test(networkName) ? 'devnet' : networkName;
+    const generatedConfig = NetworkConfigs[configKey];
     if (generatedConfig) {
         enrichEnvironmentWithNetworkConfig(generatedConfig);
     }