chore: backport #22393 (Update Noir to nightly-2026-04-10) to v4-next (#22485)

## Summary

Backport of #22393
(Update Noir to nightly-2026-04-10) to v4-next, plus 3 companion PRs
needed for Noir compatibility since v4-next was still on
nightly-2026-02-12.

## Companion PRs included

Since v4-next hadn't updated Noir since nightly-2026-02-12 (~2 months
behind), several intermediate Noir-adaptation PRs were also needed:

1. **#20702** — Remove unnecessary `comptime` qualifier from VK tree
constants (Noir broke comptime globals used in non-comptime contexts)
2. **#20798** — Remove unnecessary `let mut` across noir-projects (newer
Noir errors on this)
3. **#21801** — Replace deprecated Noir comptime APIs: `add_attribute()`
→ `add_abi()`, `set_body()`/`set_parameters()`/`set_return_public()` →
`function.disable()`, update `fn_has_noinitcheck` to also check
`is_fn_only_self()`

## Commits
1. **Cherry-pick with conflict markers** — raw cherry-pick of #22393
2. **Conflict resolution** — version bumps + reformatting resolved
3. **Cherry-pick #20702** — comptime globals + poseidon2 hash fix
4. **Cherry-pick #20798** — unnecessary mut removal (24 files)
5. **Cherry-pick #21801** — macro API migration (4 files)
6. **Remaining fixes** — private_context.nr mut + utils.nr style
alignment

Author: Thunkar

avm-transpiler/Cargo.lock

@@ -108,9 +108,6 @@ function build {
     rm -rf acir_tests/{diamond_deps_0,workspace,workspace_default_member,regression_7323}
     # These use folding, which is not currently supported.
     rm -rf acir_tests/{fold_call_witness_condition,fold_after_inlined_calls,fold_complex_outputs,fold_basic_nested_call,fold_numeric_generic_poseidon,fold_fibonacci,fold_basic,fold_2_to_17,fold_distinct_return}
-    # These are breaking with:
-    # Failed to solve program: 'Failed to solve blackbox function: embedded_curve_add, reason: Infinite input: embedded_curve_add(infinity, infinity)'
-    rm -rf acir_tests/{regression_5045,regression_7744}
     # The following test fails because it uses CallData/ReturnData with UltraBuilder, which is not supported
     rm -rf acir_tests/{regression_7612,regression_7143,databus_composite_calldata,databus_two_calldata_simple,databus_two_calldata,databus}
     # Mark tests that are expected to fail with a failing_ prefix.

barretenberg/acir_tests/bootstrap.sh

@@ -165,9 +165,9 @@ namespace constants;
     pol UPDATES_DELAYED_PUBLIC_MUTABLE_METADATA_BIT_SIZE = 144;
     pol GRUMPKIN_ONE_X = 1;
     pol GRUMPKIN_ONE_Y = 17631683881184975370165255887551781615748388533673675138860;
-    pol DOM_SEP__NOTE_HASH_NONCE = 1721808740;
-    pol DOM_SEP__UNIQUE_NOTE_HASH = 226850429;
     pol DOM_SEP__SILOED_NOTE_HASH = 3361878420;
+    pol DOM_SEP__UNIQUE_NOTE_HASH = 226850429;
+    pol DOM_SEP__NOTE_HASH_NONCE = 1721808740;
     pol DOM_SEP__SILOED_NULLIFIER = 57496191;
     pol DOM_SEP__PUBLIC_LEAF_SLOT = 1247650290;
     pol DOM_SEP__PUBLIC_STORAGE_MAP_SLOT = 4015149901;

barretenberg/cpp/pil/vm2/constants_gen.pil

@@ -257,9 +257,9 @@
 #define UPDATES_DELAYED_PUBLIC_MUTABLE_VALUES_LEN 3
 #define UPDATES_DELAYED_PUBLIC_MUTABLE_METADATA_BIT_SIZE 144
 #define DEFAULT_MAX_DEBUG_LOG_MEMORY_READS 125000
-#define DOM_SEP__NOTE_HASH_NONCE 1721808740UL
-#define DOM_SEP__UNIQUE_NOTE_HASH 226850429UL
 #define DOM_SEP__SILOED_NOTE_HASH 3361878420UL
+#define DOM_SEP__UNIQUE_NOTE_HASH 226850429UL
+#define DOM_SEP__NOTE_HASH_NONCE 1721808740UL
 #define DOM_SEP__SILOED_NULLIFIER 57496191UL
 #define DOM_SEP__PUBLIC_LEAF_SLOT 1247650290UL
 #define DOM_SEP__PUBLIC_STORAGE_MAP_SLOT 4015149901UL

barretenberg/cpp/src/barretenberg/vm2/common/aztec_constants.hpp

@@ -18,9 +18,9 @@ void note_hash_tree_checkImpl<FF_>::accumulate(ContainerOverSubrelations& evals,
     const auto constants_NOTE_HASH_TREE_HEIGHT = FF(42);
     const auto constants_AVM_PUBLIC_INPUTS_PREVIOUS_NON_REVERTIBLE_ACCUMULATED_DATA_NULLIFIERS_ROW_IDX = FF(169);
     const auto constants_AVM_PUBLIC_INPUTS_AVM_ACCUMULATED_DATA_NOTE_HASHES_ROW_IDX = FF(386);
-    const auto constants_DOM_SEP__NOTE_HASH_NONCE = FF(1721808740);
-    const auto constants_DOM_SEP__UNIQUE_NOTE_HASH = FF(226850429);
     const auto constants_DOM_SEP__SILOED_NOTE_HASH = FF(3361878420UL);
+    const auto constants_DOM_SEP__UNIQUE_NOTE_HASH = FF(226850429);
+    const auto constants_DOM_SEP__NOTE_HASH_NONCE = FF(1721808740);
     const auto note_hash_tree_check_READ = (FF(1) - in.get(C::note_hash_tree_check_write));
     const auto note_hash_tree_check_PREV_LEAF_VALUE_UNIQUE_NOTE_HASH_DIFF =
         (in.get(C::note_hash_tree_check_prev_leaf_value) - in.get(C::note_hash_tree_check_unique_note_hash));

barretenberg/cpp/src/barretenberg/vm2/generated/relations/note_hash_tree_check_impl.hpp

@@ -21,7 +21,7 @@ pub contract NFTPunk {
     struct Storage<Context> {
         admin: PublicImmutable<AztecAddress, Context>,
         minter: PublicImmutable<AztecAddress, Context>,
-        nfts: Map<Field, DelayedPublicMutable<bool, 2, Context>, Context>,
+        nfts: Map<Field, DelayedPublicMutable<bool, 2u64, Context>, Context>,
         owners: Owned<PrivateSet<NFTNote, Context>, Context>,
     }
     #[external("public")]

docs/examples/contracts/nft/src/main.nr

@@ -7,4 +7,4 @@ type = "lib"
 [dependencies]
 protocol_types = { path = "../../noir-protocol-circuits/crates/types" }
 sha256 = { tag = "v0.3.0", git = "https://github.com/noir-lang/sha256" }
-poseidon = { tag = "v0.2.3", git = "https://github.com/noir-lang/poseidon" }
+poseidon = { tag = "v0.3.0", git = "https://github.com/noir-lang/poseidon" }

noir-projects/aztec-nr/aztec/Nargo.toml

@@ -1121,7 +1121,7 @@ impl PrivateContext {
         args_hash: Field,
         is_static_call: bool,
     ) -> ReturnsHash {
-        let mut is_static_call = is_static_call | self.inputs.call_context.is_static_call;
+        let is_static_call = is_static_call | self.inputs.call_context.is_static_call;
         let start_side_effect_counter = self.side_effect_counter;
 
         // Safety: The oracle simulates the private call and returns the value of the side effects counter after
@@ -1288,7 +1288,7 @@ impl PrivateContext {
     ) {
         let counter = self.next_counter();
 
-        let mut is_static_call = is_static_call | self.inputs.call_context.is_static_call;
+        let is_static_call = is_static_call | self.inputs.call_context.is_static_call;
 
         assert_valid_public_call_data(calldata_hash);
 

noir-projects/aztec-nr/aztec/src/context/private_context.nr

@@ -131,7 +131,9 @@ impl PublicContext {
     ///
     pub fn note_hash_exists(_self: Self, note_hash: Field, leaf_index: u64) -> bool {
         // Safety: AVM opcodes are constrained by the AVM itself
-        unsafe { avm::note_hash_exists(note_hash, leaf_index) } == 1
+        unsafe {
+            avm::note_hash_exists(note_hash, leaf_index)
+        }
     }
 
     /// Checks if a specific L1-to-L2 message exists in the L1-to-L2 message tree at a particular leaf index.
@@ -153,7 +155,9 @@ impl PublicContext {
     ///
     pub fn l1_to_l2_msg_exists(_self: Self, msg_hash: Field, msg_leaf_index: Field) -> bool {
         // Safety: AVM opcodes are constrained by the AVM itself TODO(alvaro): Make l1l2msg leaf index a u64 upstream
-        unsafe { avm::l1_to_l2_msg_exists(msg_hash, msg_leaf_index as u64) } == 1
+        unsafe {
+            avm::l1_to_l2_msg_exists(msg_hash, msg_leaf_index as u64)
+        }
     }
 
     /// Returns `true` if an `unsiloed_nullifier` has been emitted by `contract_address`.
@@ -204,7 +208,9 @@ impl PublicContext {
     pub fn nullifier_exists_unsafe(_self: Self, unsiloed_nullifier: Field, contract_address: AztecAddress) -> bool {
         let siloed_nullifier = compute_siloed_nullifier(contract_address, unsiloed_nullifier);
         // Safety: AVM opcodes are constrained by the AVM itself
-        unsafe { avm::nullifier_exists(siloed_nullifier) } == 1
+        unsafe {
+            avm::nullifier_exists(siloed_nullifier)
+        }
     }
 
     /// Consumes a message sent from Ethereum (L1) to Aztec (L2) -- effectively marking it as "read".
@@ -662,7 +668,9 @@ impl PublicContext {
     ///
     pub fn is_static_call(_self: Self) -> bool {
         // Safety: AVM opcodes are constrained by the AVM itself
-        unsafe { avm::is_static_call() } == 1
+        unsafe {
+            avm::is_static_call()
+        }
     }
 
     /// Reads raw field values from public storage. Reads N consecutive storage slots starting from the given slot.

noir-projects/aztec-nr/aztec/src/context/public_context.nr

@@ -16,7 +16,7 @@ pub(crate) unconstrained fn create_note() -> (TestEnvironment, HintedNote<MockNo
     let note_owner = env.create_light_account();
 
     let note_message = env.private_context(|context| {
-        let mut mock_note = MockNote::new(69);
+        let mock_note = MockNote::new(69);
 
         lifecycle_create_note(
             context,