refactor(bb): Reuse entities from GoblinUltra in GoblinUltraRecursive (…

…#3521) This is achieved by adding some minimal templating that is redundant in the context of GoblinUltra, but can be used to remove a lot of duplication in GoblinUltraRecursive
AztecProtocol · Dec 1, 2023 · 8259636 · 8259636
1 parent d37cf52
commit 8259636
Show file tree

Hide file tree

Showing 14 changed files with 202 additions and 645 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp
@@ -51,8 +51,8 @@ template <typename Flavor> bool ECCVMVerifier_<Flavor>::verify_proof(const plonk
 
     transcript = Transcript{ proof.proof_data };
 
-    auto commitments = VerifierCommitments(key, transcript);
-    auto commitment_labels = CommitmentLabels();
+    VerifierCommitments commitments{ key };
+    CommitmentLabels commitment_labels;
 
     const auto circuit_size = transcript.template receive_from_prover<uint32_t>("circuit_size");
 

diff --git a/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp b/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp
@@ -519,17 +519,12 @@ template <typename CycleGroup_T, typename Curve_T, typename PCS_T> class ECCVMBa
     };
 
     class VerifierCommitments : public AllEntities<Commitment> {
-      private:
-        using Base = AllEntities<Commitment>;
-
       public:
-        VerifierCommitments(const std::shared_ptr<VerificationKey>& verification_key,
-                            [[maybe_unused]] const BaseTranscript& transcript)
+        VerifierCommitments(const std::shared_ptr<VerificationKey>& verification_key)
         {
-            static_cast<void>(transcript);
-            Base::lagrange_first = verification_key->lagrange_first;
-            Base::lagrange_second = verification_key->lagrange_second;
-            Base::lagrange_last = verification_key->lagrange_last;
+            this->lagrange_first = verification_key->lagrange_first;
+            this->lagrange_second = verification_key->lagrange_second;
+            this->lagrange_last = verification_key->lagrange_last;
         }
     };
 

diff --git a/barretenberg/cpp/src/barretenberg/flavor/generated/AvmMini_flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/generated/AvmMini_flavor.hpp
@@ -326,9 +326,8 @@ class AvmMiniFlavor {
         using Base = AllEntities<Commitment>;
 
       public:
-        VerifierCommitments(const std::shared_ptr<VerificationKey>& verification_key, const BaseTranscript& transcript)
+        VerifierCommitments(const std::shared_ptr<VerificationKey>& verification_key)
         {
-            static_cast<void>(transcript);
             avmMini_clk = verification_key->avmMini_clk;
             avmMini_first = verification_key->avmMini_first;
         }

diff --git a/barretenberg/cpp/src/barretenberg/flavor/generated/Fib_flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/generated/Fib_flavor.hpp
@@ -216,9 +216,8 @@ class FibFlavor {
         using Base = AllEntities<Commitment>;
 
       public:
-        VerifierCommitments(const std::shared_ptr<VerificationKey>& verification_key, const BaseTranscript& transcript)
+        VerifierCommitments(const std::shared_ptr<VerificationKey>& verification_key)
         {
-            static_cast<void>(transcript);
             Fibonacci_LAST = verification_key->Fibonacci_LAST;
             Fibonacci_FIRST = verification_key->Fibonacci_FIRST;
         }

diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp
@@ -1204,8 +1204,7 @@ class GoblinTranslator {
 
     class VerifierCommitments : public AllEntities<Commitment> {
       public:
-        VerifierCommitments([[maybe_unused]] std::shared_ptr<VerificationKey> verification_key,
-                            [[maybe_unused]] const BaseTranscript& transcript)
+        VerifierCommitments(const std::shared_ptr<VerificationKey>& verification_key)
         {
             this->lagrange_first = verification_key->lagrange_first;
             this->lagrange_last = verification_key->lagrange_last;

diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp
diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp
diff --git a/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp
@@ -354,10 +354,8 @@ class Ultra {
 
     class VerifierCommitments : public AllEntities<Commitment> {
       public:
-        VerifierCommitments(std::shared_ptr<VerificationKey> verification_key,
-                            [[maybe_unused]] const BaseTranscript& transcript)
+        VerifierCommitments(const std::shared_ptr<VerificationKey>& verification_key)
         {
-            static_cast<void>(transcript);
             q_m = verification_key->q_m;
             q_l = verification_key->q_l;
             q_r = verification_key->q_r;

diff --git a/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp
@@ -341,7 +341,7 @@ template <typename BuilderType> class UltraRecursive_ {
 
     class VerifierCommitments : public AllEntities<Commitment> {
       public:
-        VerifierCommitments(std::shared_ptr<VerificationKey> verification_key)
+        VerifierCommitments(const std::shared_ptr<VerificationKey>& verification_key)
         {
             this->q_m = verification_key->q_m;
             this->q_l = verification_key->q_l;

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
@@ -32,8 +32,8 @@ std::array<typename Flavor::GroupElement, 2> UltraRecursiveVerifier_<Flavor>::ve
 
     transcript = Transcript<Builder>{ builder, proof.proof_data };
 
-    auto commitments = VerifierCommitments(key);
-    auto commitment_labels = CommitmentLabels();
+    VerifierCommitments commitments{ key };
+    CommitmentLabels commitment_labels;
 
     const auto circuit_size = transcript.template receive_from_prover<uint32_t>("circuit_size");
     const auto public_input_size = transcript.template receive_from_prover<uint32_t>("public_input_size");

diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.cpp b/barretenberg/cpp/src/barretenberg/translator_vm/goblin_translator_verifier.cpp
@@ -67,7 +67,7 @@ bool GoblinTranslatorVerifier::verify_proof(const plonk::proof& proof)
 {
     transcript = BaseTranscript{ proof.proof_data };
 
-    Flavor::VerifierCommitments commitments{ key, transcript };
+    Flavor::VerifierCommitments commitments{ key };
     Flavor::CommitmentLabels commitment_labels;
 
     // TODO(Adrian): Change the initialization of the transcript to take the VK hash?

diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.cpp
@@ -44,8 +44,8 @@ template <typename Flavor> bool UltraVerifier_<Flavor>::verify_proof(const plonk
 
     transcript = BaseTranscript{ proof.proof_data };
 
-    auto commitments = VerifierCommitments(key, transcript);
-    auto commitment_labels = CommitmentLabels();
+    VerifierCommitments commitments{ key };
+    CommitmentLabels commitment_labels;
 
     // TODO(Adrian): Change the initialization of the transcript to take the VK hash?
     const auto circuit_size = transcript.template receive_from_prover<uint32_t>("circuit_size");

diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/AvmMini_verifier.cpp
@@ -45,8 +45,8 @@ bool AvmMiniVerifier::verify_proof(const plonk::proof& proof)
 
     transcript = BaseTranscript{ proof.proof_data };
 
-    auto commitments = VerifierCommitments(key, transcript);
-    auto commitment_labels = CommitmentLabels();
+    VerifierCommitments commitments{ key };
+    CommitmentLabels commitment_labels;
 
     const auto circuit_size = transcript.template receive_from_prover<uint32_t>("circuit_size");
 

diff --git a/barretenberg/cpp/src/barretenberg/vm/generated/Fib_verifier.cpp b/barretenberg/cpp/src/barretenberg/vm/generated/Fib_verifier.cpp
@@ -45,8 +45,8 @@ bool FibVerifier::verify_proof(const plonk::proof& proof)
 
     transcript = BaseTranscript{ proof.proof_data };
 
-    auto commitments = VerifierCommitments(key, transcript);
-    auto commitment_labels = CommitmentLabels();
+    VerifierCommitments commitments{ key };
+    CommitmentLabels commitment_labels;
 
     const auto circuit_size = transcript.template receive_from_prover<uint32_t>("circuit_size");