@aztec/aztec 0.0.0-test.0 → 0.0.1-commit.001888fc

package/dest/cli/cmds/start_archiver.js

@@ -1,36 +1,42 @@
-import { Archiver, KVArchiverDataStore, archiverConfigMappings } from '@aztec/archiver';
-import { createLogger } from '@aztec/aztec.js';
-import { createBlobSinkClient } from '@aztec/blob-sink/client';
-import { dataConfigMappings } from '@aztec/kv-store/config';
-import { createStore } from '@aztec/kv-store/lmdb-v2';
+import { archiverConfigMappings, createArchiver, getArchiverConfigFromEnv } from '@aztec/archiver';
+import { createLogger } from '@aztec/aztec.js/log';
+import { blobClientConfigMapping, createBlobClient } from '@aztec/blob-client/client';
+import { getL1Config } from '@aztec/cli/config';
 import { ArchiverApiSchema } from '@aztec/stdlib/interfaces/server';
+import { dataConfigMappings } from '@aztec/stdlib/kv-store';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
-import { getL1Config } from '../get_l1_config.js';
 import { extractRelevantOptions } from '../util.js';
 /** Starts a standalone archiver. */ export async function startArchiver(options, signalHandlers, services) {
-    let archiverConfig = extractRelevantOptions(options, {
+    const envConfig = getArchiverConfigFromEnv();
+    const cliOptions = extractRelevantOptions(options, {
         ...archiverConfigMappings,
-        ...dataConfigMappings
+        ...dataConfigMappings,
+        ...blobClientConfigMapping
     }, 'archiver');
+    let archiverConfig = {
+        ...envConfig,
+        ...cliOptions
+    };
+    archiverConfig.dataStoreMapSizeKb = archiverConfig.archiverStoreMapSizeKb ?? archiverConfig.dataStoreMapSizeKb;
     if (!archiverConfig.l1Contracts.registryAddress || archiverConfig.l1Contracts.registryAddress.isZero()) {
         throw new Error('L1 registry address is required to start an Archiver');
     }
-    const { addresses, config } = await getL1Config(archiverConfig.l1Contracts.registryAddress, archiverConfig.l1RpcUrls, archiverConfig.l1ChainId);
+    const { addresses, config: l1Config } = await getL1Config(archiverConfig.l1Contracts.registryAddress, archiverConfig.l1RpcUrls, archiverConfig.l1ChainId);
     archiverConfig.l1Contracts = addresses;
     archiverConfig = {
         ...archiverConfig,
-        ...config
+        ...l1Config
     };
-    const storeLog = createLogger('archiver:lmdb');
-    const store = await createStore('archiver', KVArchiverDataStore.SCHEMA_VERSION, archiverConfig, storeLog);
-    const archiverStore = new KVArchiverDataStore(store, archiverConfig.maxLogs);
-    const telemetry = initTelemetryClient(getTelemetryClientConfig());
-    // TODO(https://github.com/AztecProtocol/aztec-packages/issues/10056): place CL url in config here
-    const blobSinkClient = createBlobSinkClient();
-    const archiver = await Archiver.createAndSync(archiverConfig, archiverStore, {
+    const telemetry = await initTelemetryClient(getTelemetryClientConfig());
+    const blobClient = createBlobClient(archiverConfig, {
+        logger: createLogger('archiver:blob-client:client')
+    });
+    const archiver = await createArchiver(archiverConfig, {
         telemetry,
-        blobSinkClient
-    }, true);
+        blobClient
+    }, {
+        blockUntilSync: true
+    });
     services.archiver = [
         archiver,
         ArchiverApiSchema

package/dest/cli/cmds/start_bot.d.ts

@@ -1,11 +1,8 @@
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
-import type { AztecNode, PXE } from '@aztec/stdlib/interfaces/client';
+import { type AztecNode, type AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import type { TelemetryClient } from '@aztec/telemetry-client';
+import { EmbeddedWallet } from '@aztec/wallets/embedded';
 export declare function startBot(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, userLog: LogFn): Promise<void>;
-export declare function addBot(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, deps: {
-    pxe?: PXE;
-    node?: AztecNode;
-    telemetry: TelemetryClient;
-}): Promise<void>;
-//# sourceMappingURL=start_bot.d.ts.map
+export declare function addBot(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, wallet: EmbeddedWallet, aztecNode: AztecNode, telemetry: TelemetryClient, aztecNodeAdmin?: AztecNodeAdmin, userLog?: LogFn): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfYm90LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2NtZHMvc3RhcnRfYm90LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFFLEtBQUssY0FBYyxFQUF5QixNQUFNLGlDQUFpQyxDQUFDO0FBQzdHLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBTS9ELE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUt6RCx3QkFBc0IsUUFBUSxDQUM1QixPQUFPLEVBQUUsR0FBRyxFQUNaLGNBQWMsRUFBRSxDQUFDLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsRUFDdkMsUUFBUSxFQUFFLHFCQUFxQixFQUMvQixPQUFPLEVBQUUsS0FBSyxpQkF3QmY7QUFFRCx3QkFBc0IsTUFBTSxDQUMxQixPQUFPLEVBQUUsR0FBRyxFQUNaLGNBQWMsRUFBRSxDQUFDLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsRUFDdkMsUUFBUSxFQUFFLHFCQUFxQixFQUMvQixNQUFNLEVBQUUsY0FBYyxFQUN0QixTQUFTLEVBQUUsU0FBUyxFQUNwQixTQUFTLEVBQUUsZUFBZSxFQUMxQixjQUFjLENBQUMsRUFBRSxjQUFjLEVBQy9CLE9BQU8sQ0FBQyxFQUFFLEtBQUssaUJBbUJoQiJ9

package/dest/cli/cmds/start_bot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_bot.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_bot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAK/D,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBAkBf;AAED,wBAAgB,MAAM,CACpB,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,IAAI,EAAE;IAAE,GAAG,CAAC,EAAE,GAAG,CAAC;IAAC,IAAI,CAAC,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,eAAe,CAAA;CAAE,iBAWlE"}
+{"version":3,"file":"start_bot.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_bot.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,cAAc,EAAyB,MAAM,iCAAiC,CAAC;AAC7G,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAM/D,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAKzD,wBAAsB,QAAQ,CAC5B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBAwBf;AAED,wBAAsB,MAAM,CAC1B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,eAAe,EAC1B,cAAc,CAAC,EAAE,cAAc,EAC/B,OAAO,CAAC,EAAE,KAAK,iBAmBhB"}

package/dest/cli/cmds/start_bot.js

@@ -1,27 +1,42 @@
-import { BotRunner, botConfigMappings, getBotRunnerApiHandler } from '@aztec/bot';
-import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
-import { extractRelevantOptions } from '../util.js';
+import { BotRunner, BotStore, botConfigMappings, getBotRunnerApiHandler } from '@aztec/bot';
+import { createStore, openTmpStore } from '@aztec/kv-store/lmdb-v2';
+import { allPxeConfigMappings } from '@aztec/pxe/config';
+import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
+import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient, makeTracedFetch } from '@aztec/telemetry-client';
+import { EmbeddedWallet } from '@aztec/wallets/embedded';
+import { extractRelevantOptions, stringifyConfig } from '../util.js';
+import { getVersions } from '../versioning.js';
 export async function startBot(options, signalHandlers, services, userLog) {
     const { proverNode, archiver, sequencer, p2pBootstrap, txe, prover } = options;
     if (proverNode || archiver || sequencer || p2pBootstrap || txe || prover) {
         userLog(`Starting a bot with --prover-node, --prover, --archiver, --sequencer, --p2p-bootstrap, or --txe is not supported.`);
         process.exit(1);
     }
-    // Start a PXE client that is used by the bot if required
-    let pxe;
-    if (options.pxe) {
-        const { addPXE } = await import('./start_pxe.js');
-        ({ pxe } = await addPXE(options, signalHandlers, services, userLog));
+    const fetch = makeTracedFetch([
+        1,
+        2,
+        3
+    ], true);
+    const config = extractRelevantOptions(options, botConfigMappings, 'bot');
+    if (!config.nodeUrl) {
+        throw new Error('The bot requires access to a Node');
     }
-    const telemetry = initTelemetryClient(getTelemetryClientConfig());
-    await addBot(options, signalHandlers, services, {
-        pxe,
-        telemetry
+    const aztecNode = createAztecNodeClient(config.nodeUrl, getVersions(), fetch);
+    const pxeConfig = extractRelevantOptions(options, allPxeConfigMappings, 'pxe');
+    userLog(`Creating bot wallet with config ${stringifyConfig(pxeConfig)}`);
+    const wallet = await EmbeddedWallet.create(aztecNode, {
+        pxeConfig
     });
+    const telemetry = await initTelemetryClient(getTelemetryClientConfig());
+    await addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, undefined, userLog);
 }
-export function addBot(options, signalHandlers, services, deps) {
+export async function addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, aztecNodeAdmin, userLog) {
     const config = extractRelevantOptions(options, botConfigMappings, 'bot');
-    const botRunner = new BotRunner(config, deps);
+    userLog?.(`Starting bot with config ${stringifyConfig(config)}`);
+    const db = await (config.dataDirectory ? createStore('bot', BotStore.SCHEMA_VERSION, config) : openTmpStore('bot', true, config.dataStoreMapSizeKb));
+    const store = new BotStore(db);
+    await store.cleanupOldClaims();
+    const botRunner = new BotRunner(config, wallet, aztecNode, telemetry, aztecNodeAdmin, store);
     if (!config.noStart) {
         void botRunner.start(); // Do not block since bot setup takes time
     }

package/dest/cli/cmds/start_node.d.ts

@@ -1,7 +1,8 @@
 import { type AztecNodeConfig } from '@aztec/aztec-node';
+import { type NetworkNames } from '@aztec/foundation/config';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
-export declare function startNode(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, userLog: LogFn): Promise<{
+export declare function startNode(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, adminServices: NamespacedApiHandlers, userLog: LogFn, networkName: NetworkNames): Promise<{
     config: AztecNodeConfig;
 }>;
-//# sourceMappingURL=start_node.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfbm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUE2QyxNQUFNLG1CQUFtQixDQUFDO0FBS3BHLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBZSxNQUFNLDBCQUEwQixDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUEwQm5ELHdCQUFzQixTQUFTLENBQzdCLE9BQU8sRUFBRSxHQUFHLEVBQ1osY0FBYyxFQUFFLENBQUMsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxFQUN2QyxRQUFRLEVBQUUscUJBQXFCLEVBQy9CLGFBQWEsRUFBRSxxQkFBcUIsRUFDcEMsT0FBTyxFQUFFLEtBQUssRUFDZCxXQUFXLEVBQUUsWUFBWSxHQUN4QixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZUFBZSxDQUFBO0NBQUUsQ0FBQyxDQW9LdEMifQ==

package/dest/cli/cmds/start_node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAEpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAgBnD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CA6HtC"}
+{"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAKpG,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,0BAA0B,CAAC;AAC1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AA0BnD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,KAAK,EACd,WAAW,EAAE,YAAY,GACxB,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CAoKtC"}

package/dest/cli/cmds/start_node.js

@@ -1,87 +1,112 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
 import { aztecNodeConfigMappings, getConfigEnvVars } from '@aztec/aztec-node';
-import { NULL_KEY } from '@aztec/ethereum';
-import { AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
-import { P2PApiSchema } from '@aztec/stdlib/interfaces/server';
-import { initTelemetryClient, telemetryClientConfigMappings } from '@aztec/telemetry-client';
-import { getGenesisValues } from '@aztec/world-state/testing';
-import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
-import { createAztecNode, deployContractsToL1 } from '../../sandbox/index.js';
-import { getL1Config } from '../get_l1_config.js';
-import { extractNamespacedOptions, extractRelevantOptions } from '../util.js';
-export async function startNode(options, signalHandlers, services, userLog) {
-    // options specifically namespaced with --node.<option>
-    const nodeSpecificOptions = extractNamespacedOptions(options, 'node');
+import { Fr } from '@aztec/aztec.js/fields';
+import { getL1Config } from '@aztec/cli/config';
+import { getPublicClient } from '@aztec/ethereum/client';
+import { getGenesisStateConfigEnvVars } from '@aztec/ethereum/config';
+import { SecretValue } from '@aztec/foundation/config';
+import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
+import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
+import { allPxeConfigMappings } from '@aztec/pxe/config';
+import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
+import { P2PApiSchema, ProverNodeApiSchema } from '@aztec/stdlib/interfaces/server';
+import { initTelemetryClient, makeTracedFetch, telemetryClientConfigMappings } from '@aztec/telemetry-client';
+import { EmbeddedWallet } from '@aztec/wallets/embedded';
+import { createAztecNode } from '../../local-network/index.js';
+import { extractNamespacedOptions, extractRelevantOptions, preloadCrsDataForVerifying, setupVersionChecker } from '../util.js';
+import { getVersions } from '../versioning.js';
+import { computeExpectedGenesisRoot, waitForCompatibleRollup } from './standby.js';
+import { startProverBroker } from './start_prover_broker.js';
+export async function startNode(options, signalHandlers, services, adminServices, userLog, networkName) {
+    // All options set from environment variables
+    const configFromEnvVars = getConfigEnvVars();
+    // Extract relevant options from command line arguments
+    const relevantOptions = extractRelevantOptions(options, aztecNodeConfigMappings, 'node');
     // All options that are relevant to the Aztec Node
     let nodeConfig = {
-        ...getConfigEnvVars(),
-        ...extractRelevantOptions(options, aztecNodeConfigMappings, 'node')
+        ...configFromEnvVars,
+        ...relevantOptions
     };
+    // Prover node configuration and broker setup
+    // REFACTOR: Move the broker setup out of here and into the prover-node factory
+    let broker = undefined;
     if (options.proverNode) {
-        userLog(`Running a Prover Node within a Node is not yet supported`);
-        process.exit(1);
-    }
-    const initialFundedAccounts = nodeConfig.testAccounts ? await getInitialTestAccounts() : [];
-    const { genesisBlockHash, genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address));
-    // Deploy contracts if needed
-    if (nodeSpecificOptions.deployAztecContracts || nodeSpecificOptions.deployAztecContractsSalt) {
-        let account;
-        if (nodeSpecificOptions.publisherPrivateKey) {
-            account = privateKeyToAccount(nodeSpecificOptions.publisherPrivateKey);
-        } else if (options.l1Mnemonic) {
-            account = mnemonicToAccount(options.l1Mnemonic);
-        } else {
-            throw new Error('--node.publisherPrivateKey or --l1-mnemonic is required to deploy L1 contracts');
+        nodeConfig.enableProverNode = true;
+        if (nodeConfig.proverAgentCount === 0) {
+            userLog(`Running prover node without local prover agent. Connect prover agents or pass --proverAgent.proverAgentCount`);
         }
-        // REFACTOR: We should not be calling a method from sandbox on the prod start flow
-        await deployContractsToL1(nodeConfig, account, undefined, {
-            assumeProvenThroughBlockNumber: nodeSpecificOptions.assumeProvenThroughBlockNumber,
-            salt: nodeSpecificOptions.deployAztecContractsSalt,
-            genesisBlockHash,
-            genesisArchiveRoot
-        });
-    } else {
-        if (!nodeConfig.l1Contracts.registryAddress || nodeConfig.l1Contracts.registryAddress.isZero()) {
-            throw new Error('L1 registry address is required to start Aztec Node without --deploy-aztec-contracts option');
+        if (nodeConfig.proverBrokerUrl) {
+            // at 1TPS we'd enqueue ~1k chonk verifier proofs and ~1k AVM proofs immediately
+            // set a lower connection limit such that we don't overload the server
+            // Keep retrying up to 30s
+            const fetch = makeTracedFetch([
+                1,
+                2,
+                3,
+                3,
+                3,
+                3,
+                3,
+                3,
+                3,
+                3,
+                3
+            ], false, makeUndiciFetch(new Agent({
+                connections: 100
+            })));
+            broker = createProvingJobBrokerClient(nodeConfig.proverBrokerUrl, getVersions(nodeConfig), fetch);
+        } else if (options.proverBroker) {
+            ({ broker } = await startProverBroker(options, signalHandlers, services, userLog));
+        } else {
+            userLog(`--prover-broker-url or --prover-broker is required to start a Prover Node`);
+            process.exit(1);
         }
-        const { addresses, config } = await getL1Config(nodeConfig.l1Contracts.registryAddress, nodeConfig.l1RpcUrls, nodeConfig.l1ChainId);
-        // TODO(#12272): will clean this up.
-        nodeConfig = {
-            ...nodeConfig,
-            l1Contracts: {
-                ...addresses,
-                slashFactoryAddress: nodeConfig.l1Contracts.slashFactoryAddress
-            },
-            ...config
-        };
     }
-    // if no publisher private key, then use l1Mnemonic
-    if (!options.archiver) {
-        // expect archiver url in node config
-        const archiverUrl = nodeConfig.archiverUrl;
-        if (!archiverUrl) {
-            userLog('Archiver Service URL is required to start Aztec Node without --archiver option');
-            throw new Error('Archiver Service URL is required to start Aztec Node without --archiver option');
-        }
-        nodeConfig.archiverUrl = archiverUrl;
+    await preloadCrsDataForVerifying(nodeConfig, userLog);
+    const genesisConfig = getGenesisStateConfigEnvVars();
+    const { genesisArchiveRoot, prefilledPublicData } = await computeExpectedGenesisRoot(genesisConfig, userLog);
+    const followsCanonicalRollup = typeof nodeConfig.rollupVersion !== 'number' || nodeConfig.rollupVersion === 'canonical';
+    if (!nodeConfig.l1Contracts.registryAddress || nodeConfig.l1Contracts.registryAddress.isZero()) {
+        throw new Error('L1 registry address is required to start Aztec Node');
     }
-    if (!options.sequencer) {
+    // Wait for a compatible rollup before proceeding with full L1 config fetch.
+    // This prevents crashes when the canonical rollup hasn't been upgraded yet.
+    await waitForCompatibleRollup(nodeConfig, {
+        genesisArchiveRoot,
+        vkTreeRoot: getVKTreeRoot(),
+        protocolContractsHash
+    }, options.port, userLog);
+    const { addresses, config } = await getL1Config(nodeConfig.l1Contracts.registryAddress, nodeConfig.l1RpcUrls, nodeConfig.l1ChainId, nodeConfig.rollupVersion);
+    process.env.ROLLUP_CONTRACT_ADDRESS ??= addresses.rollupAddress.toString();
+    if (!Fr.fromHexString(config.genesisArchiveTreeRoot).equals(genesisArchiveRoot)) {
+        throw new Error(`The computed genesis archive tree root ${genesisArchiveRoot} does not match the expected genesis archive tree root ${config.genesisArchiveTreeRoot} for the rollup deployed at ${addresses.rollupAddress}`);
+    }
+    // TODO(#12272): will clean this up.
+    nodeConfig = {
+        ...nodeConfig,
+        l1Contracts: {
+            ...addresses,
+            slashFactoryAddress: nodeConfig.l1Contracts.slashFactoryAddress
+        },
+        ...config
+    };
+    if (!options.sequencer && !nodeConfig.fishermanMode) {
         nodeConfig.disableValidator = true;
     } else {
-        const sequencerConfig = extractNamespacedOptions(options, 'sequencer');
-        let account;
-        if (!sequencerConfig.publisherPrivateKey || sequencerConfig.publisherPrivateKey === NULL_KEY) {
-            if (!options.l1Mnemonic) {
-                userLog('--sequencer.publisherPrivateKey or --l1-mnemonic is required to start Aztec Node with --sequencer option');
-                throw new Error('Private key or Mnemonic is required to start Aztec Node with --sequencer option');
-            } else {
-                account = mnemonicToAccount(options.l1Mnemonic);
-                const privKey = account.getHdKey().privateKey;
-                nodeConfig.publisherPrivateKey = `0x${Buffer.from(privKey).toString('hex')}`;
+        const sequencerConfig = {
+            ...configFromEnvVars,
+            ...extractNamespacedOptions(options, 'sequencer')
+        };
+        // If no publisher private keys have been given, use the first validator key
+        if (sequencerConfig.sequencerPublisherPrivateKeys === undefined || !sequencerConfig.sequencerPublisherPrivateKeys.length) {
+            if (sequencerConfig.validatorPrivateKeys?.getValue().length) {
+                sequencerConfig.sequencerPublisherPrivateKeys = [
+                    new SecretValue(sequencerConfig.validatorPrivateKeys.getValue()[0])
+                ];
             }
-        } else {
-            nodeConfig.publisherPrivateKey = sequencerConfig.publisherPrivateKey;
         }
+        nodeConfig.sequencerPublisherPrivateKeys = sequencerConfig.sequencerPublisherPrivateKeys;
     }
     if (nodeConfig.p2pEnabled) {
         // ensure bootstrapNodes is an array
@@ -90,10 +115,11 @@ export async function startNode(options, signalHandlers, services, userLog) {
         }
     }
     const telemetryConfig = extractRelevantOptions(options, telemetryClientConfigMappings, 'tel');
-    const telemetry = initTelemetryClient(telemetryConfig);
+    const telemetry = await initTelemetryClient(telemetryConfig);
     // Create and start Aztec Node
     const node = await createAztecNode(nodeConfig, {
-        telemetry
+        telemetry,
+        proverBroker: broker
     }, {
         prefilledPublicData
     });
@@ -106,24 +132,41 @@ export async function startNode(options, signalHandlers, services, userLog) {
         node.getP2P(),
         P2PApiSchema
     ];
+    adminServices.nodeAdmin = [
+        node,
+        AztecNodeAdminApiSchema
+    ];
+    // Register prover-node services if the prover node subsystem is running
+    const proverNode = node.getProverNode();
+    if (proverNode) {
+        services.prover = [
+            proverNode,
+            ProverNodeApiSchema
+        ];
+        if (!nodeConfig.proverBrokerUrl) {
+            services.provingJobSource = [
+                proverNode.getProver().getProvingJobSource(),
+                ProvingJobConsumerSchema
+            ];
+        }
+    }
     // Add node stop function to signal handlers
     signalHandlers.push(node.stop.bind(node));
-    // Add a PXE client that connects to this node if requested
-    let pxe;
-    if (options.pxe) {
-        const { addPXE } = await import('./start_pxe.js');
-        ({ pxe } = await addPXE(options, signalHandlers, services, userLog, {
-            node
-        }));
-    }
     // Add a txs bot if requested
     if (options.bot) {
         const { addBot } = await import('./start_bot.js');
-        await addBot(options, signalHandlers, services, {
-            pxe,
-            node,
-            telemetry
+        const pxeConfig = extractRelevantOptions(options, allPxeConfigMappings, 'pxe');
+        const wallet = await EmbeddedWallet.create(node, {
+            pxeConfig
         });
+        await addBot(options, signalHandlers, services, wallet, node, telemetry, undefined);
+    }
+    if (nodeConfig.enableVersionCheck && networkName !== 'local') {
+        const cacheDir = process.env.DATA_DIRECTORY ? `${process.env.DATA_DIRECTORY}/cache` : undefined;
+        try {
+            await setupVersionChecker(networkName, followsCanonicalRollup, getPublicClient(nodeConfig), signalHandlers, cacheDir);
+        } catch  {
+        /* no-op */ }
     }
     return {
         config: nodeConfig

package/dest/cli/cmds/start_p2p_bootstrap.d.ts

@@ -1,6 +1,6 @@
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
-import { type LogFn } from '@aztec/foundation/log';
+import type { LogFn } from '@aztec/foundation/log';
 export declare function startP2PBootstrap(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, userLog: LogFn): Promise<{
     config: import("@aztec/stdlib/config").ChainConfig;
 }>;
-//# sourceMappingURL=start_p2p_bootstrap.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfcDJwX2Jvb3RzdHJhcC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X3AycF9ib290c3RyYXAudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUMvRSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQWFuRCx3QkFBc0IsaUJBQWlCLENBQ3JDLE9BQU8sRUFBRSxHQUFHLEVBQ1osY0FBYyxFQUFFLENBQUMsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxFQUN2QyxRQUFRLEVBQUUscUJBQXFCLEVBQy9CLE9BQU8sRUFBRSxLQUFLOztHQWlCZiJ9

package/dest/cli/cmds/start_p2p_bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_p2p_bootstrap.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_p2p_bootstrap.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AASjE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK;;GAaf"}
+{"version":3,"file":"start_p2p_bootstrap.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_p2p_bootstrap.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAanD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK;;GAiBf"}

package/dest/cli/cmds/start_p2p_bootstrap.js

@@ -1,17 +1,21 @@
 import { jsonStringify } from '@aztec/foundation/json-rpc';
-import { createLogger } from '@aztec/foundation/log';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
 import { BootstrapNode, bootnodeConfigMappings } from '@aztec/p2p';
 import { emptyChainConfig } from '@aztec/stdlib/config';
 import { P2PBootstrapApiSchema } from '@aztec/stdlib/interfaces/server';
-import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
+import { initTelemetryClient, telemetryClientConfigMappings } from '@aztec/telemetry-client';
 import { extractRelevantOptions } from '../util.js';
 export async function startP2PBootstrap(options, signalHandlers, services, userLog) {
     // Start a P2P bootstrap node.
     const config = extractRelevantOptions(options, bootnodeConfigMappings, 'p2p');
-    userLog(`Starting P2P bootstrap node with config: ${jsonStringify(config)}`);
-    const telemetryClient = initTelemetryClient(getTelemetryClientConfig());
-    const store = await createStore('p2p-bootstrap', 1, config, createLogger('p2p:bootstrap:store'));
+    const safeConfig = {
+        ...config,
+        peerIdPrivateKey: '<redacted>'
+    };
+    userLog(`Starting P2P bootstrap node with config: ${jsonStringify(safeConfig)}`);
+    const telemetryConfig = extractRelevantOptions(options, telemetryClientConfigMappings, 'tel');
+    const telemetryClient = await initTelemetryClient(telemetryConfig);
+    const store = await createStore('p2p-bootstrap', 1, config);
     const node = new BootstrapNode(store, telemetryClient);
     await node.start(config);
     signalHandlers.push(()=>node.stop());
@@ -19,7 +23,7 @@ export async function startP2PBootstrap(options, signalHandlers, services, userL
         node,
         P2PBootstrapApiSchema
     ];
-    userLog(`P2P bootstrap node started on ${config.udpListenAddress}`);
+    userLog(`P2P bootstrap node started on ${config.p2pIp}:${config.p2pPort}`);
     return {
         config: emptyChainConfig
     };

package/dest/cli/cmds/start_prover_agent.d.ts

@@ -1,4 +1,4 @@
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
 export declare function startProverAgent(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers, userLog: LogFn): Promise<void>;
-//# sourceMappingURL=start_prover_agent.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfcHJvdmVyX2FnZW50LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2NtZHMvc3RhcnRfcHJvdmVyX2FnZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFnQm5ELHdCQUFzQixnQkFBZ0IsQ0FDcEMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsRUFDL0IsT0FBTyxFQUFFLEtBQUssaUJBd0RmIn0=

package/dest/cli/cmds/start_prover_agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_prover_agent.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_agent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAenD,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBA6Cf"}
+{"version":3,"file":"start_prover_agent.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_agent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAgBnD,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBAwDf"}

package/dest/cli/cmds/start_prover_agent.js

@@ -1,10 +1,11 @@
 import { times } from '@aztec/foundation/collection';
 import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
 import { buildServerCircuitProver } from '@aztec/prover-client';
-import { InlineProofStore, ProvingAgent, createProvingJobBrokerClient, proverAgentConfigMappings } from '@aztec/prover-client/broker';
+import { ProvingAgent, createProofStore, createProvingJobBrokerClient, proverAgentConfigMappings } from '@aztec/prover-client/broker';
 import { getProverNodeAgentConfigFromEnv } from '@aztec/prover-node';
+import { ProverAgentApiSchema } from '@aztec/stdlib/interfaces/server';
 import { initTelemetryClient, makeTracedFetch, telemetryClientConfigMappings } from '@aztec/telemetry-client';
-import { extractRelevantOptions } from '../util.js';
+import { extractRelevantOptions, preloadCrsDataForServerSideProving } from '../util.js';
 import { getVersions } from '../versioning.js';
 export async function startProverAgent(options, signalHandlers, services, userLog) {
     if (options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
@@ -16,23 +17,51 @@ export async function startProverAgent(options, signalHandlers, services, userLo
         ...extractRelevantOptions(options, proverAgentConfigMappings, 'proverAgent')
     };
     if (config.realProofs && (!config.bbBinaryPath || !config.acvmBinaryPath)) {
+        userLog(`Requested real proving but no path to bb or acvm binaries provided`);
         process.exit(1);
     }
     if (!config.proverBrokerUrl) {
+        userLog(`Missing prover broker URL. Pass --proverAgent.proverBrokerUrl <value>`);
         process.exit(1);
     }
-    const fetch = makeTracedFetch([
+    await preloadCrsDataForServerSideProving(config, userLog);
+    const fetch = makeTracedFetch(// retry connections every 3s, up to 30s before giving up
+    [
         1,
         2,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
         3
     ], false, makeUndiciFetch(new Agent({
         connections: 10
     })));
     const broker = createProvingJobBrokerClient(config.proverBrokerUrl, getVersions(), fetch);
-    const telemetry = initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
+    const telemetry = await initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
     const prover = await buildServerCircuitProver(config, telemetry);
-    const proofStore = new InlineProofStore();
-    const agents = times(config.proverAgentCount, ()=>new ProvingAgent(broker, proofStore, prover, config.proverAgentProofTypes, config.proverAgentPollIntervalMs, telemetry));
+    const proofStore = await createProofStore(config.proofStore);
+    const agents = times(config.proverAgentCount, ()=>new ProvingAgent(broker, proofStore, prover, config.proverAgentProofTypes, config.proverAgentPollIntervalMs));
+    // expose all agents as individual services
+    for(let i = 0; i < agents.length; i++){
+        services[`agent${i}`] = [
+            agents[i],
+            ProverAgentApiSchema,
+            ()=>agents[i].getStatus().status !== 'stopped'
+        ];
+    }
+    // shortcut in the most common case of having a single running agent
+    if (agents.length === 1) {
+        services[`agent`] = [
+            agents[0],
+            ProverAgentApiSchema,
+            ()=>agents[0].getStatus().status !== 'stopped'
+        ];
+    }
     await Promise.all(agents.map((agent)=>agent.start()));
     signalHandlers.push(async ()=>{
         await Promise.all(agents.map((agent)=>agent.stop()));

package/dest/cli/cmds/start_prover_broker.d.ts

@@ -6,4 +6,4 @@ export declare function startProverBroker(options: any, signalHandlers: (() => P
     broker: ProvingJobBroker;
     config: ProverBrokerConfig;
 }>;
-//# sourceMappingURL=start_prover_broker.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfcHJvdmVyX2Jyb2tlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X3Byb3Zlcl9icm9rZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUMvRSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUduRCxPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSw2QkFBNkIsQ0FBQztBQUVyQyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBTXhFLHdCQUFzQixpQkFBaUIsQ0FDckMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsRUFDL0IsT0FBTyxFQUFFLEtBQUssR0FDYixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZ0JBQWdCLENBQUM7SUFBQyxNQUFNLEVBQUUsa0JBQWtCLENBQUE7Q0FBRSxDQUFDLENBNENuRSJ9

package/dest/cli/cmds/start_prover_broker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_prover_broker.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_broker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAMxE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,kBAAkB,CAAA;CAAE,CAAC,CAyBnE"}
+{"version":3,"file":"start_prover_broker.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_broker.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAMxE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,kBAAkB,CAAA;CAAE,CAAC,CA4CnE"}

package/dest/cli/cmds/start_prover_broker.js

@@ -1,8 +1,12 @@
-import { ProvingJobBrokerSchema, createAndStartProvingBroker, proverBrokerConfigMappings } from '@aztec/prover-client/broker';
+import { getL1Config } from '@aztec/cli/config';
+import { getGenesisStateConfigEnvVars } from '@aztec/ethereum/config';
+import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
+import { protocolContractsHash } from '@aztec/protocol-contracts';
+import { ProvingJobBrokerSchema, ProvingJobBrokerSchemaWithDebug, createAndStartProvingBroker, proverBrokerConfigMappings } from '@aztec/prover-client/broker';
 import { getProverNodeBrokerConfigFromEnv } from '@aztec/prover-node';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
-import { getL1Config } from '../get_l1_config.js';
 import { extractRelevantOptions } from '../util.js';
+import { computeExpectedGenesisRoot, waitForCompatibleRollup } from './standby.js';
 export async function startProverBroker(options, signalHandlers, services, userLog) {
     if (options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
         userLog(`Starting a prover broker with --node, --sequencer, --pxe, --p2p-bootstrap, or --txe is not supported.`);
@@ -15,13 +19,21 @@ export async function startProverBroker(options, signalHandlers, services, userL
     if (!config.l1Contracts.registryAddress || config.l1Contracts.registryAddress.isZero()) {
         throw new Error('L1 registry address is required to start Aztec Node without --deploy-aztec-contracts option');
     }
-    const { addresses } = await getL1Config(config.l1Contracts.registryAddress, config.l1RpcUrls, config.l1ChainId);
+    const genesisConfig = getGenesisStateConfigEnvVars();
+    const { genesisArchiveRoot } = await computeExpectedGenesisRoot(genesisConfig, userLog);
+    await waitForCompatibleRollup(config, {
+        genesisArchiveRoot,
+        vkTreeRoot: getVKTreeRoot(),
+        protocolContractsHash
+    }, options.port, userLog);
+    const { addresses, config: rollupConfig } = await getL1Config(config.l1Contracts.registryAddress, config.l1RpcUrls, config.l1ChainId, config.rollupVersion);
     config.l1Contracts = addresses;
-    const client = initTelemetryClient(getTelemetryClientConfig());
+    config.rollupVersion = rollupConfig.rollupVersion;
+    const client = await initTelemetryClient(getTelemetryClientConfig());
     const broker = await createAndStartProvingBroker(config, client);
     services.proverBroker = [
         broker,
-        ProvingJobBrokerSchema
+        config.proverBrokerDebugReplayEnabled ? ProvingJobBrokerSchemaWithDebug : ProvingJobBrokerSchema
     ];
     signalHandlers.push(()=>broker.stop());
     return {

package/dest/cli/cmds/start_txe.d.ts

@@ -1,3 +1,3 @@
 import type { Logger } from '@aztec/foundation/log';
 export declare function startTXE(options: any, debugLogger: Logger): Promise<void>;
-//# sourceMappingURL=start_txe.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfdHhlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2NtZHMvc3RhcnRfdHhlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3BELHdCQUFzQixRQUFRLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxXQUFXLEVBQUUsTUFBTSxpQkFVL0QifQ==