@aztec/aztec 0.84.0 → 0.85.0

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

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

package/dest/cli/aztec_start_options.js

@@ -317,7 +317,8 @@ export const aztecStartOptions = {
             // filter out options passed separately
             ...Object.keys(archiverConfigMappings),
             ...Object.keys(proverBrokerConfigMappings),
-            ...Object.keys(proverAgentConfigMappings)
+            ...Object.keys(proverAgentConfigMappings),
+            ...Object.keys(p2pConfigMappings)
         ]))
     ],
     'PROVER BROKER': [
@@ -346,7 +347,13 @@ export const aztecStartOptions = {
             defaultValue: undefined,
             envVar: undefined
         },
-        ...getOptions('p2pBootstrap', bootnodeConfigMappings)
+        ...getOptions('p2pBootstrap', omitConfigMappings(bootnodeConfigMappings, [
+            'p2pIp',
+            'p2pPort',
+            'peerIdPrivateKey',
+            'bootstrapNodes',
+            'listenAddress'
+        ]))
     ],
     BOT: [
         {

package/dest/cli/chain_l2_config.js

@@ -28,9 +28,9 @@ export const alphaTestnetL2ChainConfig = {
     sponsoredFPC: true,
     p2pEnabled: true,
     p2pBootstrapNodes: [],
-    registryAddress: '0xad85d55a4bbef35e95396191c22903aa717edf1c',
-    slashFactoryAddress: '',
-    feeAssetHandlerAddress: '0xf0664fec6ac15313e18d5ad8225e46b7c6463338',
+    registryAddress: '0x4d2cc1d5fb6be65240e0bfc8154243e69c0fb19e',
+    slashFactoryAddress: '0xef057a24cb08c15321c7875f18e904e5131436aa',
+    feeAssetHandlerAddress: '0x80d848dc9f52df56789e2d62ce66f19555ff1019',
     seqMinTxsPerBlock: 0,
     seqMaxTxsPerBlock: 4,
     realProofs: true,

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

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAmClG"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CA2ClG"}

package/dest/cli/cli.js

@@ -29,5 +29,9 @@ import { addOptions, printAztecStartHelpText } from './util.js';
     then runs
       $ aztec-nargo test --silence-warnings --oracle-resolver=<TXE_ADDRESS> [options]
     `);
+    program.command('preload-crs').description('Preload the points data needed for proving and verifying').action(async (options)=>{
+        const { preloadCrs } = await import('./preload_crs.js');
+        return await preloadCrs(options, userLog, debugLogger);
+    });
     return program;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"start_blob_sink.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_blob_sink.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAKnD,wBAAsB,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,iBAmBxG"}
+{"version":3,"file":"start_blob_sink.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_blob_sink.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAMnD,wBAAsB,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,iBA4CxG"}

package/dest/cli/cmds/start_blob_sink.js

@@ -1,16 +1,32 @@
 import { blobSinkConfigMappings, createBlobSinkServer, getBlobSinkConfigFromEnv } from '@aztec/blob-sink/server';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
+import { getL1Config } from '../get_l1_config.js';
 import { extractRelevantOptions } from '../util.js';
 export async function startBlobSink(options, signalHandlers, userLog) {
     if (options.prover || options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
         userLog(`Starting a blob sink with --node, --sequencer, --pxe, --p2p-bootstrap, --prover or --txe is not supported.`);
         process.exit(1);
     }
-    const blobSinkConfig = {
+    let blobSinkConfig = {
         ...getBlobSinkConfigFromEnv(),
         ...extractRelevantOptions(options, blobSinkConfigMappings, 'blobSink')
     };
+    if (!blobSinkConfig.l1Contracts?.registryAddress || blobSinkConfig.l1Contracts.registryAddress.isZero()) {
+        throw new Error('REGISTRY_CONTRACT_ADDRESS not set');
+    }
+    if (!blobSinkConfig.l1RpcUrls || blobSinkConfig.l1RpcUrls.length === 0) {
+        throw new Error('ETHEREUM_HOSTS not set');
+    }
+    if (typeof blobSinkConfig.l1ChainId !== 'number') {
+        throw new Error('L1_CHAIN_ID');
+    }
     const telemetry = initTelemetryClient(getTelemetryClientConfig());
+    const { config: chainConfig, addresses } = await getL1Config(blobSinkConfig.l1Contracts.registryAddress, blobSinkConfig.l1RpcUrls, blobSinkConfig.l1ChainId, blobSinkConfig.rollupVersion);
+    blobSinkConfig = {
+        ...blobSinkConfig,
+        l1Contracts: addresses,
+        ...chainConfig
+    };
     const blobSink = await createBlobSinkServer(blobSinkConfig, telemetry);
     signalHandlers.push(blobSink.stop.bind(blobSink));
     await blobSink.start();

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;AAGpG,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,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CAqJtC"}
+{"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;AAIpG,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,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CA2JtC"}

package/dest/cli/cmds/start_node.js

@@ -1,5 +1,6 @@
 import { getInitialTestAccounts } from '@aztec/accounts/testing';
 import { aztecNodeConfigMappings, getConfigEnvVars } from '@aztec/aztec-node';
+import { Fr } from '@aztec/aztec.js';
 import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
 import { NULL_KEY } from '@aztec/ethereum';
 import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
@@ -59,6 +60,9 @@ export async function startNode(options, signalHandlers, services, adminServices
             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, nodeConfig.rollupVersion);
+        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,

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":"AAGA,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;AAY5B,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,CAwFvC"}
+{"version":3,"file":"start_prover_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_node.ts"],"names":[],"mappings":"AAIA,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;AAY5B,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,CA8FvC"}

package/dest/cli/cmds/start_prover_node.js

@@ -1,4 +1,5 @@
 import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { Fr } from '@aztec/aztec.js';
 import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
 import { NULL_KEY } from '@aztec/ethereum';
 import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
@@ -43,6 +44,18 @@ export async function startProverNode(options, signalHandlers, services, userLog
         ...proverConfig,
         ...config
     };
+    const testAccounts = proverConfig.testAccounts ? (await getInitialTestAccounts()).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, genesisBlockHash, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
+    userLog(`Genesis block hash: ${genesisBlockHash.toString()}`);
+    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) {
@@ -66,15 +79,6 @@ export async function startProverNode(options, signalHandlers, services, userLog
         userLog(`Running prover node without local prover agent. Connect one or more prover agents to this node or pass --proverAgent.proverAgentCount`);
     }
     await preloadCrsDataForVerifying(proverConfig, userLog);
-    const testAccounts = proverConfig.testAccounts ? (await getInitialTestAccounts()).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, genesisBlockHash, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
-    userLog(`Genesis block hash: ${genesisBlockHash.toString()}`);
-    userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
     const proverNode = await createProverNode(proverConfig, {
         telemetry,
         broker

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "0.84.0",
+  "version": "0.85.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js"
@@ -29,40 +29,40 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "0.84.0",
-    "@aztec/archiver": "0.84.0",
-    "@aztec/aztec-faucet": "0.84.0",
-    "@aztec/aztec-node": "0.84.0",
-    "@aztec/aztec.js": "0.84.0",
-    "@aztec/bb-prover": "0.84.0",
-    "@aztec/bb.js": "0.84.0",
-    "@aztec/blob-sink": "0.84.0",
-    "@aztec/bot": "0.84.0",
-    "@aztec/builder": "0.84.0",
-    "@aztec/cli": "0.84.0",
-    "@aztec/cli-wallet": "0.84.0",
-    "@aztec/constants": "0.84.0",
-    "@aztec/entrypoints": "0.84.0",
-    "@aztec/ethereum": "0.84.0",
-    "@aztec/foundation": "0.84.0",
-    "@aztec/kv-store": "0.84.0",
-    "@aztec/noir-contracts.js": "0.84.0",
-    "@aztec/noir-protocol-circuits-types": "0.84.0",
-    "@aztec/p2p": "0.84.0",
-    "@aztec/p2p-bootstrap": "0.84.0",
-    "@aztec/protocol-contracts": "0.84.0",
-    "@aztec/prover-client": "0.84.0",
-    "@aztec/prover-node": "0.84.0",
-    "@aztec/pxe": "0.84.0",
-    "@aztec/stdlib": "0.84.0",
-    "@aztec/telemetry-client": "0.84.0",
-    "@aztec/txe": "0.84.0",
-    "@aztec/world-state": "0.84.0",
+    "@aztec/accounts": "0.85.0",
+    "@aztec/archiver": "0.85.0",
+    "@aztec/aztec-faucet": "0.85.0",
+    "@aztec/aztec-node": "0.85.0",
+    "@aztec/aztec.js": "0.85.0",
+    "@aztec/bb-prover": "0.85.0",
+    "@aztec/bb.js": "0.85.0",
+    "@aztec/blob-sink": "0.85.0",
+    "@aztec/bot": "0.85.0",
+    "@aztec/builder": "0.85.0",
+    "@aztec/cli": "0.85.0",
+    "@aztec/cli-wallet": "0.85.0",
+    "@aztec/constants": "0.85.0",
+    "@aztec/entrypoints": "0.85.0",
+    "@aztec/ethereum": "0.85.0",
+    "@aztec/foundation": "0.85.0",
+    "@aztec/kv-store": "0.85.0",
+    "@aztec/noir-contracts.js": "0.85.0",
+    "@aztec/noir-protocol-circuits-types": "0.85.0",
+    "@aztec/p2p": "0.85.0",
+    "@aztec/p2p-bootstrap": "0.85.0",
+    "@aztec/protocol-contracts": "0.85.0",
+    "@aztec/prover-client": "0.85.0",
+    "@aztec/prover-node": "0.85.0",
+    "@aztec/pxe": "0.85.0",
+    "@aztec/stdlib": "0.85.0",
+    "@aztec/telemetry-client": "0.85.0",
+    "@aztec/txe": "0.85.0",
+    "@aztec/world-state": "0.85.0",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
-    "koa": "^2.14.2",
+    "koa": "^2.16.1",
     "koa-router": "^12.0.0",
     "viem": "2.23.7"
   },
@@ -75,7 +75,7 @@
   "devDependencies": {
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
-    "@types/koa": "^2.13.6",
+    "@types/koa": "^2.15.0",
     "jest": "^29.5.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"

package/src/cli/aztec_start_options.ts

@@ -10,7 +10,7 @@ import {
   isBooleanConfigValue,
   omitConfigMappings,
 } from '@aztec/foundation/config';
-import { bootnodeConfigMappings, p2pConfigMappings } from '@aztec/p2p/config';
+import { type P2PConfig, bootnodeConfigMappings, p2pConfigMappings } from '@aztec/p2p/config';
 import {
   type ProverAgentConfig,
   type ProverBrokerConfig,
@@ -347,6 +347,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
         ...(Object.keys(archiverConfigMappings) as (keyof ArchiverConfig)[]),
         ...(Object.keys(proverBrokerConfigMappings) as (keyof ProverBrokerConfig)[]),
         ...(Object.keys(proverAgentConfigMappings) as (keyof ProverAgentConfig)[]),
+        ...(Object.keys(p2pConfigMappings) as (keyof P2PConfig)[]),
       ]),
     ),
   ],
@@ -379,7 +380,16 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
       defaultValue: undefined,
       envVar: undefined,
     },
-    ...getOptions('p2pBootstrap', bootnodeConfigMappings),
+    ...getOptions(
+      'p2pBootstrap',
+      omitConfigMappings(bootnodeConfigMappings, [
+        'p2pIp',
+        'p2pPort',
+        'peerIdPrivateKey',
+        'bootstrapNodes',
+        'listenAddress',
+      ]),
+    ),
   ],
   BOT: [
     {

package/src/cli/chain_l2_config.ts

@@ -53,9 +53,9 @@ export const alphaTestnetL2ChainConfig: L2ChainConfig = {
   sponsoredFPC: true,
   p2pEnabled: true,
   p2pBootstrapNodes: [],
-  registryAddress: '0xad85d55a4bbef35e95396191c22903aa717edf1c',
-  slashFactoryAddress: '',
-  feeAssetHandlerAddress: '0xf0664fec6ac15313e18d5ad8225e46b7c6463338',
+  registryAddress: '0x4d2cc1d5fb6be65240e0bfc8154243e69c0fb19e',
+  slashFactoryAddress: '0xef057a24cb08c15321c7875f18e904e5131436aa',
+  feeAssetHandlerAddress: '0x80d848dc9f52df56789e2d62ce66f19555ff1019',
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 4,
   realProofs: true,

package/src/cli/cli.ts

@@ -44,5 +44,13 @@ export function injectAztecCommands(program: Command, userLog: LogFn, debugLogge
     `,
   );
 
+  program
+    .command('preload-crs')
+    .description('Preload the points data needed for proving and verifying')
+    .action(async options => {
+      const { preloadCrs } = await import('./preload_crs.js');
+      return await preloadCrs(options, userLog, debugLogger);
+    });
+
   return program;
 }

package/src/cli/cmds/start_blob_sink.ts

@@ -7,6 +7,7 @@ import {
 import type { LogFn } from '@aztec/foundation/log';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
 
+import { getL1Config } from '../get_l1_config.js';
 import { extractRelevantOptions } from '../util.js';
 
 export async function startBlobSink(options: any, signalHandlers: (() => Promise<void>)[], userLog: LogFn) {
@@ -17,13 +18,38 @@ export async function startBlobSink(options: any, signalHandlers: (() => Promise
     process.exit(1);
   }
 
-  const blobSinkConfig = {
+  let blobSinkConfig: BlobSinkConfig = {
     ...getBlobSinkConfigFromEnv(), // get default config from env
     ...extractRelevantOptions<BlobSinkConfig>(options, blobSinkConfigMappings, 'blobSink'), // override with command line options
   };
 
+  if (!blobSinkConfig.l1Contracts?.registryAddress || blobSinkConfig.l1Contracts.registryAddress.isZero()) {
+    throw new Error('REGISTRY_CONTRACT_ADDRESS not set');
+  }
+
+  if (!blobSinkConfig.l1RpcUrls || blobSinkConfig.l1RpcUrls.length === 0) {
+    throw new Error('ETHEREUM_HOSTS not set');
+  }
+
+  if (typeof blobSinkConfig.l1ChainId !== 'number') {
+    throw new Error('L1_CHAIN_ID');
+  }
+
   const telemetry = initTelemetryClient(getTelemetryClientConfig());
 
+  const { config: chainConfig, addresses } = await getL1Config(
+    blobSinkConfig.l1Contracts.registryAddress,
+    blobSinkConfig.l1RpcUrls,
+    blobSinkConfig.l1ChainId,
+    blobSinkConfig.rollupVersion,
+  );
+
+  blobSinkConfig = {
+    ...blobSinkConfig,
+    l1Contracts: addresses,
+    ...chainConfig,
+  };
+
   const blobSink = await createBlobSinkServer(blobSinkConfig, telemetry);
   signalHandlers.push(blobSink.stop.bind(blobSink));
 

package/src/cli/cmds/start_node.ts

@@ -1,5 +1,6 @@
 import { getInitialTestAccounts } from '@aztec/accounts/testing';
 import { type AztecNodeConfig, aztecNodeConfigMappings, getConfigEnvVars } from '@aztec/aztec-node';
+import { Fr } from '@aztec/aztec.js';
 import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
 import { NULL_KEY } from '@aztec/ethereum';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
@@ -92,6 +93,12 @@ export async function startNode(
       nodeConfig.rollupVersion,
     );
 
+    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,

package/src/cli/cmds/start_prover_node.ts

@@ -1,4 +1,5 @@
 import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { Fr } from '@aztec/aztec.js';
 import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
 import { NULL_KEY } from '@aztec/ethereum';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
@@ -66,6 +67,22 @@ export async function startProverNode(
   proverConfig.l1Contracts = addresses;
   proverConfig = { ...proverConfig, ...config };
 
+  const testAccounts = proverConfig.testAccounts ? (await getInitialTestAccounts()).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, genesisBlockHash, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
+
+  userLog(`Genesis block hash: ${genesisBlockHash.toString()}`);
+  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: ProvingJobBroker;
@@ -89,16 +106,6 @@ export async function startProverNode(
 
   await preloadCrsDataForVerifying(proverConfig, userLog);
 
-  const testAccounts = proverConfig.testAccounts ? (await getInitialTestAccounts()).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, genesisBlockHash, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
-
-  userLog(`Genesis block hash: ${genesisBlockHash.toString()}`);
-  userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
-
   const proverNode = await createProverNode(proverConfig, { telemetry, broker }, { prefilledPublicData });
   services.proverNode = [proverNode, ProverNodeApiSchema];
 

package/src/cli/preload_crs.ts

@@ -0,0 +1,7 @@
+import type { LogFn, Logger } from '@aztec/foundation/log';
+
+import { preloadCrsDataForServerSideProving } from './util.js';
+
+export async function preloadCrs(_options: any, userLog: LogFn, _debugLogger: Logger) {
+  await preloadCrsDataForServerSideProving({ realProofs: true }, userLog);
+}