@aztec/aztec 0.0.1-commit.4d3c002 → 0.0.1-commit.4d9804df

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

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

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

@@ -1 +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"}
+{"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

@@ -2,19 +2,23 @@ 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;
+ * 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([
-        // Token: needed for private transfers via FPC (transfer_to_public enqueues this)
-        buildAllowedElement(TokenContractArtifact, target, '_increase_public_balance', {
+        // needed for private transfers via FPC (transfer_to_public enqueues this)
+        buildAllowedElement(artifact, target, '_increase_public_balance', {
             onlySelf: true
         }),
-        // Token: needed for public transfers via FPC (fee_entrypoint_public enqueues this)
-        buildAllowedElement(TokenContractArtifact, target, 'transfer_in_public')
+        // 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.4d3c002",
+  "version": "0.0.1-commit.4d9804df",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -28,38 +28,39 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "0.0.1-commit.4d3c002",
-    "@aztec/archiver": "0.0.1-commit.4d3c002",
-    "@aztec/aztec-node": "0.0.1-commit.4d3c002",
-    "@aztec/aztec.js": "0.0.1-commit.4d3c002",
-    "@aztec/bb-prover": "0.0.1-commit.4d3c002",
-    "@aztec/bb.js": "0.0.1-commit.4d3c002",
-    "@aztec/blob-client": "0.0.1-commit.4d3c002",
-    "@aztec/bot": "0.0.1-commit.4d3c002",
-    "@aztec/builder": "0.0.1-commit.4d3c002",
-    "@aztec/cli": "0.0.1-commit.4d3c002",
-    "@aztec/constants": "0.0.1-commit.4d3c002",
-    "@aztec/entrypoints": "0.0.1-commit.4d3c002",
-    "@aztec/ethereum": "0.0.1-commit.4d3c002",
-    "@aztec/foundation": "0.0.1-commit.4d3c002",
-    "@aztec/kv-store": "0.0.1-commit.4d3c002",
-    "@aztec/l1-artifacts": "0.0.1-commit.4d3c002",
-    "@aztec/node-lib": "0.0.1-commit.4d3c002",
-    "@aztec/noir-contracts.js": "0.0.1-commit.4d3c002",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.4d3c002",
-    "@aztec/p2p": "0.0.1-commit.4d3c002",
-    "@aztec/p2p-bootstrap": "0.0.1-commit.4d3c002",
-    "@aztec/protocol-contracts": "0.0.1-commit.4d3c002",
-    "@aztec/prover-client": "0.0.1-commit.4d3c002",
-    "@aztec/prover-node": "0.0.1-commit.4d3c002",
-    "@aztec/pxe": "0.0.1-commit.4d3c002",
-    "@aztec/sequencer-client": "0.0.1-commit.4d3c002",
-    "@aztec/stdlib": "0.0.1-commit.4d3c002",
-    "@aztec/telemetry-client": "0.0.1-commit.4d3c002",
-    "@aztec/txe": "0.0.1-commit.4d3c002",
-    "@aztec/validator-ha-signer": "0.0.1-commit.4d3c002",
-    "@aztec/wallets": "0.0.1-commit.4d3c002",
-    "@aztec/world-state": "0.0.1-commit.4d3c002",
+    "@aztec/accounts": "0.0.1-commit.4d9804df",
+    "@aztec/archiver": "0.0.1-commit.4d9804df",
+    "@aztec/aztec-node": "0.0.1-commit.4d9804df",
+    "@aztec/aztec.js": "0.0.1-commit.4d9804df",
+    "@aztec/bb-prover": "0.0.1-commit.4d9804df",
+    "@aztec/bb.js": "0.0.1-commit.4d9804df",
+    "@aztec/blob-client": "0.0.1-commit.4d9804df",
+    "@aztec/bot": "0.0.1-commit.4d9804df",
+    "@aztec/builder": "0.0.1-commit.4d9804df",
+    "@aztec/cli": "0.0.1-commit.4d9804df",
+    "@aztec/constants": "0.0.1-commit.4d9804df",
+    "@aztec/entrypoints": "0.0.1-commit.4d9804df",
+    "@aztec/ethereum": "0.0.1-commit.4d9804df",
+    "@aztec/foundation": "0.0.1-commit.4d9804df",
+    "@aztec/kv-store": "0.0.1-commit.4d9804df",
+    "@aztec/l1-artifacts": "0.0.1-commit.4d9804df",
+    "@aztec/node-lib": "0.0.1-commit.4d9804df",
+    "@aztec/noir-contracts.js": "0.0.1-commit.4d9804df",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.4d9804df",
+    "@aztec/p2p": "0.0.1-commit.4d9804df",
+    "@aztec/p2p-bootstrap": "0.0.1-commit.4d9804df",
+    "@aztec/protocol-contracts": "0.0.1-commit.4d9804df",
+    "@aztec/prover-client": "0.0.1-commit.4d9804df",
+    "@aztec/prover-node": "0.0.1-commit.4d9804df",
+    "@aztec/pxe": "0.0.1-commit.4d9804df",
+    "@aztec/sequencer-client": "0.0.1-commit.4d9804df",
+    "@aztec/standard-contracts": "0.0.1-commit.4d9804df",
+    "@aztec/stdlib": "0.0.1-commit.4d9804df",
+    "@aztec/telemetry-client": "0.0.1-commit.4d9804df",
+    "@aztec/txe": "0.0.1-commit.4d9804df",
+    "@aztec/validator-ha-signer": "0.0.1-commit.4d9804df",
+    "@aztec/wallets": "0.0.1-commit.4d9804df",
+    "@aztec/world-state": "0.0.1-commit.4d9804df",
     "@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,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

@@ -23,13 +23,17 @@ 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"}"
+    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

@@ -18,6 +18,7 @@ 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';
 
 const NETWORK_FLAG = 'network';
@@ -47,7 +48,7 @@ async function main() {
   await enrichEnvironmentWithNetworkConfig(networkName);
   enrichEnvironmentWithChainName(networkName);
 
-  const cliVersion = getPackageVersion() ?? 'unknown';
+  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);
 }