@aztec/aztec 0.82.2 → 0.82.3-nightly.20250403

package/dest/bin/index.js

@@ -10,6 +10,8 @@ import { injectCommands as injectMiscCommands } from '@aztec/cli/misc';
 import { injectCommands as injectPXECommands } from '@aztec/cli/pxe';
 import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
 import { Command } from 'commander';
+import { NETWORK_FLAG } from '../cli/aztec_start_options.js';
+import { enrichEnvironmentWithChainConfig } from '../cli/chain_l2_config.js';
 import { injectAztecCommands } from '../cli/index.js';
 import { getCliVersion } from '../cli/release_version.js';
 const userLog = createConsoleLogger();
@@ -20,6 +22,17 @@ const debugLogger = createLogger('cli');
     };
     process.once('SIGINT', shutdown);
     process.once('SIGTERM', shutdown);
+    // Intercept the setting of a network and enrich the environment with defaults for that network
+    let networkValue;
+    const args = process.argv.slice(2);
+    const networkIndex = args.findIndex((arg)=>arg.startsWith(`--${NETWORK_FLAG}=`) || arg === `--${NETWORK_FLAG}`);
+    if (networkIndex !== -1) {
+        networkValue = args[networkIndex].split('=')[1] || args[networkIndex + 1];
+    }
+    networkValue = networkValue || process.env.NETWORK;
+    if (networkValue !== undefined) {
+        await enrichEnvironmentWithChainConfig(networkValue);
+    }
     const cliVersion = getCliVersion();
     let program = new Command('aztec');
     program.description('Aztec command line interface').version(cliVersion);

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":"AAKA,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,iBAyGjF"}
+{"version":3,"file":"aztec_start_action.d.ts","sourceRoot":"","sources":["../../src/cli/aztec_start_action.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAY3D,wBAAsB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,iBAsGjF"}

package/dest/cli/aztec_start_action.js

@@ -4,7 +4,6 @@ import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
 import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
 import { createSandbox } from '../sandbox/index.js';
 import { github, splash } from '../splash.js';
-import { enrichEnvironmentWithChainConfig } from './chain_l2_config.js';
 import { getCliVersion } from './release_version.js';
 import { extractNamespacedOptions, installSignalHandlers } from './util.js';
 import { getVersions } from './versioning.js';
@@ -18,6 +17,7 @@ export async function aztecStart(options, userLog, debugLogger) {
         const cliVersion = getCliVersion();
         const sandboxOptions = extractNamespacedOptions(options, 'sandbox');
         const nodeOptions = extractNamespacedOptions(options, 'node');
+        sandboxOptions.testAccounts = true;
         userLog(`${splash}\n${github}\n\n`);
         userLog(`Setting up Aztec Sandbox ${cliVersion}, please stand by...`);
         const { node, pxe, stop } = await createSandbox({
@@ -43,10 +43,6 @@ export async function aztecStart(options, userLog, debugLogger) {
             userLog(`Not exposing PXE API through JSON-RPC server`);
         }
     } else {
-        // If a network is specified, enrich the environment with the chain config
-        if (options.network) {
-            await enrichEnvironmentWithChainConfig(options.network);
-        }
         if (options.node) {
             const { startNode } = await import('./cmds/start_node.js');
             ({ config } = await startNode(options, signalHandlers, services, adminServices, userLog));

package/dest/cli/aztec_start_options.d.ts

@@ -9,6 +9,7 @@ export interface AztecStartOption {
 }
 export declare const getOptions: (namespace: string, configMappings: Record<string, ConfigMapping>) => AztecStartOption[];
 export declare const universalOptions: string[];
+export declare const NETWORK_FLAG = "network";
 export declare const aztecStartOptions: {
     [key: string]: AztecStartOption[];
 };

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;AAGF,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAA;CA4VlE,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;CAgWlE,CAAC"}

package/dest/cli/aztec_start_options.js

@@ -31,20 +31,21 @@ export const getOptions = (namespace, configMappings)=>{
 // These are options used by multiple modules so should be inputted once
 export const universalOptions = [
     'l1RpcUrls',
-    'l1ConsensusHostUrl',
-    'l1ConsensusHostApiKey',
-    'l1ConsensusHostApiKeyHeader',
+    'l1ConsensusHostUrls',
+    'l1ConsensusHostApiKeys',
+    'l1ConsensusHostApiKeyHeaders',
     'l1ChainId',
     'l1Contracts',
     'p2pEnabled',
     'dataDirectory',
     'dataStoreMapSizeKb'
 ];
+export const NETWORK_FLAG = 'network';
 // Define categories and options
 export const aztecStartOptions = {
     NETWORK: [
         {
-            flag: '--network <value>',
+            flag: `--${NETWORK_FLAG} <value>`,
             description: 'Network to run Aztec on',
             defaultValue: undefined,
             envVar: 'NETWORK'
@@ -58,13 +59,7 @@ export const aztecStartOptions = {
             envVar: undefined
         },
         {
-            flag: '--sandbox.testAccounts',
-            description: 'Deploy test accounts on sandbox start',
-            envVar: 'TEST_ACCOUNTS',
-            ...booleanConfigHelper(true)
-        },
-        {
-            flag: '--sandbox.noPXE',
+            flag: '--sandbox.noPXE [value]',
             description: 'Do not expose PXE service on sandbox start',
             envVar: 'NO_PXE',
             ...booleanConfigHelper()
@@ -116,22 +111,25 @@ export const aztecStartOptions = {
             envVar: 'MNEMONIC'
         },
         {
-            flag: '--l1-consensus-host-url <value>',
-            description: 'URL of the Ethereum consensus node that services will connect to',
-            defaultValue: undefined,
-            envVar: 'L1_CONSENSUS_HOST_URL'
+            flag: '--l1-consensus-host-urls <value>',
+            description: 'List of URLs of the Ethereum consensus nodes that services will connect to (comma separated)',
+            defaultValue: [],
+            envVar: 'L1_CONSENSUS_HOST_URLS',
+            parseVal: (val)=>val.split(',').map((url)=>url.trim().replace(/\/$/, ''))
         },
         {
-            flag: '--l1-consensus-host-api-key <value>',
-            description: 'API key for the Ethereum consensus node',
-            defaultValue: undefined,
-            envVar: 'L1_CONSENSUS_HOST_API_KEY'
+            flag: '--l1-consensus-host-api-keys <value>',
+            description: 'List of API keys for the corresponding Ethereum consensus nodes',
+            defaultValue: [],
+            envVar: 'L1_CONSENSUS_HOST_API_KEYS',
+            parseVal: (val)=>val.split(',').map((url)=>url.trim())
         },
         {
-            flag: '--l1-consensus-host-api-key-header <value>',
-            description: 'API key header for the Ethereum consensus node. If not set, the api key will be appended to the URL as ?key=<api-key>',
-            defaultValue: undefined,
-            envVar: 'L1_CONSENSUS_HOST_API_KEY_HEADER'
+            flag: '--l1-consensus-host-api-key-headers <value>',
+            description: 'List of API key headers for the corresponding Ethereum consensus nodes. If not set, the api key for the corresponding node will be appended to the URL as ?key=<api-key>',
+            defaultValue: [],
+            envVar: 'L1_CONSENSUS_HOST_API_KEY_HEADERS',
+            parseVal: (val)=>val.split(',').map((url)=>url.trim())
         }
     ],
     STORAGE: [
@@ -241,15 +239,21 @@ export const aztecStartOptions = {
             parseVal: (val)=>parseInt(val, 10)
         },
         {
-            flag: '--node.testAccounts',
-            description: 'Populate genesis state with initial fee juice for test accounts',
-            envVar: 'TEST_ACCOUNTS',
-            ...booleanConfigHelper()
+            flag: '--node.syncMode <value>',
+            description: 'Set sync mode to `full` to always sync via L1, `snapshot` to download a snapshot if there is no local data, `force-snapshot` to download even if there is local data.',
+            defaultValue: 'snapshot',
+            envVar: 'SYNC_MODE'
+        },
+        {
+            flag: '--node.snapshotsUrl <value>',
+            description: 'Base URL for downloading snapshots for snapshot sync.',
+            defaultValue: undefined,
+            envVar: 'SYNC_SNAPSHOTS_URL'
         }
     ],
     'P2P SUBSYSTEM': [
         {
-            flag: '--p2p-enabled',
+            flag: '--p2p-enabled [value]',
             description: 'Enable P2P subsystem',
             envVar: 'P2P_ENABLED',
             ...booleanConfigHelper()

package/dest/cli/chain_l2_config.d.ts

@@ -6,12 +6,16 @@ export type L2ChainConfig = {
     aztecEpochDuration: number;
     aztecProofSubmissionWindow: number;
     testAccounts: boolean;
+    sponsoredFPC: boolean;
     p2pEnabled: boolean;
     p2pBootstrapNodes: string[];
     registryAddress: string;
+    slashFactoryAddress: string;
+    feeAssetHandlerAddress: string;
     seqMinTxsPerBlock: number;
     seqMaxTxsPerBlock: number;
     realProofs: boolean;
+    snapshotsUrl: string;
 };
 export declare const testnetIgnitionL2ChainConfig: L2ChainConfig;
 export declare const alphaTestnetL2ChainConfig: L2ChainConfig;

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

@@ -1 +1 @@
-{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/cli/chain_l2_config.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAEhE,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,aAa1C,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,aAavC,CAAC;AAEF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,gBAW3D;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAWpG;AAUD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBAmB/E"}
+{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/cli/chain_l2_config.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAEhE,MAAM,MAAM,aAAa,GAAG;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,0BAA0B,EAAE,MAAM,CAAC;IACnC,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,aAiB1C,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,aAiBvC,CAAC;AAEF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,gBAW3D;AAED,wBAAsB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAWpG;AAmBD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBAwB/E"}

package/dest/cli/chain_l2_config.js

@@ -1,3 +1,4 @@
+import { EthAddress } from '@aztec/aztec.js';
 import path from 'path';
 export const testnetIgnitionL2ChainConfig = {
     l1ChainId: 11155111,
@@ -6,12 +7,16 @@ export const testnetIgnitionL2ChainConfig = {
     aztecEpochDuration: 32,
     aztecProofSubmissionWindow: 64,
     testAccounts: true,
+    sponsoredFPC: false,
     p2pEnabled: true,
     p2pBootstrapNodes: [],
     registryAddress: '0x12b3ebc176a1646b911391eab3760764f2e05fe3',
+    slashFactoryAddress: '',
+    feeAssetHandlerAddress: '',
     seqMinTxsPerBlock: 0,
     seqMaxTxsPerBlock: 0,
-    realProofs: true
+    realProofs: true,
+    snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/'
 };
 export const alphaTestnetL2ChainConfig = {
     l1ChainId: 11155111,
@@ -20,12 +25,16 @@ export const alphaTestnetL2ChainConfig = {
     aztecEpochDuration: 32,
     aztecProofSubmissionWindow: 64,
     testAccounts: false,
+    sponsoredFPC: true,
     p2pEnabled: true,
     p2pBootstrapNodes: [],
-    registryAddress: '',
+    registryAddress: '0xad85d55a4bbef35e95396191c22903aa717edf1c',
+    slashFactoryAddress: '',
+    feeAssetHandlerAddress: '0xf0664fec6ac15313e18d5ad8225e46b7c6463338',
     seqMinTxsPerBlock: 0,
     seqMaxTxsPerBlock: 4,
-    realProofs: true
+    realProofs: true,
+    snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/'
 };
 export async function getBootnodes(networkName) {
     const url = `http://static.aztec.network/${networkName}/bootnodes.json`;
@@ -59,6 +68,14 @@ function enrichVar(envVar, value) {
     }
     process.env[envVar] = value;
 }
+function enrichEthAddressVar(envVar, value) {
+    // EthAddress doesn't like being given empty strings
+    if (value === '') {
+        enrichVar(envVar, EthAddress.ZERO.toString());
+        return;
+    }
+    enrichVar(envVar, value);
+}
 export async function enrichEnvironmentWithChainConfig(networkName) {
     const config = await getL2ChainConfig(networkName);
     if (!config) {
@@ -70,12 +87,16 @@ export async function enrichEnvironmentWithChainConfig(networkName) {
     enrichVar('AZTEC_PROOF_SUBMISSION_WINDOW', config.aztecProofSubmissionWindow.toString());
     enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
     enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
+    enrichVar('SPONSORED_FPC', config.sponsoredFPC.toString());
     enrichVar('P2P_ENABLED', config.p2pEnabled.toString());
     enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
-    enrichVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
     enrichVar('SEQ_MIN_TX_PER_BLOCK', config.seqMinTxsPerBlock.toString());
     enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString());
     enrichVar('DATA_DIRECTORY', path.join(process.env.HOME || '~', '.aztec', networkName, 'data'));
     enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
     enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
+    enrichVar('SYNC_SNAPSHOTS_URL', config.snapshotsUrl);
+    enrichEthAddressVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
+    enrichEthAddressVar('SLASH_FACTORY_CONTRACT_ADDRESS', config.slashFactoryAddress);
+    enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', config.feeAssetHandlerAddress);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"start_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,eAAe,EAA6C,MAAM,mBAAmB,CAAC;AAEpG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAgBnD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,aAAa,EAAE,qBAAqB,EACpC,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,eAAe,CAAA;CAAE,CAAC,CA2ItC"}
+{"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"}

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 { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
 import { NULL_KEY } from '@aztec/ethereum';
 import { AztecNodeAdminApiSchema, AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
 import { P2PApiSchema } from '@aztec/stdlib/interfaces/server';
@@ -26,8 +27,15 @@ export async function startNode(options, signalHandlers, services, adminServices
         process.exit(1);
     }
     await preloadCrsDataForVerifying(nodeConfig, userLog);
-    const initialFundedAccounts = nodeConfig.testAccounts ? await getInitialTestAccounts() : [];
-    const { genesisBlockHash, genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address));
+    const testAccounts = nodeConfig.testAccounts ? (await getInitialTestAccounts()).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 { genesisBlockHash, genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
+    userLog(`Genesis block hash: ${genesisBlockHash.toString()}`);
+    userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
     // Deploy contracts if needed
     if (nodeSpecificOptions.deployAztecContracts || nodeSpecificOptions.deployAztecContractsSalt) {
         let account;
@@ -43,13 +51,14 @@ export async function startNode(options, signalHandlers, services, adminServices
             assumeProvenThroughBlockNumber: nodeSpecificOptions.assumeProvenThroughBlockNumber,
             salt: nodeSpecificOptions.deployAztecContractsSalt,
             genesisBlockHash,
-            genesisArchiveRoot
+            genesisArchiveRoot,
+            feeJuicePortalInitialBalance: fundingNeeded
         });
     } else {
         if (!nodeConfig.l1Contracts.registryAddress || nodeConfig.l1Contracts.registryAddress.isZero()) {
             throw new Error('L1 registry address is required to start Aztec Node without --deploy-aztec-contracts option');
         }
-        const { addresses, config } = await getL1Config(nodeConfig.l1Contracts.registryAddress, nodeConfig.l1RpcUrls, nodeConfig.l1ChainId);
+        const { addresses, config } = await getL1Config(nodeConfig.l1Contracts.registryAddress, nodeConfig.l1RpcUrls, nodeConfig.l1ChainId, nodeConfig.rollupVersion);
         // TODO(#12272): will clean this up.
         nodeConfig = {
             ...nodeConfig,

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

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

package/dest/cli/cmds/start_p2p_bootstrap.js

@@ -9,7 +9,11 @@ import { extractRelevantOptions } from '../util.js';
 export async function startP2PBootstrap(options, signalHandlers, services, userLog) {
     // Start a P2P bootstrap node.
     const config = extractRelevantOptions(options, bootnodeConfigMappings, 'p2p');
-    userLog(`Starting P2P bootstrap node with config: ${jsonStringify(config)}`);
+    const safeConfig = {
+        ...config,
+        peerIdPrivateKey: '<redacted>'
+    };
+    userLog(`Starting P2P bootstrap node with config: ${jsonStringify(safeConfig)}`);
     const telemetryClient = initTelemetryClient(getTelemetryClientConfig());
     const store = await createStore('p2p-bootstrap', 1, config, createLogger('p2p:bootstrap:store'));
     const node = new BootstrapNode(store, telemetryClient);

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

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

package/dest/cli/cmds/start_prover_broker.js

@@ -15,8 +15,9 @@ export async function startProverBroker(options, signalHandlers, services, userL
     if (!config.l1Contracts.registryAddress || config.l1Contracts.registryAddress.isZero()) {
         throw new Error('L1 registry address is required to start Aztec Node without --deploy-aztec-contracts option');
     }
-    const { addresses } = await getL1Config(config.l1Contracts.registryAddress, config.l1RpcUrls, config.l1ChainId);
+    const { addresses, config: rollupConfig } = await getL1Config(config.l1Contracts.registryAddress, config.l1RpcUrls, config.l1ChainId, config.rollupVersion);
     config.l1Contracts = addresses;
+    config.rollupVersion = rollupConfig.rollupVersion;
     const client = initTelemetryClient(getTelemetryClientConfig());
     const broker = await createAndStartProvingBroker(config, client);
     services.proverBroker = [

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

@@ -1 +1 @@
-{"version":3,"file":"start_prover_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_node.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EACL,KAAK,gBAAgB,EAItB,MAAM,oBAAoB,CAAC;AAa5B,wBAAsB,eAAe,CACnC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,gBAAgB,CAAA;CAAE,CAAC,CA6FvC"}
+{"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"}

package/dest/cli/cmds/start_prover_node.js

@@ -1,9 +1,9 @@
 import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
 import { NULL_KEY } from '@aztec/ethereum';
 import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
 import { ProvingJobConsumerSchema, createProvingJobBrokerClient } from '@aztec/prover-client/broker';
 import { createProverNode, getProverNodeConfigFromEnv, proverNodeConfigMappings } from '@aztec/prover-node';
-import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 import { P2PApiSchema, ProverNodeApiSchema } from '@aztec/stdlib/interfaces/server';
 import { initTelemetryClient, makeTracedFetch, telemetryClientConfigMappings } from '@aztec/telemetry-client';
 import { getGenesisValues } from '@aztec/world-state/testing';
@@ -34,27 +34,15 @@ export async function startProverNode(options, signalHandlers, services, userLog
         const privKey = hdAccount.getHdKey().privateKey;
         proverConfig.publisherPrivateKey = `0x${Buffer.from(privKey).toString('hex')}`;
     }
-    // TODO(palla/prover-node) L1 contract addresses should not silently default to zero,
-    // they should be undefined if not set and fail loudly.
-    // Load l1 contract addresses from aztec node if not set.
-    const isRollupAddressSet = proverConfig.l1Contracts?.rollupAddress && !proverConfig.l1Contracts.rollupAddress.isZero();
-    const nodeUrl = proverConfig.nodeUrl ?? proverConfig.proverCoordinationNodeUrl;
-    if (nodeUrl && !isRollupAddressSet) {
-        userLog(`Loading L1 contract addresses from aztec node at ${nodeUrl}`);
-        proverConfig.l1Contracts = await createAztecNodeClient(nodeUrl).getL1ContractAddresses();
-    }
-    // If we create an archiver here, validate the L1 config
-    if (options.archiver) {
-        if (!proverConfig.l1Contracts.registryAddress || proverConfig.l1Contracts.registryAddress.isZero()) {
-            throw new Error('L1 registry address is required to start a Prover Node with --archiver option');
-        }
-        const { addresses, config } = await getL1Config(proverConfig.l1Contracts.registryAddress, proverConfig.l1RpcUrls, proverConfig.l1ChainId);
-        proverConfig.l1Contracts = addresses;
-        proverConfig = {
-            ...proverConfig,
-            ...config
-        };
+    if (!proverConfig.l1Contracts.registryAddress || proverConfig.l1Contracts.registryAddress.isZero()) {
+        throw new Error('L1 registry address is required to start a Prover Node with --archiver option');
     }
+    const { addresses, config } = await getL1Config(proverConfig.l1Contracts.registryAddress, proverConfig.l1RpcUrls, proverConfig.l1ChainId, proverConfig.rollupVersion);
+    proverConfig.l1Contracts = addresses;
+    proverConfig = {
+        ...proverConfig,
+        ...config
+    };
     const telemetry = initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
     let broker;
     if (proverConfig.proverBrokerUrl) {
@@ -78,8 +66,15 @@ 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 initialFundedAccounts = proverConfig.testAccounts ? await getInitialTestAccounts() : [];
-    const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts.map((a)=>a.address));
+    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/get_l1_config.d.ts

@@ -1,6 +1,6 @@
 import { type L1ContractAddresses, getL1ContractsConfig } from '@aztec/ethereum';
 import type { EthAddress } from '@aztec/foundation/eth-address';
-export declare function getL1Config(registryAddress: EthAddress, l1RpcUrls: string[], l1ChainId: number): Promise<{
+export declare function getL1Config(registryAddress: EthAddress, l1RpcUrls: string[], l1ChainId: number, rollupVersion?: number | 'canonical'): Promise<{
     addresses: L1ContractAddresses;
     config: Awaited<ReturnType<typeof getL1ContractsConfig>>;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"get_l1_config.d.ts","sourceRoot":"","sources":["../../src/cli/get_l1_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAoB,oBAAoB,EAAmB,MAAM,iBAAiB,CAAC;AACpH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,wBAAsB,WAAW,CAC/B,eAAe,EAAE,UAAU,EAC3B,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,SAAS,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAA;CAAE,CAAC,CAUvG"}
+{"version":3,"file":"get_l1_config.d.ts","sourceRoot":"","sources":["../../src/cli/get_l1_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,mBAAmB,EAAoB,oBAAoB,EAAmB,MAAM,iBAAiB,CAAC;AACpH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,wBAAsB,WAAW,CAC/B,eAAe,EAAE,UAAU,EAC3B,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,EAAE,MAAM,EACjB,aAAa,GAAE,MAAM,GAAG,WAAyB,GAChD,OAAO,CAAC;IAAE,SAAS,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAA;CAAE,CAAC,CAUvG"}

package/dest/cli/get_l1_config.js

@@ -1,10 +1,10 @@
 import { RegistryContract, getL1ContractsConfig, getPublicClient } from '@aztec/ethereum';
-export async function getL1Config(registryAddress, l1RpcUrls, l1ChainId) {
+export async function getL1Config(registryAddress, l1RpcUrls, l1ChainId, rollupVersion = 'canonical') {
     const publicClient = getPublicClient({
         l1RpcUrls,
         l1ChainId
     });
-    const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress, 'canonical');
+    const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress, rollupVersion);
     const config = await getL1ContractsConfig(publicClient, addresses);
     return {
         addresses,

package/dest/cli/util.js

@@ -173,7 +173,7 @@ export const printAztecStartHelpText = ()=>{
     if (realProofs) {
         const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
         await Promise.all([
-            Crs.new(2 ** 25 - 1, undefined, log),
+            Crs.new(2 ** 25 + 1, undefined, log),
             GrumpkinCrs.new(2 ** 18 + 1, undefined, log)
         ]);
     }

package/dest/sandbox/sandbox.d.ts

@@ -18,6 +18,7 @@ export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hd
     salt?: number;
     genesisArchiveRoot?: Fr;
     genesisBlockHash?: Fr;
+    feeJuicePortalInitialBalance?: bigint;
 }): Promise<{
     rollupAddress: import("@aztec/foundation/schemas").EthAddress;
     registryAddress: import("@aztec/foundation/schemas").EthAddress;
@@ -33,6 +34,7 @@ export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hd
 } & {
     slashFactoryAddress?: import("@aztec/foundation/schemas").EthAddress | undefined;
     feeAssetHandlerAddress?: import("@aztec/foundation/schemas").EthAddress | undefined;
+    stakingAssetHandlerAddress?: import("@aztec/foundation/schemas").EthAddress | undefined;
 } & {
     rollupAddress: import("@aztec/foundation/schemas").EthAddress;
 } & {

package/dest/sandbox/sandbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../src/sandbox/sandbox.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAE7F,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAU7F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AAGjE,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,mBAAmB,CAAC;AACjG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAA2D,MAAM,MAAM,CAAC;AAavH;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GAAG,iBAAiB,EACxC,oBAAoB,yCAAS,EAC7B,IAAI,GAAE;IAAE,8BAA8B,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC;IAAC,gBAAgB,CAAC,EAAE,EAAE,CAAA;CAAO;;;;;;;;;;;;;;;;;;;GA6BtH;AAED,wBAAwB;AACxB,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG;IAC5C,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,qDAAqD;IACrD,KAAK,EAAE,OAAO,CAAC;IACf,uDAAuD;IACvD,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,MAAM,oCAA6B,EAAE,OAAO,EAAE,KAAK;;;;GA8FtF;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,uBAAuB,CAAA;CAAO,EACpF,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,GAAE,OAAO,CAAC,gBAAgB,CAAM,mDAI3F"}
+{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../src/sandbox/sandbox.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAE7F,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAU7F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AAGjE,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,mBAAmB,CAAC;AACjG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAA2D,MAAM,MAAM,CAAC;AAavH;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GAAG,iBAAiB,EACxC,oBAAoB,yCAAS,EAC7B,IAAI,GAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,gBAAgB,CAAC,EAAE,EAAE,CAAC;IACtB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;GA6BP;AAED,wBAAwB;AACxB,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG;IAC5C,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,qDAAqD;IACrD,KAAK,EAAE,OAAO,CAAC;IACf,uDAAuD;IACvD,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,MAAM,oCAA6B,EAAE,OAAO,EAAE,KAAK;;;;GA8FtF;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,uBAAuB,CAAA;CAAO,EACpF,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,GAAE,OAAO,CAAC,gBAAgB,CAAM,mDAI3F"}

package/dest/sandbox/sandbox.js

@@ -4,13 +4,13 @@ import { deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/acco
 import { AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
 import { AnvilTestWatcher, EthCheatCodes } from '@aztec/aztec.js/testing';
 import { createBlobSinkClient } from '@aztec/blob-sink/client';
-import { setupCanonicalL2FeeJuice, setupSponsoredFPC } from '@aztec/cli/cli-utils';
+import { setupSponsoredFPC } from '@aztec/cli/cli-utils';
 import { GENESIS_ARCHIVE_ROOT, GENESIS_BLOCK_HASH } from '@aztec/constants';
 import { NULL_KEY, createEthereumChain, deployL1Contracts, getL1ContractsConfigEnvVars, waitForPublicClient } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
 import { getGenesisValues } from '@aztec/world-state/testing';
@@ -35,12 +35,12 @@ const localAnvil = foundry;
     const l1Contracts = await deployL1Contracts(aztecNodeConfig.l1RpcUrls, hdAccount, chain.chainInfo, contractDeployLogger, {
         ...getL1ContractsConfigEnvVars(),
         ...aztecNodeConfig,
-        l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice.toField(),
         vkTreeRoot: getVKTreeRoot(),
         protocolContractTreeRoot,
         genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
         genesisBlockHash: opts.genesisBlockHash ?? new Fr(GENESIS_BLOCK_HASH),
-        salt: opts.salt
+        salt: opts.salt,
+        feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance
     });
     aztecNodeConfig.l1Contracts = l1Contracts.l1ContractAddresses;
     return aztecNodeConfig.l1Contracts;
@@ -72,12 +72,11 @@ const localAnvil = foundry;
         aztecNodeConfig.validatorPrivateKey = `0x${Buffer.from(privKey).toString('hex')}`;
     }
     const initialAccounts = await (async ()=>{
-        if (config.testAccounts) {
+        if (config.testAccounts === true || config.testAccounts === undefined) {
             if (aztecNodeConfig.p2pEnabled) {
                 userLog(`Not setting up test accounts as we are connecting to a network`);
-            } else if (config.noPXE) {
-                userLog(`Not setting up test accounts as we are not exposing a PXE`);
             } else {
+                userLog(`Setting up test accounts`);
                 return await getInitialTestAccounts();
             }
         }
@@ -90,14 +89,15 @@ const localAnvil = foundry;
         bananaFPC,
         sponsoredFPC
     ] : [];
-    const { genesisArchiveRoot, genesisBlockHash, prefilledPublicData } = await getGenesisValues(fundedAddresses);
+    const { genesisArchiveRoot, genesisBlockHash, prefilledPublicData, fundingNeeded } = await getGenesisValues(fundedAddresses);
     let watcher = undefined;
     if (!aztecNodeConfig.p2pEnabled) {
         const l1ContractAddresses = await deployContractsToL1(aztecNodeConfig, hdAccount, undefined, {
             assumeProvenThroughBlockNumber: Number.MAX_SAFE_INTEGER,
             genesisArchiveRoot,
             genesisBlockHash,
-            salt: config.l1Salt ? parseInt(config.l1Salt) : undefined
+            salt: config.l1Salt ? parseInt(config.l1Salt) : undefined,
+            feeJuicePortalInitialBalance: fundingNeeded
         });
         const chain = aztecNodeConfig.l1RpcUrls.length > 0 ? createEthereumChain([
             l1RpcUrl
@@ -129,7 +129,6 @@ const localAnvil = foundry;
         proverEnabled: aztecNodeConfig.realProofs
     };
     const pxe = await createAztecPXE(node, pxeServiceConfig);
-    await setupCanonicalL2FeeJuice(pxe, aztecNodeConfig.l1Contracts.feeJuicePortalAddress, logger.info);
     if (initialAccounts.length) {
         userLog('Setting up funded test accounts...');
         const accounts = await deployFundedSchnorrAccounts(pxe, initialAccounts);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "0.82.2",
+  "version": "0.82.3-nightly.20250403",
   "type": "module",
   "exports": {
     ".": "./dest/index.js"
@@ -29,35 +29,35 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "0.82.2",
-    "@aztec/archiver": "0.82.2",
-    "@aztec/aztec-faucet": "0.82.2",
-    "@aztec/aztec-node": "0.82.2",
-    "@aztec/aztec.js": "0.82.2",
-    "@aztec/bb-prover": "0.82.2",
-    "@aztec/bb.js": "0.82.2",
-    "@aztec/blob-sink": "0.82.2",
-    "@aztec/bot": "0.82.2",
-    "@aztec/builder": "0.82.2",
-    "@aztec/cli": "0.82.2",
-    "@aztec/cli-wallet": "0.82.2",
-    "@aztec/constants": "0.82.2",
-    "@aztec/entrypoints": "0.82.2",
-    "@aztec/ethereum": "0.82.2",
-    "@aztec/foundation": "0.82.2",
-    "@aztec/kv-store": "0.82.2",
-    "@aztec/noir-contracts.js": "0.82.2",
-    "@aztec/noir-protocol-circuits-types": "0.82.2",
-    "@aztec/p2p": "0.82.2",
-    "@aztec/p2p-bootstrap": "0.82.2",
-    "@aztec/protocol-contracts": "0.82.2",
-    "@aztec/prover-client": "0.82.2",
-    "@aztec/prover-node": "0.82.2",
-    "@aztec/pxe": "0.82.2",
-    "@aztec/stdlib": "0.82.2",
-    "@aztec/telemetry-client": "0.82.2",
-    "@aztec/txe": "0.82.2",
-    "@aztec/world-state": "0.82.2",
+    "@aztec/accounts": "0.82.3-nightly.20250403",
+    "@aztec/archiver": "0.82.3-nightly.20250403",
+    "@aztec/aztec-faucet": "0.82.3-nightly.20250403",
+    "@aztec/aztec-node": "0.82.3-nightly.20250403",
+    "@aztec/aztec.js": "0.82.3-nightly.20250403",
+    "@aztec/bb-prover": "0.82.3-nightly.20250403",
+    "@aztec/bb.js": "0.82.3-nightly.20250403",
+    "@aztec/blob-sink": "0.82.3-nightly.20250403",
+    "@aztec/bot": "0.82.3-nightly.20250403",
+    "@aztec/builder": "0.82.3-nightly.20250403",
+    "@aztec/cli": "0.82.3-nightly.20250403",
+    "@aztec/cli-wallet": "0.82.3-nightly.20250403",
+    "@aztec/constants": "0.82.3-nightly.20250403",
+    "@aztec/entrypoints": "0.82.3-nightly.20250403",
+    "@aztec/ethereum": "0.82.3-nightly.20250403",
+    "@aztec/foundation": "0.82.3-nightly.20250403",
+    "@aztec/kv-store": "0.82.3-nightly.20250403",
+    "@aztec/noir-contracts.js": "0.82.3-nightly.20250403",
+    "@aztec/noir-protocol-circuits-types": "0.82.3-nightly.20250403",
+    "@aztec/p2p": "0.82.3-nightly.20250403",
+    "@aztec/p2p-bootstrap": "0.82.3-nightly.20250403",
+    "@aztec/protocol-contracts": "0.82.3-nightly.20250403",
+    "@aztec/prover-client": "0.82.3-nightly.20250403",
+    "@aztec/prover-node": "0.82.3-nightly.20250403",
+    "@aztec/pxe": "0.82.3-nightly.20250403",
+    "@aztec/stdlib": "0.82.3-nightly.20250403",
+    "@aztec/telemetry-client": "0.82.3-nightly.20250403",
+    "@aztec/txe": "0.82.3-nightly.20250403",
+    "@aztec/world-state": "0.82.3-nightly.20250403",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",

package/src/bin/index.ts

@@ -12,6 +12,8 @@ import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
 
 import { Command } from 'commander';
 
+import { NETWORK_FLAG } from '../cli/aztec_start_options.js';
+import { type NetworkNames, enrichEnvironmentWithChainConfig } from '../cli/chain_l2_config.js';
 import { injectAztecCommands } from '../cli/index.js';
 import { getCliVersion } from '../cli/release_version.js';
 
@@ -26,6 +28,22 @@ async function main() {
   process.once('SIGINT', shutdown);
   process.once('SIGTERM', shutdown);
 
+  // Intercept the setting of a network and enrich the environment with defaults for that network
+  let networkValue: string | undefined;
+
+  const args = process.argv.slice(2);
+  const networkIndex = args.findIndex(arg => arg.startsWith(`--${NETWORK_FLAG}=`) || arg === `--${NETWORK_FLAG}`);
+
+  if (networkIndex !== -1) {
+    networkValue = args[networkIndex].split('=')[1] || args[networkIndex + 1];
+  }
+
+  networkValue = networkValue || process.env.NETWORK;
+
+  if (networkValue !== undefined) {
+    await enrichEnvironmentWithChainConfig(networkValue as NetworkNames);
+  }
+
   const cliVersion = getCliVersion();
   let program = new Command('aztec');
   program.description('Aztec command line interface').version(cliVersion);

package/src/cli/aztec_start_action.ts

@@ -11,7 +11,6 @@ import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
 
 import { createSandbox } from '../sandbox/index.js';
 import { github, splash } from '../splash.js';
-import { enrichEnvironmentWithChainConfig } from './chain_l2_config.js';
 import { getCliVersion } from './release_version.js';
 import { extractNamespacedOptions, installSignalHandlers } from './util.js';
 import { getVersions } from './versioning.js';
@@ -27,6 +26,7 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
     const cliVersion = getCliVersion();
     const sandboxOptions = extractNamespacedOptions(options, 'sandbox');
     const nodeOptions = extractNamespacedOptions(options, 'node');
+    sandboxOptions.testAccounts = true;
     userLog(`${splash}\n${github}\n\n`);
     userLog(`Setting up Aztec Sandbox ${cliVersion}, please stand by...`);
 
@@ -51,10 +51,6 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
       userLog(`Not exposing PXE API through JSON-RPC server`);
     }
   } else {
-    // If a network is specified, enrich the environment with the chain config
-    if (options.network) {
-      await enrichEnvironmentWithChainConfig(options.network);
-    }
     if (options.node) {
       const { startNode } = await import('./cmds/start_node.js');
       ({ config } = await startNode(options, signalHandlers, services, adminServices, userLog));

package/src/cli/aztec_start_options.ts

@@ -55,9 +55,9 @@ export const getOptions = (namespace: string, configMappings: Record<string, Con
 // These are options used by multiple modules so should be inputted once
 export const universalOptions = [
   'l1RpcUrls',
-  'l1ConsensusHostUrl',
-  'l1ConsensusHostApiKey',
-  'l1ConsensusHostApiKeyHeader',
+  'l1ConsensusHostUrls',
+  'l1ConsensusHostApiKeys',
+  'l1ConsensusHostApiKeyHeaders',
   'l1ChainId',
   'l1Contracts',
   'p2pEnabled',
@@ -65,11 +65,13 @@ export const universalOptions = [
   'dataStoreMapSizeKb',
 ];
 
+export const NETWORK_FLAG = 'network';
+
 // Define categories and options
 export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
   NETWORK: [
     {
-      flag: '--network <value>',
+      flag: `--${NETWORK_FLAG} <value>`,
       description: 'Network to run Aztec on',
       defaultValue: undefined,
       envVar: 'NETWORK',
@@ -83,13 +85,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
       envVar: undefined,
     },
     {
-      flag: '--sandbox.testAccounts',
-      description: 'Deploy test accounts on sandbox start',
-      envVar: 'TEST_ACCOUNTS',
-      ...booleanConfigHelper(true),
-    },
-    {
-      flag: '--sandbox.noPXE',
+      flag: '--sandbox.noPXE [value]',
       description: 'Do not expose PXE service on sandbox start',
       envVar: 'NO_PXE',
       ...booleanConfigHelper(),
@@ -139,23 +135,26 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
       envVar: 'MNEMONIC',
     },
     {
-      flag: '--l1-consensus-host-url <value>',
-      description: 'URL of the Ethereum consensus node that services will connect to',
-      defaultValue: undefined,
-      envVar: 'L1_CONSENSUS_HOST_URL',
+      flag: '--l1-consensus-host-urls <value>',
+      description: 'List of URLs of the Ethereum consensus nodes that services will connect to (comma separated)',
+      defaultValue: [],
+      envVar: 'L1_CONSENSUS_HOST_URLS',
+      parseVal: (val: string) => val.split(',').map(url => url.trim().replace(/\/$/, '')),
     },
     {
-      flag: '--l1-consensus-host-api-key <value>',
-      description: 'API key for the Ethereum consensus node',
-      defaultValue: undefined,
-      envVar: 'L1_CONSENSUS_HOST_API_KEY',
+      flag: '--l1-consensus-host-api-keys <value>',
+      description: 'List of API keys for the corresponding Ethereum consensus nodes',
+      defaultValue: [],
+      envVar: 'L1_CONSENSUS_HOST_API_KEYS',
+      parseVal: (val: string) => val.split(',').map(url => url.trim()),
     },
     {
-      flag: '--l1-consensus-host-api-key-header <value>',
+      flag: '--l1-consensus-host-api-key-headers <value>',
       description:
-        'API key header for the Ethereum consensus node. If not set, the api key will be appended to the URL as ?key=<api-key>',
-      defaultValue: undefined,
-      envVar: 'L1_CONSENSUS_HOST_API_KEY_HEADER',
+        'List of API key headers for the corresponding Ethereum consensus nodes. If not set, the api key for the corresponding node will be appended to the URL as ?key=<api-key>',
+      defaultValue: [],
+      envVar: 'L1_CONSENSUS_HOST_API_KEY_HEADERS',
+      parseVal: (val: string) => val.split(',').map(url => url.trim()),
     },
   ],
   STORAGE: [
@@ -268,15 +267,22 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
       parseVal: val => parseInt(val, 10),
     },
     {
-      flag: '--node.testAccounts',
-      description: 'Populate genesis state with initial fee juice for test accounts',
-      envVar: 'TEST_ACCOUNTS',
-      ...booleanConfigHelper(),
+      flag: '--node.syncMode <value>',
+      description:
+        'Set sync mode to `full` to always sync via L1, `snapshot` to download a snapshot if there is no local data, `force-snapshot` to download even if there is local data.',
+      defaultValue: 'snapshot',
+      envVar: 'SYNC_MODE',
+    },
+    {
+      flag: '--node.snapshotsUrl <value>',
+      description: 'Base URL for downloading snapshots for snapshot sync.',
+      defaultValue: undefined,
+      envVar: 'SYNC_SNAPSHOTS_URL',
     },
   ],
   'P2P SUBSYSTEM': [
     {
-      flag: '--p2p-enabled',
+      flag: '--p2p-enabled [value]',
       description: 'Enable P2P subsystem',
       envVar: 'P2P_ENABLED',
       ...booleanConfigHelper(),

package/src/cli/chain_l2_config.ts

@@ -1,3 +1,4 @@
+import { EthAddress } from '@aztec/aztec.js';
 import type { EnvVar } from '@aztec/foundation/config';
 
 import path from 'path';
@@ -11,12 +12,16 @@ export type L2ChainConfig = {
   aztecEpochDuration: number;
   aztecProofSubmissionWindow: number;
   testAccounts: boolean;
+  sponsoredFPC: boolean;
   p2pEnabled: boolean;
   p2pBootstrapNodes: string[];
   registryAddress: string;
+  slashFactoryAddress: string;
+  feeAssetHandlerAddress: string;
   seqMinTxsPerBlock: number;
   seqMaxTxsPerBlock: number;
   realProofs: boolean;
+  snapshotsUrl: string;
 };
 
 export const testnetIgnitionL2ChainConfig: L2ChainConfig = {
@@ -26,12 +31,16 @@ export const testnetIgnitionL2ChainConfig: L2ChainConfig = {
   aztecEpochDuration: 32,
   aztecProofSubmissionWindow: 64,
   testAccounts: true,
+  sponsoredFPC: false,
   p2pEnabled: true,
   p2pBootstrapNodes: [],
   registryAddress: '0x12b3ebc176a1646b911391eab3760764f2e05fe3',
+  slashFactoryAddress: '',
+  feeAssetHandlerAddress: '',
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 0,
   realProofs: true,
+  snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/',
 };
 
 export const alphaTestnetL2ChainConfig: L2ChainConfig = {
@@ -41,12 +50,16 @@ export const alphaTestnetL2ChainConfig: L2ChainConfig = {
   aztecEpochDuration: 32,
   aztecProofSubmissionWindow: 64,
   testAccounts: false,
+  sponsoredFPC: true,
   p2pEnabled: true,
   p2pBootstrapNodes: [],
-  registryAddress: '', // To be updated
+  registryAddress: '0xad85d55a4bbef35e95396191c22903aa717edf1c',
+  slashFactoryAddress: '',
+  feeAssetHandlerAddress: '0xf0664fec6ac15313e18d5ad8225e46b7c6463338',
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 4,
   realProofs: true,
+  snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/',
 };
 
 export async function getBootnodes(networkName: NetworkNames) {
@@ -83,6 +96,15 @@ function enrichVar(envVar: EnvVar, value: string) {
   process.env[envVar] = value;
 }
 
+function enrichEthAddressVar(envVar: EnvVar, value: string) {
+  // EthAddress doesn't like being given empty strings
+  if (value === '') {
+    enrichVar(envVar, EthAddress.ZERO.toString());
+    return;
+  }
+  enrichVar(envVar, value);
+}
+
 export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
   const config = await getL2ChainConfig(networkName);
   if (!config) {
@@ -94,12 +116,17 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
   enrichVar('AZTEC_PROOF_SUBMISSION_WINDOW', config.aztecProofSubmissionWindow.toString());
   enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
   enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
+  enrichVar('SPONSORED_FPC', config.sponsoredFPC.toString());
   enrichVar('P2P_ENABLED', config.p2pEnabled.toString());
   enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
-  enrichVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
   enrichVar('SEQ_MIN_TX_PER_BLOCK', config.seqMinTxsPerBlock.toString());
   enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString());
   enrichVar('DATA_DIRECTORY', path.join(process.env.HOME || '~', '.aztec', networkName, 'data'));
   enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
   enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
+  enrichVar('SYNC_SNAPSHOTS_URL', config.snapshotsUrl);
+
+  enrichEthAddressVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
+  enrichEthAddressVar('SLASH_FACTORY_CONTRACT_ADDRESS', config.slashFactoryAddress);
+  enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', config.feeAssetHandlerAddress);
 }

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 { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
 import { NULL_KEY } from '@aztec/ethereum';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
@@ -47,11 +48,19 @@ export async function startNode(
 
   await preloadCrsDataForVerifying(nodeConfig, userLog);
 
-  const initialFundedAccounts = nodeConfig.testAccounts ? await getInitialTestAccounts() : [];
-  const { genesisBlockHash, genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(
-    initialFundedAccounts.map(a => a.address),
+  const testAccounts = nodeConfig.testAccounts ? (await getInitialTestAccounts()).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 { genesisBlockHash, genesisArchiveRoot, prefilledPublicData, fundingNeeded } = await getGenesisValues(
+    initialFundedAccounts,
   );
 
+  userLog(`Genesis block hash: ${genesisBlockHash.toString()}`);
+  userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
+
   // Deploy contracts if needed
   if (nodeSpecificOptions.deployAztecContracts || nodeSpecificOptions.deployAztecContractsSalt) {
     let account;
@@ -68,6 +77,7 @@ export async function startNode(
       salt: nodeSpecificOptions.deployAztecContractsSalt,
       genesisBlockHash,
       genesisArchiveRoot,
+      feeJuicePortalInitialBalance: fundingNeeded,
     });
   }
   // If not deploying, validate that any addresses and config provided are correct.
@@ -79,6 +89,7 @@ export async function startNode(
       nodeConfig.l1Contracts.registryAddress,
       nodeConfig.l1RpcUrls,
       nodeConfig.l1ChainId,
+      nodeConfig.rollupVersion,
     );
 
     // TODO(#12272): will clean this up.

package/src/cli/cmds/start_p2p_bootstrap.ts

@@ -17,7 +17,8 @@ export async function startP2PBootstrap(
 ) {
   // Start a P2P bootstrap node.
   const config = extractRelevantOptions<BootnodeConfig>(options, bootnodeConfigMappings, 'p2p');
-  userLog(`Starting P2P bootstrap node with config: ${jsonStringify(config)}`);
+  const safeConfig = { ...config, peerIdPrivateKey: '<redacted>' };
+  userLog(`Starting P2P bootstrap node with config: ${jsonStringify(safeConfig)}`);
   const telemetryClient = initTelemetryClient(getTelemetryClientConfig());
   const store = await createStore('p2p-bootstrap', 1, config, createLogger('p2p:bootstrap:store'));
   const node = new BootstrapNode(store, telemetryClient);

package/src/cli/cmds/start_prover_broker.ts

@@ -33,9 +33,15 @@ export async function startProverBroker(
     throw new Error('L1 registry address is required to start Aztec Node without --deploy-aztec-contracts option');
   }
 
-  const { addresses } = await getL1Config(config.l1Contracts.registryAddress, config.l1RpcUrls, config.l1ChainId);
+  const { addresses, config: rollupConfig } = await getL1Config(
+    config.l1Contracts.registryAddress,
+    config.l1RpcUrls,
+    config.l1ChainId,
+    config.rollupVersion,
+  );
 
   config.l1Contracts = addresses;
+  config.rollupVersion = rollupConfig.rollupVersion;
 
   const client = initTelemetryClient(getTelemetryClientConfig());
   const broker = await createAndStartProvingBroker(config, client);

package/src/cli/cmds/start_prover_node.ts

@@ -1,4 +1,5 @@
 import { getInitialTestAccounts } from '@aztec/accounts/testing';
+import { getSponsoredFPCAddress } from '@aztec/cli/cli-utils';
 import { NULL_KEY } from '@aztec/ethereum';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import { Agent, makeUndiciFetch } from '@aztec/foundation/json-rpc/undici';
@@ -10,7 +11,6 @@ import {
   getProverNodeConfigFromEnv,
   proverNodeConfigMappings,
 } from '@aztec/prover-node';
-import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 import { P2PApiSchema, ProverNodeApiSchema, type ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
 import { initTelemetryClient, makeTracedFetch, telemetryClientConfigMappings } from '@aztec/telemetry-client';
 import { getGenesisValues } from '@aztec/world-state/testing';
@@ -53,30 +53,18 @@ export async function startProverNode(
     proverConfig.publisherPrivateKey = `0x${Buffer.from(privKey!).toString('hex')}`;
   }
 
-  // TODO(palla/prover-node) L1 contract addresses should not silently default to zero,
-  // they should be undefined if not set and fail loudly.
-  // Load l1 contract addresses from aztec node if not set.
-  const isRollupAddressSet =
-    proverConfig.l1Contracts?.rollupAddress && !proverConfig.l1Contracts.rollupAddress.isZero();
-  const nodeUrl = proverConfig.nodeUrl ?? proverConfig.proverCoordinationNodeUrl;
-  if (nodeUrl && !isRollupAddressSet) {
-    userLog(`Loading L1 contract addresses from aztec node at ${nodeUrl}`);
-    proverConfig.l1Contracts = await createAztecNodeClient(nodeUrl).getL1ContractAddresses();
+  if (!proverConfig.l1Contracts.registryAddress || proverConfig.l1Contracts.registryAddress.isZero()) {
+    throw new Error('L1 registry address is required to start a Prover Node with --archiver option');
   }
 
-  // If we create an archiver here, validate the L1 config
-  if (options.archiver) {
-    if (!proverConfig.l1Contracts.registryAddress || proverConfig.l1Contracts.registryAddress.isZero()) {
-      throw new Error('L1 registry address is required to start a Prover Node with --archiver option');
-    }
-    const { addresses, config } = await getL1Config(
-      proverConfig.l1Contracts.registryAddress,
-      proverConfig.l1RpcUrls,
-      proverConfig.l1ChainId,
-    );
-    proverConfig.l1Contracts = addresses;
-    proverConfig = { ...proverConfig, ...config };
-  }
+  const { addresses, config } = await getL1Config(
+    proverConfig.l1Contracts.registryAddress,
+    proverConfig.l1RpcUrls,
+    proverConfig.l1ChainId,
+    proverConfig.rollupVersion,
+  );
+  proverConfig.l1Contracts = addresses;
+  proverConfig = { ...proverConfig, ...config };
 
   const telemetry = initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));
 
@@ -101,8 +89,15 @@ export async function startProverNode(
 
   await preloadCrsDataForVerifying(proverConfig, userLog);
 
-  const initialFundedAccounts = proverConfig.testAccounts ? await getInitialTestAccounts() : [];
-  const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts.map(a => a.address));
+  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/get_l1_config.ts

@@ -5,9 +5,10 @@ export async function getL1Config(
   registryAddress: EthAddress,
   l1RpcUrls: string[],
   l1ChainId: number,
+  rollupVersion: number | 'canonical' = 'canonical',
 ): Promise<{ addresses: L1ContractAddresses; config: Awaited<ReturnType<typeof getL1ContractsConfig>> }> {
   const publicClient = getPublicClient({ l1RpcUrls, l1ChainId });
-  const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress, 'canonical');
+  const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress, rollupVersion);
 
   const config = await getL1ContractsConfig(publicClient, addresses);
 

package/src/cli/util.ts

@@ -243,6 +243,6 @@ export async function preloadCrsDataForServerSideProving(
 ): Promise<void> {
   if (realProofs) {
     const { Crs, GrumpkinCrs } = await import('@aztec/bb.js');
-    await Promise.all([Crs.new(2 ** 25 - 1, undefined, log), GrumpkinCrs.new(2 ** 18 + 1, undefined, log)]);
+    await Promise.all([Crs.new(2 ** 25 + 1, undefined, log), GrumpkinCrs.new(2 ** 18 + 1, undefined, log)]);
   }
 }

package/src/sandbox/sandbox.ts

@@ -4,7 +4,7 @@ import { deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/acco
 import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
 import { AnvilTestWatcher, EthCheatCodes } from '@aztec/aztec.js/testing';
 import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client';
-import { setupCanonicalL2FeeJuice, setupSponsoredFPC } from '@aztec/cli/cli-utils';
+import { setupSponsoredFPC } from '@aztec/cli/cli-utils';
 import { GENESIS_ARCHIVE_ROOT, GENESIS_BLOCK_HASH } from '@aztec/constants';
 import {
   NULL_KEY,
@@ -16,7 +16,7 @@ import {
 import { Fr } from '@aztec/foundation/fields';
 import { type LogFn, createLogger } from '@aztec/foundation/log';
 import { getVKTreeRoot } from '@aztec/noir-protocol-circuits-types/vk-tree';
-import { ProtocolContractAddress, protocolContractTreeRoot } from '@aztec/protocol-contracts';
+import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { type PXEServiceConfig, createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
@@ -49,7 +49,13 @@ export async function deployContractsToL1(
   aztecNodeConfig: AztecNodeConfig,
   hdAccount: HDAccount | PrivateKeyAccount,
   contractDeployLogger = logger,
-  opts: { assumeProvenThroughBlockNumber?: number; salt?: number; genesisArchiveRoot?: Fr; genesisBlockHash?: Fr } = {},
+  opts: {
+    assumeProvenThroughBlockNumber?: number;
+    salt?: number;
+    genesisArchiveRoot?: Fr;
+    genesisBlockHash?: Fr;
+    feeJuicePortalInitialBalance?: bigint;
+  } = {},
 ) {
   const chain =
     aztecNodeConfig.l1RpcUrls.length > 0
@@ -66,12 +72,12 @@ export async function deployContractsToL1(
     {
       ...getL1ContractsConfigEnvVars(), // TODO: We should not need to be loading config from env again, caller should handle this
       ...aztecNodeConfig,
-      l2FeeJuiceAddress: ProtocolContractAddress.FeeJuice.toField(),
       vkTreeRoot: getVKTreeRoot(),
       protocolContractTreeRoot,
       genesisArchiveRoot: opts.genesisArchiveRoot ?? new Fr(GENESIS_ARCHIVE_ROOT),
       genesisBlockHash: opts.genesisBlockHash ?? new Fr(GENESIS_BLOCK_HASH),
       salt: opts.salt,
+      feeJuicePortalInitialBalance: opts.feeJuicePortalInitialBalance,
     },
   );
 
@@ -118,12 +124,11 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}, userLog
   }
 
   const initialAccounts = await (async () => {
-    if (config.testAccounts) {
+    if (config.testAccounts === true || config.testAccounts === undefined) {
       if (aztecNodeConfig.p2pEnabled) {
         userLog(`Not setting up test accounts as we are connecting to a network`);
-      } else if (config.noPXE) {
-        userLog(`Not setting up test accounts as we are not exposing a PXE`);
       } else {
+        userLog(`Setting up test accounts`);
         return await getInitialTestAccounts();
       }
     }
@@ -135,7 +140,9 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}, userLog
   const fundedAddresses = initialAccounts.length
     ? [...initialAccounts.map(a => a.address), bananaFPC, sponsoredFPC]
     : [];
-  const { genesisArchiveRoot, genesisBlockHash, prefilledPublicData } = await getGenesisValues(fundedAddresses);
+  const { genesisArchiveRoot, genesisBlockHash, prefilledPublicData, fundingNeeded } = await getGenesisValues(
+    fundedAddresses,
+  );
 
   let watcher: AnvilTestWatcher | undefined = undefined;
   if (!aztecNodeConfig.p2pEnabled) {
@@ -144,6 +151,7 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}, userLog
       genesisArchiveRoot,
       genesisBlockHash,
       salt: config.l1Salt ? parseInt(config.l1Salt) : undefined,
+      feeJuicePortalInitialBalance: fundingNeeded,
     });
 
     const chain =
@@ -168,8 +176,6 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}, userLog
   const pxeServiceConfig = { proverEnabled: aztecNodeConfig.realProofs };
   const pxe = await createAztecPXE(node, pxeServiceConfig);
 
-  await setupCanonicalL2FeeJuice(pxe, aztecNodeConfig.l1Contracts.feeJuicePortalAddress, logger.info);
-
   if (initialAccounts.length) {
     userLog('Setting up funded test accounts...');
     const accounts = await deployFundedSchnorrAccounts(pxe, initialAccounts);