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

package/dest/testing/token_allowed_setup.js

@@ -0,0 +1,24 @@
+import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
+import { buildAllowedElement } from '@aztec/p2p/msg_validators';
+import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
+/**
+ * Returns the allowlist entries needed for FPC-based fee payments, keyed by the contract class of
+ * the `artifact` actually deployed as the fee token (defaults to canonical Token). The setup-phase
+ * validator matches these entries by class id, so a test deploying the codegen'd TestToken as its
+ * fee vehicle must pass `TestTokenContract.artifact` here -- otherwise the FPC fee calls are matched
+ * against the wrong class and rejected. Test-only: FPC fee payment with custom tokens won't work on
+ * mainnet alpha.
+ */ export async function getTokenAllowedSetupFunctions(artifact = TokenContractArtifact) {
+    const tokenClassId = (await getContractClassFromArtifact(artifact)).id;
+    const target = {
+        classId: tokenClassId
+    };
+    return Promise.all([
+        // needed for private transfers via FPC (transfer_to_public enqueues this)
+        buildAllowedElement(artifact, target, '_increase_public_balance', {
+            onlySelf: true
+        }),
+        // needed for public transfers via FPC (fee_entrypoint_public enqueues this)
+        buildAllowedElement(artifact, target, 'transfer_in_public')
+    ]);
+}

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@aztec/aztec",
-  "version": "0.0.1-commit.f504929",
+  "version": "0.0.1-commit.f5a9928",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
+    "./deploy": "./dest/deploy/index.js",
     "./testing": "./dest/testing/index.js"
   },
   "bin": "./scripts/aztec.sh",
@@ -28,46 +29,48 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.f504929",
-    "@aztec/archiver": "0.0.1-commit.f504929",
-    "@aztec/aztec-faucet": "0.0.1-commit.f504929",
-    "@aztec/aztec-node": "0.0.1-commit.f504929",
-    "@aztec/aztec.js": "0.0.1-commit.f504929",
-    "@aztec/bb-prover": "0.0.1-commit.f504929",
-    "@aztec/bb.js": "0.0.1-commit.f504929",
-    "@aztec/blob-client": "0.0.1-commit.f504929",
-    "@aztec/bot": "0.0.1-commit.f504929",
-    "@aztec/builder": "0.0.1-commit.f504929",
-    "@aztec/cli": "0.0.1-commit.f504929",
-    "@aztec/constants": "0.0.1-commit.f504929",
-    "@aztec/entrypoints": "0.0.1-commit.f504929",
-    "@aztec/ethereum": "0.0.1-commit.f504929",
-    "@aztec/foundation": "0.0.1-commit.f504929",
-    "@aztec/kv-store": "0.0.1-commit.f504929",
-    "@aztec/l1-artifacts": "0.0.1-commit.f504929",
-    "@aztec/node-lib": "0.0.1-commit.f504929",
-    "@aztec/noir-contracts.js": "0.0.1-commit.f504929",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.f504929",
-    "@aztec/p2p": "0.0.1-commit.f504929",
-    "@aztec/p2p-bootstrap": "0.0.1-commit.f504929",
-    "@aztec/protocol-contracts": "0.0.1-commit.f504929",
-    "@aztec/prover-client": "0.0.1-commit.f504929",
-    "@aztec/prover-node": "0.0.1-commit.f504929",
-    "@aztec/pxe": "0.0.1-commit.f504929",
-    "@aztec/sequencer-client": "0.0.1-commit.f504929",
-    "@aztec/stdlib": "0.0.1-commit.f504929",
-    "@aztec/telemetry-client": "0.0.1-commit.f504929",
-    "@aztec/txe": "0.0.1-commit.f504929",
-    "@aztec/validator-ha-signer": "0.0.1-commit.f504929",
-    "@aztec/wallets": "0.0.1-commit.f504929",
-    "@aztec/world-state": "0.0.1-commit.f504929",
+    "@aztec/accounts": "0.0.1-commit.f5a9928",
+    "@aztec/archiver": "0.0.1-commit.f5a9928",
+    "@aztec/aztec-node": "0.0.1-commit.f5a9928",
+    "@aztec/aztec.js": "0.0.1-commit.f5a9928",
+    "@aztec/bb-prover": "0.0.1-commit.f5a9928",
+    "@aztec/bb.js": "0.0.1-commit.f5a9928",
+    "@aztec/blob-client": "0.0.1-commit.f5a9928",
+    "@aztec/bot": "0.0.1-commit.f5a9928",
+    "@aztec/builder": "0.0.1-commit.f5a9928",
+    "@aztec/cli": "0.0.1-commit.f5a9928",
+    "@aztec/constants": "0.0.1-commit.f5a9928",
+    "@aztec/entrypoints": "0.0.1-commit.f5a9928",
+    "@aztec/ethereum": "0.0.1-commit.f5a9928",
+    "@aztec/foundation": "0.0.1-commit.f5a9928",
+    "@aztec/kv-store": "0.0.1-commit.f5a9928",
+    "@aztec/l1-artifacts": "0.0.1-commit.f5a9928",
+    "@aztec/node-lib": "0.0.1-commit.f5a9928",
+    "@aztec/noir-contracts.js": "0.0.1-commit.f5a9928",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.f5a9928",
+    "@aztec/p2p": "0.0.1-commit.f5a9928",
+    "@aztec/p2p-bootstrap": "0.0.1-commit.f5a9928",
+    "@aztec/protocol-contracts": "0.0.1-commit.f5a9928",
+    "@aztec/prover-client": "0.0.1-commit.f5a9928",
+    "@aztec/prover-node": "0.0.1-commit.f5a9928",
+    "@aztec/pxe": "0.0.1-commit.f5a9928",
+    "@aztec/sequencer-client": "0.0.1-commit.f5a9928",
+    "@aztec/standard-contracts": "0.0.1-commit.f5a9928",
+    "@aztec/stdlib": "0.0.1-commit.f5a9928",
+    "@aztec/telemetry-client": "0.0.1-commit.f5a9928",
+    "@aztec/txe": "0.0.1-commit.f5a9928",
+    "@aztec/validator-ha-signer": "0.0.1-commit.f5a9928",
+    "@aztec/wallets": "0.0.1-commit.f5a9928",
+    "@aztec/world-state": "0.0.1-commit.f5a9928",
+    "@iarna/toml": "^2.2.5",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
-    "viem": "npm:@aztec/viem@2.38.2"
+    "viem": "npm:@aztec/viem@2.38.2",
+    "zod": "^4"
   },
   "files": [
     "dest",

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,72 +32,22 @@ 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"
+# Use perl -i for portability across os.
+find "$contract_dir" "$test_dir" -type f -exec \
+  perl -i -pe "s/__CRATE_NAME__/${crate_name}/g; s/__AZTEC_VERSION__/${AZTEC_VERSION}/g" {} +
 
 # Add members to workspace Nargo.toml
 if grep -q 'members\s*=\s*\[\s*\]' Nargo.toml; then
   # Empty array: members = []
-  sed -i "s|members\s*=\s*\[\s*\]|members = [\"${contract_dir}\", \"${test_dir}\"]|" Nargo.toml
+  perl -i -pe "s|members\s*=\s*\[\s*\]|members = [\"${contract_dir}\", \"${test_dir}\"]|" Nargo.toml
 else
   # Non-empty array: add before closing ]
-  sed -i "s|\(members\s*=\s*\[.*\)\]|\1, \"${contract_dir}\", \"${test_dir}\"]|" Nargo.toml
+  perl -i -pe "s|(members\s*=\s*\[.*)\]|\1, \"${contract_dir}\", \"${test_dir}\"]|" Nargo.toml
 fi
 
 echo "Created crates '${contract_dir}' and '${test_dir}'"

package/scripts/aztec.sh

@@ -20,13 +20,20 @@ function aztec {
 
 case $cmd in
   test)
-    export LOG_LEVEL="${LOG_LEVEL:-"error;trace:contract_log"}"
+    # 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:"}"
     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 "$@"
+    nargo test --silence-warnings --oracle-resolver http://127.0.0.1:8081 "$@"
     ;;
   start)
     if [ "${1:-}" == "--local-network" ]; then

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::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.
+        // Without delivery, the recipient can't find or decrypt the note.
+        self.storage.counters.at(owner).add(initial_value).deliver(
+            MessageDelivery::onchain_unconstrained(),
+        );
+    }
+
+    // Adds 1 to the owner's counter.
+    #[external("private")]
+    fn increment(owner: AztecAddress) {
+        self.storage.counters.at(owner).add(1).deliver(MessageDelivery::onchain_unconstrained());
+    }
+
+    // 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/bin/index.ts

@@ -11,14 +11,15 @@ import { injectCommands as injectMiscCommands } from '@aztec/cli/misc';
 import { injectCommands as injectValidatorKeysCommands } from '@aztec/cli/validator_keys';
 import { getActiveNetworkName } from '@aztec/foundation/config';
 import { createConsoleLogger, createLogger } from '@aztec/foundation/log';
+import { getPackageVersion } from '@aztec/stdlib/update-checker';
 
 import { Command } from 'commander';
 
 import { injectCompileCommand } from '../cli/cmds/compile.js';
 import { injectMigrateCommand } from '../cli/cmds/migrate_ha_db.js';
 import { injectProfileCommand } from '../cli/cmds/profile.js';
+import { injectProverCommand } from '../cli/cmds/prover.js';
 import { injectAztecCommands } from '../cli/index.js';
-import { getCliVersion } from '../cli/release_version.js';
 
 const NETWORK_FLAG = 'network';
 
@@ -47,7 +48,7 @@ async function main() {
   await enrichEnvironmentWithNetworkConfig(networkName);
   enrichEnvironmentWithChainName(networkName);
 
-  const cliVersion = getCliVersion();
+  const cliVersion = getPackageVersion();
   let program = new Command('aztec');
   program.description('Aztec command line interface').version(cliVersion).enablePositionalOptions();
   program = injectAztecCommands(program, userLog, debugLogger);
@@ -61,6 +62,7 @@ async function main() {
   program = injectCompileCommand(program, userLog);
   program = injectProfileCommand(program, userLog);
   program = injectMigrateCommand(program, userLog);
+  program = injectProverCommand(program, userLog);
 
   await program.parseAsync(process.argv);
 }

package/src/cli/aztec_start_action.ts

@@ -1,3 +1,5 @@
+import { registerAztecNodeRpcHandlers } from '@aztec/aztec-node';
+import { getActiveNetworkName } from '@aztec/foundation/config';
 import {
   type NamespacedApiHandlers,
   createNamespacedSafeJsonRpcServer,
@@ -5,15 +7,18 @@ import {
   startHttpRpcServer,
 } from '@aztec/foundation/json-rpc/server';
 import type { LogFn, Logger } from '@aztec/foundation/log';
-import type { ChainConfig } from '@aztec/stdlib/config';
-import { AztecNodeApiSchema } from '@aztec/stdlib/interfaces/client';
+import { type ChainConfig, getRpcCorsAllowedOrigins } from '@aztec/stdlib/config';
+import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
-import { getOtelJsonRpcPropagationMiddleware } from '@aztec/telemetry-client';
+import {
+  getOtelJsonRpcDiagnosticsMiddleware,
+  getOtelJsonRpcPropagationMiddleware,
+  getOtelJsonRpcServerMetricsMiddleware,
+} from '@aztec/telemetry-client';
 
 import { createLocalNetwork } from '../local-network/index.js';
 import { github, splash } from '../splash.js';
 import { resolveAdminApiKey } from './admin_api_key_store.js';
-import { getCliVersion } from './release_version.js';
 import { extractNamespacedOptions, installSignalHandlers } from './util.js';
 import { getVersions } from './versioning.js';
 
@@ -22,33 +27,26 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
   const signalHandlers: Array<() => Promise<void>> = [];
   const services: NamespacedApiHandlers = {};
   const adminServices: NamespacedApiHandlers = {};
+  const packageVersion = getPackageVersion();
   let config: ChainConfig | undefined = undefined;
 
   if (options.localNetwork) {
-    const cliVersion = getCliVersion();
-    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 ${cliVersion}, please stand by...`);
+    userLog(`Setting up Aztec local network ${packageVersion}, please stand by...`);
 
     const { node, stop } = await createLocalNetwork(
       {
         l1Mnemonic: localNetwork.l1Mnemonic,
         l1RpcUrls: options.l1RpcUrls,
         testAccounts: localNetwork.testAccounts,
-        realProofs: false,
-        // Setting the epoch duration to 2 by default for local network. This allows the epoch to be "proven" faster, so
-        // the users can consume out hash without having to wait for a long time.
-        // Note: We are not proving anything in the local network (realProofs == false). But in `createLocalNetwork`,
-        // the EpochTestSettler will set the out hash to the outbox when an epoch is complete.
-        aztecEpochDuration: 2,
       },
       userLog,
     );
 
     // Start Node and PXE JSON-RPC server
     signalHandlers.push(stop);
-    services.node = [node, AztecNodeApiSchema];
+    registerAztecNodeRpcHandlers(node, services, adminServices, { debug: true });
   } else {
     // Route --prover-node through startNode
     if (options.proverNode && !options.node) {
@@ -57,13 +55,11 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
 
     if (options.node) {
       const { startNode } = await import('./cmds/start_node.js');
-      ({ config } = await startNode(options, signalHandlers, services, adminServices, userLog));
+      const networkName = getActiveNetworkName(options.network);
+      ({ config } = await startNode(options, signalHandlers, services, adminServices, userLog, networkName));
     } else if (options.bot) {
       const { startBot } = await import('./cmds/start_bot.js');
       await startBot(options, signalHandlers, services, userLog);
-    } else if (options.archiver) {
-      const { startArchiver } = await import('./cmds/start_archiver.js');
-      ({ config } = await startArchiver(options, signalHandlers, services));
     } else if (options.p2pBootstrap) {
       const { startP2PBootstrap } = await import('./cmds/start_p2p_bootstrap.js');
       ({ config } = await startP2PBootstrap(options, signalHandlers, services, userLog));
@@ -75,7 +71,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);
@@ -87,24 +83,40 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
 
   installSignalHandlers(debugLogger.info, signalHandlers);
   const versions = getVersions(config);
+  const versioningOpts = { packageVersion };
 
   // Start the main JSON-RPC server
   if (Object.entries(services).length > 0) {
+    if (services.aztec) {
+      const { BarretenbergSync } = await import('@aztec/bb.js');
+      // JSON-RPC schema parsing may decompress compressed Chonk proofs before the node handler runs.
+      await BarretenbergSync.initSingleton();
+    }
+
     const rpcServer = createNamespacedSafeJsonRpcServer(services, {
+      diagnostic: getOtelJsonRpcDiagnosticsMiddleware(),
       http200OnError: false,
       log: debugLogger,
-      middlewares: [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions)],
+      middlewares: [
+        getOtelJsonRpcServerMetricsMiddleware(),
+        getOtelJsonRpcPropagationMiddleware(),
+        getVersioningMiddleware(versions, versioningOpts),
+      ],
       maxBatchSize: options.rpcMaxBatchSize,
       maxBodySizeBytes: options.rpcMaxBodySize,
+      corsAllowedHeaders: options.rpcCorsAllowedHeaders ?? [],
+      corsAllowedOrigins: getRpcCorsAllowedOrigins(options),
+    });
+    const { port } = await startHttpRpcServer(rpcServer, {
+      port: options.port,
+      keepAliveTimeoutMs: options.rpcHttpKeepAliveTimeoutMs,
+      headersTimeoutMs: options.rpcHttpHeadersTimeoutMs,
     });
-    const { port } = await startHttpRpcServer(rpcServer, { port: options.port });
     debugLogger.info(`Aztec Server listening on port ${port}`, versions);
   }
 
   // If there are any admin services, start a separate JSON-RPC server for them
   if (Object.entries(adminServices).length > 0) {
-    const adminMiddlewares = [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions)];
-
     // Resolve the admin API key (auto-generated and persisted, or opt-out)
     const apiKeyResolution = await resolveAdminApiKey(
       {
@@ -115,13 +127,18 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
       },
       debugLogger,
     );
-    if (apiKeyResolution) {
-      adminMiddlewares.unshift(getApiKeyAuthMiddleware(apiKeyResolution.apiKeyHash));
-    } else {
+    if (!apiKeyResolution) {
       debugLogger.warn('No admin API key set — admin endpoint is unauthenticated');
     }
+    const adminMiddlewares = [
+      getOtelJsonRpcServerMetricsMiddleware(),
+      ...(apiKeyResolution ? [getApiKeyAuthMiddleware(apiKeyResolution.apiKeyHash)] : []),
+      getOtelJsonRpcPropagationMiddleware(),
+      getVersioningMiddleware(versions, versioningOpts),
+    ];
 
     const rpcServer = createNamespacedSafeJsonRpcServer(adminServices, {
+      diagnostic: getOtelJsonRpcDiagnosticsMiddleware(),
       http200OnError: false,
       log: debugLogger,
       middlewares: adminMiddlewares,