removed template param from honk::proof

AztecProtocol · Jan 13, 2024 · 029350c · 029350c
1 parent 99bd01d
commit 029350c
Show file tree

Hide file tree

Showing 28 changed files with 44 additions and 43 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.cpp
@@ -274,13 +274,13 @@ template <ECCVMFlavor Flavor> void ECCVMProver_<Flavor>::execute_transcript_cons
     translation_batching_challenge_v = transcript->get_challenge("Translation:batching_challenge");
 }
 
-template <ECCVMFlavor Flavor> honk::proof<typename Flavor::FF>& ECCVMProver_<Flavor>::export_proof()
+template <ECCVMFlavor Flavor> honk::proof& ECCVMProver_<Flavor>::export_proof()
 {
     proof = transcript->export_proof();
     return proof;
 }
 
-template <ECCVMFlavor Flavor> honk::proof<typename Flavor::FF>& ECCVMProver_<Flavor>::construct_proof()
+template <ECCVMFlavor Flavor> honk::proof& ECCVMProver_<Flavor>::construct_proof()
 {
     execute_preamble_round();
 

diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp
@@ -42,8 +42,8 @@ template <ECCVMFlavor Flavor> class ECCVMProver_ {
     BBERG_PROFILE void execute_final_pcs_round();
     BBERG_PROFILE void execute_transcript_consistency_univariate_opening_round();
 
-    honk::proof<FF>& export_proof();
-    honk::proof<FF>& construct_proof();
+    honk::proof& export_proof();
+    honk::proof& construct_proof();
 
     std::shared_ptr<Transcript> transcript;
 
@@ -80,7 +80,7 @@ template <ECCVMFlavor Flavor> class ECCVMProver_ {
     using Shplonk = pcs::shplonk::ShplonkProver_<Curve>;
 
   private:
-    honk::proof<FF> proof;
+    honk::proof proof;
 };
 
 extern template class ECCVMProver_<honk::flavor::ECCVM>;

diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp
@@ -32,7 +32,7 @@ template <typename Flavor> ECCVMVerifier_<Flavor>& ECCVMVerifier_<Flavor>::opera
  * @brief This function verifies an ECCVM Honk proof for given program settings.
  *
  */
-template <typename Flavor> bool ECCVMVerifier_<Flavor>::verify_proof(const honk::proof<FF>& proof)
+template <typename Flavor> bool ECCVMVerifier_<Flavor>::verify_proof(const honk::proof& proof)
 {
     using FF = typename Flavor::FF;
     using GroupElement = typename Flavor::GroupElement;

diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.hpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.hpp
@@ -30,7 +30,7 @@ template <typename Flavor> class ECCVMVerifier_ {
     ECCVMVerifier_& operator=(ECCVMVerifier_&& other) noexcept;
     ~ECCVMVerifier_() = default;
 
-    bool verify_proof(const honk::proof<FF>& proof);
+    bool verify_proof(const honk::proof& proof);
 
     std::shared_ptr<VerificationKey> key;
     std::map<std::string, Commitment> commitments;

diff --git a/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp b/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp
@@ -614,7 +614,7 @@ template <typename CycleGroup_T, typename Curve_T, typename PCS_T> class ECCVMBa
 
         Transcript() = default;
 
-        Transcript(const honk::proof<FF>& proof)
+        Transcript(const honk::proof& proof)
             : BaseTranscript(proof)
         {}
 

diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp
@@ -538,7 +538,7 @@ class GoblinUltra {
 
         Transcript_() = default;
 
-        Transcript_(const honk::proof<FF>& proof)
+        Transcript_(const honk::proof& proof)
             : BaseTranscript(proof)
         {}
 

diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/types/proof.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/types/proof.hpp
@@ -1,8 +1,9 @@
 #pragma once
+#include "barretenberg/ecc/curves/bn254/fr.hpp"
 #include <vector>
 
 namespace proof_system::honk {
 
-template <typename FF> using proof = std::vector<FF>;
+using proof = std::vector<barretenberg::fr>;
 
 } // namespace proof_system::honk
diff --git a/...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.cpp b/...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.cpp
@@ -16,7 +16,7 @@ MergeRecursiveVerifier_<CircuitBuilder>::MergeRecursiveVerifier_(CircuitBuilder*
  */
 template <typename CircuitBuilder>
 std::array<typename bn254<CircuitBuilder>::Element, 2> MergeRecursiveVerifier_<CircuitBuilder>::verify_proof(
-    const proof_system::honk::proof<NativeFF>& proof)
+    const proof_system::honk::proof& proof)
 {
     transcript = std::make_shared<Transcript>(builder, proof);
 

diff --git a/...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp b/...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/merge_recursive_verifier.hpp
@@ -24,7 +24,7 @@ template <typename CircuitBuilder> class MergeRecursiveVerifier_ {
 
     explicit MergeRecursiveVerifier_(CircuitBuilder* builder);
 
-    PairingPoints verify_proof(const proof_system::honk::proof<NativeFF>& proof);
+    PairingPoints verify_proof(const proof_system::honk::proof& proof);
 };
 
 extern template class MergeRecursiveVerifier_<GoblinUltraCircuitBuilder>;

diff --git a/...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp b/...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp
@@ -19,7 +19,7 @@ UltraRecursiveVerifier_<Flavor>::UltraRecursiveVerifier_(
  */
 template <typename Flavor>
 std::array<typename Flavor::GroupElement, 2> UltraRecursiveVerifier_<Flavor>::verify_proof(
-    const proof_system::honk::proof<NativeFF>& proof)
+    const proof_system::honk::proof& proof)
 {
     using Sumcheck = ::proof_system::honk::sumcheck::SumcheckVerifier<Flavor>;
     using Curve = typename Flavor::Curve;

diff --git a/...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp b/...etenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp
@@ -29,7 +29,7 @@ template <typename Flavor> class UltraRecursiveVerifier_ {
 
     // TODO(luke): Eventually this will return something like aggregation_state but I'm simplifying for now until we
     // determine the exact interface. Simply returns the two pairing points.
-    PairingPoints verify_proof(const proof_system::honk::proof<NativeFF>& proof);
+    PairingPoints verify_proof(const proof_system::honk::proof& proof);
 
     std::shared_ptr<VerificationKey> key;
     std::map<std::string, Commitment> commitments;

diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.hpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_composer.hpp
@@ -19,7 +19,7 @@ class GoblinTranslatorComposer {
     using CommitmentKey = typename Flavor::CommitmentKey;
     using VerifierCommitmentKey = typename Flavor::VerifierCommitmentKey;
     using Polynomial = typename Flavor::Polynomial;
-    using Transcript = BaseTranscript<Flavor::FF>;
+    using Transcript = BaseTranscript;
     static constexpr size_t MINI_CIRCUIT_SIZE = Flavor::MINI_CIRCUIT_SIZE;
 
     static constexpr std::string_view NAME_STRING = "GoblinTranslator";

diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.cpp
@@ -168,13 +168,13 @@ void GoblinTranslatorProver::execute_zeromorph_rounds()
                      prover_polynomials.get_concatenation_groups());
 }
 
-honk::proof<GoblinTranslatorProver::FF>& GoblinTranslatorProver::export_proof()
+honk::proof& GoblinTranslatorProver::export_proof()
 {
     proof = transcript->export_proof();
     return proof;
 }
 
-honk::proof<GoblinTranslatorProver::FF>& GoblinTranslatorProver::construct_proof()
+honk::proof& GoblinTranslatorProver::construct_proof()
 {
     // Add circuit size public input size and public inputs to transcript.
     execute_preamble_round();

diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.hpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_prover.hpp
@@ -35,8 +35,8 @@ class GoblinTranslatorProver {
     BBERG_PROFILE void execute_grand_product_computation_round();
     BBERG_PROFILE void execute_relation_check_rounds();
     BBERG_PROFILE void execute_zeromorph_rounds();
-    honk::proof<FF>& export_proof();
-    honk::proof<FF>& construct_proof();
+    honk::proof& export_proof();
+    honk::proof& construct_proof();
 
     std::shared_ptr<Transcript> transcript = std::make_shared<Transcript>();
 
@@ -54,7 +54,7 @@ class GoblinTranslatorProver {
     sumcheck::SumcheckOutput<Flavor> sumcheck_output;
 
   private:
-    honk::proof<FF> proof;
+    honk::proof proof;
 };
 
 } // namespace proof_system::honk
diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.cpp
@@ -65,7 +65,7 @@ void GoblinTranslatorVerifier::put_translation_data_in_relation_parameters(const
 /**
  * @brief This function verifies an GoblinTranslator Honk proof for given program settings.
  */
-bool GoblinTranslatorVerifier::verify_proof(const honk::proof<FF>& proof)
+bool GoblinTranslatorVerifier::verify_proof(const honk::proof& proof)
 {
     // batching_challenge_v = transcript->get_challenge("Translation:batching_challenge");
     batching_challenge_v = 0;

diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.hpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.hpp
@@ -35,7 +35,7 @@ class GoblinTranslatorVerifier {
     void put_translation_data_in_relation_parameters(const uint256_t& evaluation_input_x,
                                                      const BF& batching_challenge_v,
                                                      const uint256_t& accumulated_result);
-    bool verify_proof(const honk::proof<FF>& proof);
+    bool verify_proof(const honk::proof& proof);
     bool verify_translation(const TranslationEvaluations& translation_evaluations);
 };
 } // namespace proof_system::honk
diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.cpp
@@ -27,9 +27,9 @@ MergeProver_<Flavor>::MergeProver_(const std::shared_ptr<CommitmentKey>& commitm
  * for details (https://github.com/AztecProtocol/barretenberg/issues/746).
  *
  * @tparam Flavor
- * @return honk::proof<FF>&
+ * @return honk::proof&
  */
-template <typename Flavor> honk::proof<typename Flavor::FF>& MergeProver_<Flavor>::construct_proof()
+template <typename Flavor> honk::proof& MergeProver_<Flavor>::construct_proof()
 {
     size_t N = op_queue->get_current_size();
 

diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.hpp
@@ -33,10 +33,10 @@ template <typename Flavor> class MergeProver_ {
     explicit MergeProver_(const std::shared_ptr<CommitmentKey>&,
                           const std::shared_ptr<ECCOpQueue>&,
                           const std::shared_ptr<Transcript>& transcript = std::make_shared<Transcript>());
-    BBERG_PROFILE honk::proof<FF>& construct_proof();
+    BBERG_PROFILE honk::proof& construct_proof();
 
   private:
-    honk::proof<FF> proof;
+    honk::proof proof;
 };
 
 extern template class MergeProver_<honk::flavor::Ultra>;

diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.cpp
@@ -16,9 +16,9 @@ MergeVerifier_<Flavor>::MergeVerifier_()
  * queue has been constructed correctly via a simple Schwartz-Zippel check. Evaluations are checked via batched KZG.
  *
  * @tparam Flavor
- * @return honk::proof<FF>&
+ * @return honk::proof&
  */
-template <typename Flavor> bool MergeVerifier_<Flavor>::verify_proof(const honk::proof<FF>& proof)
+template <typename Flavor> bool MergeVerifier_<Flavor>::verify_proof(const honk::proof& proof)
 {
     transcript = std::make_shared<Transcript>(proof);
 

diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.hpp
@@ -33,7 +33,7 @@ template <typename Flavor> class MergeVerifier_ {
     std::shared_ptr<VerifierCommitmentKey> pcs_verification_key;
 
     explicit MergeVerifier_();
-    bool verify_proof(const honk::proof<FF>& proof);
+    bool verify_proof(const honk::proof& proof);
 };
 
 extern template class MergeVerifier_<honk::flavor::Ultra>;

diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp
@@ -178,13 +178,13 @@ template <UltraFlavor Flavor> void UltraProver_<Flavor>::execute_zeromorph_round
                      transcript);
 }
 
-template <UltraFlavor Flavor> honk::proof<typename Flavor::FF>& UltraProver_<Flavor>::export_proof()
+template <UltraFlavor Flavor> honk::proof& UltraProver_<Flavor>::export_proof()
 {
     proof = transcript->proof_data;
     return proof;
 }
 
-template <UltraFlavor Flavor> honk::proof<typename Flavor::FF>& UltraProver_<Flavor>::construct_proof()
+template <UltraFlavor Flavor> honk::proof& UltraProver_<Flavor>::construct_proof()
 {
     // Add circuit size public input size and public inputs to transcript->
     execute_preamble_round();

diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.hpp
@@ -35,8 +35,8 @@ template <UltraFlavor Flavor> class UltraProver_ {
     BBERG_PROFILE void execute_relation_check_rounds();
     BBERG_PROFILE void execute_zeromorph_rounds();
 
-    honk::proof<FF>& export_proof();
-    honk::proof<FF>& construct_proof();
+    honk::proof& export_proof();
+    honk::proof& construct_proof();
 
     std::shared_ptr<Instance> instance;
 
@@ -55,7 +55,7 @@ template <UltraFlavor Flavor> class UltraProver_ {
     using ZeroMorph = pcs::zeromorph::ZeroMorphProver_<Curve>;
 
   private:
-    honk::proof<FF> proof;
+    honk::proof proof;
 };
 
 extern template class UltraProver_<honk::flavor::Ultra>;

diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.cpp
@@ -45,7 +45,7 @@ template <typename Flavor> UltraVerifier_<Flavor>& UltraVerifier_<Flavor>::opera
  * @brief This function verifies an Ultra Honk proof for a given Flavor.
  *
  */
-template <typename Flavor> bool UltraVerifier_<Flavor>::verify_proof(const honk::proof<FF>& proof)
+template <typename Flavor> bool UltraVerifier_<Flavor>::verify_proof(const honk::proof& proof)
 {
     using FF = typename Flavor::FF;
     using Commitment = typename Flavor::Commitment;

diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp
@@ -24,7 +24,7 @@ template <typename Flavor> class UltraVerifier_ {
     UltraVerifier_& operator=(const UltraVerifier_& other) = delete;
     UltraVerifier_& operator=(UltraVerifier_&& other);
 
-    bool verify_proof(const honk::proof<FF>& proof);
+    bool verify_proof(const honk::proof& proof);
 
     std::shared_ptr<VerificationKey> key;
     std::map<std::string, Commitment> commitments;

diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_prover.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_prover.cpp
@@ -98,13 +98,13 @@ void AvmMiniProver::execute_zeromorph_rounds()
                      transcript);
 }
 
-honk::proof<FF>& AvmMiniProver::export_proof()
+honk::proof& AvmMiniProver::export_proof()
 {
     proof = transcript->proof_data;
     return proof;
 }
 
-proof_system::honk::proof<FF>& AvmMiniProver::construct_proof()
+proof_system::honk::proof& AvmMiniProver::construct_proof()
 {
     // Add circuit size public input size and public inputs to transcript.
     execute_preamble_round();

diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_prover.hpp b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_prover.hpp
@@ -31,8 +31,8 @@ class AvmMiniProver {
     void execute_relation_check_rounds();
     void execute_zeromorph_rounds();
 
-    honk::proof<FF>& export_proof();
-    honk::proof<FF>& construct_proof();
+    honk::proof& export_proof();
+    honk::proof& construct_proof();
 
     std::shared_ptr<Transcript> transcript = std::make_shared<Transcript>();
 
@@ -56,7 +56,7 @@ class AvmMiniProver {
     using ZeroMorph = pcs::zeromorph::ZeroMorphProver_<Curve>;
 
   private:
-    honk::proof<FF> proof;
+    honk::proof proof;
 };
 
 } // namespace proof_system::honk
diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.cpp
@@ -30,7 +30,7 @@ AvmMiniVerifier& AvmMiniVerifier::operator=(AvmMiniVerifier&& other) noexcept
  * @brief This function verifies an AvmMini Honk proof for given program settings.
  *
  */
-bool AvmMiniVerifier::verify_proof(const honk::proof<FF>& proof)
+bool AvmMiniVerifier::verify_proof(const honk::proof& proof)
 {
     using Flavor = honk::flavor::AvmMiniFlavor;
     using FF = Flavor::FF;

diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.hpp b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.hpp
@@ -22,7 +22,7 @@ class AvmMiniVerifier {
     AvmMiniVerifier& operator=(const AvmMiniVerifier& other) = delete;
     AvmMiniVerifier& operator=(AvmMiniVerifier&& other) noexcept;
 
-    bool verify_proof(const honk::proof<FF>& proof);
+    bool verify_proof(const honk::proof& proof);
 
     std::shared_ptr<VerificationKey> key;
     std::map<std::string, Commitment> commitments;