@aztec/cli 2.1.0-rc.9 → 3.0.0-devnet.2

package/src/cmds/l1/advance_epoch.ts

@@ -1,12 +1,13 @@
-import { createPXEClient, makeFetch } from '@aztec/aztec.js';
+import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import { RollupCheatCodes } from '@aztec/ethereum/test';
 import type { LogFn } from '@aztec/foundation/log';
+import { DateProvider } from '@aztec/foundation/timer';
 
-export async function advanceEpoch(l1RpcUrls: string[], rpcUrl: string, log: LogFn) {
-  const pxe = createPXEClient(rpcUrl, {}, makeFetch([], true));
-  const rollupAddress = await pxe.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
+export async function advanceEpoch(l1RpcUrls: string[], nodeUrl: string, log: LogFn) {
+  const aztecNode = createAztecNodeClient(nodeUrl);
+  const rollupAddress = await aztecNode.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
 
-  const cheat = RollupCheatCodes.create(l1RpcUrls, { rollupAddress });
+  const cheat = RollupCheatCodes.create(l1RpcUrls, { rollupAddress }, new DateProvider());
 
   await cheat.advanceToNextEpoch();
   log(`Warped time to advance to next epoch`);

package/src/cmds/l1/assume_proven_through.ts

@@ -1,18 +1,19 @@
-import { createPXEClient, makeFetch } from '@aztec/aztec.js';
+import { createAztecNodeClient } from '@aztec/aztec.js/node';
 import { RollupCheatCodes } from '@aztec/ethereum/test';
 import type { LogFn } from '@aztec/foundation/log';
+import { DateProvider } from '@aztec/foundation/timer';
 
 export async function assumeProvenThrough(
   blockNumberOrLatest: number | undefined,
   l1RpcUrls: string[],
-  rpcUrl: string,
+  nodeUrl: string,
   log: LogFn,
 ) {
-  const pxe = createPXEClient(rpcUrl, {}, makeFetch([], true));
-  const rollupAddress = await pxe.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
-  const blockNumber = blockNumberOrLatest ?? (await pxe.getBlockNumber());
+  const aztecNode = createAztecNodeClient(nodeUrl);
+  const rollupAddress = await aztecNode.getNodeInfo().then(i => i.l1ContractAddresses.rollupAddress);
+  const blockNumber = blockNumberOrLatest ?? (await aztecNode.getBlockNumber());
 
-  const rollupCheatCodes = RollupCheatCodes.create(l1RpcUrls, { rollupAddress });
+  const rollupCheatCodes = RollupCheatCodes.create(l1RpcUrls, { rollupAddress }, new DateProvider());
 
   await rollupCheatCodes.markAsProven(blockNumber);
   log(`Assumed proven through block ${blockNumber}`);

package/src/cmds/l1/bridge_erc20.ts

@@ -1,4 +1,6 @@
-import { type AztecAddress, type EthAddress, type Fr, L1ToL2TokenPortalManager } from '@aztec/aztec.js';
+import type { AztecAddress, EthAddress } from '@aztec/aztec.js/addresses';
+import { L1ToL2TokenPortalManager } from '@aztec/aztec.js/ethereum';
+import type { Fr } from '@aztec/aztec.js/fields';
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import type { LogFn, Logger } from '@aztec/foundation/log';
 

package/src/cmds/l1/deploy_l1_contracts.ts

@@ -1,5 +1,6 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
-import { type EthAddress, Fr } from '@aztec/aztec.js';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import type { EthAddress } from '@aztec/aztec.js/addresses';
+import { Fr } from '@aztec/aztec.js/fields';
 import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import { SecretValue } from '@aztec/foundation/config';
 import type { LogFn, Logger } from '@aztec/foundation/log';
@@ -28,7 +29,7 @@ export async function deployL1Contracts(
 ) {
   const config = getL1ContractsConfigEnvVars();
 
-  const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
+  const initialAccounts = testAccounts ? await getInitialTestAccountsData() : [];
   const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
   const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
   const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);

package/src/cmds/l1/deploy_new_rollup.ts

@@ -1,4 +1,4 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { type Operator, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn, Logger } from '@aztec/foundation/log';
@@ -20,12 +20,13 @@ export async function deployNewRollup(
   json: boolean,
   initialValidators: Operator[],
   realVerifier: boolean,
+  createVerificationJson: string | false,
   log: LogFn,
   debugLogger: Logger,
 ) {
   const config = getL1ContractsConfigEnvVars();
 
-  const initialAccounts = testAccounts ? await getInitialTestAccounts() : [];
+  const initialAccounts = testAccounts ? await getInitialTestAccountsData() : [];
   const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
   const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
   const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
@@ -43,6 +44,7 @@ export async function deployNewRollup(
     fundingNeeded,
     config,
     realVerifier,
+    createVerificationJson,
     debugLogger,
   );
 

package/src/cmds/l1/get_l1_addresses.ts

@@ -1,4 +1,4 @@
-import { EthAddress } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js/addresses';
 import { RegistryContract, type ViemPublicClient, createEthereumChain } from '@aztec/ethereum';
 import type { LogFn } from '@aztec/foundation/log';
 

package/src/cmds/l1/index.ts

@@ -9,10 +9,10 @@ import {
   MNEMONIC,
   PRIVATE_KEY,
   l1ChainIdOption,
+  nodeOption,
   parseAztecAddress,
   parseBigint,
   parseEthereumAddress,
-  pxeOption,
 } from '../../utils/commands.js';
 
 export { addL1Validator } from './update_l1_validators.js';
@@ -94,6 +94,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     .option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts')
     .option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract')
     .option('--real-verifier', 'Deploy the real verifier', false)
+    .option('--create-verification-json [path]', 'Create JSON file for etherscan contract verification', false)
     .action(async options => {
       const { deployNewRollup } = await import('./deploy_new_rollup.js');
 
@@ -112,6 +113,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         options.json,
         initialValidators,
         options.realVerifier,
+        options.createVerificationJson,
         log,
         debugLogger,
       );
@@ -509,20 +511,20 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     )
     .argument('[blockNumber]', 'The target block number, defaults to the latest pending block number.', parseBigint)
     .addOption(l1RpcUrlsOption)
-    .addOption(pxeOption)
+    .addOption(nodeOption)
     .action(async (blockNumber, options) => {
       const { assumeProvenThrough } = await import('./assume_proven_through.js');
-      await assumeProvenThrough(blockNumber, options.l1RpcUrls, options.rpcUrl, log);
+      await assumeProvenThrough(blockNumber, options.l1RpcUrls, options.nodeUrl, log);
     });
 
   program
     .command('advance-epoch')
     .description('Use L1 cheat codes to warp time until the next epoch.')
     .addOption(l1RpcUrlsOption)
-    .addOption(pxeOption)
+    .addOption(nodeOption)
     .action(async options => {
       const { advanceEpoch } = await import('./advance_epoch.js');
-      await advanceEpoch(options.l1RpcUrls, options.rpcUrl, log);
+      await advanceEpoch(options.l1RpcUrls, options.nodeUrl, log);
     });
 
   return program;

package/src/cmds/l1/update_l1_validators.ts

@@ -11,6 +11,7 @@ import {
 import { EthCheatCodes } from '@aztec/ethereum/test';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn, Logger } from '@aztec/foundation/log';
+import { DateProvider } from '@aztec/foundation/timer';
 import { RollupAbi, StakingAssetHandlerAbi } from '@aztec/l1-artifacts';
 import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
 
@@ -120,7 +121,7 @@ export async function addL1Validator({
   await l1Client.waitForTransactionReceipt({ hash: receipt.transactionHash });
   if (isAnvilTestChain(chainId)) {
     dualLog(`Funding validator on L1`);
-    const cheatCodes = new EthCheatCodes(rpcUrls, debugLogger);
+    const cheatCodes = new EthCheatCodes(rpcUrls, new DateProvider(), debugLogger);
     await cheatCodes.setBalance(attesterAddress, 10n ** 20n);
   } else {
     const balance = await l1Client.getBalance({ address: attesterAddress.toString() });
@@ -194,7 +195,7 @@ export async function addL1ValidatorViaRollup({
   await l1Client.waitForTransactionReceipt({ hash: receipt.transactionHash });
   if (isAnvilTestChain(chainId)) {
     dualLog(`Funding validator on L1`);
-    const cheatCodes = new EthCheatCodes(rpcUrls, debugLogger);
+    const cheatCodes = new EthCheatCodes(rpcUrls, new DateProvider(), debugLogger);
     await cheatCodes.setBalance(attesterAddress, 10n ** 20n);
   } else {
     const balance = await l1Client.getBalance({ address: attesterAddress.toString() });
@@ -275,7 +276,7 @@ export async function fastForwardEpochs({
     client: publicClient,
   });
 
-  const cheatCodes = new EthCheatCodes(rpcUrls, debugLogger);
+  const cheatCodes = new EthCheatCodes(rpcUrls, new DateProvider(), debugLogger);
   const currentSlot = await rollup.read.getCurrentSlot();
   const l2SlotsInEpoch = await rollup.read.getEpochDuration();
   const timestamp = await rollup.read.getTimestampForSlot([currentSlot + l2SlotsInEpoch * numEpochs]);

package/src/cmds/misc/generate_secret_and_hash.ts

@@ -1,4 +1,4 @@
-import { computeSecretHash } from '@aztec/aztec.js';
+import { computeSecretHash } from '@aztec/aztec.js/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import type { LogFn } from '@aztec/foundation/log';
 

package/src/cmds/misc/generate_secret_key.ts

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/aztec.js';
+import { Fr } from '@aztec/aztec.js/fields';
 
 export function generateSecretKey() {
   return { secretKey: Fr.random() };

package/src/config/cached_fetch.ts

@@ -1,4 +1,4 @@
-import { createLogger } from '@aztec/aztec.js';
+import { createLogger } from '@aztec/aztec.js/log';
 
 import { mkdir, readFile, stat, writeFile } from 'fs/promises';
 import { dirname } from 'path';

package/src/config/chain_l2_config.ts

@@ -1,14 +1,12 @@
 import { DefaultL1ContractsConfig, type L1ContractsConfig } from '@aztec/ethereum';
-import type { EnvVar, NetworkNames } from '@aztec/foundation/config';
+import type { NetworkNames } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { SharedNodeConfig } from '@aztec/node-lib/config';
-import type { P2PConfig } from '@aztec/p2p/config';
 import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
 
-import path, { join } from 'path';
+import path from 'path';
 
 import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with { type: 'json' };
-import { cachedFetch } from './cached_fetch.js';
 import { enrichEthAddressVar, enrichVar } from './enrich_env.js';
 
 const SNAPSHOTS_URL = 'https://aztec-labs-snapshots.com';
@@ -17,7 +15,6 @@ const defaultDBMapSizeKb = 128 * 1_024 * 1_024; // 128 GB
 const tbMapSizeKb = 1_024 * 1_024 * 1_024; // 1 TB
 
 export type L2ChainConfig = L1ContractsConfig &
-  Pick<P2PConfig, 'txPoolDeleteTxsAfterReorg'> &
   Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways'> & {
     l1ChainId: number;
     testAccounts: boolean;
@@ -45,6 +42,7 @@ export type L2ChainConfig = L1ContractsConfig &
 
     // Control whether sentinel is enabled or not. Needed for slashing
     sentinelEnabled: boolean;
+    disableTransactions: boolean;
   };
 
 const DefaultSlashConfig = {
@@ -96,6 +94,7 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   l1ChainId: 11155111,
   testAccounts: false,
   sponsoredFPC: false,
+  disableTransactions: true,
   p2pEnabled: true,
   p2pBootstrapNodes: [],
   seqMinTxsPerBlock: 0,
@@ -108,7 +107,6 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
   publicMetricsCollectFrom: ['sequencer'],
-  txPoolDeleteTxsAfterReorg: false,
 
   /** How many seconds an L1 slot lasts. */
   ethereumSlotDuration: 12,
@@ -128,7 +126,6 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   slashingRoundSizeInEpochs: 4,
   slashingLifetimeInRounds: 40,
   slashingExecutionDelayInRounds: 28,
-  slashingDisableDuration: 5 * 24 * 60 * 60, // 5 days in seconds
   slashAmountSmall: 2_000n * 10n ** 18n,
   slashAmountMedium: 10_000n * 10n ** 18n,
   slashAmountLarge: 50_000n * 10n ** 18n,
@@ -143,10 +140,10 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
 
   /** The proving cost per mana */
   provingCostPerMana: 0n,
+  localEjectionThreshold: 196_000n * 10n ** 18n,
 
   ejectionThreshold: 100_000n * 10n ** 18n,
   activationThreshold: 200_000n * 10n ** 18n,
-  localEjectionThreshold: 196_000n * 10n ** 18n,
 
   governanceProposerRoundSize: 300, // TODO TMNT-322
   governanceProposerQuorum: 151, // TODO TMNT-322
@@ -168,6 +165,7 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   slashGracePeriodL2Slots: 32 * 4, // One round from genesis
   slashOffenseExpirationRounds: 8,
   sentinelEnabled: true,
+  slashingDisableDuration: 5 * 24 * 60 * 60,
   slashExecuteRoundsLookBack: 4,
 
   ...DefaultNetworkDBMapSizeConfig,
@@ -177,6 +175,7 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   l1ChainId: 11155111,
   testAccounts: false,
   sponsoredFPC: true,
+  disableTransactions: false,
   p2pEnabled: true,
   p2pBootstrapNodes: [],
   seqMinTxsPerBlock: 0,
@@ -189,7 +188,59 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
   publicMetricsCollectFrom: ['sequencer'],
   maxTxPoolSize: 100_000_000, // 100MB
-  txPoolDeleteTxsAfterReorg: true,
+
+  // Deployment stuff
+  /** How many seconds an L1 slot lasts. */
+  ethereumSlotDuration: 12,
+  /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
+  aztecSlotDuration: 36,
+  /** How many L2 slots an epoch lasts. */
+  aztecEpochDuration: 32,
+  /** The target validator committee size. */
+  aztecTargetCommitteeSize: 48,
+  /** The number of epochs to lag behind the current epoch for validator selection. */
+  lagInEpochs: DefaultL1ContractsConfig.lagInEpochs,
+  /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
+  localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
+  /** The number of epochs after an epoch ends that proofs are still accepted. */
+  aztecProofSubmissionEpochs: 1,
+  /** The deposit amount for a validator */
+  activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+  /** The minimum stake for a validator. */
+  ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
+  /** The slashing round size */
+  slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
+  /** Governance proposing round size */
+  governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
+  /** The mana target for the rollup */
+  manaTarget: DefaultL1ContractsConfig.manaTarget,
+  /** The proving cost per mana */
+  provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
+  /** Exit delay for stakers */
+  exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
+
+  ...DefaultSlashConfig,
+
+  ...DefaultNetworkDBMapSizeConfig,
+};
+
+export const nextNetL2ChainConfig: L2ChainConfig = {
+  l1ChainId: 11155111,
+  testAccounts: true,
+  sponsoredFPC: true,
+  p2pEnabled: true,
+  disableTransactions: false,
+  p2pBootstrapNodes: [],
+  seqMinTxsPerBlock: 0,
+  seqMaxTxsPerBlock: 8,
+  realProofs: true,
+  snapshotsUrls: [],
+  autoUpdate: 'config-and-version',
+  autoUpdateUrl: '',
+  publicIncludeMetrics,
+  publicMetricsCollectorUrl: '',
+  publicMetricsCollectFrom: [''],
+  maxTxPoolSize: 100_000_000, // 100MB
 
   // Deployment stuff
   /** How many seconds an L1 slot lasts. */
@@ -231,9 +282,10 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   testAccounts: false,
   sponsoredFPC: true,
   p2pEnabled: true,
+  disableTransactions: true,
   p2pBootstrapNodes: [],
   seqMinTxsPerBlock: 0,
-  seqMaxTxsPerBlock: 20,
+  seqMaxTxsPerBlock: 0,
   realProofs: true,
   snapshotsUrls: [`${SNAPSHOTS_URL}/testnet/`],
   autoUpdate: 'config-and-version',
@@ -242,7 +294,6 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
   publicMetricsCollectFrom: ['sequencer'],
-  txPoolDeleteTxsAfterReorg: true,
 
   // Deployment stuff
   /** How many seconds an L1 slot lasts. */
@@ -268,7 +319,7 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   /** Governance proposing round size */
   governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
   /** The mana target for the rollup */
-  manaTarget: DefaultL1ContractsConfig.manaTarget,
+  manaTarget: 0n,
   /** The proving cost per mana */
   provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
   /** Exit delay for stakers */
@@ -277,28 +328,27 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   ...DefaultSlashConfig,
   slashPrunePenalty: 0n,
   slashDataWithholdingPenalty: 0n,
-  slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountMedium,
 
   ...DefaultNetworkDBMapSizeConfig,
 };
 
-export const ignitionL2ChainConfig: L2ChainConfig = {
+export const mainnetL2ChainConfig: L2ChainConfig = {
   l1ChainId: 1,
   testAccounts: false,
   sponsoredFPC: false,
   p2pEnabled: true,
+  disableTransactions: true,
   p2pBootstrapNodes: [],
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 0,
   realProofs: true,
-  snapshotsUrls: [`${SNAPSHOTS_URL}/ignition/`],
+  snapshotsUrls: [`${SNAPSHOTS_URL}/mainnet/`],
   autoUpdate: 'notify',
-  autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/ignition.json',
+  autoUpdateUrl: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
   maxTxPoolSize: 100_000_000, // 100MB
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
   publicMetricsCollectFrom: ['sequencer'],
-  txPoolDeleteTxsAfterReorg: false,
 
   /** How many seconds an L1 slot lasts. */
   ethereumSlotDuration: 12,
@@ -308,17 +358,20 @@ export const ignitionL2ChainConfig: L2ChainConfig = {
   aztecEpochDuration: 32,
   /** The target validator committee size. */
   aztecTargetCommitteeSize: 24,
-  /** The number of epochs to lag behind the current epoch for validator selection. */
-  lagInEpochs: 2,
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: 1,
   /** How many sequencers must agree with a slash for it to be executed. */
   slashingQuorum: 65,
 
+  /** The number of epochs to lag behind the current epoch for validator selection. */
+  lagInEpochs: 2,
+
+  localEjectionThreshold: 196_000n * 10n ** 18n,
+  slashingDisableDuration: 5 * 24 * 60 * 60,
+
   slashingRoundSizeInEpochs: 4,
   slashingLifetimeInRounds: 40,
   slashingExecutionDelayInRounds: 28,
-  slashingDisableDuration: 5 * 24 * 60 * 60, // 5 days in seconds
   slashAmountSmall: 2_000n * 10n ** 18n,
   slashAmountMedium: 10_000n * 10n ** 18n,
   slashAmountLarge: 50_000n * 10n ** 18n,
@@ -336,7 +389,6 @@ export const ignitionL2ChainConfig: L2ChainConfig = {
 
   ejectionThreshold: 100_000n * 10n ** 18n,
   activationThreshold: 200_000n * 10n ** 18n,
-  localEjectionThreshold: 196_000n * 10n ** 18n,
 
   governanceProposerRoundSize: 300, // TODO TMNT-322
   governanceProposerQuorum: 151, // TODO TMNT-322
@@ -363,22 +415,60 @@ export const ignitionL2ChainConfig: L2ChainConfig = {
   ...DefaultNetworkDBMapSizeConfig,
 };
 
-const BOOTNODE_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour;
+export const devnetL2ChainConfig: L2ChainConfig = {
+  l1ChainId: 11155111,
+  testAccounts: true,
+  sponsoredFPC: true,
+  p2pEnabled: true,
+  disableTransactions: false,
+  p2pBootstrapNodes: [],
+  seqMinTxsPerBlock: 0,
+  seqMaxTxsPerBlock: 8,
+  realProofs: false,
+  snapshotsUrls: [],
+  autoUpdate: 'config-and-version',
+  autoUpdateUrl: '',
+  publicIncludeMetrics,
+  publicMetricsCollectorUrl: '',
+  publicMetricsCollectFrom: [''],
+  maxTxPoolSize: 100_000_000, // 100MB
+
+  // Deployment stuff
+  /** How many seconds an L1 slot lasts. */
+  ethereumSlotDuration: 12,
+  /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
+  aztecSlotDuration: 36,
+  /** How many L2 slots an epoch lasts. */
+  aztecEpochDuration: 8,
+  /** The target validator committee size. */
+  aztecTargetCommitteeSize: 1,
+  /** The number of epochs to lag behind the current epoch for validator selection. */
+  lagInEpochs: 1,
+  /** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
+  localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
+  /** The number of epochs after an epoch ends that proofs are still accepted. */
+  aztecProofSubmissionEpochs: 1,
+  /** The deposit amount for a validator */
+  activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+  /** The minimum stake for a validator. */
+  ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
+  /** The slashing round size */
+  slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
+  /** Governance proposing round size */
+  governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
+  /** The mana target for the rollup */
+  manaTarget: DefaultL1ContractsConfig.manaTarget,
+  /** The proving cost per mana */
+  provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
+  /** Exit delay for stakers */
+  exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
 
-export async function getBootnodes(networkName: NetworkNames, cacheDir?: string) {
-  const url = `http://static.aztec.network/${networkName}/bootnodes.json`;
-  const data = await cachedFetch(url, {
-    cacheDurationMs: BOOTNODE_CACHE_DURATION_MS,
-    cacheFile: cacheDir ? join(cacheDir, networkName, 'bootnodes.json') : undefined,
-  });
+  ...DefaultSlashConfig,
 
-  return data?.bootnodes;
-}
+  ...DefaultNetworkDBMapSizeConfig,
+};
 
-export async function getL2ChainConfig(
-  networkName: NetworkNames,
-  cacheDir?: string,
-): Promise<L2ChainConfig | undefined> {
+export function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined {
   let config: L2ChainConfig | undefined;
   if (networkName === 'staging-public') {
     config = { ...stagingPublicL2ChainConfig };
@@ -386,16 +476,12 @@ export async function getL2ChainConfig(
     config = { ...testnetL2ChainConfig };
   } else if (networkName === 'staging-ignition') {
     config = { ...stagingIgnitionL2ChainConfig };
-  } else if (networkName === 'ignition') {
-    config = { ...ignitionL2ChainConfig };
-  }
-  if (!config) {
-    return undefined;
-  }
-  // If the bootnodes are not set, get them from the network
-  const bootnodeKey: EnvVar = 'BOOTSTRAP_NODES';
-  if (!process.env[bootnodeKey]) {
-    config.p2pBootstrapNodes = await getBootnodes(networkName, cacheDir);
+  } else if (networkName === 'mainnet') {
+    config = { ...mainnetL2ChainConfig };
+  } else if (networkName === 'next-net') {
+    config = { ...nextNetL2ChainConfig };
+  } else if (networkName === 'devnet') {
+    config = { ...devnetL2ChainConfig };
   }
   return config;
 }
@@ -404,14 +490,13 @@ function getDefaultDataDir(networkName: NetworkNames): string {
   return path.join(process.env.HOME || '~', '.aztec', networkName, 'data');
 }
 
-export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
+export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
   if (networkName === 'local') {
     return;
   }
 
   enrichVar('DATA_DIRECTORY', getDefaultDataDir(networkName));
-  const cacheDir = process.env.DATA_DIRECTORY ? join(process.env.DATA_DIRECTORY, 'cache') : undefined;
-  const config = await getL2ChainConfig(networkName, cacheDir);
+  const config = getL2ChainConfig(networkName);
 
   if (!config) {
     throw new Error(`Unknown network name: ${networkName}`);
@@ -496,4 +581,5 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
   enrichVar('SLASH_MAX_PAYLOAD_SIZE', config.slashMaxPayloadSize.toString());
 
   enrichVar('SENTINEL_ENABLED', config.sentinelEnabled.toString());
+  enrichVar('TRANSACTIONS_DISABLED', config.disableTransactions.toString());
 }

package/src/config/enrich_env.ts

@@ -1,4 +1,4 @@
-import { EthAddress } from '@aztec/aztec.js';
+import { EthAddress } from '@aztec/aztec.js/addresses';
 import type { EnvVar } from '@aztec/foundation/config';
 
 export function enrichVar(envVar: EnvVar, value: string | undefined) {