@aztec/aztec 0.0.1-commit.f504929 → 0.0.1-commit.f81dbcf

package/dest/bin/index.js

@@ -11,12 +11,12 @@ import { injectCommands as injectMiscCommands } from '@aztec/cli/misc';
 import { injectCommands as injectValidatorKeysCommands } from '@aztec/cli/validator_keys';
 import { getActiveNetworkName } from '@aztec/foundation/config';
 import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
+import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import { Command } from 'commander';
 import { injectCompileCommand } from '../cli/cmds/compile.js';
 import { injectMigrateCommand } from '../cli/cmds/migrate_ha_db.js';
 import { injectProfileCommand } from '../cli/cmds/profile.js';
 import { injectAztecCommands } from '../cli/index.js';
-import { getCliVersion } from '../cli/release_version.js';
 const NETWORK_FLAG = 'network';
 const userLog = createConsoleLogger();
 const debugLogger = createLogger('cli');
@@ -36,7 +36,7 @@ const debugLogger = createLogger('cli');
     const networkName = getActiveNetworkName(networkValue);
     await enrichEnvironmentWithNetworkConfig(networkName);
     enrichEnvironmentWithChainName(networkName);
-    const cliVersion = getCliVersion();
+    const cliVersion = getPackageVersion() ?? 'unknown';
     let program = new Command('aztec');
     program.description('Aztec command line interface').version(cliVersion).enablePositionalOptions();
     program = injectAztecCommands(program, userLog, debugLogger);

package/dest/cli/aztec_start_action.d.ts

@@ -1,3 +1,3 @@
 import type { LogFn, Logger } from '@aztec/foundation/log';
 export declare function aztecStart(options: any, userLog: LogFn, debugLogger: Logger): Promise<void>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfYWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2F6dGVjX3N0YXJ0X2FjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFNQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFhM0Qsd0JBQXNCLFVBQVUsQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBd0lqRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfYWN0aW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpL2F6dGVjX3N0YXJ0X2FjdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFhM0Qsd0JBQXNCLFVBQVUsQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLE1BQU0saUJBMElqRiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"aztec_start_action.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_action.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAa3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBAwIjF"}
+{"version":3,"file":"aztec_start_action.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_action.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAa3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBA0IjF"}

package/dest/cli/aztec_start_action.js

@@ -1,11 +1,12 @@
+import { getActiveNetworkName } from '@aztec/foundation/config';
 import { createNamespacedSafeJsonRpcServer, getApiKeyAuthMiddleware, startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
 import { AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
+import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
 import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
 import { createLocalNetwork } from '../local-network/index.js';
 import { github, splash } from '../splash.js';
 import { resolveAdminApiKey } from './admin_api_key_store.js';
-import { getCliVersion } from './release_version.js';
 import { extractNamespacedOptions, installSignalHandlers } from './util.js';
 import { getVersions } from './versioning.js';
 export async function aztecStart(options, userLog, debugLogger) {
@@ -13,13 +14,13 @@ export async function aztecStart(options, userLog, debugLogger) {
     const signalHandlers = [];
     const services = {};
     const adminServices = {};
+    const packageVersion = getPackageVersion();
     let config = undefined;
     if (options.localNetwork) {
-        const cliVersion = getCliVersion();
         const localNetwork = extractNamespacedOptions(options, 'local-network');
         localNetwork.testAccounts = true;
         userLog(`${splash}\n${github}\n\n`);
-        userLog(`Setting up Aztec local network ${cliVersion}, please stand by...`);
+        userLog(`Setting up Aztec local network ${packageVersion ?? 'unknown'}, please stand by...`);
         const { node, stop } = await createLocalNetwork({
             l1Mnemonic: localNetwork.l1Mnemonic,
             l1RpcUrls: options.l1RpcUrls,
@@ -44,7 +45,8 @@ export async function aztecStart(options, userLog, debugLogger) {
         }
         if (options.node) {
             const { startNode } = await import('./cmds/start_node.js');
-            ({ config } = await startNode(options, signalHandlers, services, adminServices, userLog));
+            const networkName = getActiveNetworkName(options.network);
+            ({ config } = await startNode(options, signalHandlers, services, adminServices, userLog, networkName));
         } else if (options.bot) {
             const { startBot } = await import('./cmds/start_bot.js');
             await startBot(options, signalHandlers, services, userLog);
@@ -73,6 +75,9 @@ export async function aztecStart(options, userLog, debugLogger) {
     }
     installSignalHandlers(debugLogger.info, signalHandlers);
     const versions = getVersions(config);
+    const versioningOpts = {
+        packageVersion
+    };
     // Start the main JSON-RPC server
     if (Object.entries(services).length > 0) {
         const rpcServer = createNamespacedSafeJsonRpcServer(services, {
@@ -80,7 +85,7 @@ export async function aztecStart(options, userLog, debugLogger) {
             log: debugLogger,
             middlewares: [
                 getOtelJsonRpcPropagationMiddleware(),
-                getVersioningMiddleware(versions)
+                getVersioningMiddleware(versions, versioningOpts)
             ],
             maxBatchSize: options.rpcMaxBatchSize,
             maxBodySizeBytes: options.rpcMaxBodySize
@@ -94,7 +99,7 @@ export async function aztecStart(options, userLog, debugLogger) {
     if (Object.entries(adminServices).length > 0) {
         const adminMiddlewares = [
             getOtelJsonRpcPropagationMiddleware(),
-            getVersioningMiddleware(versions)
+            getVersioningMiddleware(versions, versioningOpts)
         ];
         // Resolve the admin API key (auto-generated and persisted, or opt-out)
         const apiKeyResolution = await resolveAdminApiKey({

package/dest/cli/aztec_start_options.d.ts

@@ -14,4 +14,4 @@ export declare const NETWORK_FLAG = "network";
 export declare const aztecStartOptions: {
     [key: string]: AztecStartOption[];
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfb3B0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9henRlY19zdGFydF9vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFDTCxLQUFLLGFBQWEsRUFDbEIsS0FBSyxNQUFNLEVBSVosTUFBTSwwQkFBMEIsQ0FBQztBQWVsQyxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLFlBQVksRUFBRSxHQUFHLENBQUM7SUFDbEIsWUFBWSxDQUFDLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxLQUFLLE1BQU0sQ0FBQztJQUNwQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUN4QixRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNwQixRQUFRLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEtBQUssR0FBRyxDQUFDO0NBQ2pDO0FBRUQsZUFBTyxNQUFNLFVBQVUsMEZBb0J0QixDQUFDO0FBdUJGLGVBQU8sTUFBTSxnQkFBZ0IsVUFZNUIsQ0FBQztBQUVGLGVBQU8sTUFBTSxZQUFZLFlBQVksQ0FBQztBQUd0QyxlQUFPLE1BQU0saUJBQWlCLEVBQUU7SUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLEVBQUUsQ0FBQTtDQXVPbEUsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfc3RhcnRfb3B0aW9ucy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9henRlY19zdGFydF9vcHRpb25zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU9BLE9BQU8sRUFDTCxLQUFLLGFBQWEsRUFDbEIsS0FBSyxNQUFNLEVBSVosTUFBTSwwQkFBMEIsQ0FBQztBQWVsQyxNQUFNLFdBQVcsZ0JBQWdCO0lBQy9CLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYixXQUFXLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLFlBQVksRUFBRSxHQUFHLENBQUM7SUFDbEIsWUFBWSxDQUFDLEVBQUUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxLQUFLLE1BQU0sQ0FBQztJQUNwQyxHQUFHLEVBQUUsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUN4QixRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNwQixRQUFRLENBQUMsRUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEtBQUssR0FBRyxDQUFDO0NBQ2pDO0FBRUQsZUFBTyxNQUFNLFVBQVUsMEZBb0J0QixDQUFDO0FBdUJGLGVBQU8sTUFBTSxnQkFBZ0IsVUFZNUIsQ0FBQztBQUVGLGVBQU8sTUFBTSxZQUFZLFlBQVksQ0FBQztBQUd0QyxlQUFPLE1BQU0saUJBQWlCLEVBQUU7SUFBRSxDQUFDLEdBQUcsRUFBRSxNQUFNLEdBQUcsZ0JBQWdCLEVBQUUsQ0FBQTtDQXNPbEUsQ0FBQyJ9

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

@@ -1 +1 @@
-{"version":3,"file":"aztec_start_options.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_options.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,MAAM,EAIZ,MAAM,0BAA0B,CAAC;AAelC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC;IACpC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;CACjC;AAED,eAAO,MAAM,UAAU,0FAoBtB,CAAC;AAuBF,eAAO,MAAM,gBAAgB,UAY5B,CAAC;AAEF,eAAO,MAAM,YAAY,YAAY,CAAC;AAGtC,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAuOlE,CAAC"}
+{"version":3,"file":"aztec_start_options.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_options.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,MAAM,EAIZ,MAAM,0BAA0B,CAAC;AAelC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,GAAG,CAAC;IAClB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC;IACpC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,GAAG,CAAC;CACjC;AAED,eAAO,MAAM,UAAU,0FAoBtB,CAAC;AAuBF,eAAO,MAAM,gBAAgB,UAY5B,CAAC;AAEF,eAAO,MAAM,YAAY,YAAY,CAAC;AAGtC,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CAsOlE,CAAC"}

package/dest/cli/aztec_start_options.js

@@ -76,8 +76,7 @@ export const aztecStartOptions = {
             defaultValue: undefined,
             env: 'NETWORK'
         },
-        configToFlag('--auto-update', sharedNodeConfigMappings.autoUpdate),
-        configToFlag('--auto-update-url', sharedNodeConfigMappings.autoUpdateUrl),
+        configToFlag('--enable-version-check', sharedNodeConfigMappings.enableVersionCheck),
         configToFlag('--sync-mode', sharedNodeConfigMappings.syncMode),
         configToFlag('--snapshots-urls', sharedNodeConfigMappings.snapshotsUrls),
         configToFlag('--fisherman-mode', sharedNodeConfigMappings.fishermanMode)

package/dest/cli/cli.js

@@ -24,9 +24,9 @@ import { addOptions, printAztecStartHelpText } from './util.js';
         program.addHelpText('after', `
 Additional commands:
 
-  init               creates a new Aztec Noir workspace in the current directory.
-  new <name>         creates a new Aztec Noir workspace in its own directory (or creates a new contract-test crates pair and adds it to the current workspace if run in workspace).
-  test [options]     starts a TXE and runs "nargo test" using it as the oracle resolver.
+  init [folder] [options]  creates a new Aztec Noir project.
+  new <path> [options]     creates a new Aztec Noir project in a new directory.
+  test [options]           starts a TXE and runs "nargo test" using it as the oracle resolver.
     `);
     }
     program.command('preload-crs').description('Preload the points data needed for proving and verifying').action(async (options)=>{

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

@@ -1,4 +1,4 @@
 import type { LogFn } from '@aztec/foundation/log';
 import type { Command } from 'commander';
 export declare function injectCompileCommand(program: Command, log: LogFn): Command;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGlsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL2NvbXBpbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBOEp6Qyx3QkFBZ0Isb0JBQW9CLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxHQUFHLE9BQU8sQ0FzQjFFIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGlsZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL2NvbXBpbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFHbkQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBc0R6Qyx3QkFBZ0Isb0JBQW9CLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxHQUFHLE9BQU8sQ0FzQjFFIn0=

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

@@ -1 +1 @@
-{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/compile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA8JzC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAsB1E"}
+{"version":3,"file":"compile.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/compile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsDzC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAsB1E"}

package/dest/cli/cmds/compile.js

@@ -1,6 +1,5 @@
 import { execFileSync } from 'child_process';
 import { readFile, writeFile } from 'fs/promises';
-import { join } from 'path';
 import { readArtifactFiles } from './utils/artifacts.js';
 import { run } from './utils/spawn.js';
 /** Returns paths to contract artifacts in the target directory. */ async function collectContractArtifacts() {
@@ -26,95 +25,6 @@ import { run } from './utils/spawn.js';
         await writeFile(path, JSON.stringify(artifact, null, 2) + '\n');
     }
 }
-/** Returns the set of package names that are contract crates in the current workspace. */ async function getContractPackageNames() {
-    const contractNames = new Set();
-    let rootToml;
-    try {
-        rootToml = await readFile('Nargo.toml', 'utf-8');
-    } catch  {
-        return contractNames;
-    }
-    const membersMatch = rootToml.match(/members\s*=\s*\[([^\]]*)\]/);
-    if (membersMatch) {
-        const members = membersMatch[1].split(',').map((m)=>m.trim().replace(/^"|"$/g, '')).filter((m)=>m.length > 0);
-        for (const member of members){
-            try {
-                const memberToml = await readFile(join(member, 'Nargo.toml'), 'utf-8');
-                if (/type\s*=\s*"contract"/.test(memberToml)) {
-                    const nameMatch = memberToml.match(/name\s*=\s*"([^"]+)"/);
-                    if (nameMatch) {
-                        contractNames.add(nameMatch[1]);
-                    }
-                }
-            } catch  {
-            // Member directory might not exist or have no Nargo.toml; skip.
-            }
-        }
-    } else {
-        // Single-crate project (no workspace): check if the root Nargo.toml itself is a contract.
-        if (/type\s*=\s*"contract"/.test(rootToml)) {
-            const nameMatch = rootToml.match(/name\s*=\s*"([^"]+)"/);
-            if (nameMatch) {
-                contractNames.add(nameMatch[1]);
-            }
-        }
-    }
-    return contractNames;
-}
-/** Checks that no tests exist in contract crates and fails with a helpful message if they do. */ async function checkNoTestsInContracts(nargo, log) {
-    const contractPackages = await getContractPackageNames();
-    if (contractPackages.size === 0) {
-        return;
-    }
-    let output;
-    try {
-        // We list tests for all the crates in the workspace
-        output = execFileSync(nargo, [
-            'test',
-            '--list-tests',
-            '--silence-warnings'
-        ], {
-            encoding: 'utf-8',
-            stdio: [
-                'pipe',
-                'pipe',
-                'inherit'
-            ]
-        });
-    } catch  {
-        // If listing tests fails (e.g. test crate has compile errors), skip the check.
-        return;
-    }
-    // The output of the `nargo test --list-tests` command is as follows:
-    // ```
-    // crate_name_1 test_name_1
-    // crate_name_2 test_name_2
-    // ...
-    // crate_name_n test_name_n
-    // ```
-    //
-    // We parse the individual lines and then we check if any contract crate appeared in the parsed output.
-    const lines = output.trim().split('\n').filter((line)=>line.length > 0);
-    const testsInContracts = [];
-    for (const line of lines){
-        const spaceIndex = line.indexOf(' ');
-        if (spaceIndex === -1) {
-            continue;
-        }
-        const packageName = line.substring(0, spaceIndex);
-        const testName = line.substring(spaceIndex + 1);
-        if (contractPackages.has(packageName)) {
-            testsInContracts.push({
-                packageName,
-                testName
-            });
-        }
-    }
-    if (testsInContracts.length > 0) {
-        const details = testsInContracts.map((t)=>`  ${t.packageName}::${t.testName}`).join('\n');
-        log(`WARNING: Found tests in contract crate(s):\n${details}\n\n` + `Tests should be in a dedicated test crate, not in the contract crate.\n` + `Learn more: https://docs.aztec.network/errors/1`);
-    }
-}
 /** Compiles Aztec Noir contracts and postprocesses artifacts. */ async function compileAztecContract(nargoArgs, log) {
     const nargo = process.env.NARGO ?? 'nargo';
     const bb = process.env.BB ?? 'bb';
@@ -122,8 +32,6 @@ import { run } from './utils/spawn.js';
         'compile',
         ...nargoArgs
     ]);
-    // Ensure contract crates contain no tests (tests belong in the test crate).
-    await checkNoTestsInContracts(nargo, log);
     const artifacts = await collectContractArtifacts();
     if (artifacts.length > 0) {
         log('Postprocessing contracts...');

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

@@ -0,0 +1,32 @@
+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, VK tree root, and protocol contracts hash
+ * all match the expected local values. 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;
+}, expected: {
+    genesisArchiveRoot: Fr;
+    vkTreeRoot: Fr;
+    protocolContractsHash: Fr;
+}, port: number | undefined, userLog: LogFn): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhbmRieS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YW5kYnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxLQUFLLEVBQUUsRUFBRSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFHakQsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUVqRSxPQUFPLEtBQUssRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUVoRSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQVNuRDs7OztHQUlHO0FBQ0gsd0JBQXNCLDBCQUEwQixDQUFDLE1BQU0sRUFBRSxrQkFBa0IsRUFBRSxPQUFPLEVBQUUsS0FBSzs7O0dBYTFGO0FBd0JEOzs7OztHQUtHO0FBQ0gsd0JBQXNCLHVCQUF1QixDQUMzQyxNQUFNLEVBQUU7SUFDTixTQUFTLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDcEIsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixXQUFXLEVBQUU7UUFBRSxlQUFlLEVBQUUsVUFBVSxDQUFBO0tBQUUsQ0FBQztJQUM3QyxhQUFhLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDeEIsRUFDRCxRQUFRLEVBQUU7SUFBRSxrQkFBa0IsRUFBRSxFQUFFLENBQUM7SUFBQyxVQUFVLEVBQUUsRUFBRSxDQUFDO0lBQUMscUJBQXFCLEVBQUUsRUFBRSxDQUFBO0NBQUUsRUFDL0UsSUFBSSxFQUFFLE1BQU0sR0FBRyxTQUFTLEVBQ3hCLE9BQU8sRUFBRSxLQUFLLEdBQ2IsT0FBTyxDQUFDLElBQUksQ0FBQyxDQXdEZiJ9

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;AAwBD;;;;;GAKG;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,QAAQ,EAAE;IAAE,kBAAkB,EAAE,EAAE,CAAC;IAAC,UAAU,EAAE,EAAE,CAAC;IAAC,qBAAqB,EAAE,EAAE,CAAA;CAAE,EAC/E,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,OAAO,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC,CAwDf"}

package/dest/cli/cmds/standby.js

@@ -0,0 +1,97 @@
+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
+    };
+}
+async function checkRollupCompatibility(rollup, expected) {
+    const mismatches = [];
+    const [l1Genesis, l1Vk, l1Protocol] = await Promise.all([
+        rollup.getGenesisArchiveTreeRoot(),
+        rollup.getVkTreeRoot(),
+        rollup.getProtocolContractsHash()
+    ]);
+    if (!l1Genesis.equals(expected.genesisArchiveRoot)) {
+        mismatches.push(`genesis archive root (expected ${expected.genesisArchiveRoot}, got ${l1Genesis})`);
+    }
+    if (!l1Vk.equals(expected.vkTreeRoot)) {
+        mismatches.push(`VK tree root (expected ${expected.vkTreeRoot}, got ${l1Vk})`);
+    }
+    if (!l1Protocol.equals(expected.protocolContractsHash)) {
+        mismatches.push(`protocol contracts hash (expected ${expected.protocolContractsHash}, got ${l1Protocol})`);
+    }
+    return mismatches;
+}
+/**
+ * Waits until the canonical rollup's genesis archive root, VK tree root, and protocol contracts hash
+ * all match the expected local values. 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, expected, 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 mismatches;
+    try {
+        mismatches = await checkRollupCompatibility(rollup, expected);
+    } catch (err) {
+        throw new Error(`Could not retrieve rollup config from canonical rollup at ${rollupAddress}: ${err.message}`);
+    }
+    if (mismatches.length === 0) {
+        return;
+    }
+    userLog(`Rollup at ${rollupAddress} is incompatible: ${mismatches.join('; ')}. ` + `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 currentMismatches;
+            try {
+                currentMismatches = await checkRollupCompatibility(currentRollup, expected);
+            } catch  {
+                userLog(`Failed to fetch rollup config from rollup at ${currentRollupAddress}. Retrying...`);
+                return undefined;
+            }
+            if (currentMismatches.length === 0) {
+                userLog(`Compatible rollup found at ${currentRollupAddress}. Exiting standby mode.`);
+                return true;
+            }
+            userLog(`Still waiting. Rollup at ${currentRollupAddress}: ${currentMismatches.join('; ')}.`);
+            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_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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfbm9kZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X25vZGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUE2QyxNQUFNLG1CQUFtQixDQUFDO0FBUXBHLE9BQU8sS0FBSyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFHL0UsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUE2Rm5ELHdCQUFzQixTQUFTLENBQzdCLE9BQU8sRUFBRSxHQUFHLEVBQ1osY0FBYyxFQUFFLENBQUMsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsRUFBRSxFQUN2QyxRQUFRLEVBQUUscUJBQXFCLEVBQy9CLGFBQWEsRUFBRSxxQkFBcUIsRUFDcEMsT0FBTyxFQUFFLEtBQUssR0FDYixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZUFBZSxDQUFBO0NBQUUsQ0FBQyxDQTRLdEMifQ==
+//# 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;AAQpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAG/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AA6FnD,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,CA4KtC"}
+{"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,74 +1,24 @@
-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 { RegistryContract, RollupContract } from '@aztec/ethereum/contracts';
+import { getGenesisStateConfigEnvVars } from '@aztec/ethereum/config';
 import { SecretValue } from '@aztec/foundation/config';
-import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
 import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
-import { sleep } from '@aztec/foundation/sleep';
+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 { getGenesisValues } from '@aztec/world-state/testing';
-import Koa from 'koa';
 import { createAztecNode } from '../../local-network/index.js';
-import { extractNamespacedOptions, extractRelevantOptions, preloadCrsDataForVerifying, setupUpdateMonitor } from '../util.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';
-const ROLLUP_POLL_INTERVAL_MS = 600_000;
-/**
- * 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 until a compatible rollup appears.
- */ async function waitForCompatibleRollup(publicClient, registryAddress, rollupVersion, expectedGenesisRoot, port, userLog) {
-    const registry = new RegistryContract(publicClient, 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_MS / 1000}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 {
-        while(true){
-            await sleep(ROLLUP_POLL_INTERVAL_MS);
-            const currentRollupAddress = await registry.getRollupAddress(rollupVersion);
-            const currentRollup = new RollupContract(publicClient, currentRollupAddress.toString());
-            try {
-                l1GenesisRoot = await currentRollup.getGenesisArchiveTreeRoot();
-            } catch  {
-                userLog(`Failed to fetch genesis root from rollup at ${currentRollupAddress}. Retrying...`);
-                continue;
-            }
-            if (l1GenesisRoot.equals(expectedGenesisRoot)) {
-                userLog(`Compatible rollup found at ${currentRollupAddress}. Exiting standby mode.`);
-                return;
-            }
-            userLog(`Still waiting. Rollup at ${currentRollupAddress} has genesis root ${l1GenesisRoot}.`);
-        }
-    } finally{
-        await new Promise((resolve, reject)=>standbyServer.close((err)=>err ? reject(err) : resolve()));
-    }
-}
-export async function startNode(options, signalHandlers, services, adminServices, userLog) {
+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
@@ -114,23 +64,19 @@ export async function startNode(options, signalHandlers, services, adminServices
         }
     }
     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.
-    const publicClient = getPublicClient(nodeConfig);
-    const rollupVersion = nodeConfig.rollupVersion ?? 'canonical';
-    await waitForCompatibleRollup(publicClient, nodeConfig.l1Contracts.registryAddress, rollupVersion, genesisArchiveRoot, options.port, userLog);
+    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)) {
@@ -215,10 +161,12 @@ export async function startNode(options, signalHandlers, services, adminServices
         });
         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_broker.d.ts

@@ -6,4 +6,4 @@ export declare function startProverBroker(options: any, signalHandlers: (() => P
     broker: ProvingJobBroker;
     config: ProverBrokerConfig;
 }>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRfcHJvdmVyX2Jyb2tlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NsaS9jbWRzL3N0YXJ0X3Byb3Zlcl9icm9rZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxLQUFLLEVBQUUscUJBQXFCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUMvRSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEVBQ0wsS0FBSyxrQkFBa0IsRUFLeEIsTUFBTSw2QkFBNkIsQ0FBQztBQUVyQyxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBS3hFLHdCQUFzQixpQkFBaUIsQ0FDckMsT0FBTyxFQUFFLEdBQUcsRUFDWixjQUFjLEVBQUUsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLEVBQ3ZDLFFBQVEsRUFBRSxxQkFBcUIsRUFDL0IsT0FBTyxFQUFFLEtBQUssR0FDYixPQUFPLENBQUM7SUFBRSxNQUFNLEVBQUUsZ0JBQWdCLENBQUM7SUFBQyxNQUFNLEVBQUUsa0JBQWtCLENBQUE7Q0FBRSxDQUFDLENBK0NuRSJ9
+//# 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":"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;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,CA+CnE"}
+{"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,9 +1,12 @@
 import { getL1Config } from '@aztec/cli/config';
-import { getPublicClient } from '@aztec/ethereum/client';
+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 { extractRelevantOptions, setupUpdateMonitor } from '../util.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.`);
@@ -16,15 +19,18 @@ 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 followsCanonicalRollup = typeof config.rollupVersion !== 'number';
+    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;
     config.rollupVersion = rollupConfig.rollupVersion;
     const client = await 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,
         config.proverBrokerDebugReplayEnabled ? ProvingJobBrokerSchemaWithDebug : ProvingJobBrokerSchema