8285: addressing of review comments

AztecProtocol · Sep 9, 2024 · 1110861 · 1110861
1 parent db13979
commit 1110861
Show file tree

Hide file tree

Showing 11 changed files with 829 additions and 847 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp
@@ -400,8 +400,11 @@ void process_avm_recursion_constraints(Builder& builder,
                                 constraint_system.original_opcode_indices.avm_recursion_constraints.at(idx++));
     }
 
-    // Now that the circuit has been completely built, we add the output aggregation as public
-    // inputs.
+    // TODO(https://github.com/AztecProtocol/barretenberg/issues/1095): The following code will have to be adapted to
+    // support a circuit with both honk and avm recursion constraints.
+
+    // Now that the circuit has been completely built, we add
+    // the output aggregation as public inputs.
     if (!constraint_system.avm_recursion_constraints.empty()) {
 
         // First add the output aggregation object as public inputs

diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/avm_recursion_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/avm_recursion_constraint.test.cpp
@@ -79,7 +79,6 @@ class AcirAvmRecursionConstraint : public ::testing::Test {
 
             std::vector<fr> key_witnesses = verifier.key->to_field_elements();
             std::vector<fr> proof_witnesses = prover.construct_proof();
-            // const size_t num_public_inputs = verifier.key->num_public_inputs;
 
             // Helper to append some values to the witness vector and return their corresponding indices
             auto add_to_witness_and_track_indices =

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp
@@ -208,7 +208,6 @@ AvmCircuitBuilder::ProverPolynomials AvmCircuitBuilder::compute_polynomials() co
         polys.main_sel_op_cast[i] = rows[i].main_sel_op_cast;
         polys.main_sel_op_chain_id[i] = rows[i].main_sel_op_chain_id;
         polys.main_sel_op_cmov[i] = rows[i].main_sel_op_cmov;
-        polys.main_sel_op_coinbase[i] = rows[i].main_sel_op_coinbase;
         polys.main_sel_op_dagasleft[i] = rows[i].main_sel_op_dagasleft;
         polys.main_sel_op_div[i] = rows[i].main_sel_op_div;
         polys.main_sel_op_ecadd[i] = rows[i].main_sel_op_ecadd;