@aztec/aztec 0.0.1-commit.96dac018d → 0.0.1-commit.9badcec54

package/dest/testing/index.d.ts

@@ -2,4 +2,5 @@ export { AnvilTestWatcher } from './anvil_test_watcher.js';
 export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
 export { CheatCodes } from './cheat_codes.js';
 export { EpochTestSettler } from './epoch_test_settler.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUMifQ==
+export { getTokenAllowedSetupFunctions } from './token_allowed_setup.js';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90ZXN0aW5nL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzNELE9BQU8sRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDM0QsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sMEJBQTBCLENBQUMifQ==

package/dest/testing/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC"}

package/dest/testing/index.js

@@ -2,3 +2,4 @@ export { AnvilTestWatcher } from './anvil_test_watcher.js';
 export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
 export { CheatCodes } from './cheat_codes.js';
 export { EpochTestSettler } from './epoch_test_settler.js';
+export { getTokenAllowedSetupFunctions } from './token_allowed_setup.js';

package/dest/testing/token_allowed_setup.d.ts

@@ -0,0 +1,7 @@
+import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
+/**
+ * Returns Token-specific allowlist entries needed for FPC-based fee payments.
+ * These are test-only: FPC-based fee payment with custom tokens won't work on mainnet alpha.
+ */
+export declare function getTokenAllowedSetupFunctions(): Promise<AllowedElement[]>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fYWxsb3dlZF9zZXR1cC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3RpbmcvdG9rZW5fYWxsb3dlZF9zZXR1cC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUV0RTs7O0dBR0c7QUFDSCx3QkFBc0IsNkJBQTZCLElBQUksT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDLENBUy9FIn0=

package/dest/testing/token_allowed_setup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"token_allowed_setup.d.ts","sourceRoot":"","sources":["../../src/testing/token_allowed_setup.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE;;;GAGG;AACH,wBAAsB,6BAA6B,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CAS/E"}

package/dest/testing/token_allowed_setup.js

@@ -0,0 +1,20 @@
+import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
+import { buildAllowedElement } from '@aztec/p2p/msg_validators';
+import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
+/**
+ * Returns Token-specific allowlist entries needed for FPC-based fee payments.
+ * These are test-only: FPC-based fee payment with custom tokens won't work on mainnet alpha.
+ */ export async function getTokenAllowedSetupFunctions() {
+    const tokenClassId = (await getContractClassFromArtifact(TokenContractArtifact)).id;
+    const target = {
+        classId: tokenClassId
+    };
+    return Promise.all([
+        // Token: needed for private transfers via FPC (transfer_to_public enqueues this)
+        buildAllowedElement(TokenContractArtifact, target, '_increase_public_balance', {
+            onlySelf: true
+        }),
+        // Token: needed for public transfers via FPC (fee_entrypoint_public enqueues this)
+        buildAllowedElement(TokenContractArtifact, target, 'transfer_in_public')
+    ]);
+}

package/package.json

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

package/scripts/add_crate.sh

@@ -0,0 +1,102 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Creates a contract+test crate pair and adds them to an existing workspace.
+# Usage: add_crate.sh <crate_name>
+# Must be called from a workspace root that already has Nargo.toml with [workspace].
+
+crate_name=$1
+
+if [ -z "$crate_name" ]; then
+  echo "Error: crate name is required"
+  exit 1
+fi
+
+if [[ "$crate_name" == *"/"* ]] || [[ "$crate_name" == *"\\"* ]]; then
+  echo "Error: crate name must not contain path separators"
+  exit 1
+fi
+
+contract_dir="${crate_name}_contract"
+test_dir="${crate_name}_test"
+
+if [ -d "$contract_dir" ]; then
+  echo "Error: directory '$contract_dir' already exists"
+  exit 1
+fi
+if [ -d "$test_dir" ]; then
+  echo "Error: directory '$test_dir' already exists"
+  exit 1
+fi
+
+# Get the actual aztec version for the git tag.
+AZTEC_VERSION=$(jq -r '.version' $(dirname $0)/../package.json)
+
+# 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"
+
+# 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
+else
+  # Non-empty array: add before closing ]
+  sed -i "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,10 +20,17 @@ 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 "$@"
@@ -46,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

@@ -3,43 +3,37 @@ set -euo pipefail
 
 script_path=$(realpath $(dirname "$0"))
 
-name_arg=""
-
-# Check for help first
-for arg in "$@"; do
-  if [ "$arg" == "--help" ] || [ "$arg" == "-h" ]; then
-    cat << 'EOF'
+# Parse arguments
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    --help|-h)
+      cat << 'EOF'
 Aztec Init - Create a new Aztec Noir project in the current directory
 
-Usage: aztec init [OPTIONS]
+Usage: aztec init
 
 Options:
-  --name <NAME>  Name of the package [default: current directory name]
   -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.
-EOF
-    exit 0
-  fi
-done
 
-# Parse arguments
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    --name)
-      name_arg="$2"
-      shift 2
+If a workspace already exists in the current directory, use
+'aztec new <name>' instead to add another contract.
+EOF
+      exit 0
       ;;
     *)
-      shift
+      echo "Error: unexpected argument '$1'"
+      echo "Usage: aztec init"
+      echo "Run 'aztec init --help' for more information"
+      exit 1
       ;;
   esac
 done
 
-# Derive package name: use --name if provided, otherwise use current directory name
-package_name="${name_arg:-$(basename $(pwd))}"
+package_name="$(basename $(pwd))"
 
 echo "Initializing Aztec contract project..."
 $script_path/setup_workspace.sh "$package_name"

package/scripts/new.sh

@@ -3,58 +3,81 @@ set -euo pipefail
 
 script_path=$(realpath $(dirname "$0"))
 
-name_arg=""
 project_path=""
 
 while [[ $# -gt 0 ]]; do
   case $1 in
     --help|-h)
       cat << 'EOF'
-Aztec New - Create a new Aztec Noir project in a new directory
+Aztec New - Create a new Aztec Noir project or add a contract to an existing workspace
 
-Usage: aztec new [OPTIONS] <PATH>
+Usage: aztec new <NAME>
 
 Arguments:
-  <PATH>  The path to save the new project
+  <NAME>  The name for the new contract (also used as the directory name when
+          creating a new workspace)
 
 Options:
-  --name <NAME>  Name of the package [default: package directory name]
   -h, --help     Print help
 
-This command creates a new Aztec Noir project with a workspace containing
-a contract crate and a test crate, and automatically adds the Aztec.nr
-dependency to both.
+When run outside an existing workspace:
+  Creates a new directory with a workspace containing a contract crate and a
+  test crate, and automatically adds the Aztec.nr dependency to both.
+
+When run inside an existing workspace (Nargo.toml with [workspace] exists):
+  Adds a new contract crate and test crate to the existing workspace.
 EOF
       exit 0
       ;;
-    --name)
-      name_arg="$2"
-      shift 2
+    -*)
+      echo "Error: unknown option '$1'"
+      echo "Usage: aztec new <NAME>"
+      echo "Run 'aztec new --help' for more information"
+      exit 1
       ;;
     *)
+      if [ -n "$project_path" ]; then
+        echo "Error: unexpected argument '$1'"
+        echo "Usage: aztec new <NAME>"
+        echo "Run 'aztec new --help' for more information"
+        exit 1
+      fi
       project_path=$1
       shift
-      break
       ;;
   esac
 done
 
 if [ -z "$project_path" ]; then
-  echo "Error: PATH argument is required"
-  echo "Usage: aztec new [OPTIONS] <PATH>"
+  echo "Error: NAME argument is required"
+  echo "Usage: aztec new <NAME>"
   echo "Run 'aztec new --help' for more information"
   exit 1
 fi
 
-if [ -d "$project_path" ] && [ "$(ls -A $project_path 2>/dev/null)" ]; then
-  echo "Error: $project_path already exists and is not empty"
+package_name="$(basename $project_path)"
+
+# Validate that the name contains only valid Noir identifier characters
+if ! [[ "$package_name" =~ ^[a-zA-Z][a-zA-Z0-9_]*$ ]]; then
+  echo "Error: '$package_name' is not a valid contract name"
+  echo "Name must start with a letter and contain only letters, digits, and underscores"
   exit 1
 fi
 
-# Derive package name: use --name if provided, otherwise use directory basename
-package_name="${name_arg:-$(basename $project_path)}"
+# Check if we're inside an existing workspace
+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"
+else
+  # Create new workspace
+  if [ -d "$project_path" ] && [ "$(ls -A $project_path 2>/dev/null)" ]; then
+    echo "Error: $project_path already exists and is not empty"
+    exit 1
+  fi
 
-echo "Creating new Aztec contract project at $project_path..."
-mkdir -p "$project_path"
-cd "$project_path"
-$script_path/setup_workspace.sh "$package_name"
+  echo "Creating new Aztec contract project at $project_path..."
+  mkdir -p "$project_path"
+  cd "$project_path"
+  $script_path/setup_workspace.sh "$package_name"
+fi

package/scripts/setup_workspace.sh

@@ -6,6 +6,7 @@ set -euo pipefail
 # Must be called from the workspace root directory.
 
 package_name=$1
+script_path=$(realpath $(dirname "$0"))
 
 if [ -z "$package_name" ]; then
   echo "Error: package name is required"
@@ -13,76 +14,19 @@ if [ -z "$package_name" ]; then
 fi
 
 if [ -f "Nargo.toml" ]; then
-  echo "Error: Nargo.toml already exists in the current directory"
+  echo "Error: Nargo.toml already exists in the current directory."
+  echo "To add another contract crate to this workspace, use 'aztec new <name>' instead."
   exit 1
 fi
 
-# Get the actual aztec version for the git tag.
-AZTEC_VERSION=$(jq -r '.version' $(dirname $0)/../package.json)
-
-# Create workspace root Nargo.toml
+# Create workspace root Nargo.toml with empty members (add_crate.sh will populate)
 cat > Nargo.toml << 'EOF'
 [workspace]
-members = ["contract", "test"]
-EOF
-
-# Create contract crate
-mkdir -p contract/src
-cat > contract/Nargo.toml << CEOF
-[package]
-name = "${package_name}"
-type = "contract"
-
-[dependencies]
-aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v${AZTEC_VERSION}", directory="aztec" }
-CEOF
-
-cat > contract/src/main.nr << 'EOF'
-use aztec::macros::aztec;
-
-#[aztec]
-pub contract Main {
-    use aztec::macros::functions::{external, initializer};
-
-    #[initializer]
-    #[external("private")]
-    fn constructor() {}
-}
+members = []
 EOF
 
-# Create test crate
-mkdir -p test/src
-cat > test/Nargo.toml << TEOF
-[package]
-name = "${package_name}_test"
-type = "lib"
-
-[dependencies]
-aztec = { git="https://github.com/AztecProtocol/aztec-nr", tag="v${AZTEC_VERSION}", directory="aztec" }
-${package_name} = { path = "../contract" }
-TEOF
-
-cat > test/src/lib.nr << 'NOIR'
-use aztec::test::helpers::test_environment::TestEnvironment;
-use __PACKAGE_NAME__::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("@__PACKAGE_NAME__/Main").with_private_initializer(
-        deployer,
-        Main::interface().constructor(),
-    );
-
-    // Deploy without an initializer:
-    let contract_address = env.deploy("@__PACKAGE_NAME__/Main").without_initializer();
-}
-NOIR
-
-sed -i "s/__PACKAGE_NAME__/${package_name}/g" test/src/lib.nr
+# Create the first crate pair
+$script_path/add_crate.sh "$package_name"
 
 # Create README
 cat > README.md << REOF
@@ -96,7 +40,7 @@ An Aztec Noir contract project.
 aztec compile
 \`\`\`
 
-This compiles the contract in \`contract/\` and outputs artifacts to \`target/\`.
+This compiles all contract crates and outputs artifacts to \`target/\`.
 
 ## Test
 
@@ -104,7 +48,7 @@ This compiles the contract in \`contract/\` and outputs artifacts to \`target/\`
 aztec test
 \`\`\`
 
-This runs the tests in \`test/\`.
+This runs all tests in the workspace.
 
 ## Generate TypeScript bindings
 
@@ -121,4 +65,4 @@ target/
 codegenCache.json
 GEOF
 
-echo "Created Aztec contract workspace with crates '${package_name}' and '${package_name}_test'"
+echo "Created Aztec contract workspace with crates '${package_name}_contract' and '${package_name}_test'"

package/src/bin/index.ts

@@ -11,6 +11,7 @@ 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';
 
@@ -18,7 +19,6 @@ import { injectCompileCommand } from '../cli/cmds/compile.js';
 import { injectMigrateCommand } from '../cli/cmds/migrate_ha_db.js';
 import { injectProfileCommand } from '../cli/cmds/profile.js';
 import { injectAztecCommands } from '../cli/index.js';
-import { getCliVersion } from '../cli/release_version.js';
 
 const NETWORK_FLAG = 'network';
 
@@ -47,7 +47,7 @@ async function main() {
   await enrichEnvironmentWithNetworkConfig(networkName);
   enrichEnvironmentWithChainName(networkName);
 
-  const cliVersion = getCliVersion();
+  const cliVersion = getPackageVersion() ?? 'unknown';
   let program = new Command('aztec');
   program.description('Aztec command line interface').version(cliVersion).enablePositionalOptions();
   program = injectAztecCommands(program, userLog, debugLogger);

package/src/cli/aztec_start_action.ts

@@ -1,3 +1,4 @@
+import { getActiveNetworkName } from '@aztec/foundation/config';
 import {
   type NamespacedApiHandlers,
   createNamespacedSafeJsonRpcServer,
@@ -6,14 +7,14 @@ import {
 } 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 { AztecNodeAdminApiSchema, AztecNodeApiSchema, AztecNodeDebugApiSchema } from '@aztec/stdlib/interfaces/client';
+import { getPackageVersion } from '@aztec/stdlib/update-checker';
 import { getVersioningMiddleware } from '@aztec/stdlib/versioning';
 import { getOtelJsonRpcPropagationMiddleware } 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,14 +23,13 @@ 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 ?? 'unknown'}, please stand by...`);
 
     const { node, stop } = await createLocalNetwork(
       {
@@ -49,6 +49,8 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
     // Start Node and PXE JSON-RPC server
     signalHandlers.push(stop);
     services.node = [node, AztecNodeApiSchema];
+    adminServices.node = [node, AztecNodeAdminApiSchema];
+    services.nodeDebug = [node, AztecNodeDebugApiSchema];
   } else {
     // Route --prover-node through startNode
     if (options.proverNode && !options.node) {
@@ -57,7 +59,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));
+      if (options.nodeDebug && services.node) {
+        services.nodeDebug = [services.node[0], AztecNodeDebugApiSchema];
+      }
     } else if (options.bot) {
       const { startBot } = await import('./cmds/start_bot.js');
       await startBot(options, signalHandlers, services, userLog);
@@ -87,13 +93,14 @@ 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) {
     const rpcServer = createNamespacedSafeJsonRpcServer(services, {
       http200OnError: false,
       log: debugLogger,
-      middlewares: [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions)],
+      middlewares: [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions, versioningOpts)],
       maxBatchSize: options.rpcMaxBatchSize,
       maxBodySizeBytes: options.rpcMaxBodySize,
     });
@@ -103,7 +110,7 @@ export async function aztecStart(options: any, userLog: LogFn, debugLogger: Logg
 
   // 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)];
+    const adminMiddlewares = [getOtelJsonRpcPropagationMiddleware(), getVersioningMiddleware(versions, versioningOpts)];
 
     // Resolve the admin API key (auto-generated and persisted, or opt-out)
     const apiKeyResolution = await resolveAdminApiKey(