@aztec/aztec 0.0.0-test.1 → 0.0.1-fake-ceab37513c

package/dest/bin/index.js

@@ -2,18 +2,18 @@
 //
 import { injectCommands as injectBuilderCommands } from '@aztec/builder';
 import { injectCommands as injectWalletCommands } from '@aztec/cli-wallet';
+import { enrichEnvironmentWithChainConfig, enrichEnvironmentWithNetworkConfig } from '@aztec/cli/config';
 import { injectCommands as injectContractCommands } from '@aztec/cli/contracts';
-import { injectCommands as injectDevnetCommands } from '@aztec/cli/devnet';
 import { injectCommands as injectInfrastructureCommands } from '@aztec/cli/infrastructure';
 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 { fileURLToPath } from '@aztec/foundation/url';
 import { Command } from 'commander';
-import { readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
+import { NETWORK_FLAG } from '../cli/aztec_start_options.js';
 import { injectAztecCommands } from '../cli/index.js';
+import { getCliVersion } from '../cli/release_version.js';
 const userLog = createConsoleLogger();
 const debugLogger = createLogger('cli');
 /** CLI & full node main entrypoint */ async function main() {
@@ -22,8 +22,17 @@ const debugLogger = createLogger('cli');
     };
     process.once('SIGINT', shutdown);
     process.once('SIGTERM', shutdown);
-    const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
-    const cliVersion = JSON.parse(readFileSync(packageJsonPath).toString()).version;
+    // Intercept the setting of a network and enrich the environment with defaults for that network
+    let networkValue;
+    const args = process.argv.slice(2);
+    const networkIndex = args.findIndex((arg)=>arg.startsWith(`--${NETWORK_FLAG}=`) || arg === `--${NETWORK_FLAG}`);
+    if (networkIndex !== -1) {
+        networkValue = args[networkIndex].split('=')[1] || args[networkIndex + 1];
+    }
+    const networkName = getActiveNetworkName(networkValue);
+    await enrichEnvironmentWithNetworkConfig(networkName);
+    enrichEnvironmentWithChainConfig(networkName);
+    const cliVersion = getCliVersion();
     let program = new Command('aztec');
     program.description('Aztec command line interface').version(cliVersion);
     program = injectAztecCommands(program, userLog, debugLogger);
@@ -33,7 +42,6 @@ const debugLogger = createLogger('cli');
     program = injectL1Commands(program, userLog, debugLogger);
     program = injectPXECommands(program, userLog, debugLogger);
     program = injectMiscCommands(program, userLog);
-    program = injectDevnetCommands(program, userLog, debugLogger);
     program = injectWalletCommands(program, userLog, debugLogger);
     await program.parseAsync(process.argv);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"aztec_start_action.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_action.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAmB3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBAyFjF"}
+{"version":3,"file":"aztec_start_action.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_action.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAY3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBAsGjF"}

package/dest/cli/aztec_start_action.js

@@ -1,33 +1,31 @@
 import { createNamespacedSafeJsonRpcServer, startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
-import { fileURLToPath } from '@aztec/foundation/url';
 import { AztecNodeApiSchema, PXESchema } from '@aztec/stdlib/interfaces/client';
 import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
 import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
-import { readFileSync } from 'fs';
-import { dirname, resolve } from 'path';
 import { createSandbox } from '../sandbox/index.js';
 import { github, splash } from '../splash.js';
-import { enrichEnvironmentWithChainConfig } from './chain_l2_config.js';
+import { getCliVersion } from './release_version.js';
 import { extractNamespacedOptions, installSignalHandlers } from './util.js';
 import { getVersions } from './versioning.js';
-const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
-const cliVersion = JSON.parse(readFileSync(packageJsonPath).toString()).version;
 export async function aztecStart(options, userLog, debugLogger) {
     // list of 'stop' functions to call when process ends
     const signalHandlers = [];
     const services = {};
+    const adminServices = {};
     let config = undefined;
     if (options.sandbox) {
+        const cliVersion = getCliVersion();
         const sandboxOptions = extractNamespacedOptions(options, 'sandbox');
-        const nodeOptions = extractNamespacedOptions(options, 'node');
+        sandboxOptions.testAccounts = true;
         userLog(`${splash}\n${github}\n\n`);
         userLog(`Setting up Aztec Sandbox ${cliVersion}, please stand by...`);
         const { node, pxe, stop } = await createSandbox({
-            l1Mnemonic: options.l1Mnemonic,
+            l1Mnemonic: sandboxOptions.l1Mnemonic,
             l1RpcUrls: options.l1RpcUrls,
-            l1Salt: nodeOptions.deployAztecContractsSalt,
+            deployAztecContractsSalt: sandboxOptions.deployAztecContractsSalt,
             noPXE: sandboxOptions.noPXE,
-            testAccounts: sandboxOptions.testAccounts
+            testAccounts: sandboxOptions.testAccounts,
+            realProofs: false
         }, userLog);
         // Start Node and PXE JSON-RPC server
         signalHandlers.push(stop);
@@ -44,13 +42,9 @@ export async function aztecStart(options, userLog, debugLogger) {
             userLog(`Not exposing PXE API through JSON-RPC server`);
         }
     } else {
-        // If a network is specified, enrich the environment with the chain config
-        if (options.network) {
-            await enrichEnvironmentWithChainConfig(options.network);
-        }
         if (options.node) {
             const { startNode } = await import('./cmds/start_node.js');
-            ({ config } = await startNode(options, signalHandlers, services, userLog));
+            ({ config } = await startNode(options, signalHandlers, services, adminServices, userLog));
         } else if (options.bot) {
             const { startBot } = await import('./cmds/start_bot.js');
             await startBot(options, signalHandlers, services, userLog);
@@ -81,9 +75,6 @@ export async function aztecStart(options, userLog, debugLogger) {
         } else if (options.sequencer) {
             userLog(`Cannot run a standalone sequencer without a node`);
             process.exit(1);
-        } else if (options.faucet) {
-            const { startFaucet } = await import('./cmds/start_faucet.js');
-            await startFaucet(options, signalHandlers, services, userLog);
         } else {
             userLog(`No module specified to start`);
             process.exit(1);
@@ -91,6 +82,7 @@ export async function aztecStart(options, userLog, debugLogger) {
     }
     installSignalHandlers(debugLogger.info, signalHandlers);
     const versions = getVersions(config);
+    // Start the main JSON-RPC server
     if (Object.entries(services).length > 0) {
         const rpcServer = createNamespacedSafeJsonRpcServer(services, {
             http200OnError: false,
@@ -98,11 +90,30 @@ export async function aztecStart(options, userLog, debugLogger) {
             middlewares: [
                 getOtelJsonRpcPropagationMiddleware(),
                 getVersioningMiddleware(versions)
-            ]
+            ],
+            maxBatchSize: options.rpcMaxBatchSize,
+            maxBodySizeBytes: options.rpcMaxBodySize
         });
         const { port } = await startHttpRpcServer(rpcServer, {
             port: options.port
         });
         debugLogger.info(`Aztec Server listening on port ${port}`, versions);
     }
+    // If there are any admin services, start a separate JSON-RPC server for them
+    if (Object.entries(adminServices).length > 0) {
+        const rpcServer = createNamespacedSafeJsonRpcServer(adminServices, {
+            http200OnError: false,
+            log: debugLogger,
+            middlewares: [
+                getOtelJsonRpcPropagationMiddleware(),
+                getVersioningMiddleware(versions)
+            ],
+            maxBatchSize: options.rpcMaxBatchSize,
+            maxBodySizeBytes: options.rpcMaxBodySize
+        });
+        const { port } = await startHttpRpcServer(rpcServer, {
+            port: options.adminPort
+        });
+        debugLogger.info(`Aztec Server admin API listening on port ${port}`, versions);
+    }
 }

package/dest/cli/aztec_start_options.d.ts

@@ -2,13 +2,15 @@ import { type ConfigMapping, type EnvVar } from '@aztec/foundation/config';
 export interface AztecStartOption {
     flag: string;
     description: string;
-    defaultValue: any | undefined;
+    defaultValue: any;
     printDefault?: (val: any) => string;
-    envVar: EnvVar | undefined;
+    env: EnvVar | undefined;
+    fallback?: EnvVar[];
     parseVal?: (val: string) => any;
 }
 export declare const getOptions: (namespace: string, configMappings: Record<string, ConfigMapping>) => AztecStartOption[];
 export declare const universalOptions: string[];
+export declare const NETWORK_FLAG = "network";
 export declare const aztecStartOptions: {
     [key: string]: AztecStartOption[];
 };

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

@@ -1 +1 @@
-{"version":3,"file":"aztec_start_options.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_options.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,MAAM,EAIZ,MAAM,0BAA0B,CAAC;AAelC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,GAAG,GAAG,SAAS,CAAC;IAC9B,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC;IACpC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;CACjC;AAED,eAAO,MAAM,UAAU,cAAe,MAAM,kBAAkB,OAAO,MAAM,EAAE,aAAa,CAAC,uBAiB1F,CAAC;AAGF,eAAO,MAAM,gBAAgB,UAA2E,CAAC;AAGzG,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAwTlE,CAAC"}
+{"version":3,"file":"aztec_start_options.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_options.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,MAAM,EAIZ,MAAM,0BAA0B,CAAC;AAclC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC;IACpC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;CACjC;AAED,eAAO,MAAM,UAAU,GAAI,WAAW,MAAM,EAAE,gBAAgB,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,uBAoB1F,CAAC;AAuBF,eAAO,MAAM,gBAAgB,UAW5B,CAAC;AAEF,eAAO,MAAM,YAAY,YAAY,CAAC;AAGtC,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAqOlE,CAAC"}

package/dest/cli/aztec_start_options.js

@@ -1,18 +1,23 @@
 import { archiverConfigMappings } from '@aztec/archiver/config';
-import { faucetConfigMapping } from '@aztec/aztec-faucet/config';
 import { sequencerClientConfigMappings } from '@aztec/aztec-node/config';
 import { blobSinkConfigMappings } from '@aztec/blob-sink/server';
 import { botConfigMappings } from '@aztec/bot/config';
+import { l1ContractAddressesMapping, l1ContractsConfigMappings, l1ReaderConfigMappings } from '@aztec/ethereum';
+import { getKeys } from '@aztec/foundation/collection';
 import { booleanConfigHelper, isBooleanConfigValue, omitConfigMappings } from '@aztec/foundation/config';
+import { dataConfigMappings } from '@aztec/kv-store/config';
+import { sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { bootnodeConfigMappings, p2pConfigMappings } from '@aztec/p2p/config';
 import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker';
 import { proverNodeConfigMappings } from '@aztec/prover-node/config';
 import { allPxeConfigMappings } from '@aztec/pxe/config';
+import { chainConfigMappings } from '@aztec/stdlib/config';
 import { telemetryClientConfigMappings } from '@aztec/telemetry-client';
+import { worldStateConfigMappings } from '@aztec/world-state';
 import { DefaultMnemonic } from '../mnemonic.js';
 export const getOptions = (namespace, configMappings)=>{
     const options = [];
-    for (const [key, { env, defaultValue: def, parseEnv, description, printDefault }] of Object.entries(configMappings)){
+    for (const [key, { env, defaultValue: def, parseEnv, description, printDefault, fallback }] of Object.entries(configMappings)){
         if (universalOptions.includes(key)) {
             continue;
         }
@@ -22,132 +27,129 @@ export const getOptions = (namespace, configMappings)=>{
             description,
             defaultValue: def,
             printDefault,
-            envVar: env,
+            env: env,
+            fallback,
             parseVal: parseEnv
         });
     }
     return options;
 };
+const configToFlag = (flag, configMapping, overrideDefaultValue)=>{
+    if (!configMapping.isBoolean) {
+        flag += ' <value>';
+    }
+    const flagConfig = {
+        flag,
+        env: undefined,
+        defaultValue: undefined,
+        parseVal: configMapping.parseEnv,
+        ...configMapping
+    };
+    if (overrideDefaultValue !== undefined) {
+        flagConfig.defaultValue = overrideDefaultValue;
+    }
+    return flagConfig;
+};
 // These are options used by multiple modules so should be inputted once
 export const universalOptions = [
-    'l1RpcUrls',
-    'l1ChainId',
-    'l1Contracts',
+    'l1ConsensusHostUrls',
+    'l1ConsensusHostApiKeys',
+    'l1ConsensusHostApiKeyHeaders',
     'p2pEnabled',
-    'dataDirectory'
+    ...getKeys(chainConfigMappings),
+    ...getKeys(l1ContractsConfigMappings),
+    ...getKeys(l1ContractAddressesMapping),
+    ...getKeys(l1ReaderConfigMappings),
+    ...getKeys(dataConfigMappings),
+    ...getKeys(worldStateConfigMappings)
 ];
+export const NETWORK_FLAG = 'network';
 // Define categories and options
 export const aztecStartOptions = {
-    NETWORK: [
+    MISC: [
         {
-            flag: '--network <value>',
+            flag: `--${NETWORK_FLAG} <value>`,
             description: 'Network to run Aztec on',
             defaultValue: undefined,
-            envVar: 'NETWORK'
-        }
+            env: 'NETWORK'
+        },
+        configToFlag('--auto-update', sharedNodeConfigMappings.autoUpdate),
+        configToFlag('--auto-update-url', sharedNodeConfigMappings.autoUpdateUrl),
+        configToFlag('--sync-mode', sharedNodeConfigMappings.syncMode),
+        configToFlag('--snapshots-urls', sharedNodeConfigMappings.snapshotsUrls)
     ],
     SANDBOX: [
         {
             flag: '--sandbox',
             description: 'Starts Aztec Sandbox',
             defaultValue: undefined,
-            envVar: undefined
-        },
-        {
-            flag: '--sandbox.testAccounts',
-            description: 'Deploy test accounts on sandbox start',
-            envVar: 'TEST_ACCOUNTS',
-            ...booleanConfigHelper(true)
+            env: undefined
         },
         {
             flag: '--sandbox.noPXE',
             description: 'Do not expose PXE service on sandbox start',
-            envVar: 'NO_PXE',
+            env: 'NO_PXE',
             ...booleanConfigHelper()
+        },
+        {
+            flag: '--sandbox.l1Mnemonic <value>',
+            description: 'Mnemonic for L1 accounts. Will be used ',
+            defaultValue: DefaultMnemonic,
+            env: 'MNEMONIC'
+        },
+        {
+            flag: '--sandbox.deployAztecContractsSalt <value>',
+            description: 'Numeric salt for deploying L1 Aztec contracts before starting the sandbox. Needs mnemonic or private key to be set.',
+            env: 'DEPLOY_AZTEC_CONTRACTS_SALT',
+            defaultValue: undefined,
+            parseVal: (val)=>val ? parseInt(val) : undefined
         }
     ],
     API: [
         {
             flag: '--port <value>',
-            description: 'Port to run the Aztec Services on on',
+            description: 'Port to run the Aztec Services on',
             defaultValue: 8080,
-            envVar: 'AZTEC_PORT',
+            env: 'AZTEC_PORT',
+            parseVal: (val)=>parseInt(val, 10)
+        },
+        {
+            flag: '--admin-port <value>',
+            description: 'Port to run admin APIs of Aztec Services on on',
+            defaultValue: 8880,
+            env: 'AZTEC_ADMIN_PORT',
             parseVal: (val)=>parseInt(val, 10)
         },
         {
             flag: '--api-prefix <value>',
             description: 'Prefix for API routes on any service that is started',
             defaultValue: '',
-            envVar: 'API_PREFIX'
+            env: 'API_PREFIX'
         }
     ],
     ETHEREUM: [
-        {
-            flag: '--l1-rpc-urls <value>',
-            description: 'List of URLs of the Ethereum RPC nodes that services will connect to (comma separated)',
-            defaultValue: [
-                'http://localhost:8545'
-            ],
-            envVar: 'ETHEREUM_HOSTS',
-            parseVal: (val)=>val.split(',').map((url)=>url.trim())
-        },
-        {
-            flag: '--l1-chain-id <value>',
-            description: 'The L1 chain ID',
-            defaultValue: 31337,
-            envVar: 'L1_CHAIN_ID',
-            parseVal: (val)=>parseInt(val, 10)
-        },
-        {
-            flag: '--l1-mnemonic <value>',
-            description: 'Mnemonic for L1 accounts. Will be used if no publisher private keys are provided',
-            defaultValue: DefaultMnemonic,
-            envVar: 'MNEMONIC'
-        }
+        configToFlag('--l1-chain-id', l1ReaderConfigMappings.l1ChainId),
+        // Do not set default for CLI: keep undefined unless provided via flag or env
+        configToFlag('--l1-rpc-urls', {
+            ...l1ReaderConfigMappings.l1RpcUrls,
+            defaultValue: undefined
+        }),
+        configToFlag('--l1-consensus-host-urls', blobSinkConfigMappings.l1ConsensusHostUrls),
+        configToFlag('--l1-consensus-host-api-keys', blobSinkConfigMappings.l1ConsensusHostApiKeys),
+        configToFlag('--l1-consensus-host-api-key-headers', blobSinkConfigMappings.l1ConsensusHostApiKeyHeaders)
     ],
-    'L1 CONTRACT ADDRESSES': [
-        {
-            flag: '--rollup-address <value>',
-            description: 'The deployed L1 rollup contract address',
-            defaultValue: undefined,
-            envVar: 'ROLLUP_CONTRACT_ADDRESS'
-        },
-        {
-            flag: '--registry-address <value>',
-            description: 'The deployed L1 registry contract address',
-            defaultValue: undefined,
-            envVar: 'REGISTRY_CONTRACT_ADDRESS'
-        },
-        {
-            flag: '--inbox-address <value>',
-            description: 'The deployed L1 -> L2 inbox contract address',
-            defaultValue: undefined,
-            envVar: 'INBOX_CONTRACT_ADDRESS'
-        },
-        {
-            flag: '--outbox-address <value>',
-            description: 'The deployed L2 -> L1 outbox contract address',
-            defaultValue: undefined,
-            envVar: 'OUTBOX_CONTRACT_ADDRESS'
-        },
-        {
-            flag: '--fee-juice-address <value>',
-            description: 'The deployed L1 Fee Juice contract address',
-            defaultValue: undefined,
-            envVar: 'FEE_JUICE_CONTRACT_ADDRESS'
-        },
-        {
-            flag: '--staking-asset-address <value>',
-            description: 'The deployed L1 Staking Asset contract address',
-            defaultValue: undefined,
-            envVar: 'STAKING_ASSET_CONTRACT_ADDRESS'
-        },
-        {
-            flag: '--fee-juice-portal-address <value>',
-            description: 'The deployed L1 Fee Juice portal contract address',
-            defaultValue: undefined,
-            envVar: 'FEE_JUICE_PORTAL_CONTRACT_ADDRESS'
-        }
+    'L1 CONTRACTS': [
+        configToFlag('--registry-address', l1ContractAddressesMapping.registryAddress),
+        configToFlag('--rollup-version', chainConfigMappings.rollupVersion)
+    ],
+    STORAGE: [
+        configToFlag('--data-directory', dataConfigMappings.dataDirectory),
+        configToFlag('--data-store-map-size-kb', dataConfigMappings.dataStoreMapSizeKb)
+    ],
+    'WORLD STATE': [
+        configToFlag('--world-state-data-directory', worldStateConfigMappings.worldStateDataDirectory),
+        configToFlag('--world-state-db-map-size-kb', worldStateConfigMappings.worldStateDbMapSizeKb),
+        configToFlag('--world-state-block-history', worldStateConfigMappings.worldStateBlockHistory)
     ],
     // We can't easily auto-generate node options as they're parts of modules defined below
     'AZTEC NODE': [
@@ -155,106 +157,38 @@ export const aztecStartOptions = {
             flag: '--node',
             description: 'Starts Aztec Node with options',
             defaultValue: undefined,
-            envVar: undefined
-        },
-        {
-            flag: '--data-directory <value>',
-            description: 'Where to store data. If not set, will store temporarily',
-            defaultValue: undefined,
-            envVar: 'DATA_DIRECTORY'
-        },
-        {
-            flag: '--node.archiverUrl <value>',
-            description: 'URL for an archiver service',
-            defaultValue: undefined,
-            envVar: 'ARCHIVER_URL'
-        },
-        {
-            flag: '--node.deployAztecContracts',
-            description: 'Deploys L1 Aztec contracts before starting the node. Needs mnemonic or private key to be set.',
-            envVar: 'DEPLOY_AZTEC_CONTRACTS',
-            defaultValue: undefined
-        },
-        {
-            flag: '--node.deployAztecContractsSalt <value>',
-            description: 'Numeric salt for deploying L1 Aztec contracts before starting the node. Needs mnemonic or private key to be set. Implies --node.deployAztecContracts.',
-            envVar: 'DEPLOY_AZTEC_CONTRACTS_SALT',
-            defaultValue: undefined,
-            parseVal: (val)=>val ? parseInt(val) : undefined
-        },
-        {
-            flag: '--node.assumeProvenThroughBlockNumber <value>',
-            description: 'Cheats the rollup contract into assuming every block until this one is proven. Useful for speeding up bootstraps.',
-            envVar: 'ASSUME_PROVEN_THROUGH_BLOCK_NUMBER',
-            parseVal: (val)=>parseInt(val, 10),
-            defaultValue: 0
-        },
-        {
-            flag: '--node.publisherPrivateKey <value>',
-            description: 'Private key of account for publishing L1 contracts',
-            defaultValue: undefined,
-            envVar: 'L1_PRIVATE_KEY'
-        },
-        {
-            flag: '--node.worldStateBlockCheckIntervalMS <value>',
-            description: 'Frequency in which to check for blocks in ms',
-            defaultValue: 100,
-            envVar: 'WS_BLOCK_CHECK_INTERVAL_MS',
-            parseVal: (val)=>parseInt(val, 10)
-        },
-        {
-            flag: '--node.testAccounts',
-            description: 'Populate genesis state with initial fee juice for test accounts',
-            envVar: 'TEST_ACCOUNTS',
-            ...booleanConfigHelper()
+            env: undefined
         }
     ],
-    'P2P SUBSYSTEM': [
-        {
-            flag: '--p2p-enabled',
-            description: 'Enable P2P subsystem',
-            envVar: 'P2P_ENABLED',
-            ...booleanConfigHelper()
-        },
-        ...getOptions('p2p', p2pConfigMappings)
-    ],
-    TELEMETRY: [
-        ...getOptions('tel', telemetryClientConfigMappings)
-    ],
-    PXE: [
-        {
-            flag: '--pxe',
-            description: 'Starts Aztec PXE with options',
-            defaultValue: undefined,
-            envVar: undefined
-        },
-        ...getOptions('pxe', allPxeConfigMappings)
-    ],
     ARCHIVER: [
         {
             flag: '--archiver',
             description: 'Starts Aztec Archiver with options',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         },
-        // filter out archiverUrl as it's passed separately in --node & --prover-node
-        ...getOptions('archiver', archiverConfigMappings).filter((opt)=>!opt.flag.includes('archiverUrl'))
+        ...getOptions('archiver', omitConfigMappings(archiverConfigMappings, Object.keys(l1ContractsConfigMappings)))
     ],
     SEQUENCER: [
         {
             flag: '--sequencer',
             description: 'Starts Aztec Sequencer with options',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         },
-        ...getOptions('sequencer', sequencerClientConfigMappings)
+        ...getOptions('sequencer', omitConfigMappings(sequencerClientConfigMappings, [
+            'fakeProcessingDelayPerTxMs',
+            'skipCollectingAttestations',
+            'skipInvalidateBlockAsProposer',
+            'blobSinkMapSizeKb'
+        ]))
     ],
-    BLOB_SINK: [
+    'BLOB SINK': [
         {
             flag: '--blob-sink',
             description: 'Starts Aztec Blob Sink with options',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         },
         ...getOptions('blobSink', blobSinkConfigMappings)
     ],
@@ -263,19 +197,16 @@ export const aztecStartOptions = {
             flag: '--prover-node',
             description: 'Starts Aztec Prover Node with options',
             defaultValue: undefined,
-            envVar: undefined
-        },
-        {
-            flag: '--proverNode.archiverUrl <value>',
-            description: 'URL for an archiver service',
-            defaultValue: undefined,
-            envVar: 'ARCHIVER_URL'
+            env: undefined
         },
         ...getOptions('proverNode', omitConfigMappings(proverNodeConfigMappings, [
             // filter out options passed separately
-            ...Object.keys(archiverConfigMappings),
-            ...Object.keys(proverBrokerConfigMappings),
-            ...Object.keys(proverAgentConfigMappings)
+            ...getKeys(archiverConfigMappings),
+            ...getKeys(proverBrokerConfigMappings),
+            ...getKeys(proverAgentConfigMappings),
+            ...getKeys(p2pConfigMappings),
+            ...getKeys(worldStateConfigMappings),
+            ...getKeys(sharedNodeConfigMappings)
         ]))
     ],
     'PROVER BROKER': [
@@ -283,7 +214,7 @@ export const aztecStartOptions = {
             flag: '--prover-broker',
             description: 'Starts Aztec proving job broker',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         },
         ...getOptions('proverBroker', // filter out archiver options from prover node options as they're passed separately in --archiver
         proverBrokerConfigMappings)
@@ -293,56 +224,61 @@ export const aztecStartOptions = {
             flag: '--prover-agent',
             description: 'Starts Aztec Prover Agent with options',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         },
         ...getOptions('proverAgent', proverAgentConfigMappings)
     ],
+    'P2P SUBSYSTEM': [
+        {
+            flag: '--p2p-enabled [value]',
+            description: 'Enable P2P subsystem',
+            env: 'P2P_ENABLED',
+            ...booleanConfigHelper()
+        },
+        ...getOptions('p2p', p2pConfigMappings)
+    ],
     'P2P BOOTSTRAP': [
         {
             flag: '--p2p-bootstrap',
             description: 'Starts Aztec P2P Bootstrap with options',
             defaultValue: undefined,
-            envVar: undefined
-        },
-        ...getOptions('p2pBootstrap', bootnodeConfigMappings)
+            env: undefined
+        },
+        ...getOptions('p2pBootstrap', omitConfigMappings(bootnodeConfigMappings, [
+            'p2pIp',
+            'p2pPort',
+            'peerIdPrivateKey',
+            'bootstrapNodes',
+            'listenAddress'
+        ]))
+    ],
+    TELEMETRY: [
+        ...getOptions('tel', telemetryClientConfigMappings)
     ],
     BOT: [
         {
             flag: '--bot',
             description: 'Starts Aztec Bot with options',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         },
         ...getOptions('bot', botConfigMappings)
     ],
+    PXE: [
+        {
+            flag: '--pxe',
+            description: 'Starts Aztec PXE with options',
+            defaultValue: undefined,
+            env: undefined
+        },
+        ...getOptions('pxe', allPxeConfigMappings)
+    ],
     TXE: [
         {
             flag: '--txe',
             description: 'Starts Aztec TXE with options',
             defaultValue: undefined,
-            envVar: undefined
+            env: undefined
         }
-    ],
-    FAUCET: [
-        {
-            flag: '--faucet',
-            description: 'Starts the Aztec faucet',
-            defaultValue: undefined,
-            envVar: undefined
-        },
-        {
-            flag: '--faucet.apiServer',
-            description: 'Starts a simple HTTP server to access the faucet',
-            defaultValue: true,
-            envVar: undefined
-        },
-        {
-            flag: '--faucet.apiServerPort <value>',
-            description: 'The port on which to start the api server on',
-            defaultValue: 8080,
-            envVar: undefined,
-            parseVal: (val)=>parseInt(val, 10)
-        },
-        ...getOptions('faucet', faucetConfigMapping)
     ]
 };