@aztec/aztec 0.0.1-commit.f146247c → 0.0.1-commit.f224bb98b

package/dest/cli/cmds/profile_flamegraph.js

@@ -0,0 +1,51 @@
+import { readFile, rename, rm, writeFile } from 'fs/promises';
+import { basename, dirname, join } from 'path';
+import { makeFunctionArtifact } from './profile_utils.js';
+import { run } from './utils/spawn.js';
+/** Generates a gate count flamegraph SVG for a single contract function. */ export async function profileFlamegraph(artifactPath, functionName, log) {
+    const raw = await readFile(artifactPath, 'utf-8');
+    const artifact = JSON.parse(raw);
+    if (!Array.isArray(artifact.functions)) {
+        throw new Error(`${artifactPath} does not appear to be a contract artifact (no functions array)`);
+    }
+    const func = artifact.functions.find((f)=>f.name === functionName);
+    if (!func) {
+        const available = artifact.functions.map((f)=>f.name).join(', ');
+        throw new Error(`Function "${functionName}" not found in artifact. Available: ${available}`);
+    }
+    if (func.is_unconstrained) {
+        throw new Error(`Function "${functionName}" is unconstrained and cannot be profiled`);
+    }
+    const outputDir = dirname(artifactPath);
+    const contractName = basename(artifactPath, '.json');
+    const functionArtifact = join(outputDir, `${contractName}-${functionName}.json`);
+    try {
+        await writeFile(functionArtifact, makeFunctionArtifact(artifact, func));
+        const profiler = process.env.PROFILER_PATH ?? 'noir-profiler';
+        const bb = process.env.BB ?? 'bb';
+        await run(profiler, [
+            'gates',
+            '--artifact-path',
+            functionArtifact,
+            '--backend-path',
+            bb,
+            '--backend-gates-command',
+            'gates',
+            '--output',
+            outputDir,
+            '--scheme',
+            'chonk',
+            '--include_gates_per_opcode'
+        ]);
+        // noir-profiler names the SVG using the internal function name which
+        // retains the __aztec_nr_internals__ prefix in the bytecode metadata.
+        const srcSvg = join(outputDir, `__aztec_nr_internals__${functionName}_gates.svg`);
+        const destSvg = join(outputDir, `${contractName}-${functionName}-flamegraph.svg`);
+        await rename(srcSvg, destSvg);
+        log(`Flamegraph written to ${destSvg}`);
+    } finally{
+        await rm(functionArtifact, {
+            force: true
+        });
+    }
+}

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

@@ -0,0 +1,4 @@
+import type { LogFn } from '@aztec/foundation/log';
+/** Profiles all compiled artifacts in a target directory and prints gate counts. */
+export declare function profileGates(targetDir: string, log: LogFn): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZmlsZV9nYXRlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3Byb2ZpbGVfZ2F0ZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUErQm5ELG9GQUFvRjtBQUNwRix3QkFBc0IsWUFBWSxDQUFDLFNBQVMsRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLEtBQUssR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBaUMvRSJ9

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

@@ -0,0 +1 @@
+{"version":3,"file":"profile_gates.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/profile_gates.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AA+BnD,oFAAoF;AACpF,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAiC/E"}

package/dest/cli/cmds/profile_gates.js

@@ -0,0 +1,57 @@
+import { asyncPool } from '@aztec/foundation/async-pool';
+import { execFile as execFileCb } from 'child_process';
+import { rm } from 'fs/promises';
+import { promisify } from 'util';
+import { MAX_CONCURRENT, discoverArtifacts } from './profile_utils.js';
+const execFile = promisify(execFileCb);
+/** Parses circuit_size from bb gates JSON output: { "functions": [{ "circuit_size": N }] } */ function parseGateCount(stdout) {
+    const parsed = JSON.parse(stdout);
+    const size = parsed?.functions?.[0]?.circuit_size;
+    if (typeof size !== 'number') {
+        throw new Error('Failed to parse circuit_size from bb gates output');
+    }
+    return size;
+}
+/** Runs bb gates on a single artifact file and returns the gate count. */ async function getGateCount(bb, artifactPath) {
+    const { stdout } = await execFile(bb, [
+        'gates',
+        '--scheme',
+        'chonk',
+        '-b',
+        artifactPath
+    ]);
+    return parseGateCount(stdout);
+}
+/** Profiles all compiled artifacts in a target directory and prints gate counts. */ export async function profileGates(targetDir, log) {
+    const bb = process.env.BB ?? 'bb';
+    const { artifacts, tmpDir } = await discoverArtifacts(targetDir);
+    if (artifacts.length === 0) {
+        log('No artifacts found in target directory.');
+        return;
+    }
+    try {
+        const results = await asyncPool(MAX_CONCURRENT, artifacts, async (artifact)=>({
+                name: artifact.name,
+                gateCount: await getGateCount(bb, artifact.filePath)
+            }));
+        results.sort((a, b)=>a.name.localeCompare(b.name));
+        if (results.length === 0) {
+            log('No constrained circuits found.');
+            return;
+        }
+        const maxNameLen = Math.max(...results.map((r)=>r.name.length));
+        log('');
+        log('Gate counts:');
+        log('-'.repeat(maxNameLen + 16));
+        for (const { name, gateCount } of results){
+            log(`${name.padEnd(maxNameLen)}  ${gateCount.toLocaleString().padStart(12)}`);
+        }
+        log('-'.repeat(maxNameLen + 16));
+        log(`Total: ${results.length} circuit(s)`);
+    } finally{
+        await rm(tmpDir, {
+            recursive: true,
+            force: true
+        });
+    }
+}

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

@@ -0,0 +1,18 @@
+import type { CompiledArtifact, ContractFunction } from './utils/artifacts.js';
+export declare const MAX_CONCURRENT = 4;
+export interface DiscoveredArtifact {
+    name: string;
+    filePath: string;
+    type: 'contract-function' | 'program';
+}
+/**
+ * Reads a target directory and returns a list of discovered artifacts with temp files
+ * created for contract functions. Caller must clean up tmpDir when done.
+ */
+export declare function discoverArtifacts(targetDir: string): Promise<{
+    artifacts: DiscoveredArtifact[];
+    tmpDir: string;
+}>;
+/** Extracts a contract function as a standalone program artifact JSON string. */
+export declare function makeFunctionArtifact(artifact: CompiledArtifact, func: ContractFunction): string;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvZmlsZV91dGlscy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3Byb2ZpbGVfdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBSUEsT0FBTyxLQUFLLEVBQUUsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUcvRSxlQUFPLE1BQU0sY0FBYyxJQUFJLENBQUM7QUFFaEMsTUFBTSxXQUFXLGtCQUFrQjtJQUNqQyxJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsUUFBUSxFQUFFLE1BQU0sQ0FBQztJQUNqQixJQUFJLEVBQUUsbUJBQW1CLEdBQUcsU0FBUyxDQUFDO0NBQ3ZDO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLGlCQUFpQixDQUNyQyxTQUFTLEVBQUUsTUFBTSxHQUNoQixPQUFPLENBQUM7SUFBRSxTQUFTLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQztJQUFDLE1BQU0sRUFBRSxNQUFNLENBQUE7Q0FBRSxDQUFDLENBc0I5RDtBQUVELGlGQUFpRjtBQUNqRix3QkFBZ0Isb0JBQW9CLENBQUMsUUFBUSxFQUFFLGdCQUFnQixFQUFFLElBQUksRUFBRSxnQkFBZ0IsVUFXdEYifQ==

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

@@ -0,0 +1 @@
+{"version":3,"file":"profile_utils.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/profile_utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAG/E,eAAO,MAAM,cAAc,IAAI,CAAC;AAEhC,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,mBAAmB,GAAG,SAAS,CAAC;CACvC;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAsB9D;AAED,iFAAiF;AACjF,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,UAWtF"}

package/dest/cli/cmds/profile_utils.js

@@ -0,0 +1,50 @@
+import { mkdtemp, writeFile } from 'fs/promises';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { readArtifactFiles } from './utils/artifacts.js';
+export const MAX_CONCURRENT = 4;
+/**
+ * Reads a target directory and returns a list of discovered artifacts with temp files
+ * created for contract functions. Caller must clean up tmpDir when done.
+ */ export async function discoverArtifacts(targetDir) {
+    const files = await readArtifactFiles(targetDir);
+    const tmpDir = await mkdtemp(join(tmpdir(), 'aztec-profile-'));
+    const artifacts = [];
+    for (const file of files){
+        if (Array.isArray(file.content.functions)) {
+            for (const func of file.content.functions){
+                if (!func.bytecode || func.is_unconstrained) {
+                    continue;
+                }
+                const name = `${file.name}::${func.name}`;
+                const tmpPath = join(tmpDir, `${file.name}-${func.name}.json`);
+                await writeFile(tmpPath, makeFunctionArtifact(file.content, func));
+                artifacts.push({
+                    name,
+                    filePath: tmpPath,
+                    type: 'contract-function'
+                });
+            }
+        } else if (file.content.bytecode) {
+            artifacts.push({
+                name: file.name,
+                filePath: file.filePath,
+                type: 'program'
+            });
+        }
+    }
+    return {
+        artifacts,
+        tmpDir
+    };
+}
+/** Extracts a contract function as a standalone program artifact JSON string. */ export function makeFunctionArtifact(artifact, func) {
+    /* eslint-disable camelcase */ return JSON.stringify({
+        noir_version: artifact.noir_version,
+        hash: 0,
+        abi: func.abi,
+        bytecode: func.bytecode,
+        debug_symbols: func.debug_symbols,
+        file_map: artifact.file_map
+    });
+/* eslint-enable camelcase */ }

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

@@ -0,0 +1,27 @@
+import type { Fr } from '@aztec/aztec.js/fields';
+import type { GenesisStateConfig } from '@aztec/ethereum/config';
+import type { EthAddress } from '@aztec/foundation/eth-address';
+import type { LogFn } from '@aztec/foundation/log';
+/**
+ * Computes the expected genesis archive root from the genesis state config.
+ * Reads test accounts and sponsored FPC addresses as specified, then computes
+ * the genesis values including the archive root and prefilled public data.
+ */
+export declare function computeExpectedGenesisRoot(config: GenesisStateConfig, userLog: LogFn): Promise<{
+    genesisArchiveRoot: Fr;
+    prefilledPublicData: import("@aztec/stdlib/trees").PublicDataTreeLeaf[];
+}>;
+/**
+ * Waits until the canonical rollup's genesis archive root matches the expected local genesis root.
+ * If the rollup is not yet compatible (e.g. during L1 contract upgrades), enters standby mode:
+ * starts a lightweight HTTP server for K8s liveness probes and polls every 60s until a compatible rollup appears.
+ */
+export declare function waitForCompatibleRollup(config: {
+    l1RpcUrls: string[];
+    l1ChainId: number;
+    l1Contracts: {
+        registryAddress: EthAddress;
+    };
+    rollupVersion?: number;
+}, expectedGenesisRoot: Fr, port: number | undefined, userLog: LogFn): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbmRieS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YW5kYnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHakQsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVqRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQVNuRDs7OztHQUlHO0FBQ0gsd0JBQXNCLDBCQUEwQixDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxPQUFPLEVBQUUsS0FBSzs7O0dBYTFGO0FBRUQ7Ozs7R0FJRztBQUNILHdCQUFzQix1QkFBdUIsQ0FDM0MsTUFBTSxFQUFFO0lBQ04sU0FBUyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ3BCLFNBQVMsRUFBRSxNQUFNLENBQUM7SUFDbEIsV0FBVyxFQUFFO1FBQUUsZUFBZSxFQUFFLFVBQVUsQ0FBQTtLQUFFLENBQUM7SUFDN0MsYUFBYSxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3hCLEVBQ0QsbUJBQW1CLEVBQUUsRUFBRSxFQUN2QixJQUFJLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDeEIsT0FBTyxFQUFFLEtBQUssR0FDYixPQUFPLENBQUMsSUFBSSxDQUFDLENBMERmIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"standby.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/standby.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAGjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AASnD;;;;GAIG;AACH,wBAAsB,0BAA0B,CAAC,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,KAAK;;;GAa1F;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE;IACN,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE;QAAE,eAAe,EAAE,UAAU,CAAA;KAAE,CAAC;IAC7C,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,EACD,mBAAmB,EAAE,EAAE,EACvB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,OAAO,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC,CA0Df"}

package/dest/cli/cmds/standby.js

@@ -0,0 +1,78 @@
+import { getInitialTestAccountsData } from '@aztec/accounts/testing';
+import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
+import { getPublicClient } from '@aztec/ethereum/client';
+import { RegistryContract, RollupContract } from '@aztec/ethereum/contracts';
+import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
+import { retryUntil } from '@aztec/foundation/retry';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
+import { getGenesisValues } from '@aztec/world-state/testing';
+import Koa from 'koa';
+const ROLLUP_POLL_INTERVAL_S = 60;
+/**
+ * Computes the expected genesis archive root from the genesis state config.
+ * Reads test accounts and sponsored FPC addresses as specified, then computes
+ * the genesis values including the archive root and prefilled public data.
+ */ export async function computeExpectedGenesisRoot(config, userLog) {
+    const testAccounts = config.testAccounts ? (await getInitialTestAccountsData()).map((a)=>a.address) : [];
+    const sponsoredFPCAccounts = config.sponsoredFPC ? [
+        await getSponsoredFPCAddress()
+    ] : [];
+    const prefundAddresses = (config.prefundAddresses ?? []).map((a)=>AztecAddress.fromString(a));
+    const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts).concat(prefundAddresses);
+    userLog(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
+    const { genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
+    userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
+    return {
+        genesisArchiveRoot,
+        prefilledPublicData
+    };
+}
+/**
+ * Waits until the canonical rollup's genesis archive root matches the expected local genesis root.
+ * If the rollup is not yet compatible (e.g. during L1 contract upgrades), enters standby mode:
+ * starts a lightweight HTTP server for K8s liveness probes and polls every 60s until a compatible rollup appears.
+ */ export async function waitForCompatibleRollup(config, expectedGenesisRoot, port, userLog) {
+    const publicClient = getPublicClient(config);
+    const rollupVersion = config.rollupVersion ?? 'canonical';
+    const registry = new RegistryContract(publicClient, config.l1Contracts.registryAddress);
+    const rollupAddress = await registry.getRollupAddress(rollupVersion);
+    const rollup = new RollupContract(publicClient, rollupAddress.toString());
+    let l1GenesisRoot;
+    try {
+        l1GenesisRoot = await rollup.getGenesisArchiveTreeRoot();
+    } catch (err) {
+        throw new Error(`Could not retrieve genesis archive root from canonical rollup at ${rollupAddress}: ${err.message}`);
+    }
+    if (l1GenesisRoot.equals(expectedGenesisRoot)) {
+        return;
+    }
+    userLog(`Genesis root mismatch: expected ${expectedGenesisRoot}, got ${l1GenesisRoot} from rollup at ${rollupAddress}. ` + `Entering standby mode. Will poll every ${ROLLUP_POLL_INTERVAL_S}s for a compatible rollup...`);
+    const standbyServer = await startHttpRpcServer({
+        getApp: ()=>new Koa(),
+        isHealthy: ()=>true
+    }, {
+        port
+    });
+    userLog(`Standby status server listening on port ${standbyServer.port}`);
+    try {
+        await retryUntil(async ()=>{
+            const currentRollupAddress = await registry.getRollupAddress(rollupVersion);
+            const currentRollup = new RollupContract(publicClient, currentRollupAddress.toString());
+            let currentGenesisRoot;
+            try {
+                currentGenesisRoot = await currentRollup.getGenesisArchiveTreeRoot();
+            } catch  {
+                userLog(`Failed to fetch genesis root from rollup at ${currentRollupAddress}. Retrying...`);
+                return undefined;
+            }
+            if (currentGenesisRoot.equals(expectedGenesisRoot)) {
+                userLog(`Compatible rollup found at ${currentRollupAddress}. Exiting standby mode.`);
+                return true;
+            }
+            userLog(`Still waiting. Rollup at ${currentRollupAddress} has genesis root ${currentGenesisRoot}.`);
+            return undefined;
+        }, 'compatible rollup', 0, ROLLUP_POLL_INTERVAL_S);
+    } finally{
+        await new Promise((resolve, reject)=>standbyServer.close((err)=>err ? reject(err) : resolve()));
+    }
+}

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

@@ -1,9 +1,9 @@
 import { type ArchiverConfig } from '@aztec/archiver';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
-import { type DataStoreConfig } from '@aztec/kv-store/config';
+import { type DataStoreConfig } from '@aztec/stdlib/kv-store';
 export type { ArchiverConfig, DataStoreConfig };
 /** Starts a standalone archiver. */
 export declare function startArchiver(options: any, signalHandlers: (() => Promise<void>)[], services: NamespacedApiHandlers): Promise<{
     config: ArchiverConfig & DataStoreConfig;
 }>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfYXJjaGl2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvY21kcy9zdGFydF9hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQW9FLE1BQU0saUJBQWlCLENBQUM7QUFJeEgsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUMvRSxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0sd0JBQXdCLENBQUM7QUFNbEYsWUFBWSxFQUFFLGNBQWMsRUFBRSxlQUFlLEVBQUUsQ0FBQztBQUVoRCxvQ0FBb0M7QUFDcEMsd0JBQXNCLGFBQWEsQ0FDakMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsR0FDOUIsT0FBTyxDQUFDO0lBQUUsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLENBQUE7Q0FBRSxDQUFDLENBK0J2RCJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfYXJjaGl2ZXIuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvY21kcy9zdGFydF9hcmNoaXZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxjQUFjLEVBQW9FLE1BQU0saUJBQWlCLENBQUM7QUFJeEgsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUUvRSxPQUFPLEVBQUUsS0FBSyxlQUFlLEVBQXNCLE1BQU0sd0JBQXdCLENBQUM7QUFLbEYsWUFBWSxFQUFFLGNBQWMsRUFBRSxlQUFlLEVBQUUsQ0FBQztBQUVoRCxvQ0FBb0M7QUFDcEMsd0JBQXNCLGFBQWEsQ0FDakMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsR0FDOUIsT0FBTyxDQUFDO0lBQUUsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLENBQUE7Q0FBRSxDQUFDLENBK0J2RCJ9

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

@@ -1 +1 @@
-{"version":3,"file":"start_archiver.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_archiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAoE,MAAM,iBAAiB,CAAC;AAIxH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAMlF,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC;AAEhD,oCAAoC;AACpC,wBAAsB,aAAa,CACjC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,GAAG,eAAe,CAAA;CAAE,CAAC,CA+BvD"}
+{"version":3,"file":"start_archiver.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_archiver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAoE,MAAM,iBAAiB,CAAC;AAIxH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAKlF,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC;AAEhD,oCAAoC;AACpC,wBAAsB,aAAa,CACjC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,GAC9B,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,GAAG,eAAe,CAAA;CAAE,CAAC,CA+BvD"}

package/dest/cli/cmds/start_archiver.js

@@ -2,8 +2,8 @@ import { archiverConfigMappings, createArchiver, getArchiverConfigFromEnv } from
 import { createLogger } from '@aztec/aztec.js/log';
 import { blobClientConfigMapping, createBlobClient } from '@aztec/blob-client/client';
 import { getL1Config } from '@aztec/cli/config';
-import { dataConfigMappings } from '@aztec/kv-store/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 { extractRelevantOptions } from '../util.js';
 /** Starts a standalone archiver. */ export async function startArchiver(options, signalHandlers, services) {

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

@@ -2,7 +2,7 @@ import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
 import { type AztecNode, type AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 import type { TelemetryClient } from '@aztec/telemetry-client';
-import { TestWallet } from '@aztec/test-wallet/server';
+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, wallet: TestWallet, aztecNode: AztecNode, telemetry: TelemetryClient, aztecNodeAdmin?: AztecNodeAdmin): Promise<void>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfYm90LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY2xpL2NtZHMvc3RhcnRfYm90LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkQsT0FBTyxFQUFFLEtBQUssU0FBUyxFQUFFLEtBQUssY0FBYyxFQUF5QixNQUFNLGlDQUFpQyxDQUFDO0FBQzdHLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBTS9ELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUt2RCx3QkFBc0IsUUFBUSxDQUM1QixPQUFPLEVBQUUsR0FBRyxFQUNaLGNBQWMsRUFBRSxDQUFDLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsRUFDdkMsUUFBUSxFQUFFLHFCQUFxQixFQUMvQixPQUFPLEVBQUUsS0FBSyxpQkF1QmY7QUFFRCx3QkFBc0IsTUFBTSxDQUMxQixPQUFPLEVBQUUsR0FBRyxFQUNaLGNBQWMsRUFBRSxDQUFDLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLEVBQUUsRUFDdkMsUUFBUSxFQUFFLHFCQUFxQixFQUMvQixNQUFNLEVBQUUsVUFBVSxFQUNsQixTQUFTLEVBQUUsU0FBUyxFQUNwQixTQUFTLEVBQUUsZUFBZSxFQUMxQixjQUFjLENBQUMsRUFBRSxjQUFjLGlCQWtCaEMifQ==
+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;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,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAKvD,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,iBAuBf;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,UAAU,EAClB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,eAAe,EAC1B,cAAc,CAAC,EAAE,cAAc,iBAkBhC"}
+{"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

@@ -3,8 +3,8 @@ 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 { 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;
@@ -23,12 +23,16 @@ export async function startBot(options, signalHandlers, services, userLog) {
     }
     const aztecNode = createAztecNodeClient(config.nodeUrl, getVersions(), fetch);
     const pxeConfig = extractRelevantOptions(options, allPxeConfigMappings, 'pxe');
-    const wallet = await TestWallet.create(aztecNode, pxeConfig);
+    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);
+    await addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, undefined, userLog);
 }
-export async function addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, aztecNodeAdmin) {
+export async function addBot(options, signalHandlers, services, wallet, aztecNode, telemetry, aztecNodeAdmin, userLog) {
     const config = extractRelevantOptions(options, botConfigMappings, 'bot');
+    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();

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, adminServices: 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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfbm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUE2QyxNQUFNLG1CQUFtQixDQUFDO0FBTXBHLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFvQm5ELHdCQUFzQixTQUFTLENBQzdCLE9BQU8sRUFBRSxHQUFHLEVBQ1osY0FBYyxFQUFFLENBQUMsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxFQUN2QyxRQUFRLEVBQUUscUJBQXFCLEVBQy9CLGFBQWEsRUFBRSxxQkFBcUIsRUFDcEMsT0FBTyxFQUFFLEtBQUssR0FDYixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZUFBZSxDQUFBO0NBQUUsQ0FBQyxDQXlIdEMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfbm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUE2QyxNQUFNLG1CQUFtQixDQUFDO0FBS3BHLE9BQU8sRUFBRSxLQUFLLFlBQVksRUFBZSxNQUFNLDBCQUEwQixDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFFL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUF3Qm5ELHdCQUFzQixTQUFTLENBQzdCLE9BQU8sRUFBRSxHQUFHLEVBQ1osY0FBYyxFQUFFLENBQUMsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxFQUN2QyxRQUFRLEVBQUUscUJBQXFCLEVBQy9CLGFBQWEsRUFBRSxxQkFBcUIsRUFDcEMsT0FBTyxFQUFFLEtBQUssRUFDZCxXQUFXLEVBQUUsWUFBWSxHQUN4QixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZUFBZSxDQUFBO0NBQUUsQ0FBQyxDQStKdEMifQ==

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;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"}
+{"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;AAwBnD,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,CA+JtC"}

package/dest/cli/cmds/start_node.js

@@ -1,19 +1,22 @@
-import { getInitialTestAccountsData } from '@aztec/accounts/testing';
 import { aztecNodeConfigMappings, getConfigEnvVars } from '@aztec/aztec-node';
 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/client';
+import { getGenesisStateConfigEnvVars } from '@aztec/ethereum/config';
 import { SecretValue } from '@aztec/foundation/config';
+import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
+import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
 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 { 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, setupUpdateMonitor } from '../util.js';
-export async function startNode(options, signalHandlers, services, adminServices, userLog) {
+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
@@ -23,23 +26,51 @@ export async function startNode(options, signalHandlers, services, adminServices
         ...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);
+        nodeConfig.enableProverNode = true;
+        if (nodeConfig.proverAgentCount === 0) {
+            userLog(`Running prover node without local prover agent. Connect prover agents or pass --proverAgent.proverAgentCount`);
+        }
+        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);
+        }
     }
     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 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');
     }
+    // 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, 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)) {
@@ -62,14 +93,14 @@ export async function startNode(options, signalHandlers, services, adminServices
             ...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.sequencerPublisherPrivateKeys === undefined || !sequencerConfig.sequencerPublisherPrivateKeys.length) {
             if (sequencerConfig.validatorPrivateKeys?.getValue().length) {
-                sequencerConfig.publisherPrivateKeys = [
+                sequencerConfig.sequencerPublisherPrivateKeys = [
                     new SecretValue(sequencerConfig.validatorPrivateKeys.getValue()[0])
                 ];
             }
         }
-        nodeConfig.publisherPrivateKeys = sequencerConfig.publisherPrivateKeys;
+        nodeConfig.sequencerPublisherPrivateKeys = sequencerConfig.sequencerPublisherPrivateKeys;
     }
     if (nodeConfig.p2pEnabled) {
         // ensure bootstrapNodes is an array
@@ -81,7 +112,8 @@ export async function startNode(options, signalHandlers, services, adminServices
     const telemetry = await initTelemetryClient(telemetryConfig);
     // Create and start Aztec Node
     const node = await createAztecNode(nodeConfig, {
-        telemetry
+        telemetry,
+        proverBroker: broker
     }, {
         prefilledPublicData
     });
@@ -98,19 +130,37 @@ export async function startNode(options, signalHandlers, services, adminServices
         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 txs bot if requested
     if (options.bot) {
         const { addBot } = await import('./start_bot.js');
         const pxeConfig = extractRelevantOptions(options, allPxeConfigMappings, 'pxe');
-        const wallet = await TestWallet.create(node, pxeConfig);
+        const wallet = await EmbeddedWallet.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]));
+    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_prover_agent.js

@@ -1,7 +1,7 @@
 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';
@@ -44,7 +44,7 @@ export async function startProverAgent(options, signalHandlers, services, userLo
     const broker = createProvingJobBrokerClient(config.proverBrokerUrl, getVersions(), fetch);
     const telemetry = await initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
     const prover = await buildServerCircuitProver(config, telemetry);
-    const proofStore = new InlineProofStore();
+    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++){

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=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfcHJvdmVyX2Jyb2tlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X3Byb3Zlcl9icm9rZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUMvRSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFJeEIsTUFBTSw2QkFBNkIsQ0FBQztBQUVyQyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBS3hFLHdCQUFzQixpQkFBaUIsQ0FDckMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsRUFDL0IsT0FBTyxFQUFFLEtBQUssR0FDYixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZ0JBQWdCLENBQUM7SUFBQyxNQUFNLEVBQUUsa0JBQWtCLENBQUE7Q0FBRSxDQUFDLENBNENuRSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfcHJvdmVyX2Jyb2tlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X3Byb3Zlcl9icm9rZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUMvRSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSw2QkFBNkIsQ0FBQztBQUVyQyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBTXhFLHdCQUFzQixpQkFBaUIsQ0FDckMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsRUFDL0IsT0FBTyxFQUFFLEtBQUssR0FDYixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZ0JBQWdCLENBQUM7SUFBQyxNQUFNLEVBQUUsa0JBQWtCLENBQUE7Q0FBRSxDQUFDLENBdUNuRSJ9

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":"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"}
+{"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,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,CAuCnE"}