@aztec/aztec 1.0.0-staging.3 → 1.0.0

package/dest/bin/index.js

@@ -8,7 +8,6 @@ import { injectCommands as injectInfrastructureCommands } from '@aztec/cli/infra
 import { injectCommands as injectL1Commands } from '@aztec/cli/l1';
 import { injectCommands as injectMiscCommands } from '@aztec/cli/misc';
 import { injectCommands as injectPXECommands } from '@aztec/cli/pxe';
-import { getActiveNetworkName } from '@aztec/foundation/config';
 import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
 import { Command } from 'commander';
 import { NETWORK_FLAG } from '../cli/aztec_start_options.js';
@@ -30,7 +29,10 @@ const debugLogger = createLogger('cli');
     if (networkIndex !== -1) {
         networkValue = args[networkIndex].split('=')[1] || args[networkIndex + 1];
     }
-    await enrichEnvironmentWithChainConfig(getActiveNetworkName(networkValue));
+    networkValue = networkValue || process.env.NETWORK;
+    if (networkValue !== undefined) {
+        await enrichEnvironmentWithChainConfig(networkValue);
+    }
     const cliVersion = getCliVersion();
     let program = new Command('aztec');
     program.description('Aztec command line interface').version(cliVersion);

package/dest/cli/chain_l2_config.d.ts

@@ -1,7 +1,11 @@
-import type { NetworkNames } from '@aztec/foundation/config';
 import type { SharedNodeConfig } from '@aztec/node-lib/config';
+export type NetworkNames = 'testnet-ignition' | 'alpha-testnet';
 export type L2ChainConfig = {
     l1ChainId: number;
+    ethereumSlotDuration: number;
+    aztecSlotDuration: number;
+    aztecEpochDuration: number;
+    aztecProofSubmissionEpochs: number;
     testAccounts: boolean;
     sponsoredFPC: boolean;
     p2pEnabled: boolean;
@@ -16,53 +20,10 @@ export type L2ChainConfig = {
     autoUpdate: SharedNodeConfig['autoUpdate'];
     autoUpdateUrl?: string;
     maxTxPoolSize: number;
-    publicIncludeMetrics?: string[];
-    publicMetricsCollectorUrl?: string;
-    publicMetricsCollectFrom?: string[];
-    /** How many seconds an L1 slot lasts. */
-    ethereumSlotDuration: number;
-    /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
-    aztecSlotDuration: number;
-    /** How many L2 slots an epoch lasts. */
-    aztecEpochDuration: number;
-    /** The target validator committee size. */
-    aztecTargetCommitteeSize: number;
-    /** The number of epochs after an epoch ends that proofs are still accepted. */
-    aztecProofSubmissionEpochs: number;
-    /** The deposit amount for a validator */
-    depositAmount: bigint;
-    /** The minimum stake for a validator. */
-    minimumStake: bigint;
-    /** The slashing quorum */
-    slashingQuorum: number;
-    /** The slashing round size */
-    slashingRoundSize: number;
-    /** Governance proposing quorum */
-    governanceProposerQuorum: number;
-    /** Governance proposing round size */
-    governanceProposerRoundSize: number;
-    /** The mana target for the rollup */
-    manaTarget: bigint;
-    /** The proving cost per mana */
-    provingCostPerMana: bigint;
-    slashPayloadTtlSeconds: number;
-    slashPruneEnabled: boolean;
-    slashPrunePenalty: bigint;
-    slashPruneMaxPenalty: bigint;
-    slashInactivityEnabled: boolean;
-    slashInactivityCreateTargetPercentage: number;
-    slashInactivitySignalTargetPercentage: number;
-    slashInactivityCreatePenalty: bigint;
-    slashInvalidBlockEnabled: boolean;
-    slashInvalidBlockPenalty: bigint;
-    slashInvalidBlockMaxPenalty: bigint;
 };
 export declare const testnetIgnitionL2ChainConfig: L2ChainConfig;
 export declare const alphaTestnetL2ChainConfig: L2ChainConfig;
 export declare function getBootnodes(networkName: NetworkNames): Promise<any>;
-export declare function getL2ChainConfig(networkName: NetworkNames): Promise<{
-    config: L2ChainConfig;
-    networkName: string;
-} | undefined>;
+export declare function getL2ChainConfig(networkName: NetworkNames): Promise<L2ChainConfig | undefined>;
 export declare function enrichEnvironmentWithChainConfig(networkName: NetworkNames): Promise<void>;
 //# sourceMappingURL=chain_l2_config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/cli/chain_l2_config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAM/D,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IAIpC,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,+EAA+E;IAC/E,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,aAAa,EAAE,MAAM,CAAC;IACtB,yCAAyC;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,8BAA8B;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kCAAkC;IAClC,wBAAwB,EAAE,MAAM,CAAC;IACjC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;IACpC,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAG3B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,sBAAsB,EAAE,OAAO,CAAC;IAChC,qCAAqC,EAAE,MAAM,CAAC;IAC9C,qCAAqC,EAAE,MAAM,CAAC;IAC9C,4BAA4B,EAAE,MAAM,CAAC;IACrC,wBAAwB,EAAE,OAAO,CAAC;IAClC,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;CACrC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,aAyD1C,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,aA4DvC,CAAC;AAEF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,gBAW3D;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,GACxB,OAAO,CAAC;IAAE,MAAM,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAWrE;AAmBD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBA0E/E"}
+{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/cli/chain_l2_config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI/D,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAEhE,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,aAoB1C,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,aAoBvC,CAAC;AAEF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,gBAW3D;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAWpG;AAmBD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBAiC/E"}

package/dest/cli/chain_l2_config.js

@@ -1,11 +1,11 @@
 import { EthAddress } from '@aztec/aztec.js';
-import { DefaultL1ContractsConfig } from '@aztec/ethereum';
 import path from 'path';
-import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with {
-    type: 'json'
-};
 export const testnetIgnitionL2ChainConfig = {
     l1ChainId: 11155111,
+    ethereumSlotDuration: 12,
+    aztecSlotDuration: 36,
+    aztecEpochDuration: 32,
+    aztecProofSubmissionEpochs: 1,
     testAccounts: true,
     sponsoredFPC: false,
     p2pEnabled: true,
@@ -19,36 +19,14 @@ export const testnetIgnitionL2ChainConfig = {
     snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/',
     autoUpdate: 'disabled',
     autoUpdateUrl: undefined,
-    maxTxPoolSize: 100_000_000,
-    // 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 after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
-    /** The deposit amount for a validator */ depositAmount: DefaultL1ContractsConfig.depositAmount,
-    /** The minimum stake for a validator. */ minimumStake: DefaultL1ContractsConfig.minimumStake,
-    /** The slashing quorum */ slashingQuorum: DefaultL1ContractsConfig.slashingQuorum,
-    /** The slashing round size */ slashingRoundSize: DefaultL1ContractsConfig.slashingRoundSize,
-    /** Governance proposing quorum */ governanceProposerQuorum: DefaultL1ContractsConfig.governanceProposerQuorum,
-    /** Governance proposing round size */ governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
-    /** The mana target for the rollup */ manaTarget: 0n,
-    /** The proving cost per mana */ provingCostPerMana: 0n,
-    // slashing stuff
-    slashInactivityEnabled: false,
-    slashInactivityCreateTargetPercentage: 0,
-    slashInactivitySignalTargetPercentage: 0,
-    slashInactivityCreatePenalty: 0n,
-    slashInvalidBlockEnabled: false,
-    slashPayloadTtlSeconds: 0,
-    slashPruneEnabled: false,
-    slashPrunePenalty: 0n,
-    slashPruneMaxPenalty: 0n,
-    slashInvalidBlockPenalty: 0n,
-    slashInvalidBlockMaxPenalty: 0n
+    maxTxPoolSize: 100_000_000
 };
 export const alphaTestnetL2ChainConfig = {
     l1ChainId: 11155111,
+    ethereumSlotDuration: 12,
+    aztecSlotDuration: 36,
+    aztecEpochDuration: 32,
+    aztecProofSubmissionEpochs: 1,
     testAccounts: false,
     sponsoredFPC: true,
     p2pEnabled: true,
@@ -62,38 +40,7 @@ export const alphaTestnetL2ChainConfig = {
     snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/',
     autoUpdate: 'config-and-version',
     autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/alpha-testnet.json',
-    maxTxPoolSize: 100_000_000,
-    publicIncludeMetrics,
-    publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec.network',
-    publicMetricsCollectFrom: [
-        'sequencer'
-    ],
-    // 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 after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
-    /** The deposit amount for a validator */ depositAmount: DefaultL1ContractsConfig.depositAmount,
-    /** The minimum stake for a validator. */ minimumStake: DefaultL1ContractsConfig.minimumStake,
-    /** The slashing quorum */ slashingQuorum: 101,
-    /** The slashing round size */ slashingRoundSize: 200,
-    /** Governance proposing quorum */ governanceProposerQuorum: 151,
-    /** Governance proposing round size */ governanceProposerRoundSize: 300,
-    /** The mana target for the rollup */ manaTarget: DefaultL1ContractsConfig.manaTarget,
-    /** The proving cost per mana */ provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
-    // slashing stuff
-    slashPayloadTtlSeconds: 36 * 32 * 24,
-    slashPruneEnabled: true,
-    slashPrunePenalty: 17n * (DefaultL1ContractsConfig.depositAmount / 100n),
-    slashPruneMaxPenalty: 17n * (DefaultL1ContractsConfig.depositAmount / 100n),
-    slashInactivityEnabled: true,
-    slashInactivityCreateTargetPercentage: 1,
-    slashInactivitySignalTargetPercentage: 1,
-    slashInactivityCreatePenalty: 17n * (DefaultL1ContractsConfig.depositAmount / 100n),
-    slashInvalidBlockEnabled: true,
-    slashInvalidBlockPenalty: DefaultL1ContractsConfig.depositAmount,
-    slashInvalidBlockMaxPenalty: DefaultL1ContractsConfig.depositAmount
+    maxTxPoolSize: 2 * 1024 * 1024 * 1024
 };
 export async function getBootnodes(networkName) {
     const url = `http://static.aztec.network/${networkName}/bootnodes.json`;
@@ -110,19 +57,13 @@ export async function getL2ChainConfig(networkName) {
             ...testnetIgnitionL2ChainConfig
         };
         config.p2pBootstrapNodes = await getBootnodes(networkName);
-        return {
-            config,
-            networkName
-        };
-    } else if (networkName === 'alpha-testnet' || networkName === 'testnet') {
+        return config;
+    } else if (networkName === 'alpha-testnet') {
         const config = {
             ...alphaTestnetL2ChainConfig
         };
-        config.p2pBootstrapNodes = await getBootnodes('alpha-testnet');
-        return {
-            config,
-            networkName: 'alpha-testnet'
-        };
+        config.p2pBootstrapNodes = await getBootnodes(networkName);
+        return config;
     }
     return undefined;
 }
@@ -142,14 +83,14 @@ function enrichEthAddressVar(envVar, value) {
     enrichVar(envVar, value);
 }
 export async function enrichEnvironmentWithChainConfig(networkName) {
-    if (networkName === 'local') {
-        return;
-    }
-    const result = await getL2ChainConfig(networkName);
-    if (!result) {
+    const config = await getL2ChainConfig(networkName);
+    if (!config) {
         throw new Error(`Unknown network name: ${networkName}`);
     }
-    const { config, networkName: name } = result;
+    enrichVar('ETHEREUM_SLOT_DURATION', config.ethereumSlotDuration.toString());
+    enrichVar('AZTEC_SLOT_DURATION', config.aztecSlotDuration.toString());
+    enrichVar('AZTEC_EPOCH_DURATION', config.aztecEpochDuration.toString());
+    enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
     enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
     enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
     enrichVar('SPONSORED_FPC', config.sponsoredFPC.toString());
@@ -157,7 +98,7 @@ export async function enrichEnvironmentWithChainConfig(networkName) {
     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('DATA_DIRECTORY', path.join(process.env.HOME || '~', '.aztec', name, 'data'));
+    enrichVar('DATA_DIRECTORY', path.join(process.env.HOME || '~', '.aztec', networkName, 'data'));
     enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
     enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
     enrichVar('SYNC_SNAPSHOTS_URL', config.snapshotsUrl);
@@ -168,42 +109,7 @@ export async function enrichEnvironmentWithChainConfig(networkName) {
     if (config.autoUpdateUrl) {
         enrichVar('AUTO_UPDATE_URL', config.autoUpdateUrl);
     }
-    if (config.publicIncludeMetrics) {
-        enrichVar('PUBLIC_OTEL_INCLUDE_METRICS', config.publicIncludeMetrics.join(','));
-    }
-    if (config.publicMetricsCollectorUrl) {
-        enrichVar('PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT', config.publicMetricsCollectorUrl);
-    }
-    if (config.publicMetricsCollectFrom) {
-        enrichVar('PUBLIC_OTEL_COLLECT_FROM', config.publicMetricsCollectFrom.join(','));
-    }
     enrichEthAddressVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
     enrichEthAddressVar('SLASH_FACTORY_CONTRACT_ADDRESS', config.slashFactoryAddress);
     enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', config.feeAssetHandlerAddress);
-    // 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_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
-    enrichVar('AZTEC_DEPOSIT_AMOUNT', config.depositAmount.toString());
-    enrichVar('AZTEC_MINIMUM_STAKE', config.minimumStake.toString());
-    enrichVar('AZTEC_SLASHING_QUORUM', config.slashingQuorum.toString());
-    enrichVar('AZTEC_SLASHING_ROUND_SIZE', config.slashingRoundSize.toString());
-    enrichVar('AZTEC_GOVERNANCE_PROPOSER_QUORUM', config.governanceProposerQuorum.toString());
-    enrichVar('AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE', config.governanceProposerRoundSize.toString());
-    enrichVar('AZTEC_MANA_TARGET', config.manaTarget.toString());
-    enrichVar('AZTEC_PROVING_COST_PER_MANA', config.provingCostPerMana.toString());
-    // Slashing
-    enrichVar('SLASH_PAYLOAD_TTL_SECONDS', config.slashPayloadTtlSeconds.toString());
-    enrichVar('SLASH_PRUNE_ENABLED', config.slashPruneEnabled.toString());
-    enrichVar('SLASH_PRUNE_PENALTY', config.slashPrunePenalty.toString());
-    enrichVar('SLASH_PRUNE_MAX_PENALTY', config.slashPruneMaxPenalty.toString());
-    enrichVar('SLASH_INACTIVITY_ENABLED', config.slashInactivityEnabled.toString());
-    enrichVar('SLASH_INACTIVITY_CREATE_TARGET_PERCENTAGE', config.slashInactivityCreateTargetPercentage.toString());
-    enrichVar('SLASH_INACTIVITY_SIGNAL_TARGET_PERCENTAGE', config.slashInactivitySignalTargetPercentage.toString());
-    enrichVar('SLASH_INACTIVITY_CREATE_PENALTY', config.slashInactivityCreatePenalty.toString());
-    enrichVar('SLASH_INVALID_BLOCK_ENABLED', config.slashInvalidBlockEnabled.toString());
-    enrichVar('SLASH_INVALID_BLOCK_PENALTY', config.slashInvalidBlockPenalty.toString());
-    enrichVar('SLASH_INVALID_BLOCK_MAX_PENALTY', config.slashInvalidBlockMaxPenalty.toString());
 }

package/dest/cli/util.d.ts

@@ -8,18 +8,6 @@ import type { PXEService } from '@aztec/pxe/server';
 import type { ProverConfig } from '@aztec/stdlib/interfaces/server';
 import type { Command } from 'commander';
 import { type AztecStartOption } from './aztec_start_options.js';
-export declare const enum ExitCode {
-    SUCCESS = 0,
-    ERROR = 1,
-    ROLLUP_UPGRADE = 78,// EX_CONFIG from FreeBSD (https://man.freebsd.org/cgi/man.cgi?query=sysexits)
-    VERSION_UPGRADE = 79,// prev + 1 because there's nothing better
-    SIGHUP = 129,
-    SIGINT = 130,
-    SIGQUIT = 131,
-    SIGTERM = 143
-}
-export declare function shutdown(logFn: LogFn, exitCode: ExitCode, cb?: Array<() => Promise<void>>): Promise<never>;
-export declare function isShuttingDown(): boolean;
 export declare const installSignalHandlers: (logFn: LogFn, cb?: Array<() => Promise<void>>) => void;
 /**
  * Creates logs for the initial accounts
@@ -72,4 +60,5 @@ export declare function preloadCrsDataForVerifying({ realProofs }: Pick<AztecNod
  */
 export declare function preloadCrsDataForServerSideProving({ realProofs }: Pick<ProverConfig, 'realProofs'>, log: LogFn): Promise<void>;
 export declare function setupUpdateMonitor(autoUpdateMode: SharedNodeConfig['autoUpdate'], updatesLocation: URL, followsCanonicalRollup: boolean, publicClient: ViemClient, registryContractAddress: EthAddress, signalHandlers: Array<() => Promise<void>>, updateNodeConfig?: (config: object) => Promise<void>): Promise<void>;
+export declare function shutdown(logFn: LogFn, cb?: Array<() => Promise<void>>): Promise<void>;
 //# sourceMappingURL=util.d.ts.map

package/dest/cli/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/cli/util.ts"],"names":[],"mappings":"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"}

package/dest/cli/util.js

@@ -3,63 +3,13 @@ import { UpdateChecker } from '@aztec/stdlib/update-checker';
 import { getTelemetryClient } from '@aztec/telemetry-client';
 import chalk from 'chalk';
 import { aztecStartOptions } from './aztec_start_options.js';
-export var ExitCode = /*#__PURE__*/ function(ExitCode) {
-    ExitCode[ExitCode["SUCCESS"] = 0] = "SUCCESS";
-    ExitCode[ExitCode["ERROR"] = 1] = "ERROR";
-    ExitCode[ExitCode["ROLLUP_UPGRADE"] = 78] = "ROLLUP_UPGRADE";
-    ExitCode[ExitCode["VERSION_UPGRADE"] = 79] = "VERSION_UPGRADE";
-    // 128 + int(SIGNAL)
-    ExitCode[ExitCode["SIGHUP"] = 129] = "SIGHUP";
-    ExitCode[ExitCode["SIGINT"] = 130] = "SIGINT";
-    ExitCode[ExitCode["SIGQUIT"] = 131] = "SIGQUIT";
-    ExitCode[ExitCode["SIGTERM"] = 143] = "SIGTERM";
-    return ExitCode;
-}({});
-let shutdownPromise;
-export function shutdown(logFn, exitCode, cb) {
-    if (shutdownPromise) {
-        logFn('Already shutting down.');
-        return shutdownPromise;
-    }
-    logFn('Shutting down...', {
-        exitCode
-    });
-    if (cb) {
-        shutdownPromise = Promise.allSettled(cb).then(()=>process.exit(exitCode));
-    } else {
-        // synchronously shuts down the process
-        // no need to set shutdownPromise on this branch of the if statement because no more code will be executed
-        process.exit(exitCode);
-    }
-    return shutdownPromise;
-}
-export function isShuttingDown() {
-    return shutdownPromise !== undefined;
-}
 export const installSignalHandlers = (logFn, cb)=>{
-    const signals = [
-        [
-            'SIGINT',
-            130
-        ],
-        [
-            'SIGTERM',
-            143
-        ],
-        [
-            'SIGHUP',
-            129
-        ],
-        [
-            'SIQUIT',
-            131
-        ]
-    ];
-    for (const [signal, exitCode] of signals){
-        process.removeAllListeners(signal);
-        // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        process.once(signal, ()=>shutdown(logFn, exitCode, cb));
-    }
+    process.removeAllListeners('SIGINT');
+    process.removeAllListeners('SIGTERM');
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    process.once('SIGINT', ()=>shutdown(logFn, cb));
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    process.once('SIGTERM', ()=>shutdown(logFn, cb));
 };
 /**
  * Creates logs for the initial accounts
@@ -233,9 +183,6 @@ export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, follow
     });
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     checker.on('newRollupVersion', async ({ latestVersion, currentVersion })=>{
-        if (isShuttingDown()) {
-            return;
-        }
         // if node follows canonical rollup then this is equivalent to a config update
         if (!followsCanonicalRollup) {
             return;
@@ -245,7 +192,7 @@ export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, follow
                 latestVersion,
                 currentVersion
             });
-            await shutdown(logger.info, 78, signalHandlers);
+            await shutdown(logger.info, signalHandlers);
         } else if (autoUpdateMode === 'notify') {
             logger.warn(`New rollup detected. Please restart the node`, {
                 latestVersion,
@@ -255,15 +202,12 @@ export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, follow
     });
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     checker.on('newNodeVersion', async ({ latestVersion, currentVersion })=>{
-        if (isShuttingDown()) {
-            return;
-        }
         if (autoUpdateMode === 'config-and-version') {
             logger.info(`New node version detected. Please update and restart the node`, {
                 latestVersion,
                 currentVersion
             });
-            await shutdown(logger.info, 79, signalHandlers);
+            await shutdown(logger.info, signalHandlers);
         } else if (autoUpdateMode === 'notify') {
             logger.info(`New node version detected. Please update and restart the node`, {
                 latestVersion,
@@ -273,9 +217,6 @@ export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, follow
     });
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
     checker.on('updateNodeConfig', async (config)=>{
-        if (isShuttingDown()) {
-            return;
-        }
         if ((autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') && updateNodeConfig) {
             logger.warn(`Config change detected. Updating node`, config);
             try {
@@ -296,10 +237,6 @@ export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, follow
                 if (Array.isArray(publicIncludeMetrics) && publicIncludeMetrics.every((m)=>typeof m === 'string')) {
                     getTelemetryClient().setExportedPublicTelemetry(publicIncludeMetrics);
                 }
-                const publicMetricsCollectFrom = config.publicMetricsCollectFrom;
-                if (Array.isArray(publicMetricsCollectFrom) && publicMetricsCollectFrom.every((m)=>typeof m === 'string')) {
-                    getTelemetryClient().setPublicTelemetryCollectFrom(publicMetricsCollectFrom);
-                }
             } catch (err) {
                 logger.warn('Failed to update config', {
                     err
@@ -310,3 +247,10 @@ export async function setupUpdateMonitor(autoUpdateMode, updatesLocation, follow
     });
     checker.start();
 }
+export async function shutdown(logFn, cb) {
+    logFn('Shutting down...');
+    if (cb) {
+        await Promise.all(cb);
+    }
+    process.exit(0);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "1.0.0-staging.3",
+  "version": "1.0.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js"
@@ -27,35 +27,35 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "1.0.0-staging.3",
-    "@aztec/archiver": "1.0.0-staging.3",
-    "@aztec/aztec-faucet": "1.0.0-staging.3",
-    "@aztec/aztec-node": "1.0.0-staging.3",
-    "@aztec/aztec.js": "1.0.0-staging.3",
-    "@aztec/bb-prover": "1.0.0-staging.3",
-    "@aztec/bb.js": "1.0.0-staging.3",
-    "@aztec/blob-sink": "1.0.0-staging.3",
-    "@aztec/bot": "1.0.0-staging.3",
-    "@aztec/builder": "1.0.0-staging.3",
-    "@aztec/cli": "1.0.0-staging.3",
-    "@aztec/cli-wallet": "1.0.0-staging.3",
-    "@aztec/constants": "1.0.0-staging.3",
-    "@aztec/entrypoints": "1.0.0-staging.3",
-    "@aztec/ethereum": "1.0.0-staging.3",
-    "@aztec/foundation": "1.0.0-staging.3",
-    "@aztec/kv-store": "1.0.0-staging.3",
-    "@aztec/noir-contracts.js": "1.0.0-staging.3",
-    "@aztec/noir-protocol-circuits-types": "1.0.0-staging.3",
-    "@aztec/p2p": "1.0.0-staging.3",
-    "@aztec/p2p-bootstrap": "1.0.0-staging.3",
-    "@aztec/protocol-contracts": "1.0.0-staging.3",
-    "@aztec/prover-client": "1.0.0-staging.3",
-    "@aztec/prover-node": "1.0.0-staging.3",
-    "@aztec/pxe": "1.0.0-staging.3",
-    "@aztec/stdlib": "1.0.0-staging.3",
-    "@aztec/telemetry-client": "1.0.0-staging.3",
-    "@aztec/txe": "1.0.0-staging.3",
-    "@aztec/world-state": "1.0.0-staging.3",
+    "@aztec/accounts": "1.0.0",
+    "@aztec/archiver": "1.0.0",
+    "@aztec/aztec-faucet": "1.0.0",
+    "@aztec/aztec-node": "1.0.0",
+    "@aztec/aztec.js": "1.0.0",
+    "@aztec/bb-prover": "1.0.0",
+    "@aztec/bb.js": "1.0.0",
+    "@aztec/blob-sink": "1.0.0",
+    "@aztec/bot": "1.0.0",
+    "@aztec/builder": "1.0.0",
+    "@aztec/cli": "1.0.0",
+    "@aztec/cli-wallet": "1.0.0",
+    "@aztec/constants": "1.0.0",
+    "@aztec/entrypoints": "1.0.0",
+    "@aztec/ethereum": "1.0.0",
+    "@aztec/foundation": "1.0.0",
+    "@aztec/kv-store": "1.0.0",
+    "@aztec/noir-contracts.js": "1.0.0",
+    "@aztec/noir-protocol-circuits-types": "1.0.0",
+    "@aztec/p2p": "1.0.0",
+    "@aztec/p2p-bootstrap": "1.0.0",
+    "@aztec/protocol-contracts": "1.0.0",
+    "@aztec/prover-client": "1.0.0",
+    "@aztec/prover-node": "1.0.0",
+    "@aztec/pxe": "1.0.0",
+    "@aztec/stdlib": "1.0.0",
+    "@aztec/telemetry-client": "1.0.0",
+    "@aztec/txe": "1.0.0",
+    "@aztec/world-state": "1.0.0",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",

package/src/bin/index.ts

@@ -8,13 +8,12 @@ import { injectCommands as injectInfrastructureCommands } from '@aztec/cli/infra
 import { injectCommands as injectL1Commands } from '@aztec/cli/l1';
 import { injectCommands as injectMiscCommands } from '@aztec/cli/misc';
 import { injectCommands as injectPXECommands } from '@aztec/cli/pxe';
-import { getActiveNetworkName } from '@aztec/foundation/config';
 import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
 
 import { Command } from 'commander';
 
 import { NETWORK_FLAG } from '../cli/aztec_start_options.js';
-import { enrichEnvironmentWithChainConfig } from '../cli/chain_l2_config.js';
+import { type NetworkNames, enrichEnvironmentWithChainConfig } from '../cli/chain_l2_config.js';
 import { injectAztecCommands } from '../cli/index.js';
 import { getCliVersion } from '../cli/release_version.js';
 
@@ -39,7 +38,11 @@ async function main() {
     networkValue = args[networkIndex].split('=')[1] || args[networkIndex + 1];
   }
 
-  await enrichEnvironmentWithChainConfig(getActiveNetworkName(networkValue));
+  networkValue = networkValue || process.env.NETWORK;
+
+  if (networkValue !== undefined) {
+    await enrichEnvironmentWithChainConfig(networkValue as NetworkNames);
+  }
 
   const cliVersion = getCliVersion();
   let program = new Command('aztec');

package/src/cli/chain_l2_config.ts

@@ -1,14 +1,17 @@
 import { EthAddress } from '@aztec/aztec.js';
-import { DefaultL1ContractsConfig } from '@aztec/ethereum';
-import type { EnvVar, NetworkNames } from '@aztec/foundation/config';
+import type { EnvVar } from '@aztec/foundation/config';
 import type { SharedNodeConfig } from '@aztec/node-lib/config';
 
 import path from 'path';
 
-import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with { type: 'json' };
+export type NetworkNames = 'testnet-ignition' | 'alpha-testnet';
 
 export type L2ChainConfig = {
   l1ChainId: number;
+  ethereumSlotDuration: number;
+  aztecSlotDuration: number;
+  aztecEpochDuration: number;
+  aztecProofSubmissionEpochs: number;
   testAccounts: boolean;
   sponsoredFPC: boolean;
   p2pEnabled: boolean;
@@ -23,55 +26,14 @@ export type L2ChainConfig = {
   autoUpdate: SharedNodeConfig['autoUpdate'];
   autoUpdateUrl?: string;
   maxTxPoolSize: number;
-  publicIncludeMetrics?: string[];
-  publicMetricsCollectorUrl?: string;
-  publicMetricsCollectFrom?: string[];
-
-  // Deployment stuff
-
-  /** How many seconds an L1 slot lasts. */
-  ethereumSlotDuration: number;
-  /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
-  aztecSlotDuration: number;
-  /** How many L2 slots an epoch lasts. */
-  aztecEpochDuration: number;
-  /** The target validator committee size. */
-  aztecTargetCommitteeSize: number;
-  /** The number of epochs after an epoch ends that proofs are still accepted. */
-  aztecProofSubmissionEpochs: number;
-  /** The deposit amount for a validator */
-  depositAmount: bigint;
-  /** The minimum stake for a validator. */
-  minimumStake: bigint;
-  /** The slashing quorum */
-  slashingQuorum: number;
-  /** The slashing round size */
-  slashingRoundSize: number;
-  /** Governance proposing quorum */
-  governanceProposerQuorum: number;
-  /** Governance proposing round size */
-  governanceProposerRoundSize: number;
-  /** The mana target for the rollup */
-  manaTarget: bigint;
-  /** The proving cost per mana */
-  provingCostPerMana: bigint;
-
-  // slashing stuff
-  slashPayloadTtlSeconds: number;
-  slashPruneEnabled: boolean;
-  slashPrunePenalty: bigint;
-  slashPruneMaxPenalty: bigint;
-  slashInactivityEnabled: boolean;
-  slashInactivityCreateTargetPercentage: number;
-  slashInactivitySignalTargetPercentage: number;
-  slashInactivityCreatePenalty: bigint;
-  slashInvalidBlockEnabled: boolean;
-  slashInvalidBlockPenalty: bigint;
-  slashInvalidBlockMaxPenalty: bigint;
 };
 
 export const testnetIgnitionL2ChainConfig: L2ChainConfig = {
   l1ChainId: 11155111,
+  ethereumSlotDuration: 12,
+  aztecSlotDuration: 36,
+  aztecEpochDuration: 32,
+  aztecProofSubmissionEpochs: 1,
   testAccounts: true,
   sponsoredFPC: false,
   p2pEnabled: true,
@@ -86,51 +48,14 @@ export const testnetIgnitionL2ChainConfig: L2ChainConfig = {
   autoUpdate: 'disabled',
   autoUpdateUrl: undefined,
   maxTxPoolSize: 100_000_000, // 100MB
+};
 
-  // Deployment stuff
-  /** How many seconds an L1 slot lasts. */
+export const alphaTestnetL2ChainConfig: L2ChainConfig = {
+  l1ChainId: 11155111,
   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 after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: 1,
-  /** The deposit amount for a validator */
-  depositAmount: DefaultL1ContractsConfig.depositAmount,
-  /** The minimum stake for a validator. */
-  minimumStake: DefaultL1ContractsConfig.minimumStake,
-  /** The slashing quorum */
-  slashingQuorum: DefaultL1ContractsConfig.slashingQuorum,
-  /** The slashing round size */
-  slashingRoundSize: DefaultL1ContractsConfig.slashingRoundSize,
-  /** Governance proposing quorum */
-  governanceProposerQuorum: DefaultL1ContractsConfig.governanceProposerQuorum,
-  /** Governance proposing round size */
-  governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
-  /** The mana target for the rollup */
-  manaTarget: 0n,
-  /** The proving cost per mana */
-  provingCostPerMana: 0n,
-
-  // slashing stuff
-  slashInactivityEnabled: false,
-  slashInactivityCreateTargetPercentage: 0,
-  slashInactivitySignalTargetPercentage: 0,
-  slashInactivityCreatePenalty: 0n,
-  slashInvalidBlockEnabled: false,
-  slashPayloadTtlSeconds: 0,
-  slashPruneEnabled: false,
-  slashPrunePenalty: 0n,
-  slashPruneMaxPenalty: 0n,
-  slashInvalidBlockPenalty: 0n,
-  slashInvalidBlockMaxPenalty: 0n,
-};
-
-export const alphaTestnetL2ChainConfig: L2ChainConfig = {
-  l1ChainId: 11155111,
   testAccounts: false,
   sponsoredFPC: true,
   p2pEnabled: true,
@@ -144,51 +69,7 @@ export const alphaTestnetL2ChainConfig: L2ChainConfig = {
   snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/',
   autoUpdate: 'config-and-version',
   autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/alpha-testnet.json',
-  maxTxPoolSize: 100_000_000, // 100MB
-  publicIncludeMetrics,
-  publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec.network',
-  publicMetricsCollectFrom: ['sequencer'],
-
-  // 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 after an epoch ends that proofs are still accepted. */
-  aztecProofSubmissionEpochs: 1,
-  /** The deposit amount for a validator */
-  depositAmount: DefaultL1ContractsConfig.depositAmount,
-  /** The minimum stake for a validator. */
-  minimumStake: DefaultL1ContractsConfig.minimumStake,
-  /** The slashing quorum */
-  slashingQuorum: 101,
-  /** The slashing round size */
-  slashingRoundSize: 200,
-  /** Governance proposing quorum */
-  governanceProposerQuorum: 151,
-  /** Governance proposing round size */
-  governanceProposerRoundSize: 300,
-  /** The mana target for the rollup */
-  manaTarget: DefaultL1ContractsConfig.manaTarget,
-  /** The proving cost per mana */
-  provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
-
-  // slashing stuff
-  slashPayloadTtlSeconds: 36 * 32 * 24, // 24 epochs
-  slashPruneEnabled: true,
-  slashPrunePenalty: 17n * (DefaultL1ContractsConfig.depositAmount / 100n),
-  slashPruneMaxPenalty: 17n * (DefaultL1ContractsConfig.depositAmount / 100n),
-  slashInactivityEnabled: true,
-  slashInactivityCreateTargetPercentage: 1,
-  slashInactivitySignalTargetPercentage: 1,
-  slashInactivityCreatePenalty: 17n * (DefaultL1ContractsConfig.depositAmount / 100n),
-  slashInvalidBlockEnabled: true,
-  slashInvalidBlockPenalty: DefaultL1ContractsConfig.depositAmount,
-  slashInvalidBlockMaxPenalty: DefaultL1ContractsConfig.depositAmount,
+  maxTxPoolSize: 2 * 1024 * 1024 * 1024, // 2GB
 };
 
 export async function getBootnodes(networkName: NetworkNames) {
@@ -204,17 +85,15 @@ export async function getBootnodes(networkName: NetworkNames) {
   return json['bootnodes'];
 }
 
-export async function getL2ChainConfig(
-  networkName: NetworkNames,
-): Promise<{ config: L2ChainConfig; networkName: string } | undefined> {
+export async function getL2ChainConfig(networkName: NetworkNames): Promise<L2ChainConfig | undefined> {
   if (networkName === 'testnet-ignition') {
     const config = { ...testnetIgnitionL2ChainConfig };
     config.p2pBootstrapNodes = await getBootnodes(networkName);
-    return { config, networkName };
-  } else if (networkName === 'alpha-testnet' || networkName === 'testnet') {
+    return config;
+  } else if (networkName === 'alpha-testnet') {
     const config = { ...alphaTestnetL2ChainConfig };
-    config.p2pBootstrapNodes = await getBootnodes('alpha-testnet');
-    return { config, networkName: 'alpha-testnet' };
+    config.p2pBootstrapNodes = await getBootnodes(networkName);
+    return config;
   }
   return undefined;
 }
@@ -237,15 +116,14 @@ function enrichEthAddressVar(envVar: EnvVar, value: string) {
 }
 
 export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
-  if (networkName === 'local') {
-    return;
-  }
-
-  const result = await getL2ChainConfig(networkName);
-  if (!result) {
+  const config = await getL2ChainConfig(networkName);
+  if (!config) {
     throw new Error(`Unknown network name: ${networkName}`);
   }
-  const { config, networkName: name } = result;
+  enrichVar('ETHEREUM_SLOT_DURATION', config.ethereumSlotDuration.toString());
+  enrichVar('AZTEC_SLOT_DURATION', config.aztecSlotDuration.toString());
+  enrichVar('AZTEC_EPOCH_DURATION', config.aztecEpochDuration.toString());
+  enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
   enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
   enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
   enrichVar('SPONSORED_FPC', config.sponsoredFPC.toString());
@@ -253,7 +131,7 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
   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('DATA_DIRECTORY', path.join(process.env.HOME || '~', '.aztec', name, 'data'));
+  enrichVar('DATA_DIRECTORY', path.join(process.env.HOME || '~', '.aztec', networkName, 'data'));
   enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
   enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
   enrichVar('SYNC_SNAPSHOTS_URL', config.snapshotsUrl);
@@ -267,47 +145,7 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
     enrichVar('AUTO_UPDATE_URL', config.autoUpdateUrl);
   }
 
-  if (config.publicIncludeMetrics) {
-    enrichVar('PUBLIC_OTEL_INCLUDE_METRICS', config.publicIncludeMetrics.join(','));
-  }
-
-  if (config.publicMetricsCollectorUrl) {
-    enrichVar('PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT', config.publicMetricsCollectorUrl);
-  }
-
-  if (config.publicMetricsCollectFrom) {
-    enrichVar('PUBLIC_OTEL_COLLECT_FROM', config.publicMetricsCollectFrom.join(','));
-  }
-
   enrichEthAddressVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
   enrichEthAddressVar('SLASH_FACTORY_CONTRACT_ADDRESS', config.slashFactoryAddress);
   enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', config.feeAssetHandlerAddress);
-
-  // 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_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
-  enrichVar('AZTEC_DEPOSIT_AMOUNT', config.depositAmount.toString());
-  enrichVar('AZTEC_MINIMUM_STAKE', config.minimumStake.toString());
-  enrichVar('AZTEC_SLASHING_QUORUM', config.slashingQuorum.toString());
-  enrichVar('AZTEC_SLASHING_ROUND_SIZE', config.slashingRoundSize.toString());
-  enrichVar('AZTEC_GOVERNANCE_PROPOSER_QUORUM', config.governanceProposerQuorum.toString());
-  enrichVar('AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE', config.governanceProposerRoundSize.toString());
-  enrichVar('AZTEC_MANA_TARGET', config.manaTarget.toString());
-  enrichVar('AZTEC_PROVING_COST_PER_MANA', config.provingCostPerMana.toString());
-
-  // Slashing
-  enrichVar('SLASH_PAYLOAD_TTL_SECONDS', config.slashPayloadTtlSeconds.toString());
-  enrichVar('SLASH_PRUNE_ENABLED', config.slashPruneEnabled.toString());
-  enrichVar('SLASH_PRUNE_PENALTY', config.slashPrunePenalty.toString());
-  enrichVar('SLASH_PRUNE_MAX_PENALTY', config.slashPruneMaxPenalty.toString());
-  enrichVar('SLASH_INACTIVITY_ENABLED', config.slashInactivityEnabled.toString());
-  enrichVar('SLASH_INACTIVITY_CREATE_TARGET_PERCENTAGE', config.slashInactivityCreateTargetPercentage.toString());
-  enrichVar('SLASH_INACTIVITY_SIGNAL_TARGET_PERCENTAGE', config.slashInactivitySignalTargetPercentage.toString());
-  enrichVar('SLASH_INACTIVITY_CREATE_PENALTY', config.slashInactivityCreatePenalty.toString());
-  enrichVar('SLASH_INVALID_BLOCK_ENABLED', config.slashInvalidBlockEnabled.toString());
-  enrichVar('SLASH_INVALID_BLOCK_PENALTY', config.slashInvalidBlockPenalty.toString());
-  enrichVar('SLASH_INVALID_BLOCK_MAX_PENALTY', config.slashInvalidBlockMaxPenalty.toString());
 }

package/src/cli/util.ts

@@ -14,54 +14,13 @@ import type { Command } from 'commander';
 
 import { type AztecStartOption, aztecStartOptions } from './aztec_start_options.js';
 
-export const enum ExitCode {
-  SUCCESS = 0,
-  ERROR = 1,
-  ROLLUP_UPGRADE = 78, // EX_CONFIG from FreeBSD (https://man.freebsd.org/cgi/man.cgi?query=sysexits)
-  VERSION_UPGRADE = 79, // prev + 1 because there's nothing better
-  // 128 + int(SIGNAL)
-  SIGHUP = 129,
-  SIGINT = 130,
-  SIGQUIT = 131,
-  SIGTERM = 143,
-}
-
-let shutdownPromise: Promise<never> | undefined;
-export function shutdown(logFn: LogFn, exitCode: ExitCode, cb?: Array<() => Promise<void>>): Promise<never> {
-  if (shutdownPromise) {
-    logFn('Already shutting down.');
-    return shutdownPromise;
-  }
-
-  logFn('Shutting down...', { exitCode });
-  if (cb) {
-    shutdownPromise = Promise.allSettled(cb).then(() => process.exit(exitCode));
-  } else {
-    // synchronously shuts down the process
-    // no need to set shutdownPromise on this branch of the if statement because no more code will be executed
-    process.exit(exitCode);
-  }
-
-  return shutdownPromise;
-}
-
-export function isShuttingDown(): boolean {
-  return shutdownPromise !== undefined;
-}
-
 export const installSignalHandlers = (logFn: LogFn, cb?: Array<() => Promise<void>>) => {
-  const signals = [
-    ['SIGINT', ExitCode.SIGINT],
-    ['SIGTERM', ExitCode.SIGTERM],
-    ['SIGHUP', ExitCode.SIGHUP],
-    ['SIQUIT', ExitCode.SIGQUIT],
-  ] as const;
-
-  for (const [signal, exitCode] of signals) {
-    process.removeAllListeners(signal);
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    process.once(signal, () => shutdown(logFn, exitCode, cb));
-  }
+  process.removeAllListeners('SIGINT');
+  process.removeAllListeners('SIGTERM');
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  process.once('SIGINT', () => shutdown(logFn, cb));
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  process.once('SIGTERM', () => shutdown(logFn, cb));
 };
 
 /**
@@ -303,10 +262,6 @@ export async function setupUpdateMonitor(
 
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
   checker.on('newRollupVersion', async ({ latestVersion, currentVersion }) => {
-    if (isShuttingDown()) {
-      return;
-    }
-
     // if node follows canonical rollup then this is equivalent to a config update
     if (!followsCanonicalRollup) {
       return;
@@ -314,7 +269,7 @@ export async function setupUpdateMonitor(
 
     if (autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') {
       logger.info(`New rollup version detected. Please restart the node`, { latestVersion, currentVersion });
-      await shutdown(logger.info, ExitCode.ROLLUP_UPGRADE, signalHandlers);
+      await shutdown(logger.info, signalHandlers);
     } else if (autoUpdateMode === 'notify') {
       logger.warn(`New rollup detected. Please restart the node`, { latestVersion, currentVersion });
     }
@@ -322,12 +277,9 @@ export async function setupUpdateMonitor(
 
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
   checker.on('newNodeVersion', async ({ latestVersion, currentVersion }) => {
-    if (isShuttingDown()) {
-      return;
-    }
     if (autoUpdateMode === 'config-and-version') {
       logger.info(`New node version detected. Please update and restart the node`, { latestVersion, currentVersion });
-      await shutdown(logger.info, ExitCode.VERSION_UPGRADE, signalHandlers);
+      await shutdown(logger.info, signalHandlers);
     } else if (autoUpdateMode === 'notify') {
       logger.info(`New node version detected. Please update and restart the node`, { latestVersion, currentVersion });
     }
@@ -335,10 +287,6 @@ export async function setupUpdateMonitor(
 
   // eslint-disable-next-line @typescript-eslint/no-misused-promises
   checker.on('updateNodeConfig', async config => {
-    if (isShuttingDown()) {
-      return;
-    }
-
     if ((autoUpdateMode === 'config' || autoUpdateMode === 'config-and-version') && updateNodeConfig) {
       logger.warn(`Config change detected. Updating node`, config);
       try {
@@ -358,10 +306,6 @@ export async function setupUpdateMonitor(
         if (Array.isArray(publicIncludeMetrics) && publicIncludeMetrics.every(m => typeof m === 'string')) {
           getTelemetryClient().setExportedPublicTelemetry(publicIncludeMetrics);
         }
-        const publicMetricsCollectFrom: unknown = (config as any).publicMetricsCollectFrom;
-        if (Array.isArray(publicMetricsCollectFrom) && publicMetricsCollectFrom.every(m => typeof m === 'string')) {
-          getTelemetryClient().setPublicTelemetryCollectFrom(publicMetricsCollectFrom);
-        }
       } catch (err) {
         logger.warn('Failed to update config', { err });
       }
@@ -371,3 +315,11 @@ export async function setupUpdateMonitor(
 
   checker.start();
 }
+
+export async function shutdown(logFn: LogFn, cb?: Array<() => Promise<void>>) {
+  logFn('Shutting down...');
+  if (cb) {
+    await Promise.all(cb);
+  }
+  process.exit(0);
+}