fix(ci): run noir-projects nargo fmt check in CI (#24003)

## Problem

The nargo fmt check for noir-projects lives only in the aggregate
`noir-projects/bootstrap.sh` `prep` function. CI stopped invoking that
script when the build moved to the root Makefile (90b7a95, "feat:
build with makefile"): the Makefile calls each subproject bootstrap
directly. Since then no nargo fmt check has run in CI, which is how
unformatted `.nr` files have been landing and showing up as unrelated
fmt diffs in later PRs.

## Fix

Extract the check into a `format_check` function in
`noir-projects/bootstrap.sh` and wire it as a
`noir-projects-format-check` Makefile target, mirroring
`bb-cpp-format-check`. It is a prerequisite of all four noir-projects
subproject builds, preserving the old `prep` ordering: the check doubles
as the nargo git dependency download, which must finish before the
subproject builds run nargo in parallel.

Also add `protocol-fuzzer/contracts` to the check and to the precommit
hook. It is a Nargo workspace that no check covered, and it had already
accumulated fmt drift. The nargo path in both loops is now anchored
(repo root in the bootstrap, absolute in the precommit) since the
previous relative form only resolved for workspaces one level under
noir-projects.

## Red green

The branch tip deliberately leaves 5 unformatted files untouched (3 from
the recent delivery module PRs, 2 in protocol-fuzzer/contracts), so CI
on this PR should fail in `noir-projects-format-check`. A follow up
commit will run `nargo fmt` to turn it green.

Author: vezenovm

Makefile

@@ -287,19 +287,30 @@ claude-tests:
 # Noir Projects
 #==============================================================================
 
-noir-protocol-circuits: noir bb-cpp-native
+# Generates the noir-protocol-circuits workspace files (Nargo.toml, autogenerated crates),
+# which are git-ignored and must exist before nargo can run in that workspace. Needs only
+# yarn/node, so no prerequisites: it runs in parallel with the noir build.
+noir-protocol-circuits-variants:
+	$(call build,$@,noir-projects,generate_variants)
+
+# Format check. Also warms the nargo dependency cache, so it must complete before the
+# subproject builds to avoid parallel nargo runs tripping over each other downloading.
+noir-projects-format-check: noir noir-protocol-circuits-variants
+	$(call build,$@,noir-projects,format_check)
+
+noir-protocol-circuits: noir bb-cpp-native noir-projects-format-check
 	$(call build,$@,noir-projects/noir-protocol-circuits)
 
 noir-protocol-circuits-tests: noir noir-protocol-circuits
 	$(call test,$@,noir-projects/noir-protocol-circuits)
 
-mock-protocol-circuits: noir bb-cpp-native
+mock-protocol-circuits: noir bb-cpp-native noir-projects-format-check
 	$(call build,$@,noir-projects/mock-protocol-circuits)
 
-noir-contracts: noir bb-cpp-native
+noir-contracts: noir bb-cpp-native noir-projects-format-check
 	$(call build,$@,noir-projects/noir-contracts)
 
-aztec-nr: noir bb-cpp-native
+aztec-nr: noir bb-cpp-native noir-projects-format-check
 	$(call build,$@,noir-projects/aztec-nr)
 
 # These tests are not included in the dep tree.
@@ -308,7 +319,7 @@ noir-projects-txe-tests:
 	$(call test,$@,noir-projects/aztec-nr)
 	$(call test,$@,noir-projects/noir-contracts)
 
-contract-snapshots-tests: noir
+contract-snapshots-tests: noir noir-projects-format-check
 	$(call test,$@,noir-projects/contract-snapshots)
 
 # Noir Projects - Aggregate target (builds all sub-projects)

noir-projects/bootstrap.sh

@@ -1,6 +1,29 @@
 #!/usr/bin/env bash
 source $(git rev-parse --show-toplevel)/ci3/source_bootstrap
 
+# Generates the noir-protocol-circuits workspace files (Nargo.toml, crates/autogenerated),
+# which are git-ignored and must exist before nargo can run in that workspace. CI runs
+# this via the root Makefile's noir-protocol-circuits-variants target.
+function generate_variants {
+  set -eu
+  (cd noir-protocol-circuits && yarn && node ./scripts/generate_variants.js)
+}
+
+# Format check across all workspaces. CI runs this via the root Makefile's
+# noir-projects-format-check target, ordered after generate_variants and before the
+# subproject builds so the nargo dependency cache is warm by the time they run.
+function format_check {
+  # nargo downloads its git dependencies (e.g. noir-lang/poseidon) on first use.
+  # Under heavy parallel CI load the VPC DNS resolver drops lookups
+  # ("Could not resolve host: github.com"), leaving a half-cloned dependency dir
+  # that then fails with "Cannot read file .../Nargo.toml". Retry the download,
+  # wiping the partial dependency cache after a failure so the next attempt
+  # re-clones cleanly. A warm cache is left intact on success.
+  local nargo=$root/noir/noir-repo/target/release/nargo
+  local fmt_check="( set -e; for dir in noir-contracts noir-protocol-circuits mock-protocol-circuits aztec-nr protocol-fuzzer/contracts; do (cd \"\$dir\" && \"$nargo\" fmt --check); done )"
+  RETRY_SLEEP=10 retry "$fmt_check || { rm -rf \"\$HOME/nargo\"; exit 1; }"
+}
+
 function build {
   echo_header "noir-projects build"
 
@@ -9,17 +32,10 @@ function build {
   # Also doubles up as our formatting check.
   function prep {
     set -eu
-    (cd noir-protocol-circuits && yarn && node ./scripts/generate_variants.js)
-    # nargo downloads its git dependencies (e.g. noir-lang/poseidon) on first use.
-    # Under heavy parallel CI load the VPC DNS resolver drops lookups
-    # ("Could not resolve host: github.com"), leaving a half-cloned dependency dir
-    # that then fails with "Cannot read file .../Nargo.toml". Retry the download,
-    # wiping the partial dependency cache after a failure so the next attempt
-    # re-clones cleanly. A warm cache is left intact on success.
-    local fmt_check='( set -e; for dir in noir-contracts noir-protocol-circuits mock-protocol-circuits aztec-nr; do (cd "$dir" && ../../noir/noir-repo/target/release/nargo fmt --check); done )'
-    RETRY_SLEEP=10 retry "$fmt_check || { rm -rf \"\$HOME/nargo\"; exit 1; }"
+    generate_variants
+    format_check
   }
-  export -f prep
+  export -f prep generate_variants format_check
 
   denoise prep
 

noir-projects/precommit.sh

@@ -13,6 +13,9 @@ export FORCE_COLOR=true
 
 # Path to nargo binary
 NARGO_PATH="../noir/noir-repo/target/release/nargo"
+# Absolute path for use inside the per-workspace loop, where a relative path would
+# resolve differently depending on each workspace's depth.
+NARGO_ABS="$PWD/$NARGO_PATH"
 
 # Check if there are staged .nr files
 staged_nr_files=$(git diff --cached --name-only --diff-filter=d | grep '\.nr$' || true)
@@ -50,10 +53,10 @@ if [[ -n "$staged_nr_files" ]]; then
     exit 0
   fi
 
-  for dir in noir-contracts noir-protocol-circuits mock-protocol-circuits aztec-nr; do
+  for dir in noir-contracts noir-protocol-circuits mock-protocol-circuits aztec-nr protocol-fuzzer/contracts; do
     if [[ -d "$dir" ]]; then
       echo "Formatting in $dir..."
-      (cd "$dir" && "../$NARGO_PATH" fmt) || echo "Warning: Formatting failed in $dir, but continuing..."
+      (cd "$dir" && "$NARGO_ABS" fmt) || echo "Warning: Formatting failed in $dir, but continuing..."
     else
       echo "Warning: Directory $dir not found, skipping..."
     fi

noir-projects/protocol-fuzzer/contracts/parent_contract/src/main.nr

@@ -5,9 +5,7 @@ pub contract Parent {
     use aztec::{
         macros::functions::{external, initializer},
         protocol::{
-            abis::function_selector::FunctionSelector,
-            address::AztecAddress,
-            traits::ToField,
+            abis::function_selector::FunctionSelector, address::AztecAddress, traits::ToField,
         },
     };
 
@@ -36,48 +34,34 @@ pub contract Parent {
     // Forward a call to emit_nullifier(Field) on the target contract.
     #[external("private")]
     fn forward_emit_nullifier(target: AztecAddress, nullifier: Field) {
-        let selector =
-            comptime { FunctionSelector::from_signature("emit_nullifier(Field)") };
+        let selector = comptime { FunctionSelector::from_signature("emit_nullifier(Field)") };
         let _ = self.context.call_private_function(target, selector, [nullifier]);
     }
 
     // Forward a call to test_settled_nullifier_inclusion(Field) on the target contract.
     #[external("private")]
     fn forward_test_settled_nullifier_inclusion(target: AztecAddress, nullifier: Field) {
-        let selector =
-            comptime { FunctionSelector::from_signature("test_settled_nullifier_inclusion(Field)") };
+        let selector = comptime {
+            FunctionSelector::from_signature("test_settled_nullifier_inclusion(Field)")
+        };
         let _ = self.context.call_private_function(target, selector, [nullifier]);
     }
 
     // Forward a call to call_destroy_note(AztecAddress, Field) on the target contract.
     #[external("private")]
-    fn forward_call_destroy_note(
-        target: AztecAddress,
-        owner: AztecAddress,
-        storage_slot: Field,
-    ) {
+    fn forward_call_destroy_note(target: AztecAddress, owner: AztecAddress, storage_slot: Field) {
         let selector =
             comptime { FunctionSelector::from_signature("call_destroy_note((Field),Field)") };
-        let _ = self.context.call_private_function(
-            target,
-            selector,
-            [owner.to_field(), storage_slot],
-        );
+        let _ =
+            self.context.call_private_function(target, selector, [owner.to_field(), storage_slot]);
     }
 
     // Forward a call to test_note_inclusion(AztecAddress, Field) on the target contract.
     #[external("private")]
-    fn forward_test_note_inclusion(
-        target: AztecAddress,
-        owner: AztecAddress,
-        storage_slot: Field,
-    ) {
+    fn forward_test_note_inclusion(target: AztecAddress, owner: AztecAddress, storage_slot: Field) {
         let selector =
             comptime { FunctionSelector::from_signature("test_note_inclusion((Field),Field)") };
-        let _ = self.context.call_private_function(
-            target,
-            selector,
-            [owner.to_field(), storage_slot],
-        );
+        let _ =
+            self.context.call_private_function(target, selector, [owner.to_field(), storage_slot]);
     }
 }

noir-projects/protocol-fuzzer/contracts/side_effect_contract/src/main.nr

@@ -26,10 +26,7 @@ pub contract SideEffect {
     use aztec::{
         hash::compute_siloed_nullifier,
         history::nullifier::assert_nullifier_existed_by,
-        macros::{
-            functions::{external, initializer, noinitcheck},
-            storage::storage,
-        },
+        macros::{functions::{external, initializer, noinitcheck}, storage::storage},
         messages::delivery::MessageDelivery,
         note::{
             ConfirmedNote,
@@ -122,18 +119,26 @@ pub contract SideEffect {
         active_or_nullified: bool,
         offset: u32,
     ) -> [u128; 2] {
-        let mut options = NoteViewerOptions::new()
-            .set_owner(owner)
-            .set_offset(offset)
-            .sort(PropertySelector { index: 0, offset: 0, length: 32 }, SortOrder.ASC);
+        let mut options = NoteViewerOptions::new().set_owner(owner).set_offset(offset).sort(
+            PropertySelector { index: 0, offset: 0, length: 32 },
+            SortOrder.ASC,
+        );
         if (active_or_nullified) {
             options = options.set_status(NoteStatus.ACTIVE_OR_NULLIFIED);
         }
 
         let notes: BoundedVec<UintNote, MAX_NOTES_PER_PAGE> = view_notes(storage_slot, options);
 
-        let v0 = if notes.len() > 0 { notes.get(0).value } else { 0 };
-        let v1 = if notes.len() > 1 { notes.get(1).value } else { 0 };
+        let v0 = if notes.len() > 0 {
+            notes.get(0).value
+        } else {
+            0
+        };
+        let v1 = if notes.len() > 1 {
+            notes.get(1).value
+        } else {
+            0
+        };
         [v0, v1]
     }
 
@@ -154,8 +159,16 @@ pub contract SideEffect {
 
         let confirmed_notes = get_notes(self.context, storage_slot, options);
 
-        let v0 = if confirmed_notes.len() > 0 { confirmed_notes.get(0).note.value } else { 0 };
-        let v1 = if confirmed_notes.len() > 1 { confirmed_notes.get(1).note.value } else { 0 };
+        let v0 = if confirmed_notes.len() > 0 {
+            confirmed_notes.get(0).note.value
+        } else {
+            0
+        };
+        let v1 = if confirmed_notes.len() > 1 {
+            confirmed_notes.get(1).note.value
+        } else {
+            0
+        };
         [v0, v1]
     }