chore: Rename files relating to what were "instances" (#8383)

Follow-up to #8362
where I rename files according to the new class names therein. Instances
had been with sumcheck, but they don't really belong there, so I move
them to ultra_honk. I also rename the recursive versions of things and
the instance inspector in place.

barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.hpp

@@ -6,7 +6,7 @@
 #include "barretenberg/protogalaxy/protogalaxy_prover.hpp"
 #include "barretenberg/protogalaxy/protogalaxy_verifier.hpp"
 #include "barretenberg/stdlib/primitives/databus/databus.hpp"
-#include "barretenberg/sumcheck/instance/instances.hpp"
+#include "barretenberg/ultra_honk/decider_keys.hpp"
 #include "barretenberg/ultra_honk/decider_prover.hpp"
 #include "barretenberg/ultra_honk/decider_verifier.hpp"
 #include <algorithm>

barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_bench/protogalaxy.bench.cpp

@@ -4,8 +4,8 @@
 #include "barretenberg/protogalaxy/protogalaxy_prover.hpp"
 #include "barretenberg/stdlib_circuit_builders/mock_circuits.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp"
-#include "barretenberg/sumcheck/instance/instances.hpp"
-#include "barretenberg/sumcheck/instance/prover_instance.hpp"
+#include "barretenberg/ultra_honk/decider_keys.hpp"
+#include "barretenberg/ultra_honk/decider_proving_key.hpp"
 
 using namespace benchmark;
 

barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/protogalaxy_rounds.bench.cpp

@@ -3,7 +3,7 @@
 #include "barretenberg/protogalaxy/protogalaxy_prover.hpp"
 #include "barretenberg/stdlib_circuit_builders/mock_circuits.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp"
-#include "barretenberg/sumcheck/instance/instances.hpp"
+#include "barretenberg/ultra_honk/decider_keys.hpp"
 
 using namespace benchmark;
 

barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp

@@ -2,8 +2,8 @@
 #include "barretenberg/protogalaxy/protogalaxy_prover_internal.hpp" // just for an alias; should perhaps move to prover
 #include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_flavor.hpp"
-#include "barretenberg/sumcheck/instance/instances.hpp"
 #include "barretenberg/translator_vm/translator_flavor.hpp"
+#include "barretenberg/ultra_honk/decider_keys.hpp"
 #include <benchmark/benchmark.h>
 
 namespace {

barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.hpp

@@ -5,7 +5,7 @@
 #include "barretenberg/plonk_honk_shared/arithmetization/max_block_size_tracker.hpp"
 #include "barretenberg/protogalaxy/protogalaxy_prover.hpp"
 #include "barretenberg/protogalaxy/protogalaxy_verifier.hpp"
-#include "barretenberg/sumcheck/instance/instances.hpp"
+#include "barretenberg/ultra_honk/decider_keys.hpp"
 #include "barretenberg/ultra_honk/decider_prover.hpp"
 #include "barretenberg/ultra_honk/decider_verifier.hpp"
 #include <algorithm>

barretenberg/cpp/src/barretenberg/dsl/acir_format/honk_recursion_constraint.test.cpp

@@ -1,7 +1,7 @@
 #include "honk_recursion_constraint.hpp"
 #include "acir_format.hpp"
 #include "acir_format_mocks.hpp"
-#include "barretenberg/sumcheck/instance/prover_instance.hpp"
+#include "barretenberg/ultra_honk/decider_proving_key.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"
 #include "proof_surgeon.hpp"

barretenberg/cpp/src/barretenberg/dsl/acir_format/ivc_recursion_constraint.test.cpp

@@ -2,7 +2,7 @@
 #include "acir_format_mocks.hpp"
 #include "barretenberg/aztec_ivc/aztec_ivc.hpp"
 #include "barretenberg/goblin/mock_circuits.hpp"
-#include "barretenberg/sumcheck/instance/prover_instance.hpp"
+#include "barretenberg/ultra_honk/decider_proving_key.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"
 #include "honk_recursion_constraint.hpp"

barretenberg/cpp/src/barretenberg/goblin/goblin.hpp

@@ -6,7 +6,7 @@
 #include "barretenberg/eccvm/eccvm_verifier.hpp"
 #include "barretenberg/goblin/mock_circuits.hpp"
 #include "barretenberg/goblin/types.hpp"
-#include "barretenberg/plonk_honk_shared/instance_inspector.hpp"
+#include "barretenberg/plonk_honk_shared/proving_key_inspector.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/stdlib/goblin_verifier/merge_recursive_verifier.hpp"
 #include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp"

barretenberg/cpp/src/barretenberg/plonk_honk_shared/proving_key_inspector.cpp

@@ -0,0 +1,3 @@
+#include "proving_key_inspector.hpp"
+
+// Hack to make the module compile.

barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp

@@ -2,7 +2,7 @@
 #include "barretenberg/protogalaxy/protogalaxy_prover_internal.hpp"
 #include "barretenberg/relations/ultra_arithmetic_relation.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_flavor.hpp"
-#include "barretenberg/sumcheck/instance/instances.hpp"
+#include "barretenberg/ultra_honk/decider_keys.hpp"
 #include <gtest/gtest.h>
 
 using namespace bb;

barretenberg/cpp/src/barretenberg/protogalaxy/folding_result.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
-#include "barretenberg/sumcheck/instance/prover_instance.hpp"
+#include "barretenberg/ultra_honk/decider_proving_key.hpp"
 namespace bb {
 /**
  * @brief The result of running the Protogalaxy prover containing a new accumulator as well as the proof data to

barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover_mega.cpp

@@ -1,6 +1,6 @@
 // Note: this is split up from protogalaxy_prover_impl.hpp for compile performance reasons
 #include "barretenberg/flavor/flavor.hpp"
-#include "barretenberg/sumcheck/instance/instances.hpp"
+#include "barretenberg/ultra_honk/decider_keys.hpp"
 #include "barretenberg/ultra_honk/oink_prover.hpp"
 #include "protogalaxy_prover_impl.hpp"
 namespace bb {

barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover_ultra.cpp

@@ -1,5 +1,5 @@
 // Note: this is split up from protogalaxy_prover_impl.hpp for compile performance reasons
-#include "barretenberg/sumcheck/instance/instances.hpp"
+#include "barretenberg/ultra_honk/decider_keys.hpp"
 #include "protogalaxy_prover_impl.hpp"
 
 // TODO(https://github.com/AztecProtocol/barretenberg/issues/1076) Remove this instantiation.

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

@@ -3,8 +3,8 @@
 #include "barretenberg/protogalaxy/folding_result.hpp"
 #include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_flavor.hpp"
-#include "barretenberg/sumcheck/instance/instances.hpp"
 #include "barretenberg/transcript/transcript.hpp"
+#include "barretenberg/ultra_honk/decider_keys.hpp"
 
 namespace bb {
 template <class DeciderVerificationKeys> class ProtogalaxyVerifier_ {

barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/decider_recursive_verifier.hpp

@@ -1,6 +1,6 @@
 #pragma once
 #include "barretenberg/honk/proof_system/types/proof.hpp"
-#include "barretenberg/stdlib/protogalaxy_verifier/recursive_verifier_instance.hpp"
+#include "barretenberg/stdlib/protogalaxy_verifier/recursive_decider_verification_key.hpp"
 #include "barretenberg/stdlib/transcript/transcript.hpp"
 #include "barretenberg/stdlib_circuit_builders/mega_recursive_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_recursive_flavor.hpp"

barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/oink_recursive_verifier.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "barretenberg/stdlib/protogalaxy_verifier/recursive_verifier_instance.hpp"
+#include "barretenberg/stdlib/protogalaxy_verifier/recursive_decider_verification_key.hpp"
 #include "barretenberg/stdlib/transcript/transcript.hpp"
 #include "barretenberg/stdlib_circuit_builders/mega_recursive_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_recursive_flavor.hpp"

barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.hpp

@@ -2,7 +2,7 @@
 #include "../circuit_builders/circuit_builders_fwd.hpp"
 #include "../field/field.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
-#include "barretenberg/stdlib/protogalaxy_verifier/recursive_instances.hpp"
+#include "barretenberg/stdlib/protogalaxy_verifier/recursive_decider_verification_keys.hpp"
 #include "barretenberg/stdlib_circuit_builders/databus.hpp"
 
 namespace bb::stdlib {

barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/protogalaxy_recursive_verifier.cpp

@@ -1,6 +1,6 @@
 #include "protogalaxy_recursive_verifier.hpp"
 #include "barretenberg/plonk_honk_shared/library/grand_product_delta.hpp"
-#include "barretenberg/stdlib/protogalaxy_verifier/recursive_instances.hpp"
+#include "barretenberg/stdlib/protogalaxy_verifier/recursive_decider_verification_keys.hpp"
 
 namespace bb::stdlib::recursion::honk {
 

barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/protogalaxy_recursive_verifier.hpp

@@ -3,7 +3,7 @@
 #include "barretenberg/honk/proof_system/types/proof.hpp"
 #include "barretenberg/protogalaxy/folding_result.hpp"
 #include "barretenberg/stdlib/honk_verifier/oink_recursive_verifier.hpp"
-#include "barretenberg/stdlib/protogalaxy_verifier/recursive_instances.hpp"
+#include "barretenberg/stdlib/protogalaxy_verifier/recursive_decider_verification_keys.hpp"
 #include "barretenberg/stdlib/transcript/transcript.hpp"
 #include "barretenberg/stdlib_circuit_builders/mega_recursive_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_recursive_flavor.hpp"

barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/protogalaxy_recursive_verifier.test.cpp

@@ -8,7 +8,7 @@
 #include "barretenberg/stdlib/honk_verifier/decider_recursive_verifier.hpp"
 #include "barretenberg/stdlib/primitives/curves/bn254.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_recursive_flavor.hpp"
-#include "barretenberg/sumcheck/instance/instances.hpp"
+#include "barretenberg/ultra_honk/decider_keys.hpp"
 #include "barretenberg/ultra_honk/decider_prover.hpp"
 #include "barretenberg/ultra_honk/decider_verifier.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"

barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/recursive_verifier_instance.hpp → barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/recursive_decider_verification_key.hpp

@@ -2,7 +2,7 @@
 #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"
+#include "barretenberg/ultra_honk/decider_verification_key.hpp"
 
 namespace bb::stdlib::recursion::honk {
 

barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/recursive_instances.hpp → barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/recursive_decider_verification_keys.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
-#include "barretenberg/stdlib/protogalaxy_verifier/recursive_verifier_instance.hpp"
+#include "barretenberg/stdlib/protogalaxy_verifier/recursive_decider_verification_key.hpp"
 
 namespace bb::stdlib::recursion::honk {
 template <IsRecursiveFlavor Flavor_, size_t NUM_> struct RecursiveDeciderVerificationKeys_ {

barretenberg/cpp/src/barretenberg/stdlib/transcript/transcript.test.cpp

@@ -6,8 +6,8 @@
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_recursive_flavor.hpp"
-#include "barretenberg/sumcheck/instance/prover_instance.hpp"
 #include "barretenberg/transcript/transcript.hpp"
+#include "barretenberg/ultra_honk/decider_proving_key.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"
 

barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.cpp

@@ -0,0 +1,3 @@
+#include "sumcheck.hpp"
+
+// Hack to make the module compile.

barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.hpp

@@ -1,9 +1,9 @@
 #pragma once
 #include "barretenberg/plonk_honk_shared/library/grand_product_delta.hpp"
 #include "barretenberg/polynomials/polynomial_arithmetic.hpp"
-#include "barretenberg/sumcheck/instance/prover_instance.hpp"
 #include "barretenberg/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/transcript/transcript.hpp"
+#include "barretenberg/ultra_honk/decider_proving_key.hpp"
 #include "sumcheck_round.hpp"
 
 namespace bb {
@@ -123,7 +123,6 @@ template <typename Flavor> class SumcheckProver {
     using ClaimedEvaluations = typename Flavor::AllValues;
 
     using Transcript = typename Flavor::Transcript;
-    using DeciderPK = DeciderProvingKey_<Flavor>;
     using RelationSeparator = typename Flavor::RelationSeparator;
     /**
      * @brief The total algebraic degree of the Sumcheck relation \f$ F \f$ as a polynomial in Prover Polynomials
@@ -178,15 +177,6 @@ template <typename Flavor> class SumcheckProver {
         , round(multivariate_n)
         , partially_evaluated_polynomials(multivariate_n){};
 
-    /**
-     * @brief Compute round univariate, place it in transcript, compute challenge, partially evaluate. Repeat
-     * until final round, then get full evaluations of prover polynomials, and place them in transcript.
-     */
-    SumcheckOutput<Flavor> prove(std::shared_ptr<DeciderPK> key)
-    {
-        return prove(key->proving_key.polynomials, key->relation_parameters, key->alphas, key->gate_challenges);
-    };
-
     /**
      * @brief Compute round univariate, place it in transcript, compute challenge, partially evaluate. Repeat
      * until final round, then get full evaluations of prover polynomials, and place them in transcript.

barretenberg/cpp/src/barretenberg/ultra_honk/databus.test.cpp

@@ -4,7 +4,7 @@
 
 #include "barretenberg/common/log.hpp"
 #include "barretenberg/goblin/mock_circuits.hpp"
-#include "barretenberg/plonk_honk_shared/instance_inspector.hpp"
+#include "barretenberg/plonk_honk_shared/proving_key_inspector.hpp"
 #include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp"
 

barretenberg/cpp/src/barretenberg/sumcheck/instance/instances.hpp → barretenberg/cpp/src/barretenberg/ultra_honk/decider_keys.hpp

@@ -1,6 +1,6 @@
 #pragma once
-#include "barretenberg/sumcheck/instance/prover_instance.hpp"
-#include "barretenberg/sumcheck/instance/verifier_instance.hpp"
+#include "barretenberg/ultra_honk/decider_proving_key.hpp"
+#include "barretenberg/ultra_honk/decider_verification_key.hpp"
 
 namespace bb {
 

barretenberg/cpp/src/barretenberg/ultra_honk/decider_prover.cpp

@@ -32,7 +32,10 @@ template <IsUltraFlavor Flavor> void DeciderProver_<Flavor>::execute_relation_ch
     auto sumcheck = Sumcheck(polynomial_size, transcript);
     {
         ZoneScopedN("sumcheck.prove");
-        sumcheck_output = sumcheck.prove(proving_key);
+        sumcheck_output = sumcheck.prove(proving_key->proving_key.polynomials,
+                                         proving_key->relation_parameters,
+                                         proving_key->alphas,
+                                         proving_key->gate_challenges);
     }
 }
 

barretenberg/cpp/src/barretenberg/ultra_honk/decider_prover.hpp

@@ -4,9 +4,9 @@
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_flavor.hpp"
-#include "barretenberg/sumcheck/instance/prover_instance.hpp"
 #include "barretenberg/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/transcript/transcript.hpp"
+#include "barretenberg/ultra_honk/decider_proving_key.hpp"
 
 namespace bb {
 

barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.cpp → barretenberg/cpp/src/barretenberg/ultra_honk/decider_proving_key.cpp

@@ -1,4 +1,4 @@
-#include "prover_instance.hpp"
+#include "decider_proving_key.hpp"
 #include "barretenberg/honk/proof_system/logderivative_library.hpp"
 #include "barretenberg/plonk_honk_shared/composer/permutation_lib.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp"

barretenberg/cpp/src/barretenberg/ultra_honk/decider_verifier.cpp

@@ -1,8 +1,8 @@
 #include "decider_verifier.hpp"
 #include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
-#include "barretenberg/sumcheck/instance/verifier_instance.hpp"
 #include "barretenberg/transcript/transcript.hpp"
+#include "barretenberg/ultra_honk/decider_verification_key.hpp"
 
 namespace bb {
 

barretenberg/cpp/src/barretenberg/ultra_honk/decider_verifier.hpp

@@ -3,8 +3,8 @@
 #include "barretenberg/srs/global_crs.hpp"
 #include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_flavor.hpp"
-#include "barretenberg/sumcheck/instance/verifier_instance.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
+#include "barretenberg/ultra_honk/decider_verification_key.hpp"
 
 namespace bb {
 template <typename Flavor> class DeciderVerifier_ {

barretenberg/cpp/src/barretenberg/ultra_honk/mega_transcript.test.cpp

@@ -2,8 +2,8 @@
 #include "barretenberg/flavor/flavor.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
-#include "barretenberg/sumcheck/instance/prover_instance.hpp"
 #include "barretenberg/transcript/transcript.hpp"
+#include "barretenberg/ultra_honk/decider_proving_key.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"
 

barretenberg/cpp/src/barretenberg/ultra_honk/oink_prover.cpp

@@ -1,5 +1,5 @@
 #include "barretenberg/ultra_honk/oink_prover.hpp"
-#include "barretenberg/plonk_honk_shared/instance_inspector.hpp"
+#include "barretenberg/plonk_honk_shared/proving_key_inspector.hpp"
 #include "barretenberg/relations/logderiv_lookup_relation.hpp"
 
 namespace bb {

barretenberg/cpp/src/barretenberg/ultra_honk/oink_prover.hpp

@@ -22,8 +22,8 @@
 #include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_keccak_flavor.hpp"
-#include "barretenberg/sumcheck/instance/prover_instance.hpp"
 #include "barretenberg/transcript/transcript.hpp"
+#include "barretenberg/ultra_honk/decider_proving_key.hpp"
 
 namespace bb {
 /**

barretenberg/cpp/src/barretenberg/ultra_honk/oink_verifier.hpp

@@ -6,7 +6,7 @@
 #include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_keccak_flavor.hpp"
-#include "barretenberg/sumcheck/instance/verifier_instance.hpp"
+#include "barretenberg/ultra_honk/decider_verification_key.hpp"
 
 namespace bb {
 

barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp

@@ -11,7 +11,7 @@
 #include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/plookup_tables/fixed_base/fixed_base.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_flavor.hpp"
-#include "barretenberg/sumcheck/instance/prover_instance.hpp"
+#include "barretenberg/ultra_honk/decider_proving_key.hpp"
 
 #include <gtest/gtest.h>
 using namespace bb;

barretenberg/cpp/src/barretenberg/ultra_honk/sumcheck.test.cpp

@@ -179,7 +179,10 @@ TEST_F(SumcheckTestsRealCircuit, Ultra)
             prover_transcript->template get_challenge<FF>("Sumcheck:gate_challenge_" + std::to_string(idx));
     }
     decider_pk->gate_challenges = prover_gate_challenges;
-    auto prover_output = sumcheck_prover.prove(decider_pk);
+    auto prover_output = sumcheck_prover.prove(decider_pk->proving_key.polynomials,
+                                               decider_pk->relation_parameters,
+                                               decider_pk->alphas,
+                                               decider_pk->gate_challenges);
 
     auto verifier_transcript = Transcript::verifier_init_empty(prover_transcript);
 

barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.hpp

@@ -4,9 +4,9 @@
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_flavor.hpp"
-#include "barretenberg/sumcheck/instance/prover_instance.hpp"
 #include "barretenberg/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/transcript/transcript.hpp"
+#include "barretenberg/ultra_honk/decider_proving_key.hpp"
 
 namespace bb {
 

barretenberg/cpp/src/barretenberg/ultra_honk/ultra_transcript.test.cpp

@@ -3,8 +3,8 @@
 #include "barretenberg/numeric/bitop/get_msb.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_flavor.hpp"
-#include "barretenberg/sumcheck/instance/prover_instance.hpp"
 #include "barretenberg/transcript/transcript.hpp"
+#include "barretenberg/ultra_honk/decider_proving_key.hpp"
 #include "barretenberg/ultra_honk/ultra_prover.hpp"
 #include "barretenberg/ultra_honk/ultra_verifier.hpp"
 

barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp

@@ -3,8 +3,8 @@
 #include "barretenberg/srs/global_crs.hpp"
 #include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp"
 #include "barretenberg/stdlib_circuit_builders/ultra_flavor.hpp"
-#include "barretenberg/sumcheck/instance//verifier_instance.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
+#include "barretenberg/ultra_honk/decider_verification_key.hpp"
 #include "barretenberg/ultra_honk/decider_verifier.hpp"
 
 namespace bb {