@aztec/aztec 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/cli/cmds/start_bot.js

@@ -1,27 +1,38 @@
-import { BotRunner, botConfigMappings, getBotRunnerApiHandler } from '@aztec/bot';
-import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
+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 { TestWallet } from '@aztec/test-wallet/server';
 import { extractRelevantOptions } 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 aztecNode = createAztecNodeClient(config.nodeUrl, getVersions(), fetch);
+    const pxeConfig = extractRelevantOptions(options, allPxeConfigMappings, 'pxe');
+    const wallet = await TestWallet.create(aztecNode, pxeConfig);
     const telemetry = initTelemetryClient(getTelemetryClientConfig());
-    await addBot(options, signalHandlers, services, {
-        pxe,
-        telemetry
-    });
+    await addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, undefined);
 }
-export function addBot(options, signalHandlers, services, deps) {
+export async function addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, aztecNodeAdmin) {
     const config = extractRelevantOptions(options, botConfigMappings, 'bot');
-    const botRunner = new BotRunner(config, deps);
+    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,7 @@
 import { type AztecNodeConfig } from '@aztec/aztec-node';
 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): Promise<{
     config: AztecNodeConfig;
 }>;
 //# sourceMappingURL=start_node.d.ts.map

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":"AACA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAMpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAoBnD,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,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CAyHtC"}

package/dest/cli/cmds/start_node.js

@@ -1,87 +1,75 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getInitialTestAccountsData } 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 { Fr } from '@aztec/aztec.js/fields';
+import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
+import { getL1Config } from '@aztec/cli/config';
+import { getPublicClient } from '@aztec/ethereum';
+import { SecretValue } from '@aztec/foundation/config';
+import { allPxeConfigMappings } from '@aztec/pxe/config';
+import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
 import { P2PApiSchema } from '@aztec/stdlib/interfaces/server';
 import { initTelemetryClient, telemetryClientConfigMappings } from '@aztec/telemetry-client';
+import { TestWallet } from '@aztec/test-wallet/server';
 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 { createAztecNode } from '../../sandbox/index.js';
+import { extractNamespacedOptions, extractRelevantOptions, preloadCrsDataForVerifying, setupUpdateMonitor } from '../util.js';
+export async function startNode(options, signalHandlers, services, adminServices, userLog) {
+    // 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
     };
     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');
-        }
-        // 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');
-        }
-        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
-        };
+    await preloadCrsDataForVerifying(nodeConfig, userLog);
+    const testAccounts = nodeConfig.testAccounts ? (await getInitialTestAccountsData()).map((a)=>a.address) : [];
+    const sponsoredFPCAccounts = nodeConfig.sponsoredFPC ? [
+        await getSponsoredFPCAddress()
+    ] : [];
+    const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts);
+    userLog(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
+    const { genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
+    userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
+    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 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;
+    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.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.publisherPrivateKeys === undefined || !sequencerConfig.publisherPrivateKeys.length) {
+            if (sequencerConfig.validatorPrivateKeys?.getValue().length) {
+                sequencerConfig.publisherPrivateKeys = [
+                    new SecretValue(sequencerConfig.validatorPrivateKeys.getValue()[0])
+                ];
             }
-        } else {
-            nodeConfig.publisherPrivateKey = sequencerConfig.publisherPrivateKey;
         }
+        nodeConfig.publisherPrivateKeys = sequencerConfig.publisherPrivateKeys;
     }
     if (nodeConfig.p2pEnabled) {
         // ensure bootstrapNodes is an array
@@ -106,24 +94,23 @@ export async function startNode(options, signalHandlers, services, userLog) {
         node.getP2P(),
         P2PApiSchema
     ];
+    adminServices.nodeAdmin = [
+        node,
+        AztecNodeAdminApiSchema
+    ];
     // 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 TestWallet.create(node, pxeConfig);
+        await addBot(options, signalHandlers, services, wallet, node, telemetry, undefined);
+    }
+    if (nodeConfig.autoUpdate !== 'disabled' && nodeConfig.autoUpdateUrl) {
+        await setupUpdateMonitor(nodeConfig.autoUpdate, new URL(nodeConfig.autoUpdateUrl), followsCanonicalRollup, getPublicClient(nodeConfig), nodeConfig.l1Contracts.registryAddress, signalHandlers, async (config)=>node.setConfig((await AztecNodeAdminApiSchema.setConfig.parameters().parseAsync([
+                config
+            ]))[0]));
     }
     return {
         config: nodeConfig

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,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AAajE,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

@@ -4,13 +4,18 @@ 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 safeConfig = {
+        ...config,
+        peerIdPrivateKey: '<redacted>'
+    };
+    userLog(`Starting P2P bootstrap node with config: ${jsonStringify(safeConfig)}`);
+    const telemetryConfig = extractRelevantOptions(options, telemetryClientConfigMappings, 'tel');
+    const telemetryClient = initTelemetryClient(telemetryConfig);
     const store = await createStore('p2p-bootstrap', 1, config, createLogger('p2p:bootstrap:store'));
     const node = new BootstrapNode(store, telemetryClient);
     await node.start(config);
@@ -19,7 +24,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.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,iBAgEf"}

package/dest/cli/cmds/start_prover_agent.js

@@ -3,8 +3,9 @@ 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 { 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,14 +17,26 @@ 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
@@ -33,6 +46,22 @@ export async function startProverAgent(options, signalHandlers, services, userLo
     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));
+    // 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.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;AACnD,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAKxE,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,9 @@
+import { getL1Config } from '@aztec/cli/config';
+import { getPublicClient } from '@aztec/ethereum';
 import { ProvingJobBrokerSchema, 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 { extractRelevantOptions, setupUpdateMonitor } from '../util.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,10 +16,15 @@ 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 followsCanonicalRollup = typeof config.rollupVersion !== 'number';
+    const { addresses, config: rollupConfig } = await getL1Config(config.l1Contracts.registryAddress, config.l1RpcUrls, config.l1ChainId, config.rollupVersion);
     config.l1Contracts = addresses;
+    config.rollupVersion = rollupConfig.rollupVersion;
     const client = initTelemetryClient(getTelemetryClientConfig());
     const broker = await createAndStartProvingBroker(config, client);
+    if (options.autoUpdate !== 'disabled' && options.autoUpdateUrl) {
+        await setupUpdateMonitor(options.autoUpdate, new URL(options.autoUpdateUrl), followsCanonicalRollup, getPublicClient(config), config.l1Contracts.registryAddress, signalHandlers);
+    }
     services.proverBroker = [
         broker,
         ProvingJobBrokerSchema

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

@@ -1 +1 @@
-{"version":3,"file":"start_prover_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_node.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EACL,KAAK,gBAAgB,EAItB,MAAM,oBAAoB,CAAC;AAa5B,wBAAsB,eAAe,CACnC,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,CAAA;CAAE,CAAC,CA2FvC"}
+{"version":3,"file":"start_prover_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_node.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EACL,KAAK,gBAAgB,EAItB,MAAM,oBAAoB,CAAC;AAS5B,wBAAsB,eAAe,CACnC,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,CAAA;CAAE,CAAC,CA+FvC"}

package/dest/cli/cmds/start_prover_node.js

@@ -1,15 +1,15 @@
-import { getInitialTestAccounts } from '@aztec/accounts/testing';
-import { NULL_KEY } from '@aztec/ethereum';
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { Fr } from '@aztec/aztec.js/fields';
+import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
+import { getL1Config } from '@aztec/cli/config';
+import { getPublicClient } from '@aztec/ethereum';
 import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
 import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
 import { createProverNode, getProverNodeConfigFromEnv, proverNodeConfigMappings } from '@aztec/prover-node';
-import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 import { P2PApiSchema, ProverNodeApiSchema } from '@aztec/stdlib/interfaces/server';
 import { initTelemetryClient, makeTracedFetch, telemetryClientConfigMappings } from '@aztec/telemetry-client';
 import { getGenesisValues } from '@aztec/world-state/testing';
-import { mnemonicToAccount } from 'viem/accounts';
-import { getL1Config } from '../get_l1_config.js';
-import { extractRelevantOptions } from '../util.js';
+import { extractRelevantOptions, preloadCrsDataForVerifying, setupUpdateMonitor } from '../util.js';
 import { getVersions } from '../versioning.js';
 import { startProverBroker } from './start_prover_broker.js';
 export async function startProverNode(options, signalHandlers, services, userLog) {
@@ -21,48 +21,45 @@ export async function startProverNode(options, signalHandlers, services, userLog
         ...getProverNodeConfigFromEnv(),
         ...extractRelevantOptions(options, proverNodeConfigMappings, 'proverNode')
     };
-    if (!options.archiver && !proverConfig.archiverUrl) {
-        userLog('--archiver.archiverUrl is required to start a Prover Node without --archiver option');
-        process.exit(1);
-    }
-    if (!proverConfig.publisherPrivateKey || proverConfig.publisherPrivateKey === NULL_KEY) {
-        if (!options.l1Mnemonic) {
-            userLog(`--l1-mnemonic is required to start a Prover Node without --node.publisherPrivateKey`);
-            process.exit(1);
-        }
-        const hdAccount = mnemonicToAccount(options.l1Mnemonic);
-        const privKey = hdAccount.getHdKey().privateKey;
-        proverConfig.publisherPrivateKey = `0x${Buffer.from(privKey).toString('hex')}`;
-    }
-    // TODO(palla/prover-node) L1 contract addresses should not silently default to zero,
-    // they should be undefined if not set and fail loudly.
-    // Load l1 contract addresses from aztec node if not set.
-    const isRollupAddressSet = proverConfig.l1Contracts?.rollupAddress && !proverConfig.l1Contracts.rollupAddress.isZero();
-    const nodeUrl = proverConfig.nodeUrl ?? proverConfig.proverCoordinationNodeUrl;
-    if (nodeUrl && !isRollupAddressSet) {
-        userLog(`Loading L1 contract addresses from aztec node at ${nodeUrl}`);
-        proverConfig.l1Contracts = await createAztecNodeClient(nodeUrl).getL1ContractAddresses();
+    if (!proverConfig.l1Contracts.registryAddress || proverConfig.l1Contracts.registryAddress.isZero()) {
+        throw new Error('L1 registry address is required to start a Prover Node');
     }
-    // If we create an archiver here, validate the L1 config
-    if (options.archiver) {
-        if (!proverConfig.l1Contracts.registryAddress || proverConfig.l1Contracts.registryAddress.isZero()) {
-            throw new Error('L1 registry address is required to start a Prover Node with --archiver option');
-        }
-        const { addresses, config } = await getL1Config(proverConfig.l1Contracts.registryAddress, proverConfig.l1RpcUrls, proverConfig.l1ChainId);
-        proverConfig.l1Contracts = addresses;
-        proverConfig = {
-            ...proverConfig,
-            ...config
-        };
+    const followsCanonicalRollup = typeof proverConfig.rollupVersion !== 'number';
+    const { addresses, config } = await getL1Config(proverConfig.l1Contracts.registryAddress, proverConfig.l1RpcUrls, proverConfig.l1ChainId, proverConfig.rollupVersion);
+    process.env.ROLLUP_CONTRACT_ADDRESS ??= addresses.rollupAddress.toString();
+    proverConfig.l1Contracts = addresses;
+    proverConfig = {
+        ...proverConfig,
+        ...config
+    };
+    const testAccounts = proverConfig.testAccounts ? (await getInitialTestAccountsData()).map((a)=>a.address) : [];
+    const sponsoredFPCAccounts = proverConfig.sponsoredFPC ? [
+        await getSponsoredFPCAddress()
+    ] : [];
+    const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts);
+    userLog(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
+    const { genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
+    userLog(`Genesis archive root: ${genesisArchiveRoot.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}`);
     }
     const telemetry = initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
     let broker;
     if (proverConfig.proverBrokerUrl) {
-        // at 1TPS we'd enqueue ~1k tube proofs and ~1k AVM proofs immediately
-        // set a lower connectio  limit such that we don't overload the server
+        // 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
@@ -77,8 +74,7 @@ export async function startProverNode(options, signalHandlers, services, userLog
     if (proverConfig.proverAgentCount === 0) {
         userLog(`Running prover node without local prover agent. Connect one or more prover agents to this node or pass --proverAgent.proverAgentCount`);
     }
-    const initialFundedAccounts = proverConfig.testAccounts ? await getInitialTestAccounts() : [];
-    const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address));
+    await preloadCrsDataForVerifying(proverConfig, userLog);
     const proverNode = await createProverNode(proverConfig, {
         telemetry,
         broker
@@ -89,8 +85,7 @@ export async function startProverNode(options, signalHandlers, services, userLog
         proverNode,
         ProverNodeApiSchema
     ];
-    const p2p = proverNode.getP2P();
-    if (p2p) {
+    if (proverNode.getP2P()) {
         services.p2p = [
             proverNode.getP2P(),
             P2PApiSchema
@@ -103,7 +98,10 @@ export async function startProverNode(options, signalHandlers, services, userLog
         ];
     }
     signalHandlers.push(proverNode.stop.bind(proverNode));
-    proverNode.start();
+    await proverNode.start();
+    if (proverConfig.autoUpdate !== 'disabled' && proverConfig.autoUpdateUrl) {
+        await setupUpdateMonitor(proverConfig.autoUpdate, new URL(proverConfig.autoUpdateUrl), followsCanonicalRollup, getPublicClient(proverConfig), proverConfig.l1Contracts.registryAddress, signalHandlers);
+    }
     return {
         config: proverConfig
     };

package/dest/cli/preload_crs.d.ts

@@ -0,0 +1,3 @@
+import type { LogFn, Logger } from '@aztec/foundation/log';
+export declare function preloadCrs(_options: any, userLog: LogFn, _debugLogger: Logger): Promise<void>;
+//# sourceMappingURL=preload_crs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"preload_crs.d.ts","sourceRoot":"","sources":["../../src/cli/preload_crs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAI3D,wBAAsB,UAAU,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,iBAEnF"}

package/dest/cli/preload_crs.js

@@ -0,0 +1,6 @@
+import { preloadCrsDataForServerSideProving } from './util.js';
+export async function preloadCrs(_options, userLog, _debugLogger) {
+    await preloadCrsDataForServerSideProving({
+        realProofs: true
+    }, userLog);
+}

package/dest/cli/release_version.d.ts

@@ -0,0 +1,2 @@
+export declare const getCliVersion: () => any;
+//# sourceMappingURL=release_version.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"release_version.d.ts","sourceRoot":"","sources":["../../src/cli/release_version.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,aAAa,WAezB,CAAC"}

package/dest/cli/release_version.js

@@ -0,0 +1,14 @@
+import { fileURLToPath } from '@aztec/foundation/url';
+import { readFileSync } from 'fs';
+import { dirname, resolve } from 'path';
+export const getCliVersion = ()=>{
+    const packageJsonPath = resolve(dirname(fileURLToPath(import.meta.url)), '../../package.json');
+    const cliVersion = JSON.parse(readFileSync(packageJsonPath).toString()).version;
+    // If the version is 0.1.0, this is a placeholder version and we are in a docker container; query release please for the latest version
+    if (cliVersion === '0.1.0') {
+        const releasePleasePath = resolve(dirname(fileURLToPath(import.meta.url)), '../../../../.release-please-manifest.json');
+        const releaseVersion = JSON.parse(readFileSync(releasePleasePath).toString())['.'];
+        return releaseVersion;
+    }
+    return cliVersion;
+};