feat: merge-train/barretenberg (#17728)

BEGIN_COMMIT_OVERRIDE
chore: clean-up `pow`-polynomial handling in
`MultilinearBatchingSumcheck` (#17717)
chore: Integrate Hypernova into ClientIVC (#17720)
chore(bb): remove unused polynomial methods (#17696)
fix: tamper heavy-handedly to avoid PG test flake (#17740)
delete test of deleted poly method
END_COMMIT_OVERRIDE

Author: AztecBot

barretenberg/cpp/src/CMakeLists.txt

@@ -160,6 +160,7 @@ set(BARRETENBERG_TARGET_OBJECTS
     $<TARGET_OBJECTS:trace_to_polynomials_objects>
     $<TARGET_OBJECTS:flavor_objects>
     $<TARGET_OBJECTS:goblin_objects>
+    $<TARGET_OBJECTS:hypernova_objects>
     $<TARGET_OBJECTS:honk>
     $<TARGET_OBJECTS:multilinear_batching_objects>
     $<TARGET_OBJECTS:numeric_objects>

barretenberg/cpp/src/barretenberg/client_ivc/CMakeLists.txt

@@ -1 +1 @@
-barretenberg_module(client_ivc stdlib_protogalaxy_verifier dsl libdeflate::libdeflate_static multilinear_batching)
+barretenberg_module(client_ivc stdlib_protogalaxy_verifier dsl libdeflate::libdeflate_static hypernova multilinear_batching)

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

@@ -30,9 +30,7 @@ class SumcheckClientIVCTests : public ::testing::Test {
     using Builder = SumcheckClientIVC::ClientCircuit;
     using ProverInstance = SumcheckClientIVC::ProverInstance;
     using VerifierInstance = SumcheckClientIVC::VerifierInstance;
-    using FoldProof = SumcheckClientIVC::FoldProof;
     using DeciderProver = SumcheckClientIVC::DeciderProver;
-    using DeciderVerifier = SumcheckClientIVC::DeciderVerifier;
     using CircuitProducer = PrivateFunctionExecutionMockCircuitProducer;
 
   public:
@@ -46,9 +44,6 @@ class SumcheckClientIVCTests : public ::testing::Test {
             circuit_producer.construct_and_accumulate_next_circuit(ivc);
         }
 
-        info("Num ecc rows: ", ivc.goblin.op_queue->get_num_rows());
-        // info("Num ecc ultra ops: ", ivc.goblin.op_queue->get_ultra_ops_table_num_rows());
-
         return { ivc.prove(), ivc.get_vk() };
     };
 };
@@ -59,8 +54,7 @@ class SumcheckClientIVCTests : public ::testing::Test {
  */
 TEST_F(SumcheckClientIVCTests, BasicStructured)
 {
-    // BB_DISABLE_ASSERTS();
-    const size_t NUM_APP_CIRCUITS = 15;
+    const size_t NUM_APP_CIRCUITS = 5;
     auto [proof, vk] = SumcheckClientIVCTests::accumulate_and_prove_ivc(NUM_APP_CIRCUITS);
 
     EXPECT_TRUE(SumcheckClientIVC::verify(proof, vk));

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

@@ -205,7 +205,6 @@ class PrivateFunctionExecutionMockCircuitProducer {
         if (ivc.num_circuits_accumulated == ivc.get_num_circuits() - 1) {
             settings = TestSettings{};
         }
-        info("setting gates ", settings.log2_num_gates);
         auto circuit = create_next_circuit(ivc, settings.log2_num_gates, settings.num_public_inputs);
         return { circuit, get_verification_key(circuit) };
     }

barretenberg/cpp/src/barretenberg/client_ivc/sumcheck_client_ivc.test.cpp

@@ -283,14 +283,16 @@ void mock_sumcheck_ivc_accumulation(const std::shared_ptr<SumcheckClientIVC>& iv
     // Initialize verifier accumulator with proper structure
     ivc->recursive_verifier_native_accum.challenge =
         std::vector<FF>(SumcheckClientIVC::Flavor::VIRTUAL_LOG_N, FF::zero());
-    ivc->recursive_verifier_native_accum.batched_evaluations = { FF::zero(), FF::zero() };
-    ivc->recursive_verifier_native_accum.batched_commitments = { Commitment::one(), Commitment::one() };
+    ivc->recursive_verifier_native_accum.non_shifted_evaluation = FF::zero();
+    ivc->recursive_verifier_native_accum.shifted_evaluation = FF::zero();
+    ivc->recursive_verifier_native_accum.non_shifted_commitment = Commitment::one();
+    ivc->recursive_verifier_native_accum.shifted_commitment = Commitment::one();
 
     SumcheckClientIVC::VerifierInputs entry = acir_format::create_mock_verification_queue_entry_nova(type, is_kernel);
     ivc->verification_queue.emplace_back(entry);
     ivc->goblin.merge_verification_queue.emplace_back(acir_format::create_mock_merge_proof());
     if (type == SumcheckClientIVC::QUEUE_TYPE::PG_FINAL) {
-        ivc->pcs_proof = acir_format::create_mock_pcs_proof<SumcheckClientIVC::Flavor>();
+        ivc->decider_proof = acir_format::create_mock_pcs_proof<SumcheckClientIVC::Flavor>();
     }
     ivc->num_circuits_accumulated++;
 }

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

@@ -359,6 +359,7 @@ TEST_F(SumcheckIvcRecursionConstraintTest, AccumulateTwoApps)
 // Test generation of "init" kernel VK via dummy IVC data
 TEST_F(SumcheckIvcRecursionConstraintTest, GenerateInitKernelVKFromConstraints)
 {
+    BB_DISABLE_ASSERTS();
     // First, construct the kernel VK by running the full IVC (accumulate one app and one kernel)
     std::shared_ptr<MegaFlavor::VerificationKey> expected_kernel_vk;
     {
@@ -392,6 +393,7 @@ TEST_F(SumcheckIvcRecursionConstraintTest, GenerateInitKernelVKFromConstraints)
 // Test generation of "reset" kernel VK via dummy IVC data
 TEST_F(SumcheckIvcRecursionConstraintTest, GenerateResetKernelVKFromConstraints)
 {
+    BB_DISABLE_ASSERTS();
     // First, construct the kernel VK by running the full IVC (accumulate one app and one kernel)
     std::shared_ptr<MegaFlavor::VerificationKey> expected_kernel_vk;
     {
@@ -431,6 +433,7 @@ TEST_F(SumcheckIvcRecursionConstraintTest, GenerateResetKernelVKFromConstraints)
 // Test generation of "tail" kernel VK via dummy IVC data
 TEST_F(SumcheckIvcRecursionConstraintTest, GenerateTailKernelVKFromConstraints)
 {
+    BB_DISABLE_ASSERTS();
     // First, construct the kernel VK by running the full IVC (accumulate one app and one kernel)
     std::shared_ptr<MegaFlavor::VerificationKey> expected_kernel_vk;
     {
@@ -475,6 +478,7 @@ TEST_F(SumcheckIvcRecursionConstraintTest, GenerateTailKernelVKFromConstraints)
 // Test generation of "inner" kernel VK via dummy IVC data
 TEST_F(SumcheckIvcRecursionConstraintTest, GenerateInnerKernelVKFromConstraints)
 {
+    BB_DISABLE_ASSERTS();
     // First, construct the kernel VK by running the full IVC (accumulate one app and one kernel)
     std::shared_ptr<MegaFlavor::VerificationKey> expected_kernel_vk;
     {
@@ -525,6 +529,7 @@ TEST_F(SumcheckIvcRecursionConstraintTest, GenerateInnerKernelVKFromConstraints)
 // Test generation of "hiding" kernel VK via dummy IVC data
 TEST_F(SumcheckIvcRecursionConstraintTest, GenerateHidingKernelVKFromConstraints)
 {
+    BB_DISABLE_ASSERTS();
     // First, construct the kernel VK by running the full IVC
     std::shared_ptr<MegaFlavor::VerificationKey> expected_hiding_kernel_vk;
     {

barretenberg/cpp/src/barretenberg/dsl/acir_format/pg_recursion_constraint.cpp

@@ -61,6 +61,9 @@ concept IsRecursiveFlavor = IsAnyOf<T, UltraRecursiveFlavor_<UltraCircuitBuilder
 template <typename T>
 concept IsKeccakFlavor = IsAnyOf<T, UltraKeccakFlavor, UltraKeccakZKFlavor>;
 
+template <typename T>
+concept isMultilinearBatchingFlavor =IsAnyOf<T, MultilinearBatchingFlavor>;
+
 // This concept is relevant for the Sumcheck Prover, where the logic differs between BN254 and Grumpkin
 template <typename T> concept IsGrumpkinFlavor = IsAnyOf<T, ECCVMFlavor, ECCVMRecursiveFlavor>;
 template <typename Container, typename Element>

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

@@ -36,7 +36,7 @@ template <typename Flavor_> class HypernovaDeciderVerifier {
 
     std::shared_ptr<Transcript> transcript;
 
-    HypernovaDeciderVerifier(std::shared_ptr<Transcript>& transcript)
+    HypernovaDeciderVerifier(const std::shared_ptr<Transcript>& transcript)
         : transcript(transcript) {};
 
     PairingPoints verify_proof(Accumulator& accumulator, const Proof& proof);