feat: PG recursive verifier constructors based on stdlib inputs

.github/workflows/ci.yml

@@ -25,6 +25,7 @@ env:
   GIT_COMMIT: ${{ github.event.pull_request.head.sha || github.sha }}
   # kludge until we move away from runners
   WAIT_FOR_RUNNERS: false
+  FULL_CI: true
 
 jobs:
   setup:
@@ -78,6 +79,7 @@ jobs:
               - barretenberg/cpp/pil/**
               - barretenberg/cpp/src/barretenberg/vm/**
               - barretenberg/cpp/src/barretenberg/**/generated/*
+              - barretenberg/cpp/src/barretenberg/client_ivc.{hpp,cpp}
             non-docs:
               - '!(docs/**)'
             non-misc-ci:
@@ -105,7 +107,7 @@ jobs:
 
   build:
     needs: [build-images, changes]
-    if: ${{ needs.changes.outputs.non-docs == 'true' && needs.changes.outputs.non-misc-ci == 'true' && needs.changes.outputs.non-barretenberg-cpp == 'true' }}
+    if: ${{ (needs.changes.outputs.non-docs == 'true' && needs.changes.outputs.non-misc-ci == 'true' && needs.changes.outputs.non-barretenberg-cpp == 'true') || 'true' }}
     runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
     outputs:
       e2e_list: ${{ steps.e2e_list.outputs.list }}
@@ -133,7 +135,7 @@ jobs:
   # all the non-bench end-to-end integration tests for aztec
   e2e:
     needs: [build, changes]
-    if: ${{ needs.changes.outputs.non-barretenberg-cpp == 'true' }}
+    if: ${{ needs.changes.outputs.non-barretenberg-cpp == 'true' || 'true' }}
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
@@ -163,7 +165,7 @@ jobs:
   # all the benchmarking end-to-end integration tests for aztec (not required to merge)
   bench-e2e:
     needs: [build, changes]
-    if: ${{ needs.changes.outputs.non-barretenberg-cpp == 'true' }}
+    if: ${{ needs.changes.outputs.non-barretenberg-cpp == 'true' || 'true'}}
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
@@ -196,7 +198,7 @@ jobs:
     runs-on: ubuntu-20.04
     needs: [build-images, changes]
     # Note: not fully accurate, but to work with bench-summary needs to be the same as bench-e2e
-    if: ${{ needs.changes.outputs.non-barretenberg-cpp == 'true' }}
+    if: ${{ needs.changes.outputs.non-barretenberg-cpp == 'true' || 'true' }}
     steps:
       - uses: actions/checkout@v4
         with: { ref: "${{ env.GIT_COMMIT }}" }

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

@@ -17,9 +17,15 @@ void AztecIVC::complete_kernel_circuit_logic(ClientCircuit& circuit)
     ASSERT(verification_queue.empty() || verification_queue.size() == 2);
 
     for (auto& [proof, vkey] : verification_queue) {
+
+        // Construct stdlib accumulator, vkey and proof
+        auto stdlib_verifier_accum = std::make_shared<RecursiveVerifierInstance>(&circuit, verifier_accumulator);
+        auto stdlib_vkey = std::make_shared<RecursiveVerificationKey>(&circuit, vkey);
+        auto stdlib_proof = bb::convert_proof_to_witness(&circuit, proof);
+
         // Perform folding recursive verification
-        FoldingRecursiveVerifier verifier{ &circuit, { verifier_accumulator, { vkey } } };
-        auto verifier_accum = verifier.verify_folding_proof(proof);
+        FoldingRecursiveVerifier verifier{ &circuit, stdlib_verifier_accum, { stdlib_vkey } };
+        auto verifier_accum = verifier.verify_folding_proof(stdlib_proof);
         verifier_accumulator = std::make_shared<VerifierInstance>(verifier_accum->get_value());
 
         // Perform databus commitment consistency checks and propagate return data commitments via public inputs

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

@@ -44,6 +44,8 @@ class AztecIVC {
 
     using GURecursiveFlavor = MegaRecursiveFlavor_<bb::MegaCircuitBuilder>;
     using RecursiveVerifierInstances = bb::stdlib::recursion::honk::RecursiveVerifierInstances_<GURecursiveFlavor, 2>;
+    using RecursiveVerifierInstance = RecursiveVerifierInstances::Instance;
+    using RecursiveVerificationKey = RecursiveVerifierInstances::VerificationKey;
     using FoldingRecursiveVerifier =
         bb::stdlib::recursion::honk::ProtoGalaxyRecursiveVerifier_<RecursiveVerifierInstances>;
 

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

@@ -18,8 +18,14 @@ void ClientIVC::accumulate(ClientCircuit& circuit, const std::shared_ptr<Verific
     // If a previous fold proof exists, add a recursive folding verification to the circuit
     if (!fold_output.proof.empty()) {
         BB_OP_COUNT_TIME_NAME("construct_circuits");
-        FoldingRecursiveVerifier verifier{ &circuit, { verifier_accumulator, { instance_vk } } };
-        auto verifier_accum = verifier.verify_folding_proof(fold_output.proof);
+
+        // Construct stdlib accumulator, vkey and proof
+        auto stdlib_verifier_accum = std::make_shared<RecursiveVerifierInstance>(&circuit, verifier_accumulator);
+        auto stdlib_instance_vk = std::make_shared<RecursiveVerificationKey>(&circuit, instance_vk);
+        auto stdlib_proof = bb::convert_proof_to_witness(&circuit, fold_output.proof);
+
+        FoldingRecursiveVerifier verifier{ &circuit, stdlib_verifier_accum, { stdlib_instance_vk } };
+        auto verifier_accum = verifier.verify_folding_proof(stdlib_proof);
         verifier_accumulator = std::make_shared<VerifierInstance>(verifier_accum->get_value());
     }
 

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

@@ -39,6 +39,8 @@ class ClientIVC {
 
     using GURecursiveFlavor = MegaRecursiveFlavor_<bb::MegaCircuitBuilder>;
     using RecursiveVerifierInstances = bb::stdlib::recursion::honk::RecursiveVerifierInstances_<GURecursiveFlavor, 2>;
+    using RecursiveVerifierInstance = RecursiveVerifierInstances::Instance;
+    using RecursiveVerificationKey = RecursiveVerifierInstances::VerificationKey;
     using FoldingRecursiveVerifier =
         bb::stdlib::recursion::honk::ProtoGalaxyRecursiveVerifier_<RecursiveVerifierInstances>;
 

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/client_ivc_recursive_verifier.cpp

@@ -10,9 +10,16 @@ namespace bb::stdlib::recursion::honk {
  */
 void ClientIVCRecursiveVerifier::verify(const ClientIVC::Proof& proof)
 {
+    // Construct stdlib accumulator, vkey and proof
+    auto stdlib_verifier_accum =
+        std::make_shared<RecursiveVerifierInstance>(builder.get(), verifier_input.fold_input.accumulator);
+    auto stdlib_instance_vk =
+        std::make_shared<RecursiveVerificationKey>(builder.get(), verifier_input.fold_input.instance_vks[0]);
+    auto stdlib_proof = bb::convert_proof_to_witness(builder.get(), proof.folding_proof);
+
     // Perform recursive folding verification
-    FoldingVerifier folding_verifier{ builder.get(), verifier_input.fold_input };
-    auto recursive_verifier_accumulator = folding_verifier.verify_folding_proof(proof.folding_proof);
+    FoldingVerifier folding_verifier{ builder.get(), stdlib_verifier_accum, { stdlib_instance_vk } };
+    auto recursive_verifier_accumulator = folding_verifier.verify_folding_proof(stdlib_proof);
     auto native_verifier_acc =
         std::make_shared<FoldVerifierInput::Instance>(recursive_verifier_accumulator->get_value());
 

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/client_ivc_recursive_verifier.hpp

@@ -8,6 +8,8 @@ class ClientIVCRecursiveVerifier {
     using Builder = UltraCircuitBuilder;                   // The circuit will be an Ultra circuit
     using RecursiveFlavor = MegaRecursiveFlavor_<Builder>; // The verifier algorithms are Mega
     using RecursiveVerifierInstances = RecursiveVerifierInstances_<RecursiveFlavor, 2>;
+    using RecursiveVerifierInstance = RecursiveVerifierInstances::Instance;
+    using RecursiveVerificationKey = RecursiveVerifierInstances::VerificationKey;
     using DeciderVerifier = DeciderRecursiveVerifier_<RecursiveFlavor>;
     using FoldingVerifier = ProtoGalaxyRecursiveVerifier_<RecursiveVerifierInstances>;
     using GoblinVerifier = GoblinRecursiveVerifier;

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.cpp

@@ -116,12 +116,11 @@ template <class VerifierInstances> void ProtoGalaxyRecursiveVerifier_<VerifierIn
 
 template <class VerifierInstances>
 std::shared_ptr<typename VerifierInstances::Instance> ProtoGalaxyRecursiveVerifier_<
-    VerifierInstances>::verify_folding_proof(const HonkProof& proof)
+    VerifierInstances>::verify_folding_proof(const StdlibProof<Builder>& proof)
 {
     using Transcript = typename Flavor::Transcript;
 
-    StdlibProof<Builder> stdlib_proof = bb::convert_proof_to_witness(builder, proof);
-    transcript = std::make_shared<Transcript>(stdlib_proof);
+    transcript = std::make_shared<Transcript>(proof);
     prepare_for_folding();
 
     auto delta = transcript->template get_challenge<FF>("delta");

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp

@@ -42,9 +42,11 @@ template <class VerifierInstances> class ProtoGalaxyRecursiveVerifier_ {
     std::shared_ptr<Transcript> transcript;
     VerifierInstances instances;
 
-    ProtoGalaxyRecursiveVerifier_(Builder* builder, const VerifierInput& input_data)
+    ProtoGalaxyRecursiveVerifier_(Builder* builder,
+                                  const std::shared_ptr<Instance>& accumulator,
+                                  const std::vector<std::shared_ptr<VerificationKey>>& instance_vks)
         : builder(builder)
-        , instances(VerifierInstances(builder, input_data.accumulator, input_data.instance_vks)){};
+        , instances(VerifierInstances(builder, accumulator, instance_vks)){};
 
     /**
      * @brief Given a new round challenge δ for each iteration of the full ProtoGalaxy protocol, compute the vector
@@ -101,9 +103,9 @@ template <class VerifierInstances> class ProtoGalaxyRecursiveVerifier_ {
      * @details In the recursive setting this function doesn't return anything because the equality checks performed by
      * the recursive verifier, ensuring the folded ϕ*, e* and β* on the verifier side correspond to what has been sent
      * by the prover, are expressed as constraints.
-
+     *
      */
-    std::shared_ptr<Instance> verify_folding_proof(const HonkProof&);
+    std::shared_ptr<Instance> verify_folding_proof(const StdlibProof<Builder>&);
 
     /**
      * @brief Evaluates the perturbator at a  given scalar, in a sequential manner for the recursive setting.

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.test.cpp

@@ -37,6 +37,8 @@ template <typename RecursiveFlavor> class ProtoGalaxyRecursiveTests : public tes
     using OuterProverInstance = ProverInstance_<OuterFlavor>;
 
     using RecursiveVerifierInstances = ::bb::stdlib::recursion::honk::RecursiveVerifierInstances_<RecursiveFlavor, 2>;
+    using RecursiveVerifierInstance = RecursiveVerifierInstances::Instance;
+    using RecursiveVerificationKey = RecursiveVerifierInstances::VerificationKey;
     using FoldingRecursiveVerifier = ProtoGalaxyRecursiveVerifier_<RecursiveVerifierInstances>;
     using DeciderRecursiveVerifier = DeciderRecursiveVerifier_<RecursiveFlavor>;
     using InnerDeciderProver = DeciderProver_<InnerFlavor>;
@@ -193,9 +195,17 @@ template <typename RecursiveFlavor> class ProtoGalaxyRecursiveTests : public tes
 
         // Create a recursive folding verifier circuit for the folding proof of the two instances
         OuterBuilder folding_circuit;
-        auto verifier = FoldingRecursiveVerifier(&folding_circuit,
-                                                 { verifier_instance_1, { verifier_instance_2->verification_key } });
-        verifier.verify_folding_proof(folding_proof.proof);
+
+        auto recursive_verifier_instance_1 =
+            std::make_shared<RecursiveVerifierInstance>(&folding_circuit, verifier_instance_1);
+        auto recursive_verification_key_2 =
+            std::make_shared<RecursiveVerificationKey>(&folding_circuit, verifier_instance_2->verification_key);
+        StdlibProof<OuterBuilder> stdlib_proof = bb::convert_proof_to_witness(&folding_circuit, folding_proof.proof);
+
+        auto verifier = FoldingRecursiveVerifier{ &folding_circuit,
+                                                  recursive_verifier_instance_1,
+                                                  { recursive_verification_key_2 } };
+        verifier.verify_folding_proof(stdlib_proof);
         info("Folding Recursive Verifier: num gates = ", folding_circuit.num_gates);
         EXPECT_EQ(folding_circuit.failed(), false) << folding_circuit.err();
 
@@ -257,9 +267,16 @@ template <typename RecursiveFlavor> class ProtoGalaxyRecursiveTests : public tes
 
         // Create a recursive folding verifier circuit for the folding proof of the two instances
         OuterBuilder folding_circuit;
-        auto verifier = FoldingRecursiveVerifier(&folding_circuit,
-                                                 { verifier_instance_1, { verifier_instance_2->verification_key } });
-        auto recursive_verifier_accumulator = verifier.verify_folding_proof(folding_proof.proof);
+        auto recursive_verifier_instance_1 =
+            std::make_shared<RecursiveVerifierInstance>(&folding_circuit, verifier_instance_1);
+        auto recursive_verification_key_2 =
+            std::make_shared<RecursiveVerificationKey>(&folding_circuit, verifier_instance_2->verification_key);
+        StdlibProof<OuterBuilder> stdlib_proof = bb::convert_proof_to_witness(&folding_circuit, folding_proof.proof);
+
+        auto verifier = FoldingRecursiveVerifier{ &folding_circuit,
+                                                  recursive_verifier_instance_1,
+                                                  { recursive_verification_key_2 } };
+        auto recursive_verifier_accumulator = verifier.verify_folding_proof(stdlib_proof);
         auto native_verifier_acc = std::make_shared<InnerVerifierInstance>(recursive_verifier_accumulator->get_value());
         info("Folding Recursive Verifier: num gates = ", folding_circuit.num_gates);
 
@@ -356,9 +373,17 @@ template <typename RecursiveFlavor> class ProtoGalaxyRecursiveTests : public tes
         // Create a recursive folding verifier circuit for the folding proof of the two instances with the untampered
         // commitments
         OuterBuilder folding_circuit;
-        FoldingRecursiveVerifier verifier{ &folding_circuit,
-                                           { verifier_accumulator, { verifier_inst->verification_key } } };
-        auto recursive_verifier_acc = verifier.verify_folding_proof(folding_proof.proof);
+        auto recursive_verifier_instance_1 =
+            std::make_shared<RecursiveVerifierInstance>(&folding_circuit, verifier_accumulator);
+        auto recursive_verification_key_2 =
+            std::make_shared<RecursiveVerificationKey>(&folding_circuit, verifier_inst->verification_key);
+        StdlibProof<OuterBuilder> stdlib_proof = bb::convert_proof_to_witness(&folding_circuit, folding_proof.proof);
+
+        auto verifier = FoldingRecursiveVerifier{ &folding_circuit,
+                                                  recursive_verifier_instance_1,
+                                                  { recursive_verification_key_2 } };
+        auto recursive_verifier_acc = verifier.verify_folding_proof(stdlib_proof);
+
         // Validate that the target sum between prover and verifier is now different
         EXPECT_FALSE(folding_proof.accumulator->target_sum == recursive_verifier_acc->target_sum.get_value());
     };

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp

@@ -8,9 +8,7 @@ template <IsRecursiveFlavor Flavor_, size_t NUM_> struct RecursiveVerifierInstan
     using Flavor = Flavor_;
     using Builder = typename Flavor::CircuitBuilder;
     using VerificationKey = typename Flavor::VerificationKey;
-    using NativeVerificationKey = typename Flavor::NativeVerificationKey;
     using Instance = RecursiveVerifierInstance_<Flavor>;
-    using NativeInstance = bb::VerifierInstance_<typename Flavor::NativeFlavor>;
     using ArrayType = std::array<std::shared_ptr<Instance>, NUM_>;
 
   public:
@@ -23,13 +21,13 @@ template <IsRecursiveFlavor Flavor_, size_t NUM_> struct RecursiveVerifierInstan
     Builder* builder;
 
     RecursiveVerifierInstances_(Builder* builder,
-                                const std::shared_ptr<NativeInstance>& accumulator,
-                                const std::vector<std::shared_ptr<NativeVerificationKey>>& vks)
+                                const std::shared_ptr<Instance>& accumulator,
+                                const std::vector<std::shared_ptr<VerificationKey>>& vks)
         : builder(builder)
     {
         ASSERT(vks.size() == NUM - 1);
 
-        _data[0] = std::make_shared<Instance>(builder, accumulator);
+        _data[0] = accumulator;
 
         size_t idx = 1;
         for (auto& vk : vks) {

barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/recursive_verifier_instance.hpp

@@ -40,9 +40,15 @@ template <IsRecursiveFlavor Flavor> class RecursiveVerifierInstance_ {
 
     RecursiveVerifierInstance_(Builder* builder)
         : builder(builder){};
+
     RecursiveVerifierInstance_(Builder* builder, std::shared_ptr<NativeVerificationKey> vk)
         : builder(builder)
-        , verification_key(std::make_shared<VerificationKey>(builder, vk))
+        , verification_key(std::make_shared<VerificationKey>(builder, vk)){};
+
+    // Constructor from stdlib vkey
+    RecursiveVerifierInstance_(Builder* builder, std::shared_ptr<VerificationKey> vk)
+        : builder(builder)
+        , verification_key(vk)
     {}
 
     RecursiveVerifierInstance_(Builder* builder, const std::shared_ptr<VerifierInstance>& instance)