feat: uncomment read request membership check

AztecProtocol · Oct 25, 2023 · e79724e · e79724e
1 parent 28ec608
commit e79724e
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/yarn-project/noir-private-kernel/src/crates/private-kernel-lib/src/common.nr b/yarn-project/noir-private-kernel/src/crates/private-kernel-lib/src/common.nr
@@ -93,7 +93,7 @@ pub fn validate_read_requests(historic_note_hash_tree_root : Field, read_request
 
         if (read_request != 0) & (witness.is_transient == false) {
             let root_for_read_request = read_request_root_from_siblings(read_request, witness.leaf_index, witness.sibling_path);
-            // assert(root_for_read_request == historic_note_hash_tree_root, "private data tree root mismatch");
+            assert(root_for_read_request == historic_note_hash_tree_root, "private data tree root mismatch");
 
             // TODO(https://github.com/AztecProtocol/aztec-packages/issues/1354): do we need to enforce
             // that a non-transient read_request was derived from the proper/current contract address?

diff --git a/yarn-project/noir-private-kernel/src/crates/private-kernel-lib/src/hash.nr b/yarn-project/noir-private-kernel/src/crates/private-kernel-lib/src/hash.nr
@@ -121,7 +121,7 @@ pub fn silo_nullifier(address : Address, nullifier : Field) -> Field {
 
 fn merkle_hash(left : Field, right : Field) -> Field {
     // TODO ensure it's the same hash cpp is doing for merkle trees. 
-    dep::std::hash::pedersen([left, right])[0]
+    dep::std::hash::pedersen_hash_with_separator([left, right], 0)
 }
 
 pub fn stdlib_recursion_verification_key_compress_native_vk(vk : VerificationKey) -> Field {

diff --git a/yarn-project/noir-private-kernel/src/target/private_kernel_init.json b/yarn-project/noir-private-kernel/src/target/private_kernel_init.json
diff --git a/yarn-project/noir-private-kernel/src/target/private_kernel_init_simulated.json b/yarn-project/noir-private-kernel/src/target/private_kernel_init_simulated.json
diff --git a/yarn-project/noir-private-kernel/src/target/private_kernel_inner.json b/yarn-project/noir-private-kernel/src/target/private_kernel_inner.json
diff --git a/yarn-project/noir-private-kernel/src/target/private_kernel_inner_simulated.json b/yarn-project/noir-private-kernel/src/target/private_kernel_inner_simulated.json
diff --git a/yarn-project/noir-private-kernel/src/target/private_kernel_ordering.json b/yarn-project/noir-private-kernel/src/target/private_kernel_ordering.json
diff --git a/yarn-project/noir-private-kernel/src/target/private_kernel_ordering_simulated.json b/yarn-project/noir-private-kernel/src/target/private_kernel_ordering_simulated.json