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

package/dest/testing/local-network.d.ts

@@ -0,0 +1,51 @@
+import type { AztecNodeService } from '@aztec/aztec-node';
+import type { AztecNodeConfig } from '@aztec/aztec-node/config';
+import type { Fr } from '@aztec/aztec.js/fields';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
+/** A running in-process local network: an inline Aztec node backed by its own anvil L1. */
+export interface LocalNetwork extends AsyncDisposable {
+    /** Fully-synced Aztec node, ready to serve client requests. */
+    node: AztecNodeService;
+    /** RPC URL of the spawned anvil instance. */
+    l1RpcUrl: string;
+    /** Chain id used on L1 (foundry's default 31337). */
+    l1ChainId: number;
+    /** Stops every process started by the fixture: node and anvil. Also invoked by `await using`. */
+    stop: () => Promise<void>;
+}
+/** Options for {@link setupLocalNetwork}. */
+export interface LocalNetworkOptions {
+    /**
+     * Addresses that should hold fee juice at genesis. Saves each of these the round-trip of bridging
+     * + claiming fee juice before they can pay for gas.
+     */
+    fundedAddresses?: AztecAddress[];
+    /** Override the default per-address genesis fee juice granted to {@link fundedAddresses}. */
+    initialAccountFeeJuice?: Fr;
+    /** Node config overrides, e.g. `realProofs`, `aztecEpochDuration`, `p2pEnabled`. */
+    config?: Partial<AztecNodeConfig>;
+}
+/**
+ * Spin up an in-process local network with the given addresses pre-funded.
+ *
+ * Each call spawns its own anvil on an OS-assigned random port and runs the Aztec node inline via
+ * the same {@link createLocalNetwork} codepath that backs `aztec start --local-network` (with the
+ * sandbox account/FPC/token setup skipped). Distinct ports let independent suites run in parallel.
+ * The caller must `await result.stop()` in its teardown (or hold the result with `await using`).
+ *
+ * Requires a Foundry toolchain (`anvil`/`forge`), installed via `aztec-up` or `foundryup`. Binaries
+ * are located in the standard install directories or on `PATH`; set `$ANVIL_BIN` / `$FORGE_BIN` to
+ * pin specific ones.
+ */
+export declare function setupLocalNetwork(opts?: LocalNetworkOptions): Promise<LocalNetwork>;
+/**
+ * Min-fee padding multiplier for test wallets whose txs may mine well after their fee estimate.
+ * The automine sequencer builds one block per tx and advances L1 time in big jumps, and proposer
+ * pipelining evolves the fee-asset price across the build/publish gap (~20x observed in CI), so the
+ * network's congestion base fee can swing sharply between the wallet's fee estimate and the block
+ * the tx actually lands in. The default wallet padding isn't enough and trips
+ * `maxFeesPerGas.feePerL2Gas must be >= gasFees.feePerL2Gas`. Apply via
+ * `wallet.setMinFeePadding(TEST_FEE_PADDING)` on every test wallet that sends txs.
+ */
+export declare const TEST_FEE_PADDING = 30;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9jYWwtbmV0d29yay5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3RpbmcvbG9jYWwtbmV0d29yay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQzFELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRWpELE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBTWhFLDJGQUEyRjtBQUMzRixNQUFNLFdBQVcsWUFBYSxTQUFRLGVBQWU7SUFDbkQsK0RBQStEO0lBQy9ELElBQUksRUFBRSxnQkFBZ0IsQ0FBQztJQUN2Qiw2Q0FBNkM7SUFDN0MsUUFBUSxFQUFFLE1BQU0sQ0FBQztJQUNqQixxREFBcUQ7SUFDckQsU0FBUyxFQUFFLE1BQU0sQ0FBQztJQUNsQixpR0FBaUc7SUFDakcsSUFBSSxFQUFFLE1BQU0sT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0NBQzNCO0FBRUQsNkNBQTZDO0FBQzdDLE1BQU0sV0FBVyxtQkFBbUI7SUFDbEM7OztPQUdHO0lBQ0gsZUFBZSxDQUFDLEVBQUUsWUFBWSxFQUFFLENBQUM7SUFDakMsNkZBQTZGO0lBQzdGLHNCQUFzQixDQUFDLEVBQUUsRUFBRSxDQUFDO0lBQzVCLG9GQUFvRjtJQUNwRixNQUFNLENBQUMsRUFBRSxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7Q0FDbkM7QUFFRDs7Ozs7Ozs7Ozs7R0FXRztBQUNILHdCQUFzQixpQkFBaUIsQ0FBQyxJQUFJLEdBQUUsbUJBQXdCLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxDQXNDN0Y7QUFFRDs7Ozs7Ozs7R0FRRztBQUNILGVBQU8sTUFBTSxnQkFBZ0IsS0FBSyxDQUFDIn0=

package/dest/testing/local-network.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"local-network.d.ts","sourceRoot":"","sources":["../../src/testing/local-network.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAMhE,2FAA2F;AAC3F,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,+DAA+D;IAC/D,IAAI,EAAE,gBAAgB,CAAC;IACvB,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,iGAAiG;IACjG,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,6CAA6C;AAC7C,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,eAAe,CAAC,EAAE,YAAY,EAAE,CAAC;IACjC,6FAA6F;IAC7F,sBAAsB,CAAC,EAAE,EAAE,CAAC;IAC5B,oFAAoF;IACpF,MAAM,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CACnC;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,YAAY,CAAC,CAsC7F;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,gBAAgB,KAAK,CAAC"}

package/dest/testing/local-network.js

@@ -0,0 +1,60 @@
+import { startAnvil } from '@aztec/ethereum/test';
+import { foundry } from 'viem/chains';
+import { createLocalNetwork } from '../local-network/local-network.js';
+/**
+ * Spin up an in-process local network with the given addresses pre-funded.
+ *
+ * Each call spawns its own anvil on an OS-assigned random port and runs the Aztec node inline via
+ * the same {@link createLocalNetwork} codepath that backs `aztec start --local-network` (with the
+ * sandbox account/FPC/token setup skipped). Distinct ports let independent suites run in parallel.
+ * The caller must `await result.stop()` in its teardown (or hold the result with `await using`).
+ *
+ * Requires a Foundry toolchain (`anvil`/`forge`), installed via `aztec-up` or `foundryup`. Binaries
+ * are located in the standard install directories or on `PATH`; set `$ANVIL_BIN` / `$FORGE_BIN` to
+ * pin specific ones.
+ */ export async function setupLocalNetwork(opts = {}) {
+    // `--port 0` → anvil binds an ephemeral port that `startAnvil` reads back, so parallel suites
+    // never collide on a fixed port.
+    const { rpcUrl, stop: stopAnvil } = await startAnvil({
+        port: 0
+    });
+    try {
+        const { node, stop: stopNode } = await createLocalNetwork({
+            ...opts.config,
+            l1RpcUrls: [
+                rpcUrl
+            ],
+            testAccounts: false,
+            prefundAddresses: (opts.fundedAddresses ?? []).map((a)=>a.toString()),
+            initialAccountFeeJuice: opts.initialAccountFeeJuice
+        }, ()=>{});
+        // Stop the node before anvil (its teardown still talks to L1); the finally guarantees anvil is
+        // reaped even if node shutdown throws.
+        const stop = async ()=>{
+            try {
+                await stopNode();
+            } finally{
+                await stopAnvil();
+            }
+        };
+        return {
+            node,
+            l1RpcUrl: rpcUrl,
+            l1ChainId: foundry.id,
+            stop,
+            [Symbol.asyncDispose]: stop
+        };
+    } catch (err) {
+        await stopAnvil();
+        throw err;
+    }
+}
+/**
+ * Min-fee padding multiplier for test wallets whose txs may mine well after their fee estimate.
+ * The automine sequencer builds one block per tx and advances L1 time in big jumps, and proposer
+ * pipelining evolves the fee-asset price across the build/publish gap (~20x observed in CI), so the
+ * network's congestion base fee can swing sharply between the wallet's fee estimate and the block
+ * the tx actually lands in. The default wallet padding isn't enough and trips
+ * `maxFeesPerGas.feePerL2Gas must be >= gasFees.feePerL2Gas`. Apply via
+ * `wallet.setMinFeePadding(TEST_FEE_PADDING)` on every test wallet that sends txs.
+ */ export const TEST_FEE_PADDING = 30;

package/dest/testing/token_allowed_setup.d.ts

@@ -0,0 +1,12 @@
+import type { ContractArtifact } from '@aztec/stdlib/abi';
+import type { AllowedElement } from '@aztec/stdlib/interfaces/server';
+/**
+ * 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 declare function getTokenAllowedSetupFunctions(artifact?: ContractArtifact): Promise<AllowedElement[]>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW5fYWxsb3dlZF9zZXR1cC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3RpbmcvdG9rZW5fYWxsb3dlZF9zZXR1cC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRTFELE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXRFOzs7Ozs7O0dBT0c7QUFDSCx3QkFBc0IsNkJBQTZCLENBQ2pELFFBQVEsR0FBRSxnQkFBd0MsR0FDakQsT0FBTyxDQUFDLGNBQWMsRUFBRSxDQUFDLENBUzNCIn0=

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":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE;;;;;;;GAOG;AACH,wBAAsB,6BAA6B,CACjD,QAAQ,GAAE,gBAAwC,GACjD,OAAO,CAAC,cAAc,EAAE,CAAC,CAS3B"}

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,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "0.0.1-commit.96dac018d",
+  "version": "0.0.1-commit.9a89641",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -28,39 +28,40 @@
     "../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.9a89641",
+    "@aztec/archiver": "0.0.1-commit.9a89641",
+    "@aztec/aztec-node": "0.0.1-commit.9a89641",
+    "@aztec/aztec.js": "0.0.1-commit.9a89641",
+    "@aztec/bb-prover": "0.0.1-commit.9a89641",
+    "@aztec/bb.js": "6.0.0-nightly.20260807",
+    "@aztec/blob-client": "0.0.1-commit.9a89641",
+    "@aztec/bot": "0.0.1-commit.9a89641",
+    "@aztec/builder": "0.0.1-commit.9a89641",
+    "@aztec/cli": "0.0.1-commit.9a89641",
+    "@aztec/constants": "0.0.1-commit.9a89641",
+    "@aztec/entrypoints": "0.0.1-commit.9a89641",
+    "@aztec/ethereum": "0.0.1-commit.9a89641",
+    "@aztec/foundation": "0.0.1-commit.9a89641",
+    "@aztec/kv-store": "0.0.1-commit.9a89641",
+    "@aztec/l1-artifacts": "6.0.0-nightly.20260807",
+    "@aztec/node-lib": "0.0.1-commit.9a89641",
+    "@aztec/noir-contracts.js": "0.0.1-commit.9a89641",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.9a89641",
+    "@aztec/p2p": "0.0.1-commit.9a89641",
+    "@aztec/p2p-bootstrap": "0.0.1-commit.9a89641",
+    "@aztec/protocol-contracts": "0.0.1-commit.9a89641",
+    "@aztec/prover-client": "0.0.1-commit.9a89641",
+    "@aztec/prover-node": "0.0.1-commit.9a89641",
+    "@aztec/pxe": "0.0.1-commit.9a89641",
+    "@aztec/sequencer-client": "0.0.1-commit.9a89641",
+    "@aztec/standard-contracts": "0.0.1-commit.9a89641",
+    "@aztec/stdlib": "0.0.1-commit.9a89641",
+    "@aztec/telemetry-client": "0.0.1-commit.9a89641",
+    "@aztec/txe": "0.0.1-commit.9a89641",
+    "@aztec/validator-ha-signer": "0.0.1-commit.9a89641",
+    "@aztec/wallets": "0.0.1-commit.9a89641",
+    "@aztec/world-state": "0.0.1-commit.9a89641",
+    "@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,53 @@
+#!/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> <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"
+  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)
+TEMPLATE_DIR="$(dirname $0)/templates/$template"
+
+# 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 = []
+  perl -i -pe "s|members\s*=\s*\[\s*\]|members = [\"${contract_dir}\", \"${test_dir}\"]|" Nargo.toml
+else
+  # Non-empty array: add before closing ]
+  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
@@ -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
+a workspace containing a Counter contract example with tests. The Counter
+demonstrates private state, private functions, and utility reads.
 
-# Parse arguments
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    --name)
-      name_arg="$2"
-      shift 2
+Use 'aztec new <name>' to create a blank contract project, or to add another
+contract to an existing workspace.
+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"
+$script_path/setup_workspace.sh "$package_name" counter

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" blank
+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" blank
+fi

package/scripts/setup_workspace.sh

@@ -2,10 +2,12 @@
 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
   echo "Error: package name is required"
@@ -13,76 +15,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" "$template"
 
 # Create README
 cat > README.md << REOF
@@ -96,7 +41,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 +49,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 +66,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/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" }