From 81f89e1eb1cffd69818fbc5ad8fb73f0844493e4 Mon Sep 17 00:00:00 2001
From: jeanmon <jean@aztecprotocol.com>
Date: Thu, 25 Apr 2024 16:22:13 +0000
Subject: [PATCH 1/2] Port changes of ProvingKey_ for AVM

---
 bberg/src/flavor_builder.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bberg/src/flavor_builder.rs b/bberg/src/flavor_builder.rs
index 61c80938a4..eecc64dc44 100644
--- a/bberg/src/flavor_builder.rs
+++ b/bberg/src/flavor_builder.rs
@@ -348,10 +348,10 @@ fn create_proving_and_verification_key(
 
     format!("
         public:
-        class ProvingKey : public ProvingKey_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>, CommitmentKey> {{
+        class ProvingKey : public ProvingKeyAvm_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>, CommitmentKey> {{
             public:
             // Expose constructors on the base class
-            using Base = ProvingKey_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>, CommitmentKey>;
+            using Base = ProvingKeyAvm_<PrecomputedEntities<Polynomial>, WitnessEntities<Polynomial>, CommitmentKey>;
             using Base::Base;
 
             {get_to_be_shifted}

From 4b0d96286606de4c7d60e79d64bb516e68e3140e Mon Sep 17 00:00:00 2001
From: jeanmon <jean@aztecprotocol.com>
Date: Mon, 6 May 2024 10:21:59 +0000
Subject: [PATCH 2/2] Port of PR #5844 from aztec-package

---
 bberg/src/flavor_builder.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bberg/src/flavor_builder.rs b/bberg/src/flavor_builder.rs
index eecc64dc44..b9d6bb2534 100644
--- a/bberg/src/flavor_builder.rs
+++ b/bberg/src/flavor_builder.rs
@@ -436,6 +436,14 @@ fn create_polynomial_views(first_poly: &String) -> String {
     template <size_t LENGTH>
     using ProverUnivariates = AllEntities<bb::Univariate<FF, LENGTH>>;
 
+    /**
+     * @brief A container for univariates used during Protogalaxy folding and sumcheck with some of the computation
+     * optmistically ignored
+     * @details During folding and sumcheck, the prover evaluates the relations on these univariates.
+     */
+    template <size_t LENGTH, size_t SKIP_COUNT>
+    using OptimisedProverUnivariates = AllEntities<bb::Univariate<FF, LENGTH, 0, SKIP_COUNT>>;
+
     /**
      * @brief A container for univariates produced during the hot loop in sumcheck.
      */