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

package/src/config/chain_l2_config.ts

@@ -1,8 +1,9 @@
-import { DefaultL1ContractsConfig, type L1ContractsConfig } from '@aztec/ethereum';
+import { DefaultL1ContractsConfig, type L1ContractsConfig, type L1TxUtilsConfig } from '@aztec/ethereum';
 import type { NetworkNames } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { SharedNodeConfig } from '@aztec/node-lib/config';
-import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
+import type { P2PConfig } from '@aztec/p2p';
+import type { SequencerConfig, SlasherConfig } from '@aztec/stdlib/interfaces/server';
 
 import path from 'path';
 
@@ -14,29 +15,30 @@ const SNAPSHOTS_URL = 'https://aztec-labs-snapshots.com';
 const defaultDBMapSizeKb = 128 * 1_024 * 1_024; // 128 GB
 const tbMapSizeKb = 1_024 * 1_024 * 1_024; // 1 TB
 
-export type L2ChainConfig = L1ContractsConfig &
-  Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways'> & {
+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;
-    p2pEnabled: boolean;
-    p2pBootstrapNodes: string[];
-    seqMinTxsPerBlock: number;
-    seqMaxTxsPerBlock: number;
+    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;
 
-    // Setting the dbMapSize provides the default for every DB in the node.
+    // Setting the dataStoreMapSize provides the default for every DB in the node.
     // Then we explicitly override the sizes for the archiver and the larger trees.
-    dbMapSizeKb: number;
+    dataStoreMapSizeKb: number;
     archiverStoreMapSizeKb: number;
     noteHashTreeMapSizeKb: number;
     nullifierTreeMapSizeKb: number;
@@ -85,7 +87,7 @@ const DefaultSlashConfig = {
 } satisfies Partial<L2ChainConfig>;
 
 const DefaultNetworkDBMapSizeConfig = {
-  dbMapSizeKb: defaultDBMapSizeKb,
+  dataStoreMapSizeKb: defaultDBMapSizeKb,
   archiverStoreMapSizeKb: tbMapSizeKb,
   noteHashTreeMapSizeKb: tbMapSizeKb,
   nullifierTreeMapSizeKb: tbMapSizeKb,
@@ -98,17 +100,20 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   sponsoredFPC: false,
   disableTransactions: true,
   p2pEnabled: true,
-  p2pBootstrapNodes: [],
-  seqMinTxsPerBlock: 0,
-  seqMaxTxsPerBlock: 0,
+  bootstrapNodes: [],
+  minTxsPerBlock: 0,
+  maxTxsPerBlock: 0,
   realProofs: true,
   snapshotsUrls: [`${SNAPSHOTS_URL}/staging-ignition/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
-  maxTxPoolSize: 100_000_000, // 100MB
+  maxTxPoolSize: 0,
+  publicMetricsOptOut: false,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
   publicMetricsCollectFrom: ['sequencer'],
+  txPoolDeleteTxsAfterReorg: false,
+  blobAllowEmptySources: true,
 
   /** How many seconds an L1 slot lasts. */
   ethereumSlotDuration: 12,
@@ -119,7 +124,9 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   /** The target validator committee size. */
   aztecTargetCommitteeSize: 24,
   /** The number of epochs to lag behind the current epoch for validator selection. */
-  lagInEpochs: 2,
+  lagInEpochsForValidatorSet: 2,
+  /** The number of epochs to lag behind the current epoch for randao selection. */
+  lagInEpochsForRandao: 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. */
@@ -133,7 +140,7 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
   slashAmountLarge: 50_000n * 10n ** 18n,
   slashingOffsetInRounds: 2,
   slasherFlavor: 'tally',
-  slashingVetoer: EthAddress.ZERO, // TODO TMNT-329
+  slashingVetoer: EthAddress.ZERO,
 
   /** The mana target for the rollup */
   manaTarget: 0n,
@@ -178,17 +185,19 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   sponsoredFPC: true,
   disableTransactions: false,
   p2pEnabled: true,
-  p2pBootstrapNodes: [],
-  seqMinTxsPerBlock: 0,
-  seqMaxTxsPerBlock: 20,
+  bootstrapNodes: [],
+  minTxsPerBlock: 0,
+  maxTxsPerBlock: 20,
   realProofs: true,
   snapshotsUrls: [`${SNAPSHOTS_URL}/staging-public/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-public.json',
+  publicMetricsOptOut: false,
   publicIncludeMetrics,
   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. */
@@ -200,7 +209,9 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
   /** The target validator committee size. */
   aztecTargetCommitteeSize: 48,
   /** The number of epochs to lag behind the current epoch for validator selection. */
-  lagInEpochs: DefaultL1ContractsConfig.lagInEpochs,
+  lagInEpochsForValidatorSet: DefaultL1ContractsConfig.lagInEpochsForValidatorSet,
+  /** The number of epochs to lag behind the current epoch for randao selection. */
+  lagInEpochsForRandao: DefaultL1ContractsConfig.lagInEpochsForRandao,
   /** 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. */
@@ -231,17 +242,19 @@ export const nextNetL2ChainConfig: L2ChainConfig = {
   sponsoredFPC: true,
   p2pEnabled: true,
   disableTransactions: false,
-  p2pBootstrapNodes: [],
-  seqMinTxsPerBlock: 0,
-  seqMaxTxsPerBlock: 8,
+  bootstrapNodes: [],
+  minTxsPerBlock: 0,
+  maxTxsPerBlock: 8,
   realProofs: true,
   snapshotsUrls: [],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: '',
+  publicMetricsOptOut: true,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: '',
   publicMetricsCollectFrom: [''],
   maxTxPoolSize: 100_000_000, // 100MB
+  txPoolDeleteTxsAfterReorg: false,
 
   // Deployment stuff
   /** How many seconds an L1 slot lasts. */
@@ -253,7 +266,9 @@ export const nextNetL2ChainConfig: L2ChainConfig = {
   /** The target validator committee size. */
   aztecTargetCommitteeSize: 48,
   /** The number of epochs to lag behind the current epoch for validator selection. */
-  lagInEpochs: DefaultL1ContractsConfig.lagInEpochs,
+  lagInEpochsForValidatorSet: DefaultL1ContractsConfig.lagInEpochsForValidatorSet,
+  /** The number of epochs to lag behind the current epoch for randao selection. */
+  lagInEpochsForRandao: DefaultL1ContractsConfig.lagInEpochsForRandao,
   /** 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. */
@@ -284,17 +299,19 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   sponsoredFPC: true,
   p2pEnabled: true,
   disableTransactions: true,
-  p2pBootstrapNodes: [],
-  seqMinTxsPerBlock: 0,
-  seqMaxTxsPerBlock: 0,
+  bootstrapNodes: [],
+  minTxsPerBlock: 0,
+  maxTxsPerBlock: 0,
   realProofs: true,
   snapshotsUrls: [`${SNAPSHOTS_URL}/testnet/`],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
   maxTxPoolSize: 100_000_000, // 100MB
+  publicMetricsOptOut: false,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
   publicMetricsCollectFrom: ['sequencer'],
+  txPoolDeleteTxsAfterReorg: true,
   skipArchiverInitialSync: true,
   blobAllowEmptySources: true,
 
@@ -307,7 +324,9 @@ export const testnetL2ChainConfig: L2ChainConfig = {
   /** The target validator committee size. */
   aztecTargetCommitteeSize: 24,
   /** The number of epochs to lag behind the current epoch for validator selection. */
-  lagInEpochs: 2,
+  lagInEpochsForValidatorSet: 2,
+  /** The number of epochs to lag behind the current epoch for randao selection. */
+  lagInEpochsForRandao: 2,
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: 1,
 
@@ -366,22 +385,26 @@ export const testnetL2ChainConfig: L2ChainConfig = {
 };
 
 export const mainnetL2ChainConfig: L2ChainConfig = {
+  txPoolDeleteTxsAfterReorg: true,
+  disableTransactions: true,
+
   l1ChainId: 1,
   testAccounts: false,
   sponsoredFPC: false,
   p2pEnabled: true,
-  disableTransactions: true,
-  p2pBootstrapNodes: [],
-  seqMinTxsPerBlock: 0,
-  seqMaxTxsPerBlock: 0,
+  bootstrapNodes: [],
+  minTxsPerBlock: 0,
+  maxTxsPerBlock: 0,
   realProofs: true,
   snapshotsUrls: [`${SNAPSHOTS_URL}/mainnet/`],
   autoUpdate: 'notify',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
-  maxTxPoolSize: 100_000_000, // 100MB
+  maxTxPoolSize: 0,
+  publicMetricsOptOut: true,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
   publicMetricsCollectFrom: ['sequencer'],
+  blobAllowEmptySources: true,
 
   /** How many seconds an L1 slot lasts. */
   ethereumSlotDuration: 12,
@@ -392,7 +415,9 @@ export const mainnetL2ChainConfig: L2ChainConfig = {
   /** The target validator committee size. */
   aztecTargetCommitteeSize: 24,
   /** The number of epochs to lag behind the current epoch for validator selection. */
-  lagInEpochs: 2,
+  lagInEpochsForValidatorSet: 2,
+  /** The number of epochs to lag behind the current epoch for randao selection. */
+  lagInEpochsForRandao: 2,
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: 1,
 
@@ -402,7 +427,7 @@ export const mainnetL2ChainConfig: L2ChainConfig = {
   slashingRoundSizeInEpochs: 4,
   slashingExecutionDelayInRounds: 28,
   slashingLifetimeInRounds: 34,
-  slashingVetoer: EthAddress.ZERO, // TODO TMNT-329
+  slashingVetoer: EthAddress.fromString('0xBbB4aF368d02827945748b28CD4b2D42e4A37480'),
   slashingOffsetInRounds: 2,
 
   slashingDisableDuration: 259_200, // 3 days
@@ -455,17 +480,19 @@ export const devnetL2ChainConfig: L2ChainConfig = {
   sponsoredFPC: true,
   p2pEnabled: true,
   disableTransactions: false,
-  p2pBootstrapNodes: [],
-  seqMinTxsPerBlock: 0,
-  seqMaxTxsPerBlock: 8,
+  bootstrapNodes: [],
+  minTxsPerBlock: 0,
+  maxTxsPerBlock: 8,
   realProofs: false,
   snapshotsUrls: [],
   autoUpdate: 'config-and-version',
   autoUpdateUrl: '',
+  publicMetricsOptOut: true,
   publicIncludeMetrics,
   publicMetricsCollectorUrl: '',
   publicMetricsCollectFrom: [''],
   maxTxPoolSize: 100_000_000, // 100MB
+  txPoolDeleteTxsAfterReorg: true,
 
   // Deployment stuff
   /** How many seconds an L1 slot lasts. */
@@ -477,7 +504,9 @@ export const devnetL2ChainConfig: L2ChainConfig = {
   /** The target validator committee size. */
   aztecTargetCommitteeSize: 1,
   /** The number of epochs to lag behind the current epoch for validator selection. */
-  lagInEpochs: 1,
+  lagInEpochsForValidatorSet: 1,
+  /** The number of epochs to lag behind the current epoch for randao selection. */
+  lagInEpochsForRandao: 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. */
@@ -524,7 +553,7 @@ function getDefaultDataDir(networkName: NetworkNames): string {
   return path.join(process.env.HOME || '~', '.aztec', networkName, 'data');
 }
 
-export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
+export function enrichEnvironmentWithChainName(networkName: NetworkNames) {
   if (networkName === 'local') {
     return;
   }
@@ -536,19 +565,24 @@ export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
     throw new Error(`Unknown network name: ${networkName}`);
   }
 
-  enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
+  enrichEnvironmentWithChainConfig(config);
+}
+
+export function enrichEnvironmentWithChainConfig(config: L2ChainConfig) {
+  enrichVar('BOOTSTRAP_NODES', config.bootstrapNodes.join(','));
   enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
   enrichVar('SPONSORED_FPC', config.sponsoredFPC.toString());
   enrichVar('P2P_ENABLED', config.p2pEnabled.toString());
   enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
-  enrichVar('SEQ_MIN_TX_PER_BLOCK', config.seqMinTxsPerBlock.toString());
-  enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString());
+  enrichVar('SEQ_MIN_TX_PER_BLOCK', config.minTxsPerBlock.toString());
+  enrichVar('SEQ_MAX_TX_PER_BLOCK', config.maxTxsPerBlock.toString());
   enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
   enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
   enrichVar('SYNC_SNAPSHOTS_URLS', config.snapshotsUrls.join(','));
   enrichVar('P2P_MAX_TX_POOL_SIZE', config.maxTxPoolSize.toString());
+  enrichVar('P2P_TX_POOL_DELETE_TXS_AFTER_REORG', config.txPoolDeleteTxsAfterReorg.toString());
 
-  enrichVar('DATA_STORE_MAP_SIZE_KB', config.dbMapSizeKb.toString());
+  enrichVar('DATA_STORE_MAP_SIZE_KB', config.dataStoreMapSizeKb.toString());
   enrichVar('ARCHIVER_STORE_MAP_SIZE_KB', config.archiverStoreMapSizeKb.toString());
   enrichVar('NOTE_HASH_TREE_MAP_SIZE_KB', config.noteHashTreeMapSizeKb.toString());
   enrichVar('NULLIFIER_TREE_MAP_SIZE_KB', config.nullifierTreeMapSizeKb.toString());
@@ -582,11 +616,15 @@ export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
     enrichVar('PUBLIC_OTEL_COLLECT_FROM', config.publicMetricsCollectFrom.join(','));
   }
 
+  enrichVar('PUBLIC_OTEL_OPT_OUT', config.publicMetricsOptOut.toString());
+
   // Deployment stuff
   enrichVar('ETHEREUM_SLOT_DURATION', config.ethereumSlotDuration.toString());
   enrichVar('AZTEC_SLOT_DURATION', config.aztecSlotDuration.toString());
   enrichVar('AZTEC_EPOCH_DURATION', config.aztecEpochDuration.toString());
   enrichVar('AZTEC_TARGET_COMMITTEE_SIZE', config.aztecTargetCommitteeSize.toString());
+  enrichVar('AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET', config.lagInEpochsForValidatorSet.toString());
+  enrichVar('AZTEC_LAG_IN_EPOCHS_FOR_RANDAO', config.lagInEpochsForRandao.toString());
   enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
   enrichVar('AZTEC_ACTIVATION_THRESHOLD', config.activationThreshold.toString());
   enrichVar('AZTEC_EJECTION_THRESHOLD', config.ejectionThreshold.toString());
@@ -604,6 +642,7 @@ export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
   enrichVar('AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS', config.slashingExecutionDelayInRounds.toString());
   enrichVar('AZTEC_SLASHING_OFFSET_IN_ROUNDS', config.slashingOffsetInRounds.toString());
   enrichVar('AZTEC_SLASHER_FLAVOR', config.slasherFlavor);
+  enrichVar('AZTEC_SLASHING_DISABLE_DURATION', config.slashingDisableDuration.toString());
   enrichVar('AZTEC_EXIT_DELAY_SECONDS', config.exitDelaySeconds.toString());
   enrichEthAddressVar('AZTEC_SLASHING_VETOER', config.slashingVetoer.toString());
 
@@ -621,6 +660,8 @@ export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
   enrichVar('SLASH_INVALID_BLOCK_PENALTY', config.slashBroadcastedInvalidBlockPenalty.toString());
   enrichVar('SLASH_OFFENSE_EXPIRATION_ROUNDS', config.slashOffenseExpirationRounds.toString());
   enrichVar('SLASH_MAX_PAYLOAD_SIZE', config.slashMaxPayloadSize.toString());
+  enrichVar('SLASH_GRACE_PERIOD_L2_SLOTS', config.slashGracePeriodL2Slots.toString());
+  enrichVar('SLASH_EXECUTE_ROUNDS_LOOK_BACK', config.slashExecuteRoundsLookBack.toString());
 
   enrichVar('SENTINEL_ENABLED', config.sentinelEnabled.toString());
   enrichVar('TRANSACTIONS_DISABLED', config.disableTransactions.toString());

package/src/config/network_config.ts

@@ -8,11 +8,12 @@ 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.
+ * Uses the reusable cachedFetch utility. Falls back to metadata.aztec.network if the default URL fails.
  *
  * @param networkName - The network name to fetch config for
  * @param cacheDir - Optional cache directory for storing fetched config
@@ -22,13 +23,33 @@ export async function getNetworkConfig(
   networkName: NetworkNames,
   cacheDir?: string,
 ): Promise<NetworkConfig | undefined> {
-  let url: URL | undefined;
+  // Try with the primary URL (env var or default)
   const configLocation = process.env.NETWORK_CONFIG_LOCATION || DEFAULT_CONFIG_URL;
 
-  if (!configLocation) {
-    return undefined;
+  // First try the primary config location
+  let config = await fetchNetworkConfigFromUrl(configLocation, networkName, cacheDir);
+
+  // If primary fails and we were using the default URL, try the fallback
+  if (!config && configLocation === DEFAULT_CONFIG_URL) {
+    config = await fetchNetworkConfigFromUrl(FALLBACK_CONFIG_URL, networkName, cacheDir);
   }
 
+  return config;
+}
+
+/**
+ * Helper function to fetch network config from a specific URL.
+ * @param configLocation - The URL or file path to fetch from
+ * @param networkName - The network name to fetch config for
+ * @param cacheDir - Optional cache directory for storing fetched config
+ * @returns Remote configuration for the specified network, or undefined if not found/error
+ */
+async function fetchNetworkConfigFromUrl(
+  configLocation: string,
+  networkName: NetworkNames,
+  cacheDir?: string,
+): Promise<NetworkConfig | undefined> {
+  let url: URL | undefined;
   try {
     if (configLocation.includes('://')) {
       url = new URL(configLocation);
@@ -88,7 +109,7 @@ export async function enrichEnvironmentWithNetworkConfig(networkName: NetworkNam
   const networkConfig = await getNetworkConfig(networkName, cacheDir);
 
   if (!networkConfig) {
-    return;
+    throw new Error(`Failed to fetch network config for network: ${networkName}`);
   }
 
   enrichVar('BOOTSTRAP_NODES', networkConfig.bootnodes.join(','));