refactor: Remove commitment key copy out of instance

barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp

@@ -41,7 +41,7 @@ template <typename BuilderType> class GoblinUltraRecursiveFlavor_ {
     using NativeVerificationKey = NativeFlavor::VerificationKey;
 
     // Note(luke): Eventually this may not be needed at all
-    using VerifierCommitmentKey = bb::VerifierCommitmentKey<Curve>;
+    using VerifierCommitmentKey = bb::VerifierCommitmentKey<NativeFlavor::Curve>;
 
     static constexpr size_t NUM_WIRES = GoblinUltraFlavor::NUM_WIRES;
     // The number of multivariate polynomials on which a sumcheck prover sumcheck operates (including shifts). We often
@@ -114,6 +114,7 @@ template <typename BuilderType> class GoblinUltraRecursiveFlavor_ {
          */
         VerificationKey(CircuitBuilder* builder, const std::shared_ptr<NativeVerificationKey>& native_key)
         {
+            this->pcs_verification_key = native_key->pcs_verification_key;
             this->circuit_size = native_key->circuit_size;
             this->log_circuit_size = numeric::get_msb(this->circuit_size);
             this->num_public_inputs = native_key->num_public_inputs;

barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp

@@ -56,7 +56,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
     using NativeVerificationKey = NativeFlavor::VerificationKey;
 
     // Note(luke): Eventually this may not be needed at all
-    using VerifierCommitmentKey = bb::VerifierCommitmentKey<Curve>;
+    using VerifierCommitmentKey = bb::VerifierCommitmentKey<NativeFlavor::Curve>;
 
     static constexpr size_t NUM_WIRES = UltraFlavor::NUM_WIRES;
     // The number of multivariate polynomials on which a sumcheck prover sumcheck operates (including shifts). We often
@@ -288,6 +288,7 @@ template <typename BuilderType> class UltraRecursiveFlavor_ {
             this->circuit_size = native_key->circuit_size;
             this->log_circuit_size = numeric::get_msb(this->circuit_size);
             this->num_public_inputs = native_key->num_public_inputs;
+            this->pcs_verification_key = native_key->pcs_verification_key;
             this->q_m = Commitment::from_witness(builder, native_key->q_m);
             this->q_l = Commitment::from_witness(builder, native_key->q_l);
             this->q_r = Commitment::from_witness(builder, native_key->q_r);

barretenberg/cpp/src/barretenberg/protogalaxy/decider_prover.cpp

@@ -17,7 +17,7 @@ DeciderProver_<Flavor>::DeciderProver_(const std::shared_ptr<Instance>& inst,
                                        const std::shared_ptr<Transcript>& transcript)
     : accumulator(std::move(inst))
     , transcript(transcript)
-    , commitment_key(inst->commitment_key)
+    , commitment_key(inst->proving_key->commitment_key)
 {}
 
 /**

barretenberg/cpp/src/barretenberg/protogalaxy/decider_verifier.cpp

@@ -54,7 +54,8 @@ template <typename Flavor> bool DeciderVerifier_<Flavor>::verify_proof(const Hon
                                             multivariate_challenge,
                                             transcript);
 
-    auto verified = accumulator->pcs_verification_key->pairing_check(pairing_points[0], pairing_points[1]);
+    auto verified =
+        accumulator->verification_key->pcs_verification_key->pairing_check(pairing_points[0], pairing_points[1]);
 
     return sumcheck_verified.value() && verified;
 }

barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.cpp

@@ -129,12 +129,11 @@ std::shared_ptr<typename ProverInstances::Instance> ProtoGalaxyProver_<ProverIns
     auto vanishing_polynomial_at_challenge = challenge * (challenge - FF(1));
     std::vector<FF> lagranges{ FF(1) - challenge, challenge };
 
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/881): bad pattern
-    auto next_accumulator = std::make_shared<Instance>();
+    std::shared_ptr<Instance> next_accumulator = instances[0];
     next_accumulator->is_accumulator = true;
     next_accumulator->instance_size = instances[0]->instance_size;
     next_accumulator->log_instance_size = instances[0]->log_instance_size;
-    next_accumulator->commitment_key = instances[0]->commitment_key;
+    next_accumulator->proving_key = instances[0]->proving_key;
 
     // Compute the next target sum and send the next folding parameters to the verifier
     FF next_target_sum =

barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.cpp

@@ -138,10 +138,11 @@ std::shared_ptr<typename VerifierInstances::Instance> ProtoGalaxyVerifier_<Verif
     auto vanishing_polynomial_at_challenge = combiner_challenge * (combiner_challenge - FF(1));
     auto lagranges = std::vector<FF>{ FF(1) - combiner_challenge, combiner_challenge };
 
-    auto next_accumulator = std::make_shared<Instance>();
+    std::shared_ptr<Instance> next_accumulator = accumulator;
     next_accumulator->instance_size = accumulator->instance_size;
     next_accumulator->log_instance_size = accumulator->log_instance_size;
     next_accumulator->is_accumulator = true;
+
     // Compute next folding parameters
     next_accumulator->target_sum =
         perturbator_at_challenge * lagranges[0] + vanishing_polynomial_at_challenge * combiner_quotient_at_challenge;
@@ -200,6 +201,7 @@ std::shared_ptr<typename VerifierInstances::Instance> ProtoGalaxyVerifier_<Verif
 
     next_accumulator->verification_key =
         std::make_shared<VerificationKey>(instances[0]->instance_size, instances[0]->public_input_size);
+    next_accumulator->verification_key->pcs_verification_key = accumulator->verification_key->pcs_verification_key;
     size_t vk_idx = 0;
     for (auto& expected_vk : next_accumulator->verification_key->get_all()) {
         size_t inst = 0;

barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.cpp

@@ -212,6 +212,7 @@ std::shared_ptr<typename VerifierInstances::Instance> ProtoGalaxyRecursiveVerifi
 
     next_accumulator->verification_key =
         std::make_shared<VerificationKey>(instances[0]->instance_size, instances[0]->public_input_size);
+    next_accumulator->verification_key->pcs_verification_key = accumulator->verification_key->pcs_verification_key;
     size_t vk_idx = 0;
     for (auto& expected_vk : next_accumulator->verification_key->get_all()) {
         size_t inst = 0;

barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/protogalaxy_recursive_verifier.test.cpp

@@ -280,8 +280,9 @@ template <typename RecursiveFlavor> class ProtoGalaxyRecursiveTests : public tes
         //  decider verifier and check that the result agrees.
         DeciderVerifier native_decider_verifier = composer.create_decider_verifier(verifier_accumulator);
         auto native_result = native_decider_verifier.verify_proof(decider_proof);
-        auto recursive_result = native_decider_verifier.accumulator->pcs_verification_key->pairing_check(
-            pairing_points[0].get_value(), pairing_points[1].get_value());
+        auto recursive_result =
+            native_decider_verifier.accumulator->verification_key->pcs_verification_key->pairing_check(
+                pairing_points[0].get_value(), pairing_points[1].get_value());
         EXPECT_EQ(native_result, recursive_result);
 
         // Ensure that the underlying native and recursive decider verification algorithms agree by ensuring

barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/recursive_verifier_instance.hpp

@@ -1,4 +1,5 @@
 #pragma once
+#include "barretenberg/commitment_schemes/verification_key.hpp"
 #include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/sumcheck/instance/verifier_instance.hpp"
@@ -46,7 +47,9 @@ template <IsRecursiveFlavor Flavor> class RecursiveVerifierInstance_ {
     RecursiveVerifierInstance_(Builder* builder, std::shared_ptr<NativeVerificationKey> vk)
         : builder(builder)
         , verification_key(std::make_shared<VerificationKey>(builder, vk))
-    {}
+    {
+        verification_key->pcs_verification_key = vk->pcs_verification_key;
+    }
 
     RecursiveVerifierInstance_(Builder* builder, const std::shared_ptr<VerifierInstance>& instance)
         : pub_inputs_offset((instance->pub_inputs_offset))
@@ -63,6 +66,7 @@ template <IsRecursiveFlavor Flavor> class RecursiveVerifierInstance_ {
             public_input_idx++;
         }
         verification_key = std::make_shared<VerificationKey>(instance_size, public_input_size);
+        verification_key->pcs_verification_key = instance->verification_key->pcs_verification_key;
         auto other_vks = instance->verification_key->get_all();
         size_t vk_idx = 0;
         for (auto& vk : verification_key->get_all()) {
@@ -105,7 +109,13 @@ template <IsRecursiveFlavor Flavor> class RecursiveVerifierInstance_ {
      */
     VerifierInstance get_value()
     {
-        VerifierInstance inst;
+        auto inst_verification_key = std::make_shared<NativeVerificationKey>(instance_size, public_input_size);
+        inst_verification_key->pcs_verification_key = verification_key->pcs_verification_key;
+        for (auto [vk, inst_vk] : zip_view(verification_key->get_all(), inst_verification_key->get_all())) {
+            inst_vk = vk.get_value();
+        }
+
+        VerifierInstance inst(inst_verification_key);
         inst.pub_inputs_offset = pub_inputs_offset;
         inst.public_input_size = public_input_size;
         inst.log_instance_size = log_instance_size;
@@ -117,11 +127,6 @@ template <IsRecursiveFlavor Flavor> class RecursiveVerifierInstance_ {
             inst_public_input = public_input.get_value();
         }
 
-        inst.verification_key = std::make_shared<NativeVerificationKey>(instance_size, public_input_size);
-        for (auto [vk, inst_vk] : zip_view(verification_key->get_all(), inst.verification_key->get_all())) {
-            inst_vk = vk.get_value();
-        }
-
         for (auto [alpha, inst_alpha] : zip_view(alphas, inst.alphas)) {
             inst_alpha = alpha.get_value();
         }

barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp

@@ -33,10 +33,6 @@ template <class Flavor> class ProverInstance_ {
 
   public:
     std::shared_ptr<ProvingKey> proving_key;
-    // currently commitment_key needs to be here, and not accessed through the proving key, since sometimes the proving
-    // key is null during protogalaxy proving (TODO(https://github.com/AztecProtocol/barretenberg/issues/881)?)
-    std::shared_ptr<CommitmentKey> commitment_key;
-
     ProverPolynomials prover_polynomials;
     WitnessCommitments witness_commitments;
     CommitmentLabels commitment_labels;
@@ -90,8 +86,6 @@ template <class Flavor> class ProverInstance_ {
         proving_key->contains_recursive_proof = contains_recursive_proof;
 
         sorted_polynomials = construct_sorted_list_polynomials<Flavor>(circuit, dyadic_circuit_size);
-
-        commitment_key = proving_key->commitment_key;
     }
 
     ProverInstance_() = default;

barretenberg/cpp/src/barretenberg/sumcheck/instance/verifier_instance.hpp

@@ -20,9 +20,6 @@ template <class Flavor, size_t NUM_ = 2> class VerifierInstance_ {
     using RelationSeparator = typename Flavor::RelationSeparator;
 
     std::shared_ptr<VerificationKey> verification_key;
-    // TODO(https://github.com/AztecProtocol/barretenberg/issues/881)?: Access throutgh vk by making sure vk is
-    // initialized in Protogalaxy?
-    std::shared_ptr<VerifierCommitmentKey> pcs_verification_key;
     std::vector<FF> public_inputs;
     size_t pub_inputs_offset = 0;
     size_t public_input_size;
@@ -38,11 +35,8 @@ template <class Flavor, size_t NUM_ = 2> class VerifierInstance_ {
 
     WitnessCommitments witness_commitments;
     CommitmentLabels commitment_labels;
-    VerifierInstance_()
-        : pcs_verification_key(std::make_shared<VerifierCommitmentKey>()){};
     VerifierInstance_(std::shared_ptr<VerificationKey> vk)
         : verification_key(std::move(vk))
-        , pcs_verification_key(std::make_shared<VerifierCommitmentKey>())
     {}
 };
 } // namespace bb