chore: Accumulated backports to v4-next

aztec-up/bootstrap.sh

@@ -104,7 +104,7 @@ EOF
 }
 
 function test_cmds {
-  for test in amm_flow bridge_and_claim basic_install counter_contract; do
+  for test in amm_flow bridge_and_claim basic_install counter_contract default_scaffold; do
     echo "$hash:TIMEOUT=15m aztec-up/scripts/run_test.sh $test"
   done
 }

aztec-up/test/counter_contract.sh

@@ -4,28 +4,38 @@ set -euo pipefail
 export LOG_LEVEL=silent
 
 # Execute commands as per: https://docs.aztec.network/tutorials/codealong/contract_tutorials/counter_contract
-aztec new counter_contract
-if [ ! -f counter_contract/Nargo.toml ] || [ ! -f counter_contract/src/main.nr ]; then
-  echo "Failed to create contract."
+aztec new counter
+
+# Verify workspace structure
+if [ ! -f counter/Nargo.toml ]; then
+  echo "Failed to create workspace Nargo.toml."
+  exit 1
+fi
+if [ ! -f counter/counter_contract/Nargo.toml ] || [ ! -f counter/counter_contract/src/main.nr ]; then
+  echo "Failed to create contract crate."
+  exit 1
+fi
+if [ ! -f counter/counter_test/Nargo.toml ] || [ ! -f counter/counter_test/src/lib.nr ]; then
+  echo "Failed to create test crate."
   exit 1
 fi
 
-# Check counter_contract dir is owned by aztec-dev.
-if [ "$(stat -c %U counter_contract)" != "ubuntu" ]; then
-  echo "counter_contract dir is not owned by ubuntu."
+# Check counter dir is owned by ubuntu.
+if [ "$(stat -c %U counter)" != "ubuntu" ]; then
+  echo "counter dir is not owned by ubuntu."
   exit 1
 fi
 
-# "Write" our contract.
-cp -Rf ./aztec-packages/noir-projects/noir-contracts/contracts/test/counter_contract .
-cd counter_contract
-sed -i 's|\.\./\.\./\.\./\.\./|/home/ubuntu/aztec-packages/noir-projects/|g' Nargo.toml
+# "Write" our contract over the scaffold.
+cp -Rf ./aztec-packages/noir-projects/noir-contracts/contracts/test/counter/* counter/
+cd counter
+sed -i 's|\.\./\.\./\.\./\.\./\.\./|/home/ubuntu/aztec-packages/noir-projects/|g' counter_contract/Nargo.toml counter_test/Nargo.toml
 
 # Compile the contract.
 aztec compile
 # Codegen
-aztec codegen -o src/artifacts target
-if [ ! -d src/artifacts ]; then
+aztec codegen -o counter_contract/src/artifacts target
+if [ ! -d counter_contract/src/artifacts ]; then
   echo "Failed to codegen TypeScript."
   exit 1
 fi

aztec-up/test/default_scaffold.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Tests that the default scaffold generated by `aztec new` compiles and passes its tests without any modifications.
+# Also tests that a second contract can be added to the workspace with `aztec new`.
+
+export LOG_LEVEL=silent
+
+aztec new my_workspace
+
+# Verify workspace structure with named crate directories.
+if [ ! -f my_workspace/Nargo.toml ]; then
+  echo "Failed to create workspace Nargo.toml."
+  exit 1
+fi
+if [ ! -f my_workspace/my_workspace_contract/Nargo.toml ] || [ ! -f my_workspace/my_workspace_contract/src/main.nr ]; then
+  echo "Failed to create contract crate."
+  exit 1
+fi
+if [ ! -f my_workspace/my_workspace_test/Nargo.toml ] || [ ! -f my_workspace/my_workspace_test/src/lib.nr ]; then
+  echo "Failed to create test crate."
+  exit 1
+fi
+
+cd my_workspace
+
+# This is unfortunate as it makes the test worse but in CI setting the aztec version is 0.0.1 which doesn't exist as
+# a remote git tag, so we need to rewrite dependencies to use local aztec-nr.
+sed -i 's|aztec = .*git.*AztecProtocol/aztec-nr.*|aztec = { path="/home/ubuntu/aztec-packages/noir-projects/aztec-nr/aztec" }|' \
+  my_workspace_contract/Nargo.toml my_workspace_test/Nargo.toml
+
+# Compile the default scaffold contract.
+aztec compile
+
+# Run the default scaffold tests.
+aztec test
+
+# --- Test adding a second contract to the workspace ---
+aztec new token
+
+# Verify token crates were created.
+if [ ! -f token_contract/Nargo.toml ] || [ ! -f token_contract/src/main.nr ]; then
+  echo "Failed to create token contract crate."
+  exit 1
+fi
+if [ ! -f token_test/Nargo.toml ] || [ ! -f token_test/src/lib.nr ]; then
+  echo "Failed to create token test crate."
+  exit 1
+fi
+
+# Verify workspace Nargo.toml contains all four members.
+if ! grep -q '"my_workspace_contract"' Nargo.toml || \
+   ! grep -q '"my_workspace_test"' Nargo.toml || \
+   ! grep -q '"token_contract"' Nargo.toml || \
+   ! grep -q '"token_test"' Nargo.toml; then
+  echo "Workspace Nargo.toml does not contain all expected members."
+  exit 1
+fi
+
+# Rewrite aztec deps for token crates too.
+sed -i 's|aztec = .*git.*AztecProtocol/aztec-nr.*|aztec = { path="/home/ubuntu/aztec-packages/noir-projects/aztec-nr/aztec" }|' \
+  token_contract/Nargo.toml token_test/Nargo.toml
+
+# Compile and test the full workspace (both contracts).
+aztec compile
+aztec test

barretenberg/cpp/src/barretenberg/api/aztec_process.cpp

@@ -258,6 +258,21 @@ bool process_aztec_artifact(const std::string& input_path, const std::string& ou
         return true;
     }
 
+    // Strip __aztec_nr_internals__ prefix from function names.
+    // The #[aztec] macro generates wrapper functions with this prefix; we strip it so
+    // the exported ABI exposes the original developer-written names.
+    const std::string internal_prefix = "__aztec_nr_internals__";
+    for (auto& function : artifact_json["functions"]) {
+        auto& name = function["name"];
+        if (name.is_string()) {
+            std::string fn_name = name.get<std::string>();
+            if (fn_name.size() >= internal_prefix.size() &&
+                fn_name.compare(0, internal_prefix.size(), internal_prefix) == 0) {
+                name = fn_name.substr(internal_prefix.size());
+            }
+        }
+    }
+
     // Filter to private constrained functions
     std::vector<nlohmann::json*> private_functions;
     for (auto& function : artifact_json["functions"]) {
@@ -266,14 +281,13 @@ bool process_aztec_artifact(const std::string& input_path, const std::string& ou
         }
     }
 
-    if (private_functions.empty()) {
+    if (!private_functions.empty()) {
+        // Generate VKs
+        generate_vks_for_functions(cache_dir, private_functions, force);
+    } else {
         info("No private constrained functions found");
-        return true;
     }
 
-    // Generate VKs
-    generate_vks_for_functions(cache_dir, private_functions, force);
-
     // Write updated JSON back to file
     std::ofstream out_file(output_path);
     out_file << artifact_json.dump(2) << std::endl;

boxes/init/.gitignore

@@ -0,0 +1,2 @@
+target/
+codegenCache.json

boxes/init/Nargo.toml

@@ -1,6 +1,2 @@
-[package]
-name = "init"
-type = "contract"
-
-[dependencies]
-aztec = { path = "../../noir-projects/aztec-nr/aztec" }
+[workspace]
+members = ["contract", "test"]

boxes/init/README.md

@@ -0,0 +1,27 @@
+# init
+
+An Aztec Noir contract project.
+
+## Compile
+
+```bash
+aztec compile
+```
+
+This compiles the contract in `contract/` and outputs artifacts to `target/`.
+
+## Test
+
+```bash
+aztec test
+```
+
+This runs the tests in `test/`.
+
+## Generate TypeScript bindings
+
+```bash
+aztec codegen target -o src/artifacts
+```
+
+This generates TypeScript contract artifacts from the compiled output in `target/` into `src/artifacts/`.

boxes/init/contract/Nargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "init"
+type = "contract"
+
+[dependencies]
+aztec = { path = "../../../noir-projects/aztec-nr/aztec" }

boxes/init/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() {}
+}

boxes/init/test/Nargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "init_test"
+type = "lib"
+
+[dependencies]
+aztec = { path = "../../../noir-projects/aztec-nr/aztec" }
+init = { path = "../contract" }

boxes/init/test/src/lib.nr

@@ -0,0 +1,17 @@
+use aztec::test::helpers::test_environment::TestEnvironment;
+use init::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("@init/Main").with_private_initializer(
+        deployer,
+        Main::interface().constructor(),
+    );
+
+    // Deploy without an initializer:
+    let contract_address = env.deploy("@init/Main").without_initializer();
+}

docs/bootstrap.sh

@@ -4,7 +4,6 @@ source $(git rev-parse --show-toplevel)/ci3/source_bootstrap
 repo_root=$(git rev-parse --show-toplevel)
 export BB=${BB:-$repo_root/barretenberg/cpp/build/bin/bb}
 export NARGO=${NARGO:-$repo_root/noir/noir-repo/target/release/nargo}
-export TRANSPILER=${TRANSPILER:-$repo_root/avm-transpiler/target/release/avm-transpiler}
 export BB_HASH=${BB_HASH:-$($repo_root/barretenberg/cpp/bootstrap.sh hash)}
 
 # We search the docs/*.md files to find included code, and use those as our rebuild dependencies.

docs/developer_versioned_docs/version-v4.1.0-rc.2/getting_started_on_local_network.md

@@ -8,7 +8,7 @@ tags: [local_network, testnet]
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-Get started on your local environment using a local network.
+Get started on your local environment using a local network. If you'd rather deploy to a live network, read the [getting started on testnet guide](./getting_started_on_testnet.md).
 
 The local network is a local development Aztec network running fully on your machine, and interacting with a development Ethereum node. You can develop and deploy on it just like on a testnet or mainnet (when the time comes). The local network makes it faster and easier to develop and test your Aztec applications.
 
@@ -252,4 +252,5 @@ Simulation result:  25n
 Want to build something cool on Aztec?
 
 - Check out the [Token Contract Tutorial](./docs/tutorials/contract_tutorials/token_contract.md) for a beginner tutorial, or jump into more advanced ones
+- Ready for a live network? Try [deploying on testnet](./getting_started_on_testnet.md)
 - Start on your own thing and check out the How To Guides to help you!