@aztec/aztec 0.0.1-commit.5914bae → 0.0.1-commit.59a0419c6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "0.0.1-commit.5914bae",
+  "version": "0.0.1-commit.59a0419c6",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -28,39 +28,38 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.5914bae",
-    "@aztec/archiver": "0.0.1-commit.5914bae",
-    "@aztec/aztec-faucet": "0.0.1-commit.5914bae",
-    "@aztec/aztec-node": "0.0.1-commit.5914bae",
-    "@aztec/aztec.js": "0.0.1-commit.5914bae",
-    "@aztec/bb-prover": "0.0.1-commit.5914bae",
-    "@aztec/bb.js": "0.0.1-commit.5914bae",
-    "@aztec/blob-client": "0.0.1-commit.5914bae",
-    "@aztec/bot": "0.0.1-commit.5914bae",
-    "@aztec/builder": "0.0.1-commit.5914bae",
-    "@aztec/cli": "0.0.1-commit.5914bae",
-    "@aztec/constants": "0.0.1-commit.5914bae",
-    "@aztec/entrypoints": "0.0.1-commit.5914bae",
-    "@aztec/ethereum": "0.0.1-commit.5914bae",
-    "@aztec/foundation": "0.0.1-commit.5914bae",
-    "@aztec/kv-store": "0.0.1-commit.5914bae",
-    "@aztec/l1-artifacts": "0.0.1-commit.5914bae",
-    "@aztec/node-lib": "0.0.1-commit.5914bae",
-    "@aztec/noir-contracts.js": "0.0.1-commit.5914bae",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.5914bae",
-    "@aztec/p2p": "0.0.1-commit.5914bae",
-    "@aztec/p2p-bootstrap": "0.0.1-commit.5914bae",
-    "@aztec/protocol-contracts": "0.0.1-commit.5914bae",
-    "@aztec/prover-client": "0.0.1-commit.5914bae",
-    "@aztec/prover-node": "0.0.1-commit.5914bae",
-    "@aztec/pxe": "0.0.1-commit.5914bae",
-    "@aztec/sequencer-client": "0.0.1-commit.5914bae",
-    "@aztec/stdlib": "0.0.1-commit.5914bae",
-    "@aztec/telemetry-client": "0.0.1-commit.5914bae",
-    "@aztec/txe": "0.0.1-commit.5914bae",
-    "@aztec/validator-ha-signer": "0.0.1-commit.5914bae",
-    "@aztec/wallets": "0.0.1-commit.5914bae",
-    "@aztec/world-state": "0.0.1-commit.5914bae",
+    "@aztec/accounts": "0.0.1-commit.59a0419c6",
+    "@aztec/archiver": "0.0.1-commit.59a0419c6",
+    "@aztec/aztec-node": "0.0.1-commit.59a0419c6",
+    "@aztec/aztec.js": "0.0.1-commit.59a0419c6",
+    "@aztec/bb-prover": "0.0.1-commit.59a0419c6",
+    "@aztec/bb.js": "0.0.1-commit.59a0419c6",
+    "@aztec/blob-client": "0.0.1-commit.59a0419c6",
+    "@aztec/bot": "0.0.1-commit.59a0419c6",
+    "@aztec/builder": "0.0.1-commit.59a0419c6",
+    "@aztec/cli": "0.0.1-commit.59a0419c6",
+    "@aztec/constants": "0.0.1-commit.59a0419c6",
+    "@aztec/entrypoints": "0.0.1-commit.59a0419c6",
+    "@aztec/ethereum": "0.0.1-commit.59a0419c6",
+    "@aztec/foundation": "0.0.1-commit.59a0419c6",
+    "@aztec/kv-store": "0.0.1-commit.59a0419c6",
+    "@aztec/l1-artifacts": "0.0.1-commit.59a0419c6",
+    "@aztec/node-lib": "0.0.1-commit.59a0419c6",
+    "@aztec/noir-contracts.js": "0.0.1-commit.59a0419c6",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.59a0419c6",
+    "@aztec/p2p": "0.0.1-commit.59a0419c6",
+    "@aztec/p2p-bootstrap": "0.0.1-commit.59a0419c6",
+    "@aztec/protocol-contracts": "0.0.1-commit.59a0419c6",
+    "@aztec/prover-client": "0.0.1-commit.59a0419c6",
+    "@aztec/prover-node": "0.0.1-commit.59a0419c6",
+    "@aztec/pxe": "0.0.1-commit.59a0419c6",
+    "@aztec/sequencer-client": "0.0.1-commit.59a0419c6",
+    "@aztec/stdlib": "0.0.1-commit.59a0419c6",
+    "@aztec/telemetry-client": "0.0.1-commit.59a0419c6",
+    "@aztec/txe": "0.0.1-commit.59a0419c6",
+    "@aztec/validator-ha-signer": "0.0.1-commit.59a0419c6",
+    "@aztec/wallets": "0.0.1-commit.59a0419c6",
+    "@aztec/world-state": "0.0.1-commit.59a0419c6",
     "@iarna/toml": "^2.2.5",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",

package/scripts/add_crate.sh

@@ -2,10 +2,11 @@
 set -euo pipefail
 
 # Creates a contract+test crate pair and adds them to an existing workspace.
-# Usage: add_crate.sh <crate_name>
+# Usage: add_crate.sh <crate_name> <template>
 # Must be called from a workspace root that already has Nargo.toml with [workspace].
 
 crate_name=$1
+template=$2
 
 if [ -z "$crate_name" ]; then
   echo "Error: crate name is required"
@@ -31,64 +32,13 @@ fi
 
 # Get the actual aztec version for the git tag.
 AZTEC_VERSION=$(jq -r '.version' $(dirname $0)/../package.json)
+TEMPLATE_DIR="$(dirname $0)/templates/$template"
 
-# Create contract crate
-mkdir -p "$contract_dir/src"
-cat > "$contract_dir/Nargo.toml" << CEOF
-[package]
-name = "${crate_name}_contract"
-type = "contract"
-
-[dependencies]
-aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v${AZTEC_VERSION}", directory="aztec" }
-CEOF
-
-cat > "$contract_dir/src/main.nr" << 'EOF'
-use aztec::macros::aztec;
-
-#[aztec]
-pub contract Main {
-    use aztec::macros::functions::{external, initializer};
-
-    #[initializer]
-    #[external("private")]
-    fn constructor() {}
-}
-EOF
-
-# Create test crate
-mkdir -p "$test_dir/src"
-cat > "$test_dir/Nargo.toml" << TEOF
-[package]
-name = "${crate_name}_test"
-type = "lib"
-
-[dependencies]
-aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v${AZTEC_VERSION}", directory="aztec" }
-${crate_name}_contract = { path = "../${contract_dir}" }
-TEOF
-
-cat > "$test_dir/src/lib.nr" << 'NOIR'
-use aztec::test::helpers::test_environment::TestEnvironment;
-use __CRATE_NAME___contract::Main;
-
-#[test]
-unconstrained fn test_constructor() {
-    let mut env = TestEnvironment::new();
-    let deployer = env.create_light_account();
-
-    // Deploy the contract with the default constructor:
-    let contract_address = env.deploy("@__CRATE_NAME___contract/Main").with_private_initializer(
-        deployer,
-        Main::interface().constructor(),
-    );
-
-    // Deploy without an initializer:
-    let contract_address = env.deploy("@__CRATE_NAME___contract/Main").without_initializer();
-}
-NOIR
-
-sed -i "s/__CRATE_NAME__/${crate_name}/g" "$test_dir/src/lib.nr"
+# Copy template crates and substitute placeholders
+cp -r "$TEMPLATE_DIR/contract" "$contract_dir"
+cp -r "$TEMPLATE_DIR/test" "$test_dir"
+find "$contract_dir" "$test_dir" -type f -exec \
+  sed -i -e "s/__CRATE_NAME__/${crate_name}/g" -e "s/__AZTEC_VERSION__/${AZTEC_VERSION}/g" {} +
 
 # Add members to workspace Nargo.toml
 if grep -q 'members\s*=\s*\[\s*\]' Nargo.toml; then

package/scripts/aztec.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
-shopt -s inherit_errexit
 
 # Re-execute using correct version if we have an .aztecrc file.
 if [ "${AZTEC_VERSIONED:-0}" -eq 0 ] && [ -f .aztecrc ] && command -v aztec-up &>/dev/null; then
@@ -24,10 +23,14 @@ case $cmd in
     # Attempt to compile, no-op if there are no changes
     node --no-warnings "$script_dir/../dest/bin/index.js" compile
 
-    export LOG_LEVEL="${LOG_LEVEL:-"error;trace:contract_log"}"
+    export LOG_LEVEL="${LOG_LEVEL:-"error;trace:^contract:"}"
     aztec start --txe --port 8081 &
     server_pid=$!
     trap 'kill $server_pid &>/dev/null || true' EXIT
+    if ! command -v nc &>/dev/null; then
+      echo "Error: 'nc' (netcat) is required but not installed." >&2
+      exit 1
+    fi
     while ! nc -z 127.0.0.1 8081 &>/dev/null; do sleep 0.2; done
     export NARGO_FOREIGN_CALL_TIMEOUT=300000
     nargo test --silence-warnings --oracle-resolver http://127.0.0.1:8081 --test-threads 16 "$@"
@@ -50,7 +53,7 @@ case $cmd in
       export ETHEREUM_HOSTS=${ETHEREUM_HOSTS:-"http://127.0.0.1:${ANVIL_PORT}"}
 
       anvil --version
-      anvil --silent &
+      anvil --silent --port "$ANVIL_PORT" &
       anvil_pid=$!
       trap 'kill $anvil_pid &>/dev/null' EXIT
     fi

package/scripts/init.sh

@@ -16,11 +16,11 @@ Options:
   -h, --help     Print help
 
 This command creates a new Aztec Noir project in the current directory with
-a workspace containing a contract crate and a test crate, and automatically
-adds the Aztec.nr dependency to both.
+a workspace containing a Counter contract example with tests. The Counter
+demonstrates private state, private functions, and utility reads.
 
-If a workspace already exists in the current directory, use
-'aztec new <name>' instead to add another contract.
+Use 'aztec new <name>' to create a blank contract project, or to add another
+contract to an existing workspace.
 EOF
       exit 0
       ;;
@@ -36,4 +36,4 @@ done
 package_name="$(basename $(pwd))"
 
 echo "Initializing Aztec contract project..."
-$script_path/setup_workspace.sh "$package_name"
+$script_path/setup_workspace.sh "$package_name" counter

package/scripts/new.sh

@@ -68,7 +68,7 @@ fi
 if [ -f "Nargo.toml" ] && grep -q '\[workspace\]' Nargo.toml; then
   # Add crate pair to existing workspace
   echo "Adding contract '$package_name' to existing workspace..."
-  $script_path/add_crate.sh "$package_name"
+  $script_path/add_crate.sh "$package_name" blank
 else
   # Create new workspace
   if [ -d "$project_path" ] && [ "$(ls -A $project_path 2>/dev/null)" ]; then
@@ -79,5 +79,5 @@ else
   echo "Creating new Aztec contract project at $project_path..."
   mkdir -p "$project_path"
   cd "$project_path"
-  $script_path/setup_workspace.sh "$package_name"
+  $script_path/setup_workspace.sh "$package_name" blank
 fi

package/scripts/setup_workspace.sh

@@ -2,10 +2,11 @@
 set -euo pipefail
 
 # Creates an Aztec contract workspace with a contract crate and a test crate.
-# Usage: setup_workspace.sh <package_name>
+# Usage: setup_workspace.sh <package_name> <template>
 # Must be called from the workspace root directory.
 
 package_name=$1
+template=$2
 script_path=$(realpath $(dirname "$0"))
 
 if [ -z "$package_name" ]; then
@@ -26,7 +27,7 @@ members = []
 EOF
 
 # Create the first crate pair
-$script_path/add_crate.sh "$package_name"
+$script_path/add_crate.sh "$package_name" "$template"
 
 # Create README
 cat > README.md << REOF

package/scripts/templates/blank/contract/Nargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "__CRATE_NAME___contract"
+type = "contract"
+
+[dependencies]
+aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v__AZTEC_VERSION__", directory="aztec" }

package/scripts/templates/blank/contract/src/main.nr

@@ -0,0 +1,10 @@
+use aztec::macros::aztec;
+
+#[aztec]
+pub contract Main {
+    use aztec::macros::functions::{external, initializer};
+
+    #[initializer]
+    #[external("private")]
+    fn constructor() {}
+}

package/scripts/templates/blank/test/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "__CRATE_NAME___test"
+type = "lib"
+
+[dependencies]
+aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v__AZTEC_VERSION__", directory="aztec" }
+__CRATE_NAME___contract = { path = "../__CRATE_NAME___contract" }

package/scripts/templates/blank/test/src/lib.nr

@@ -0,0 +1,11 @@
+use aztec::test::helpers::test_environment::TestEnvironment;
+use __CRATE_NAME___contract::Main;
+
+#[test]
+unconstrained fn test_constructor() {
+    let mut env = TestEnvironment::new();
+    let deployer = env.create_light_account();
+
+    let _contract_address = env.deploy("@__CRATE_NAME___contract/Main")
+        .with_private_initializer(deployer, Main::interface().constructor());
+}

package/scripts/templates/counter/contract/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "__CRATE_NAME___contract"
+type = "contract"
+
+[dependencies]
+aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v__AZTEC_VERSION__", directory="aztec" }
+balance_set = { git="https://github.com/AztecProtocol/aztec-nr", tag="v__AZTEC_VERSION__", directory="balance-set" }

package/scripts/templates/counter/contract/src/main.nr

@@ -0,0 +1,48 @@
+use aztec::macros::aztec;
+
+#[aztec]
+pub contract Counter {
+    use aztec::{
+        macros::{functions::{external, initializer}, storage::storage},
+        messages::message_delivery::MessageDelivery,
+        protocol::address::AztecAddress,
+        state_vars::Owned,
+    };
+    use balance_set::BalanceSet;
+
+    #[storage]
+    struct Storage<Context> {
+        // Each owner has their own counter, stored as private encrypted notes.
+        // Owned: dictates who will receive the encrypted notes.
+        // BalanceSet: manages the underlying notes, providing add/sub/balance_of.
+        counters: Owned<BalanceSet<Context>, Context>,
+    }
+
+    // Sets the owner's counter to an initial value.
+    //
+    // #[external("private")]: executes on the user's device, inputs are hidden from everyone.
+    #[initializer]
+    #[external("private")]
+    fn constructor(initial_value: u128, owner: AztecAddress) {
+        // Delivers the note to the recipient onchain with provable correctness.
+        // Without delivery, the recipient can't find or decrypt the note.
+        self.storage.counters.at(owner).add(initial_value).deliver(
+            MessageDelivery.ONCHAIN_CONSTRAINED,
+        );
+    }
+
+    // Adds 1 to the owner's counter.
+    #[external("private")]
+    fn increment(owner: AztecAddress) {
+        self.storage.counters.at(owner).add(1).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
+    }
+
+    // Returns the current value of the owner's counter.
+    //
+    // #[external("utility")]: runs off-chain, no transaction created, no cost.
+    // Only the owner can decrypt and read their own counter.
+    #[external("utility")]
+    unconstrained fn get_counter(owner: AztecAddress) -> u128 {
+        self.storage.counters.at(owner).balance_of()
+    }
+}

package/scripts/templates/counter/test/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "__CRATE_NAME___test"
+type = "lib"
+
+[dependencies]
+aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v__AZTEC_VERSION__", directory="aztec" }
+__CRATE_NAME___contract = { path = "../__CRATE_NAME___contract" }

package/scripts/templates/counter/test/src/lib.nr

@@ -0,0 +1,32 @@
+use aztec::{protocol::address::AztecAddress, test::helpers::test_environment::TestEnvironment};
+use __CRATE_NAME___contract::Counter;
+
+unconstrained fn setup(initial_value: u128) -> (TestEnvironment, AztecAddress, AztecAddress) {
+    let mut env = TestEnvironment::new();
+    let owner = env.create_light_account();
+
+    let contract_address = env.deploy("@__CRATE_NAME___contract/Counter")
+        .with_private_initializer(owner, Counter::interface().constructor(initial_value, owner));
+
+    (env, contract_address, owner)
+}
+
+#[test]
+unconstrained fn test_constructor() {
+    let initial_value = 5;
+    let (env, contract_address, owner) = setup(initial_value);
+
+    let counter = env.execute_utility(Counter::at(contract_address).get_counter(owner));
+    assert_eq(counter, initial_value);
+}
+
+#[test]
+unconstrained fn test_increment() {
+    let initial_value = 5;
+    let (mut env, contract_address, owner) = setup(initial_value);
+
+    env.call_private(owner, Counter::at(contract_address).increment(owner));
+
+    let counter = env.execute_utility(Counter::at(contract_address).get_counter(owner));
+    assert_eq(counter, initial_value + 1);
+}

package/src/cli/aztec_start_action.ts

@@ -27,8 +27,7 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
   let config: ChainConfig | undefined = undefined;
 
   if (options.localNetwork) {
-    const localNetwork = extractNamespacedOptions(options, 'local-network');
-    localNetwork.testAccounts = true;
+    const localNetwork = extractNamespacedOptions(options, 'localNetwork');
     userLog(`${splash}\n${github}\n\n`);
     userLog(`Setting up Aztec local network ${packageVersion ?? 'unknown'}, please stand by...`);
 
@@ -82,7 +81,7 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
       await startProverBroker(options, signalHandlers, services, userLog);
     } else if (options.txe) {
       const { startTXE } = await import('./cmds/start_txe.js');
-      await startTXE(options, debugLogger);
+      await startTXE(options, signalHandlers, debugLogger);
     } else if (options.sequencer) {
       userLog(`Cannot run a standalone sequencer without a node`);
       process.exit(1);

package/src/cli/aztec_start_options.ts

@@ -12,7 +12,6 @@ import {
   isBooleanConfigValue,
   omitConfigMappings,
 } from '@aztec/foundation/config';
-import { dataConfigMappings } from '@aztec/kv-store/config';
 import { sharedNodeConfigMappings } from '@aztec/node-lib/config';
 import { bootnodeConfigMappings, p2pConfigMappings } from '@aztec/p2p/config';
 import { proverAgentConfigMappings, proverBrokerConfigMappings } from '@aztec/prover-client/broker/config';
@@ -20,6 +19,7 @@ import { proverNodeConfigMappings } from '@aztec/prover-node/config';
 import { allPxeConfigMappings } from '@aztec/pxe/config';
 import { sequencerClientConfigMappings } from '@aztec/sequencer-client/config';
 import { chainConfigMappings, nodeRpcConfigMappings } from '@aztec/stdlib/config';
+import { dataConfigMappings } from '@aztec/stdlib/kv-store';
 import { telemetryClientConfigMappings } from '@aztec/telemetry-client/config';
 import { worldStateConfigMappings } from '@aztec/world-state/config';
 
@@ -36,7 +36,7 @@ export interface AztecStartOption {
   parseVal?: (val: string) => any;
 }
 
-export const getOptions = (namespace: string, configMappings: Record<string, ConfigMapping>) => {
+export const getOptions = (namespace: string, configMappings: Record<string, ConfigMapping<unknown>>) => {
   const options: AztecStartOption[] = [];
   for (const [key, { env, defaultValue: def, parseEnv, description, printDefault, fallback }] of Object.entries(
     configMappings,
@@ -58,7 +58,11 @@ export const getOptions = (namespace: string, configMappings: Record<string, Con
   return options;
 };
 
-const configToFlag = (flag: string, configMapping: ConfigMapping, overrideDefaultValue?: any): AztecStartOption => {
+const configToFlag = (
+  flag: string,
+  configMapping: ConfigMapping<unknown>,
+  overrideDefaultValue?: any,
+): AztecStartOption => {
   if (!configMapping.isBoolean) {
     flag += ' <value>';
   }
@@ -125,6 +129,12 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
       defaultValue: DefaultMnemonic,
       env: 'MNEMONIC',
     },
+    {
+      flag: '--local-network.testAccounts',
+      description: 'Deploy test accounts on local network start',
+      env: 'TEST_ACCOUNTS',
+      ...booleanConfigHelper(true),
+    },
   ],
   API: [
     {

package/src/cli/cmds/compile.ts

@@ -3,7 +3,7 @@ import type { LogFn } from '@aztec/foundation/log';
 
 import { execFileSync } from 'child_process';
 import type { Command } from 'commander';
-import { readFile, writeFile } from 'fs/promises';
+import { readFile } from 'fs/promises';
 import { join } from 'path';
 
 import { readArtifactFiles } from './utils/artifacts.js';
@@ -25,19 +25,6 @@ async function collectContractArtifacts(): Promise<string[]> {
   return files.filter(f => Array.isArray(f.content.functions)).map(f => f.filePath);
 }
 
-/** Strips the `__aztec_nr_internals__` prefix from function names in contract artifacts. */
-async function stripInternalPrefixes(artifactPaths: string[]): Promise<void> {
-  for (const path of artifactPaths) {
-    const artifact = JSON.parse(await readFile(path, 'utf-8'));
-    for (const fn of artifact.functions) {
-      if (typeof fn.name === 'string') {
-        fn.name = fn.name.replace(/^__aztec_nr_internals__/, '');
-      }
-    }
-    await writeFile(path, JSON.stringify(artifact, null, 2) + '\n');
-  }
-}
-
 /** Returns the set of package names that are contract crates in the current workspace. */
 async function getContractPackageNames(): Promise<Set<string>> {
   const contractNames = new Set<string>();
@@ -161,9 +148,6 @@ async function compileAztecContract(nargoArgs: string[], log: LogFn): Promise<vo
     log('Postprocessing contracts...');
     const bbArgs = artifacts.flatMap(a => ['-i', a]);
     await run(bb, ['aztec_process', ...bbArgs]);
-
-    // TODO: This should be part of bb aztec_process!
-    await stripInternalPrefixes(artifacts);
   }
 
   log('Compilation complete!');

package/src/cli/cmds/standby.ts

@@ -28,11 +28,11 @@ export async function computeExpectedGenesisRoot(config: GenesisStateConfig, use
 
   userLog(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
 
-  const { genesisArchiveRoot, prefilledPublicData } = await getGenesisValues(initialFundedAccounts);
+  const { genesisArchiveRoot, genesis } = await getGenesisValues(initialFundedAccounts);
 
   userLog(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
 
-  return { genesisArchiveRoot, prefilledPublicData };
+  return { genesisArchiveRoot, genesis };
 }
 
 async function checkRollupCompatibility(

package/src/cli/cmds/start_archiver.ts

@@ -3,8 +3,8 @@ import { createLogger } from '@aztec/aztec.js/log';
 import { type BlobClientConfig, blobClientConfigMapping, createBlobClient } from '@aztec/blob-client/client';
 import { getL1Config } from '@aztec/cli/config';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
-import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
 import { ArchiverApiSchema } from '@aztec/stdlib/interfaces/server';
+import { type DataStoreConfig, dataConfigMappings } from '@aztec/stdlib/kv-store';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
 
 import { extractRelevantOptions } from '../util.js';
@@ -20,7 +20,13 @@ export async function startArchiver(
   const envConfig = getArchiverConfigFromEnv();
   const cliOptions = extractRelevantOptions<ArchiverConfig & DataStoreConfig & BlobClientConfig>(
     options,
-    { ...archiverConfigMappings, ...dataConfigMappings, ...blobClientConfigMapping },
+    {
+      // dataConfigMappings must come first: its l1Contracts only maps rollupAddress,
+      // while archiverConfigMappings (spread later) maps all L1 contract addresses.
+      ...dataConfigMappings,
+      ...archiverConfigMappings,
+      ...blobClientConfigMapping,
+    },
     'archiver',
   );
 

package/src/cli/cmds/start_node.ts

@@ -83,7 +83,7 @@ export async function startNode(
   await preloadCrsDataForVerifying(nodeConfig, userLog);
 
   const genesisConfig = getGenesisStateConfigEnvVars();
-  const { genesisArchiveRoot, prefilledPublicData } = await computeExpectedGenesisRoot(genesisConfig, userLog);
+  const { genesisArchiveRoot, genesis } = await computeExpectedGenesisRoot(genesisConfig, userLog);
 
   const followsCanonicalRollup =
     typeof nodeConfig.rollupVersion !== 'number' || (nodeConfig.rollupVersion as unknown as string) === 'canonical';
@@ -116,12 +116,10 @@ export async function startNode(
     );
   }
 
-  // TODO(#12272): will clean this up.
   nodeConfig = {
     ...nodeConfig,
     l1Contracts: {
       ...addresses,
-      slashFactoryAddress: nodeConfig.l1Contracts.slashFactoryAddress,
     },
     ...config,
   };
@@ -158,7 +156,7 @@ export async function startNode(
   const telemetry = await initTelemetryClient(telemetryConfig);
 
   // Create and start Aztec Node
-  const node = await createAztecNode(nodeConfig, { telemetry, proverBroker: broker }, { prefilledPublicData });
+  const node = await createAztecNode(nodeConfig, { telemetry, proverBroker: broker }, { genesis });
 
   // Add node and p2p to services list
   services.node = [node, AztecNodeApiSchema];

package/src/cli/cmds/start_txe.ts

@@ -2,14 +2,16 @@ import { startHttpRpcServer } from '@aztec/foundation/json-rpc/server';
 import type { Logger } from '@aztec/foundation/log';
 import { createTXERpcServer } from '@aztec/txe';
 
-export async function startTXE(options: any, debugLogger: Logger) {
+export async function startTXE(options: any, signalHandlers: Array<() => Promise<void>>, debugLogger: Logger) {
   debugLogger.info(`Setting up TXE...`);
 
   const txeServer = createTXERpcServer(debugLogger);
-  const { port } = await startHttpRpcServer(txeServer, {
+  const httpServer = await startHttpRpcServer(txeServer, {
     port: options.port,
     timeoutMs: 1e3 * 60 * 5,
   });
 
-  debugLogger.info(`TXE listening on port ${port}`);
+  signalHandlers.push(() => new Promise<void>(resolve => httpServer.close(() => resolve())));
+
+  debugLogger.info(`TXE listening on port ${httpServer.port}`);
 }