@aztec/aztec 0.82.2-alpha-testnet.2 → 0.82.2-alpha-testnet.4

package/dest/bin/index.js

@@ -10,8 +10,11 @@ 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, aztecStartOptions } 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';
+import { addOptions } from '../cli/util.js';
 const userLog = createConsoleLogger();
 const debugLogger = createLogger('cli');
 /** CLI & full node main entrypoint */ async function main() {
@@ -20,6 +23,15 @@ const debugLogger = createLogger('cli');
     };
     process.once('SIGINT', shutdown);
     process.once('SIGTERM', shutdown);
+    // We create a temp command object to detect the presence of the network option
+    // If it has been given then we enrich the environment with the chain config
+    const tempCmd = new Command('aztec').allowUnknownOption();
+    addOptions(tempCmd, aztecStartOptions['NETWORK']);
+    tempCmd.parse(process.argv);
+    const networkValue = tempCmd.getOptionValue(NETWORK_FLAG);
+    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;CAgVlE,CAAC"}

package/dest/cli/aztec_start_options.js

@@ -40,11 +40,12 @@ export const universalOptions = [
     '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'
@@ -57,12 +58,6 @@ export const aztecStartOptions = {
             defaultValue: undefined,
             envVar: undefined
         },
-        {
-            flag: '--sandbox.testAccounts',
-            description: 'Deploy test accounts on sandbox start',
-            envVar: 'TEST_ACCOUNTS',
-            ...booleanConfigHelper(true)
-        },
         {
             flag: '--sandbox.noPXE',
             description: 'Do not expose PXE service on sandbox start',
@@ -239,12 +234,6 @@ export const aztecStartOptions = {
             defaultValue: 100,
             envVar: 'WS_BLOCK_CHECK_INTERVAL_MS',
             parseVal: (val)=>parseInt(val, 10)
-        },
-        {
-            flag: '--node.testAccounts',
-            description: 'Populate genesis state with initial fee juice for test accounts',
-            envVar: 'TEST_ACCOUNTS',
-            ...booleanConfigHelper()
         }
     ],
     'P2P SUBSYSTEM': [

package/dest/cli/chain_l2_config.d.ts

@@ -11,6 +11,7 @@ export type L2ChainConfig = {
     p2pBootstrapNodes: string[];
     registryAddress: string;
     slashFactoryAddress: string;
+    feeAssetHandlerAddress: string;
     seqMinTxsPerBlock: number;
     seqMaxTxsPerBlock: number;
     realProofs: boolean;

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,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,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,aAe1C,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,aAevC,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,iBAqB/E"}
+{"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,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;CACrB,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,aAgB1C,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,aAgBvC,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,iBAsB/E"}

package/dest/cli/chain_l2_config.js

@@ -11,6 +11,7 @@ export const testnetIgnitionL2ChainConfig = {
     p2pBootstrapNodes: [],
     registryAddress: '0x12b3ebc176a1646b911391eab3760764f2e05fe3',
     slashFactoryAddress: '',
+    feeAssetHandlerAddress: '',
     seqMinTxsPerBlock: 0,
     seqMaxTxsPerBlock: 0,
     realProofs: true
@@ -22,11 +23,12 @@ export const alphaTestnetL2ChainConfig = {
     aztecEpochDuration: 32,
     aztecProofSubmissionWindow: 64,
     testAccounts: true,
-    sponsoredFPC: true,
+    sponsoredFPC: false,
     p2pEnabled: true,
     p2pBootstrapNodes: [],
     registryAddress: '0xad85d55a4bbef35e95396191c22903aa717edf1c',
     slashFactoryAddress: '0xf667f50fd68b30c38b12d29fee537fa5ea158eb8',
+    feeAssetHandlerAddress: '0xf0664fec6ac15313e18d5ad8225e46b7c6463338',
     seqMinTxsPerBlock: 0,
     seqMaxTxsPerBlock: 4,
     realProofs: true
@@ -79,6 +81,7 @@ export async function enrichEnvironmentWithChainConfig(networkName) {
     enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
     enrichVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
     enrichVar('SLASH_FACTORY_CONTRACT_ADDRESS', config.slashFactoryAddress);
+    enrichVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', config.feeAssetHandlerAddress);
     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'));

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,CA4ItC"}
+{"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,CAiJtC"}

package/dest/cli/cmds/start_node.js

@@ -32,7 +32,10 @@ export async function startNode(options, signalHandlers, services, adminServices
         await getSponsoredFPCAddress()
     ] : [];
     const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts);
+    userLog(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
     const { genesisBlockHash, genesisArchiveRoot, prefilledPublicData } = 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;

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;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,CA+FvC"}
+{"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;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,CAoGvC"}

package/dest/cli/cmds/start_prover_node.js

@@ -84,7 +84,10 @@ export async function startProverNode(options, signalHandlers, services, userLog
         await getSponsoredFPCAddress()
     ] : [];
     const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts);
-    const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
+    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/package.json

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

package/src/bin/index.ts

@@ -12,8 +12,11 @@ import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
 
 import { Command } from 'commander';
 
+import { NETWORK_FLAG, aztecStartOptions } 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';
+import { addOptions } from '../cli/util.js';
 
 const userLog = createConsoleLogger();
 const debugLogger = createLogger('cli');
@@ -26,6 +29,17 @@ async function main() {
   process.once('SIGINT', shutdown);
   process.once('SIGTERM', shutdown);
 
+  // We create a temp command object to detect the presence of the network option
+  // If it has been given then we enrich the environment with the chain config
+  const tempCmd = new Command('aztec').allowUnknownOption();
+  addOptions(tempCmd, aztecStartOptions['NETWORK']);
+  tempCmd.parse(process.argv);
+  const networkValue = tempCmd.getOptionValue(NETWORK_FLAG);
+
+  if (networkValue !== undefined) {
+    await enrichEnvironmentWithChainConfig(networkValue);
+  }
+
   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

@@ -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',
@@ -82,12 +84,6 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
       defaultValue: undefined,
       envVar: undefined,
     },
-    {
-      flag: '--sandbox.testAccounts',
-      description: 'Deploy test accounts on sandbox start',
-      envVar: 'TEST_ACCOUNTS',
-      ...booleanConfigHelper(true),
-    },
     {
       flag: '--sandbox.noPXE',
       description: 'Do not expose PXE service on sandbox start',
@@ -267,12 +263,6 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
       envVar: 'WS_BLOCK_CHECK_INTERVAL_MS',
       parseVal: val => parseInt(val, 10),
     },
-    {
-      flag: '--node.testAccounts',
-      description: 'Populate genesis state with initial fee juice for test accounts',
-      envVar: 'TEST_ACCOUNTS',
-      ...booleanConfigHelper(),
-    },
   ],
   'P2P SUBSYSTEM': [
     {

package/src/cli/chain_l2_config.ts

@@ -16,6 +16,7 @@ export type L2ChainConfig = {
   p2pBootstrapNodes: string[];
   registryAddress: string;
   slashFactoryAddress: string;
+  feeAssetHandlerAddress: string;
   seqMinTxsPerBlock: number;
   seqMaxTxsPerBlock: number;
   realProofs: boolean;
@@ -33,6 +34,7 @@ export const testnetIgnitionL2ChainConfig: L2ChainConfig = {
   p2pBootstrapNodes: [],
   registryAddress: '0x12b3ebc176a1646b911391eab3760764f2e05fe3',
   slashFactoryAddress: '',
+  feeAssetHandlerAddress: '',
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 0,
   realProofs: true,
@@ -45,11 +47,12 @@ export const alphaTestnetL2ChainConfig: L2ChainConfig = {
   aztecEpochDuration: 32,
   aztecProofSubmissionWindow: 64,
   testAccounts: true,
-  sponsoredFPC: true,
+  sponsoredFPC: false,
   p2pEnabled: true,
   p2pBootstrapNodes: [],
   registryAddress: '0xad85d55a4bbef35e95396191c22903aa717edf1c',
   slashFactoryAddress: '0xf667f50fd68b30c38b12d29fee537fa5ea158eb8',
+  feeAssetHandlerAddress: '0xf0664fec6ac15313e18d5ad8225e46b7c6463338',
   seqMinTxsPerBlock: 0,
   seqMaxTxsPerBlock: 4,
   realProofs: true,
@@ -105,6 +108,7 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
   enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
   enrichVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress);
   enrichVar('SLASH_FACTORY_CONTRACT_ADDRESS', config.slashFactoryAddress);
+  enrichVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', config.feeAssetHandlerAddress);
   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'));

package/src/cli/cmds/start_node.ts

@@ -52,8 +52,13 @@ export async function startNode(
   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 } = 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;

package/src/cli/cmds/start_prover_node.ts

@@ -105,7 +105,12 @@ export async function startProverNode(
   const testAccounts = proverConfig.testAccounts ? (await getInitialTestAccounts()).map(a => a.address) : [];
   const sponsoredFPCAccounts = proverConfig.sponsoredFPC ? [await getSponsoredFPCAddress()] : [];
   const initialFundedAccounts = testAccounts.concat(sponsoredFPCAccounts);
-  const { prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
+
+  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];