Address Facundo's commend

Author: Rumata888

barretenberg/cpp/src/barretenberg/vm2/avm_api.cpp

@@ -26,8 +26,7 @@ std::pair<AvmAPI::AvmProof, AvmAPI::AvmVerificationKey> AvmAPI::prove(const AvmA
     // Prove.
     info("Proving...");
     AvmProvingHelper proving_helper;
-    auto [proof, vk] =
-        AVM_TRACK_TIME_V("proving/all", proving_helper.prove(std::move(trace), inputs.publicInputs.to_columns()));
+    auto [proof, vk] = AVM_TRACK_TIME_V("proving/all", proving_helper.prove(std::move(trace)));
 
     info("Done!");
     return { std::move(proof), std::move(vk) };

barretenberg/cpp/src/barretenberg/vm2/constraining/prover.cpp

@@ -50,13 +50,18 @@ void AvmProver::execute_preamble_round()
  * @brief Add public inputs to transcript
  *
  */
-void AvmProver::execute_public_inputs_round(const std::vector<std::vector<FF>>& public_inputs_cols)
+void AvmProver::execute_public_inputs_round()
 {
+    // We take the starting values of the public inputs polynomials to add to the transcript
+    const auto public_inputs_cols = std::vector({ &prover_polynomials.public_inputs_cols_0_,
+                                                  &prover_polynomials.public_inputs_cols_1_,
+                                                  &prover_polynomials.public_inputs_cols_2_,
+                                                  &prover_polynomials.public_inputs_cols_3_ });
     for (size_t i = 0; i < public_inputs_cols.size(); ++i) {
         for (size_t j = 0; j < AVM_PUBLIC_INPUTS_COLUMNS_MAX_LENGTH; ++j) {
             // The public inputs are added to the hash buffer, but do not increase the size of the proof
             transcript->add_to_hash_buffer("public_input_" + std::to_string(i) + "_" + std::to_string(j),
-                                           j < public_inputs_cols[i].size() ? public_inputs_cols[i][j] : FF(0));
+                                           j < public_inputs_cols[i]->size() ? public_inputs_cols[i]->at(j) : FF(0));
         }
     }
 }
@@ -155,13 +160,13 @@ HonkProof AvmProver::export_proof()
     return transcript->export_proof();
 }
 
-HonkProof AvmProver::construct_proof(const std::vector<std::vector<FF>>& public_inputs_cols)
+HonkProof AvmProver::construct_proof()
 {
     // Add circuit size public input size and public inputs to transcript.
     execute_preamble_round();
 
     // Add public inputs to transcript.
-    AVM_TRACK_TIME("prove/public_inputs_round", execute_public_inputs_round(public_inputs_cols));
+    AVM_TRACK_TIME("prove/public_inputs_round", execute_public_inputs_round());
 
     // Compute wire commitments.
     AVM_TRACK_TIME("prove/wire_commitments_round", execute_wire_commitments_round());

barretenberg/cpp/src/barretenberg/vm2/constraining/prover.hpp

@@ -31,15 +31,15 @@ class AvmProver {
     // Note: all the following methods are virtual to allow Avm2 to tweak the behaviour.
     // We can remove this once the transition is done.
     virtual void execute_preamble_round();
-    virtual void execute_public_inputs_round(const std::vector<std::vector<FF>>& public_inputs_cols);
+    virtual void execute_public_inputs_round();
     virtual void execute_wire_commitments_round();
     virtual void execute_log_derivative_inverse_round();
     virtual void execute_log_derivative_inverse_commitments_round();
     virtual void execute_relation_check_rounds();
     virtual void execute_pcs_rounds();
 
     virtual HonkProof export_proof();
-    virtual HonkProof construct_proof(const std::vector<std::vector<FF>>& public_inputs_cols);
+    virtual HonkProof construct_proof();
 
     std::shared_ptr<Transcript> transcript = std::make_shared<Transcript>();
 

barretenberg/cpp/src/barretenberg/vm2/constraining/recursion/recursive_verifier.test.cpp

@@ -44,7 +44,7 @@ class AvmRecursiveTests : public ::testing::Test {
         const auto public_inputs_cols = public_inputs.to_columns();
 
         InnerProver prover;
-        const auto [proof, vk_data] = prover.prove(std::move(trace), public_inputs_cols);
+        const auto [proof, vk_data] = prover.prove(std::move(trace));
         const auto verification_key = InnerProver::create_verification_key(vk_data);
         InnerVerifier verifier(verification_key);
 

barretenberg/cpp/src/barretenberg/vm2/constraining/verifier.test.cpp

@@ -30,7 +30,7 @@ class AvmVerifierTests : public ::testing::Test {
 
         Prover prover;
         auto public_inputs_cols = public_inputs.to_columns();
-        const auto [proof, vk_data] = prover.prove(std::move(trace), public_inputs_cols);
+        const auto [proof, vk_data] = prover.prove(std::move(trace));
         const auto verification_key = prover.create_verification_key(vk_data);
 
         return { proof, verification_key, public_inputs_cols };

barretenberg/cpp/src/barretenberg/vm2/proving_helper.cpp

@@ -55,8 +55,7 @@ std::shared_ptr<AvmVerifier::VerificationKey> AvmProvingHelper::create_verificat
     return std::make_shared<VerificationKey>(precomputed_cmts);
 }
 
-std::pair<AvmProvingHelper::Proof, AvmProvingHelper::VkData> AvmProvingHelper::prove(
-    tracegen::TraceContainer&& trace, const std::vector<std::vector<FF>>& public_inputs_cols)
+std::pair<AvmProvingHelper::Proof, AvmProvingHelper::VkData> AvmProvingHelper::prove(tracegen::TraceContainer&& trace)
 {
     auto polynomials = AVM_TRACK_TIME_V("proving/prove:compute_polynomials", constraining::compute_polynomials(trace));
     auto proving_key = AVM_TRACK_TIME_V("proving/prove:proving_key", create_proving_key(polynomials));
@@ -66,7 +65,7 @@ std::pair<AvmProvingHelper::Proof, AvmProvingHelper::VkData> AvmProvingHelper::p
     auto prover = AVM_TRACK_TIME_V("proving/prove:construct_prover",
                                    AvmProver(proving_key, verification_key, proving_key->commitment_key));
 
-    auto proof = AVM_TRACK_TIME_V("proving/construct_proof", prover.construct_proof(public_inputs_cols));
+    auto proof = AVM_TRACK_TIME_V("proving/construct_proof", prover.construct_proof());
     auto serialized_vk = to_buffer(verification_key->to_field_elements());
 
     return { std::move(proof), std::move(serialized_vk) };

barretenberg/cpp/src/barretenberg/vm2/proving_helper.hpp

@@ -15,8 +15,7 @@ class AvmProvingHelper {
     using VkData = std::vector<uint8_t>;
 
     static std::shared_ptr<AvmVerifier::VerificationKey> create_verification_key(const VkData& vk_data);
-    std::pair<Proof, VkData> prove(tracegen::TraceContainer&& trace,
-                                   const std::vector<std::vector<FF>>& public_inputs_cols);
+    std::pair<Proof, VkData> prove(tracegen::TraceContainer&& trace);
     bool check_circuit(tracegen::TraceContainer&& trace);
     bool verify(const Proof& proof, const PublicInputs& pi, const VkData& vk_data);
 };