refactor: aztec new and init creating 2 crates (#20681)

Author: benesjan

aztec-up/test/counter_contract.sh

@@ -5,27 +5,37 @@ 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."
+
+# Verify workspace structure
+if [ ! -f counter_contract/Nargo.toml ]; then
+  echo "Failed to create workspace Nargo.toml."
+  exit 1
+fi
+if [ ! -f counter_contract/contract/Nargo.toml ] || [ ! -f counter_contract/contract/src/main.nr ]; then
+  echo "Failed to create contract crate."
+  exit 1
+fi
+if [ ! -f counter_contract/test/Nargo.toml ] || [ ! -f counter_contract/test/src/lib.nr ]; then
+  echo "Failed to create test crate."
   exit 1
 fi
 
-# Check counter_contract dir is owned by aztec-dev.
+# Check counter_contract dir is owned by ubuntu.
 if [ "$(stat -c %U counter_contract)" != "ubuntu" ]; then
   echo "counter_contract dir is not owned by ubuntu."
   exit 1
 fi
 
-# "Write" our contract.
-cp -Rf ./aztec-packages/noir-projects/noir-contracts/contracts/test/counter_contract .
+# "Write" our contract over the scaffold.
+cp -Rf ./aztec-packages/noir-projects/noir-contracts/contracts/test/counter_contract/* counter_contract/
 cd counter_contract
-sed -i 's|\.\./\.\./\.\./\.\./|/home/ubuntu/aztec-packages/noir-projects/|g' Nargo.toml
+sed -i 's|\.\./\.\./\.\./\.\./\.\./|/home/ubuntu/aztec-packages/noir-projects/|g' contract/Nargo.toml test/Nargo.toml
 
 # Compile the contract.
 aztec compile
 # Codegen
-aztec codegen -o src/artifacts target
-if [ ! -d src/artifacts ]; then
+aztec codegen -o contract/src/artifacts target
+if [ ! -d contract/src/artifacts ]; then
   echo "Failed to codegen TypeScript."
   exit 1
 fi

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/src/main.nr

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

boxes/init/test/Nargo.toml

@@ -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();
+}

boxes/init/test/src/lib.nr

@@ -10,15 +10,23 @@ High-level structure of how Aztec smart contracts including the different compon
 
 ## Directory structure
 
-Here's a common layout for a basic Aztec.nr Contract project:
+When you create a new project with `aztec new`, it generates a workspace with two crates: a `contract` crate for your smart contract and a `test` crate for Noir tests.
 
 ```text title="layout of an aztec contract project"
 ─── my_aztec_contract_project
-       ├── src
-       │     └── main.nr       <-- your contract
-       └── Nargo.toml          <-- package and dependency management
+       ├── Nargo.toml              <-- workspace root
+       ├── contract
+       │     ├── src
+       │     │     └── main.nr     <-- your contract
+       │     └── Nargo.toml        <-- contract package and dependencies
+       └── test
+             ├── src
+             │     └── lib.nr      <-- your tests
+             └── Nargo.toml        <-- test package and dependencies
 ```
 
+The workspace root `Nargo.toml` declares both crates as workspace members. The contract code lives in `contract/src/main.nr`, and tests live in a separate `test` crate that depends on the contract crate.
+
 See the vanilla Noir docs for [more info on packages](https://noir-lang.org/docs/noir/modules_packages_crates/crates_and_packages).
 
 ## Contract block