merge

Author: dbanks12

barretenberg/acir_tests/regenerate_verify_honk_proof_inputs.sh

@@ -21,7 +21,7 @@ PROGRAM=assert_statement
 # the program containing the recursive verifier
 RECURSIVE_PROGRAM=verify_honk_proof
 
-./reset_acir_tests.sh --rebuild-nargo --programs "$PROGRAM"
+./reset_acir_tests.sh --programs "$PROGRAM"
 cd "acir_tests/$PROGRAM"
 
 TOML_DIR=../../../../noir/noir-repo/test_programs/execution_success/"$RECURSIVE_PROGRAM"

barretenberg/acir_tests/reset_acir_tests.sh

@@ -4,14 +4,14 @@ set -e
 # Run from within barretenberg/acir_tests
 
 # Initialize variables for flags
-REBUILD_NARGO_FLAG=""
+REBUILD_NARGO_FLAG=true
 PROGRAMS=""
 
 # Parse the arguments
 while [[ "$#" -gt 0 ]]; do
     case $1 in
-        --rebuild-nargo)
-            REBUILD_NARGO_FLAG="--rebuild-nargo"
+        --no-rebuild-nargo)
+            REBUILD_NARGO_FLAG=false
             ;;
         --programs)
             shift
@@ -26,12 +26,13 @@ while [[ "$#" -gt 0 ]]; do
     shift
 done
 
-# Clean and rebuild noir, then compile the test programs if --rebuild-nargo flag is set
-cd ../../noir/noir-repo
-
-if [[ -n "$REBUILD_NARGO_FLAG" ]]; then
+    cd ../../noir/noir-repo
+# Clean and rebuild noir unless --no-rebuild-nargo is specified, then compile the test programs
+if [[ "$REBUILD_NARGO_FLAG" == true ]]; then
     cargo clean
     noirup -p .
+else
+    echo "Skipping noir nargo build."
 fi
 
 # Rebuild test programs with rebuild.sh

barretenberg/cpp/src/barretenberg/plonk_honk_shared/composer/permutation_lib.hpp

@@ -54,6 +54,10 @@ class AvmExecutionTests : public ::testing::Test {
         public_inputs.gas_settings.gas_limits.da_gas = DEFAULT_INITIAL_DA_GAS;
         public_inputs.start_gas_used.l2_gas = 0;
         public_inputs.start_gas_used.da_gas = 0;
+        public_inputs.end_tree_snapshots.note_hash_tree.size =
+            public_inputs.start_tree_snapshots.note_hash_tree.size + MAX_NOTE_HASHES_PER_TX;
+        public_inputs.end_tree_snapshots.nullifier_tree.size =
+            public_inputs.start_tree_snapshots.nullifier_tree.size + MAX_NULLIFIERS_PER_TX;
 
         // These values are magic because of how some tests work! Don't change them
         PublicCallRequest dummy_request = {

barretenberg/cpp/src/barretenberg/vm/avm/tests/execution.test.cpp

@@ -399,6 +399,8 @@ std::vector<Row> Execution::gen_trace(AvmPublicInputs const& public_inputs,
         trace_builder.pay_fee();
     }
 
+    trace_builder.pad_trees();
+
     auto trace = trace_builder.finalize(apply_e2e_assertions);
 
     returndata = trace_builder.get_all_returndata();

barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp

@@ -69,6 +69,7 @@ class AvmMerkleTreeTraceBuilder {
                                 const std::vector<FF>& low_path,
                                 const FF& nullifier,
                                 const std::vector<FF>& insertion_path);
+    void set_nullifier_tree_size(uint32_t size) { tree_snapshots.nullifier_tree.size = size; }
 
     // Note Hash Tree
     bool perform_note_hash_read(uint32_t clk,
@@ -77,6 +78,7 @@ class AvmMerkleTreeTraceBuilder {
                                 const std::vector<FF>& path) const;
 
     FF perform_note_hash_append(uint32_t clk, const FF& note_hash, const std::vector<FF>& insertion_path);
+    void set_note_hash_tree_size(uint32_t size) { tree_snapshots.note_hash_tree.size = size; }
 
     // L1 to L2 Message Tree
     bool perform_l1_to_l2_message_read(uint32_t clk,

barretenberg/cpp/src/barretenberg/vm/avm/trace/gadgets/merkle_tree.hpp

@@ -312,6 +312,23 @@ void AvmTraceBuilder::pay_fee()
     side_effect_counter++;
 }
 
+void AvmTraceBuilder::pad_trees()
+{
+    auto current_tree_snapshots = merkle_tree_trace_builder.get_tree_snapshots();
+
+    auto initial_note_hash_snapshot = public_inputs.start_tree_snapshots.note_hash_tree;
+    // sanity check
+    uint32_t padded_note_hash_size = initial_note_hash_snapshot.size + MAX_NOTE_HASHES_PER_TX;
+    ASSERT(current_tree_snapshots.note_hash_tree.size <= padded_note_hash_size);
+    merkle_tree_trace_builder.set_note_hash_tree_size(padded_note_hash_size);
+
+    auto initial_nullifier_snapshot = public_inputs.start_tree_snapshots.nullifier_tree;
+    // sanity check
+    uint32_t padded_nullifier_size = initial_nullifier_snapshot.size + MAX_NULLIFIERS_PER_TX;
+    ASSERT(current_tree_snapshots.nullifier_tree.size <= padded_nullifier_size);
+    merkle_tree_trace_builder.set_nullifier_tree_size(padded_nullifier_size);
+}
+
 void AvmTraceBuilder::allocate_gas_for_call(uint32_t l2_gas, uint32_t da_gas)
 {
     gas_trace_builder.allocate_gas_for_call(l2_gas, da_gas);

barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.cpp

@@ -238,6 +238,7 @@ class AvmTraceBuilder {
     void insert_private_revertible_state(const std::vector<FF>& siloed_nullifiers,
                                          const std::vector<FF>& siloed_note_hashes);
     void pay_fee();
+    void pad_trees();
     void allocate_gas_for_call(uint32_t l2_gas, uint32_t da_gas);
     void handle_exceptional_halt();
 

barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.hpp

@@ -224,13 +224,13 @@ contract Counter {
         assert(notes.len() == 4);
         assert(get_counter(owner) == 7);
 
-        // Checking from the note cache, note that we MUST advance the block to get a correct and updated value.
+        // Checking from the note cache
         Counter::at(contract_address).decrement(owner, sender).call(&mut env.private());
         let notes: BoundedVec<ValueNote, MAX_NOTES_PER_PAGE> = view_notes(owner_slot, options);
-        assert(get_counter(owner) == 11);
-        assert(notes.len() == 5);
+        assert(get_counter(owner) == 6);
+        assert(notes.len() == 4);
 
-        // We advance the block here to have the nullification of the prior note be applied. Should we try nullifiying notes in our DB on notifyNullifiedNote ?
+        // Checking that the note was discovered from private logs
         env.advance_block_by(1);
         let notes: BoundedVec<ValueNote, MAX_NOTES_PER_PAGE> = view_notes(owner_slot, options);
         assert(get_counter(owner) == 6);

noir-projects/noir-contracts/contracts/counter_contract/src/main.nr

@@ -1,3 +1,4 @@
+mod test;
 use dep::aztec::macros::aztec;
 
 #[aztec]