Backport of Aztec PR #5406

bberg/src/circuit_builder.rs

@@ -26,12 +26,12 @@ fn circuit_hpp_includes(name: &str, relations: &[String], permutations: &[String
     #include \"barretenberg/common/constexpr_utils.hpp\"
     #include \"barretenberg/common/throw_or_abort.hpp\"
     #include \"barretenberg/ecc/curves/bn254/fr.hpp\"
-    #include \"barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp\"
+    #include \"barretenberg/stdlib_circuit_builders/circuit_builder_base.hpp\"
     #include \"barretenberg/relations/generic_permutation/generic_permutation_relation.hpp\"
     #include \"barretenberg/relations/generic_lookup/generic_lookup_relation.hpp\"
     #include \"barretenberg/honk/proof_system/logderivative_library.hpp\"
 
-    #include \"barretenberg/flavor/generated/{name}_flavor.hpp\"
+    #include \"barretenberg/vm/generated/{name}_flavor.hpp\"
     {relation_imports}
 "
     )

bberg/src/composer_builder.rs

@@ -187,10 +187,10 @@ fn cpp_includes(name: &str) -> String {
     format!(
         "
 #include \"./{name}_composer.hpp\"
+#include \"barretenberg/plonk_honk_shared/composer/composer_lib.hpp\"
+#include \"barretenberg/plonk_honk_shared/composer/permutation_lib.hpp\"
+#include \"barretenberg/vm/generated/{name}_circuit_builder.hpp\"
 #include \"barretenberg/vm/generated/{name}_verifier.hpp\"
-#include \"barretenberg/proof_system/circuit_builder/generated/{name}_circuit_builder.hpp\"
-#include \"barretenberg/proof_system/composer/composer_lib.hpp\"
-#include \"barretenberg/proof_system/composer/permutation_lib.hpp\"
 "
     )
 }
@@ -200,11 +200,11 @@ pub fn hpp_includes(name: &str) -> String {
         "
 #pragma once
 
+#include \"barretenberg/plonk_honk_shared/composer/composer_lib.hpp\"
+#include \"barretenberg/srs/global_crs.hpp\"
+#include \"barretenberg/vm/generated/{name}_circuit_builder.hpp\"
 #include \"barretenberg/vm/generated/{name}_prover.hpp\"
 #include \"barretenberg/vm/generated/{name}_verifier.hpp\"
-#include \"barretenberg/proof_system/circuit_builder/generated/{name}_circuit_builder.hpp\"
-#include \"barretenberg/proof_system/composer/composer_lib.hpp\"
-#include \"barretenberg/srs/global_crs.hpp\"
     "
     )
 }

bberg/src/file_writer.rs

@@ -6,7 +6,6 @@ pub struct BBFiles {
     pub file_name: String,
     pub base: String,
     pub rel: String,
-    pub arith: String,
     pub circuit: String,
     pub flavor: String,
     pub composer: String,
@@ -15,25 +14,23 @@ pub struct BBFiles {
 
 impl BBFiles {
     pub fn default(file_name: String) -> Self {
-        Self::new(file_name, None, None, None, None, None, None, None)
+        Self::new(file_name, None, None, None, None, None, None)
     }
 
     #[allow(clippy::too_many_arguments)]
     pub fn new(
         file_name: String,
         base: Option<String>,
         rel: Option<String>,
-        arith: Option<String>,
         circuit: Option<String>,
         flavor: Option<String>,
         composer: Option<String>,
         prover: Option<String>,
     ) -> Self {
         let base = base.unwrap_or("src/barretenberg".to_owned());
         let rel = rel.unwrap_or("relations/generated".to_owned());
-        let arith = arith.unwrap_or("proof_system/arithmetization/generated".to_owned());
-        let circuit = circuit.unwrap_or("proof_system/circuit_builder/generated".to_owned());
-        let flavor = flavor.unwrap_or("flavor/generated".to_owned());
+        let circuit = circuit.unwrap_or("vm/generated".to_owned());
+        let flavor = flavor.unwrap_or("vm/generated".to_owned());
         let composer = composer.unwrap_or("vm/generated".to_owned());
         let prover = prover.unwrap_or("vm/generated".to_owned());
 
@@ -42,7 +39,6 @@ impl BBFiles {
 
             base,
             rel,
-            arith,
             circuit,
             flavor,
             composer,

bberg/src/flavor_builder.rs

@@ -122,9 +122,9 @@ fn flavor_includes(name: &str, relation_file_names: &[String], permutations: &[S
     format!(
         "
 #pragma once
-#include \"../relation_definitions.hpp\"
-#include \"barretenberg/ecc/curves/bn254/g1.hpp\"
 #include \"barretenberg/commitment_schemes/kzg/kzg.hpp\"
+#include \"barretenberg/ecc/curves/bn254/g1.hpp\"
+#include \"barretenberg/flavor/relation_definitions.hpp\"
 #include \"barretenberg/polynomials/barycentric.hpp\"
 #include \"barretenberg/polynomials/univariate.hpp\"
 

bberg/src/prover_builder.rs

@@ -223,12 +223,13 @@ fn includes_hpp(name: &str) -> String {
     format!(
         "
 #pragma once
-#include \"barretenberg/flavor/generated/{name}_flavor.hpp\"
 #include \"barretenberg/commitment_schemes/zeromorph/zeromorph.hpp\"
-#include \"barretenberg/sumcheck/sumcheck_output.hpp\"
-#include \"barretenberg/transcript/transcript.hpp\"
 #include \"barretenberg/plonk/proof_system/types/proof.hpp\"
 #include \"barretenberg/relations/relation_parameters.hpp\"
+#include \"barretenberg/sumcheck/sumcheck_output.hpp\"
+#include \"barretenberg/transcript/transcript.hpp\"
+
+#include \"barretenberg/vm/generated/{name}_flavor.hpp\"
 
     "
     )
@@ -243,8 +244,8 @@ fn includes_cpp(name: &str) -> String {
     #include \"barretenberg/commitment_schemes/commitment_key.hpp\"
     #include \"barretenberg/honk/proof_system/logderivative_library.hpp\"
     #include \"barretenberg/honk/proof_system/permutation_library.hpp\"
+    #include \"barretenberg/plonk_honk_shared/library/grand_product_library.hpp\"
     #include \"barretenberg/polynomials/polynomial.hpp\"
-    #include \"barretenberg/proof_system/library/grand_product_library.hpp\"
     #include \"barretenberg/relations/lookup_relation.hpp\"
     #include \"barretenberg/relations/permutation_relation.hpp\"
     #include \"barretenberg/sumcheck/sumcheck.hpp\"

bberg/src/verifier_builder.rs

@@ -167,9 +167,9 @@ fn include_hpp(name: &str) -> String {
     format!(
         "
 #pragma once
-#include \"barretenberg/flavor/generated/{name}_flavor.hpp\"
-#include \"barretenberg/sumcheck/sumcheck.hpp\"
 #include \"barretenberg/plonk/proof_system/types/proof.hpp\"
+#include \"barretenberg/sumcheck/sumcheck.hpp\"
+#include \"barretenberg/vm/generated/{name}_flavor.hpp\"
 "
     )
 }