From 717100474b7e581662c8a9bfe5046ac036416f72 Mon Sep 17 00:00:00 2001 From: codygunton Date: Wed, 1 Nov 2023 22:18:09 +0000 Subject: [PATCH 1/3] Move flavors --- barretenberg/cpp/src/barretenberg/{honk => }/flavor/ecc_vm.hpp | 0 .../cpp/src/barretenberg/{honk => }/flavor/flavor.test.cpp | 0 .../cpp/src/barretenberg/{honk => }/flavor/goblin_translator.hpp | 0 .../cpp/src/barretenberg/{honk => }/flavor/goblin_ultra.hpp | 0 .../src/barretenberg/{honk => }/flavor/goblin_ultra_recursive.hpp | 0 .../{honk/sumcheck => flavor}/relation_definitions_fwd.hpp | 0 barretenberg/cpp/src/barretenberg/{honk => }/flavor/ultra.hpp | 0 .../cpp/src/barretenberg/{honk => }/flavor/ultra_recursive.hpp | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename barretenberg/cpp/src/barretenberg/{honk => }/flavor/ecc_vm.hpp (100%) rename barretenberg/cpp/src/barretenberg/{honk => }/flavor/flavor.test.cpp (100%) rename barretenberg/cpp/src/barretenberg/{honk => }/flavor/goblin_translator.hpp (100%) rename barretenberg/cpp/src/barretenberg/{honk => }/flavor/goblin_ultra.hpp (100%) rename barretenberg/cpp/src/barretenberg/{honk => }/flavor/goblin_ultra_recursive.hpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/sumcheck => flavor}/relation_definitions_fwd.hpp (100%) rename barretenberg/cpp/src/barretenberg/{honk => }/flavor/ultra.hpp (100%) rename barretenberg/cpp/src/barretenberg/{honk => }/flavor/ultra_recursive.hpp (100%) diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/ecc_vm.hpp b/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/flavor/ecc_vm.hpp rename to barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/flavor.test.cpp b/barretenberg/cpp/src/barretenberg/flavor/flavor.test.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/flavor/flavor.test.cpp rename to barretenberg/cpp/src/barretenberg/flavor/flavor.test.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_translator.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/flavor/goblin_translator.hpp rename to barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp rename to barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp rename to barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp diff --git a/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_definitions_fwd.hpp b/barretenberg/cpp/src/barretenberg/flavor/relation_definitions_fwd.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_definitions_fwd.hpp rename to barretenberg/cpp/src/barretenberg/flavor/relation_definitions_fwd.hpp diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp rename to barretenberg/cpp/src/barretenberg/flavor/ultra.hpp diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp rename to barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp From 60dcf150db2cbb68fe707363fd4e15e233557f51 Mon Sep 17 00:00:00 2001 From: codygunton Date: Wed, 1 Nov 2023 22:42:11 +0000 Subject: [PATCH 2/3] Move plonk and base flavors --- .../cpp/src/barretenberg/{proof_system => }/flavor/flavor.hpp | 0 .../{plonk/flavor/flavor.hpp => flavor/plonk_flavors.hpp} | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename barretenberg/cpp/src/barretenberg/{proof_system => }/flavor/flavor.hpp (100%) rename barretenberg/cpp/src/barretenberg/{plonk/flavor/flavor.hpp => flavor/plonk_flavors.hpp} (99%) diff --git a/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/flavor.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp rename to barretenberg/cpp/src/barretenberg/flavor/flavor.hpp diff --git a/barretenberg/cpp/src/barretenberg/plonk/flavor/flavor.hpp b/barretenberg/cpp/src/barretenberg/flavor/plonk_flavors.hpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/plonk/flavor/flavor.hpp rename to barretenberg/cpp/src/barretenberg/flavor/plonk_flavors.hpp index 0cf96a7e8a5..0335d7bd1d7 100644 --- a/barretenberg/cpp/src/barretenberg/plonk/flavor/flavor.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/plonk_flavors.hpp @@ -1,9 +1,9 @@ #pragma once +#include "barretenberg/flavor/flavor.hpp" #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" #include "barretenberg/plonk/transcript/transcript.hpp" #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" namespace proof_system::plonk::flavor { class Standard { From 66bc2cbee8f3ec7dd3ae31d8b16c0e13760c4f16 Mon Sep 17 00:00:00 2001 From: codygunton Date: Wed, 1 Nov 2023 22:43:27 +0000 Subject: [PATCH 3/3] Resolve include changes --- barretenberg/cpp/scripts/bb-tests.sh | 1 + barretenberg/cpp/src/CMakeLists.txt | 1 + .../benchmark/relations_bench/relations.bench.cpp | 4 ++-- .../benchmark/relations_bench/widget.bench.cpp | 4 ++-- barretenberg/cpp/src/barretenberg/flavor/CMakeLists.txt | 1 + barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp | 4 ++-- barretenberg/cpp/src/barretenberg/flavor/flavor.cpp | 3 +++ barretenberg/cpp/src/barretenberg/flavor/flavor.test.cpp | 2 +- .../cpp/src/barretenberg/flavor/goblin_translator.hpp | 4 ++-- barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp | 2 +- .../src/barretenberg/flavor/goblin_ultra_recursive.hpp | 4 ++-- barretenberg/cpp/src/barretenberg/flavor/ultra.hpp | 2 +- .../cpp/src/barretenberg/flavor/ultra_recursive.hpp | 4 ++-- barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt | 2 +- .../barretenberg/honk/composer/eccvm_transcript.test.cpp | 2 +- .../honk/composer/goblin_ultra_transcript.test.cpp | 2 +- .../cpp/src/barretenberg/honk/composer/ultra_composer.hpp | 2 +- .../barretenberg/honk/composer/ultra_transcript.test.cpp | 2 +- .../src/barretenberg/honk/instance/prover_instance.hpp | 6 +++--- .../src/barretenberg/honk/instance/verifier_instance.hpp | 2 +- .../src/barretenberg/honk/proof_system/combiner.test.cpp | 2 +- .../src/barretenberg/honk/proof_system/eccvm_prover.hpp | 2 +- .../src/barretenberg/honk/proof_system/eccvm_verifier.hpp | 2 +- .../src/barretenberg/honk/proof_system/folding_result.hpp | 2 +- .../honk/proof_system/goblin_merge/merge_prover.hpp | 4 ++-- .../honk/proof_system/goblin_merge/merge_verifier.hpp | 4 ++-- .../honk/proof_system/grand_product_library.test.cpp | 2 +- .../barretenberg/honk/proof_system/protogalaxy_prover.cpp | 2 +- .../barretenberg/honk/proof_system/protogalaxy_prover.hpp | 6 +++--- .../honk/proof_system/protogalaxy_verifier.hpp | 6 +++--- .../src/barretenberg/honk/proof_system/ultra_prover.hpp | 4 ++-- .../src/barretenberg/honk/proof_system/ultra_verifier.hpp | 4 ++-- .../honk/sumcheck/partial_evaluation.test.cpp | 2 +- .../honk/sumcheck/relation_correctness.test.cpp | 2 +- .../cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp | 2 +- .../barretenberg/honk/sumcheck/sumcheck_round.test.cpp | 2 +- .../cpp/src/barretenberg/honk/utils/testing.test.cpp | 2 +- barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt | 2 +- .../src/barretenberg/plonk/composer/standard_composer.hpp | 2 +- .../src/barretenberg/plonk/composer/ultra_composer.hpp | 2 +- .../circuit_builder/eccvm/eccvm_circuit_builder.hpp | 2 +- .../barretenberg/proof_system/composer/composer_lib.hpp | 2 +- .../proof_system/composer/composer_lib.test.cpp | 2 +- .../proof_system/composer/permutation_lib.hpp | 2 +- .../proof_system/composer/permutation_lib.test.cpp | 2 +- .../proof_system/relations/ecc_vm/ecc_lookup_relation.cpp | 4 ++-- .../proof_system/relations/ecc_vm/ecc_msm_relation.cpp | 4 ++-- .../relations/ecc_vm/ecc_point_table_relation.cpp | 4 ++-- .../proof_system/relations/ecc_vm/ecc_set_relation.cpp | 4 ++-- .../relations/ecc_vm/ecc_transcript_relation.cpp | 4 ++-- .../proof_system/relations/ecc_vm/ecc_wnaf_relation.cpp | 4 ++-- .../stdlib/recursion/honk/transcript/transcript.test.cpp | 4 ++-- .../recursion/honk/verifier/goblin_verifier.test.cpp | 2 +- .../recursion/honk/verifier/ultra_recursive_verifier.hpp | 8 ++++---- .../stdlib/recursion/honk/verifier/verifier.test.cpp | 2 +- .../barretenberg/stdlib/recursion/verifier/verifier.hpp | 2 +- 56 files changed, 84 insertions(+), 78 deletions(-) create mode 100644 barretenberg/cpp/src/barretenberg/flavor/CMakeLists.txt create mode 100644 barretenberg/cpp/src/barretenberg/flavor/flavor.cpp diff --git a/barretenberg/cpp/scripts/bb-tests.sh b/barretenberg/cpp/scripts/bb-tests.sh index 6054ec74a14..cfcdb2a944b 100755 --- a/barretenberg/cpp/scripts/bb-tests.sh +++ b/barretenberg/cpp/scripts/bb-tests.sh @@ -21,6 +21,7 @@ TESTS=( crypto_pedersen_commitment_tests crypto_pedersen_hash_tests ecc_tests + flavor_tests numeric_tests plonk_tests polynomials_tests diff --git a/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt index 09750815165..892a72e7cf8 100644 --- a/barretenberg/cpp/src/CMakeLists.txt +++ b/barretenberg/cpp/src/CMakeLists.txt @@ -56,6 +56,7 @@ add_subdirectory(barretenberg/dsl) add_subdirectory(barretenberg/ecc) add_subdirectory(barretenberg/env) add_subdirectory(barretenberg/examples) +add_subdirectory(barretenberg/flavor) add_subdirectory(barretenberg/grumpkin_srs_gen) add_subdirectory(barretenberg/honk) add_subdirectory(barretenberg/join_split_example) diff --git a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp index 20a99af6a4a..04f3eff27a5 100644 --- a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp +++ b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp @@ -1,5 +1,5 @@ -#include "barretenberg/honk/flavor/goblin_ultra.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/goblin_ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/proof_system/relations/auxiliary_relation.hpp" #include "barretenberg/proof_system/relations/ecc_op_queue_relation.hpp" #include "barretenberg/proof_system/relations/elliptic_relation.hpp" diff --git a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/widget.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/widget.bench.cpp index a47d1cc1460..eb2d7ec79da 100644 --- a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/widget.bench.cpp +++ b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/widget.bench.cpp @@ -1,6 +1,6 @@ #include "barretenberg/benchmark/honk_bench/benchmark_utilities.hpp" -#include "barretenberg/honk/flavor/goblin_ultra.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/goblin_ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/plonk/composer/standard_composer.hpp" #include "barretenberg/plonk/composer/ultra_composer.hpp" #include "barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp" diff --git a/barretenberg/cpp/src/barretenberg/flavor/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/flavor/CMakeLists.txt new file mode 100644 index 00000000000..19dc8bec7b1 --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/flavor/CMakeLists.txt @@ -0,0 +1 @@ +barretenberg_module(flavor commitment_schemes ecc polynomials proof_system) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp b/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp index 2f4725bd6a8..251fdafa01c 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp @@ -1,12 +1,11 @@ #pragma once -#include "../sumcheck/relation_definitions_fwd.hpp" #include "barretenberg/commitment_schemes/commitment_key.hpp" #include "barretenberg/commitment_schemes/ipa/ipa.hpp" #include "barretenberg/commitment_schemes/kzg/kzg.hpp" #include "barretenberg/ecc/curves/bn254/bn254.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/flavor/flavor.hpp" #include "barretenberg/polynomials/univariate.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/proof_system/relations/ecc_vm/ecc_lookup_relation.hpp" #include "barretenberg/proof_system/relations/ecc_vm/ecc_msm_relation.hpp" #include "barretenberg/proof_system/relations/ecc_vm/ecc_point_table_relation.hpp" @@ -15,6 +14,7 @@ #include "barretenberg/proof_system/relations/ecc_vm/ecc_wnaf_relation.hpp" #include "barretenberg/proof_system/relations/relation_parameters.hpp" #include "barretenberg/proof_system/relations/relation_types.hpp" +#include "relation_definitions_fwd.hpp" #include #include #include diff --git a/barretenberg/cpp/src/barretenberg/flavor/flavor.cpp b/barretenberg/cpp/src/barretenberg/flavor/flavor.cpp new file mode 100644 index 00000000000..91a791d8b93 --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/flavor/flavor.cpp @@ -0,0 +1,3 @@ +#include "flavor.hpp" + +// This file is here to make sure that a flavor object file is created. diff --git a/barretenberg/cpp/src/barretenberg/flavor/flavor.test.cpp b/barretenberg/cpp/src/barretenberg/flavor/flavor.test.cpp index 2bdfa000a13..167bc9db017 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/flavor.test.cpp +++ b/barretenberg/cpp/src/barretenberg/flavor/flavor.test.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp index 0874821c1d0..340e4f24554 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp @@ -1,17 +1,17 @@ #pragma once -#include "../sumcheck/relation_definitions_fwd.hpp" #include "barretenberg/commitment_schemes/commitment_key.hpp" #include "barretenberg/commitment_schemes/kzg/kzg.hpp" #include "barretenberg/ecc/curves/bn254/bn254.hpp" +#include "barretenberg/flavor/flavor.hpp" #include "barretenberg/polynomials/univariate.hpp" #include "barretenberg/proof_system/arithmetization/arithmetization.hpp" #include "barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/proof_system/relations/translator_vm/translator_decomposition_relation.hpp" #include "barretenberg/proof_system/relations/translator_vm/translator_extra_relations.hpp" #include "barretenberg/proof_system/relations/translator_vm/translator_gen_perm_sort_relation.hpp" #include "barretenberg/proof_system/relations/translator_vm/translator_non_native_field_relation.hpp" #include "barretenberg/proof_system/relations/translator_vm/translator_permutation_relation.hpp" +#include "relation_definitions_fwd.hpp" #include #include #include diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp index 9912dcf5c18..efd9782229e 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp @@ -1,8 +1,8 @@ #pragma once #include "barretenberg/commitment_schemes/kzg/kzg.hpp" +#include "barretenberg/flavor/flavor.hpp" #include "barretenberg/polynomials/univariate.hpp" #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/proof_system/relations/auxiliary_relation.hpp" #include "barretenberg/proof_system/relations/ecc_op_queue_relation.hpp" #include "barretenberg/proof_system/relations/elliptic_relation.hpp" diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp index ed5fc43c6ba..0b42f56035c 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp @@ -5,11 +5,11 @@ #include "barretenberg/polynomials/barycentric.hpp" #include "barretenberg/polynomials/univariate.hpp" -#include "barretenberg/honk/flavor/goblin_ultra.hpp" +#include "barretenberg/flavor/flavor.hpp" +#include "barretenberg/flavor/goblin_ultra.hpp" #include "barretenberg/polynomials/evaluation_domain.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/proof_system/relations/auxiliary_relation.hpp" #include "barretenberg/proof_system/relations/ecc_op_queue_relation.hpp" #include "barretenberg/proof_system/relations/elliptic_relation.hpp" diff --git a/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp index 4521e7dbd6e..7ebee0e928f 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp @@ -1,12 +1,12 @@ #pragma once #include "barretenberg/commitment_schemes/kzg/kzg.hpp" #include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/flavor/flavor.hpp" #include "barretenberg/polynomials/barycentric.hpp" #include "barretenberg/polynomials/evaluation_domain.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/polynomials/univariate.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/proof_system/relations/auxiliary_relation.hpp" #include "barretenberg/proof_system/relations/elliptic_relation.hpp" #include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp" diff --git a/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp index 065b5df186b..08b6c3e6317 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp @@ -5,11 +5,11 @@ #include "barretenberg/polynomials/barycentric.hpp" #include "barretenberg/polynomials/univariate.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/flavor.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/polynomials/evaluation_domain.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/proof_system/relations/auxiliary_relation.hpp" #include "barretenberg/proof_system/relations/elliptic_relation.hpp" #include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt index bfae9cf414b..17bb465c579 100644 --- a/barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt @@ -1,4 +1,4 @@ -barretenberg_module(honk numeric ecc srs proof_system transcript commitment_schemes) +barretenberg_module(honk numeric ecc srs proof_system transcript commitment_schemes flavor) if(TESTING) # TODO: Re-enable all these warnings once PoC is finished diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_transcript.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_transcript.test.cpp index aad38dd49aa..e30ca1e4ffe 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_transcript.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_transcript.test.cpp @@ -1,8 +1,8 @@ #include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/flavor/flavor.hpp" #include "barretenberg/honk/composer/eccvm_composer.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" #include "barretenberg/polynomials/univariate.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/transcript/transcript.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_transcript.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_transcript.test.cpp index 8287028f438..6fedc40f1ba 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_transcript.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_transcript.test.cpp @@ -1,8 +1,8 @@ #include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/flavor/flavor.hpp" #include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" #include "barretenberg/polynomials/univariate.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/transcript/transcript.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp b/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp index d43b3d0d5f9..d9a2de27354 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp @@ -1,4 +1,5 @@ #pragma once +#include "barretenberg/flavor/flavor.hpp" #include "barretenberg/honk/instance/prover_instance.hpp" #include "barretenberg/honk/proof_system/goblin_merge/merge_prover.hpp" #include "barretenberg/honk/proof_system/goblin_merge/merge_verifier.hpp" @@ -7,7 +8,6 @@ #include "barretenberg/honk/proof_system/ultra_prover.hpp" #include "barretenberg/honk/proof_system/ultra_verifier.hpp" #include "barretenberg/proof_system/composer/composer_lib.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/srs/global_crs.hpp" namespace proof_system::honk { diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/ultra_transcript.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/ultra_transcript.test.cpp index 2b11f154659..f4f17bb0368 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/ultra_transcript.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/composer/ultra_transcript.test.cpp @@ -1,8 +1,8 @@ #include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/flavor/flavor.hpp" #include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" #include "barretenberg/polynomials/univariate.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/transcript/transcript.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/honk/instance/prover_instance.hpp b/barretenberg/cpp/src/barretenberg/honk/instance/prover_instance.hpp index 42e5b50e1a7..300054c2e7f 100644 --- a/barretenberg/cpp/src/barretenberg/honk/instance/prover_instance.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/instance/prover_instance.hpp @@ -1,9 +1,9 @@ #pragma once -#include "barretenberg/honk/flavor/goblin_ultra.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/flavor.hpp" +#include "barretenberg/flavor/goblin_ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/honk/proof_system/folding_result.hpp" #include "barretenberg/proof_system/composer/composer_lib.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/proof_system/relations/relation_parameters.hpp" #include "barretenberg/srs/factories/file_crs_factory.hpp" namespace proof_system::honk { diff --git a/barretenberg/cpp/src/barretenberg/honk/instance/verifier_instance.hpp b/barretenberg/cpp/src/barretenberg/honk/instance/verifier_instance.hpp index 2e8ac9a0210..6b57affc490 100644 --- a/barretenberg/cpp/src/barretenberg/honk/instance/verifier_instance.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/instance/verifier_instance.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/proof_system/flavor/flavor.hpp" +#include "barretenberg/flavor/flavor.hpp" #include "barretenberg/proof_system/relations/relation_parameters.hpp" namespace proof_system::honk { template class VerifierInstance_ { diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/combiner.test.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/combiner.test.cpp index f469ec8863f..341a16a1916 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/combiner.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/combiner.test.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/honk/instance/instances.hpp" #include "barretenberg/honk/proof_system/protogalaxy_prover.hpp" #include "barretenberg/honk/utils/testing.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.hpp index 2754a6a4dc2..1f2df849e27 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.hpp @@ -1,7 +1,7 @@ #pragma once #include "barretenberg/commitment_schemes/gemini/gemini.hpp" #include "barretenberg/commitment_schemes/shplonk/shplonk.hpp" -#include "barretenberg/honk/flavor/ecc_vm.hpp" +#include "barretenberg/flavor/ecc_vm.hpp" #include "barretenberg/honk/sumcheck/sumcheck_output.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/proof_system/relations/relation_parameters.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_verifier.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_verifier.hpp index b24fb024313..fda75166557 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_verifier.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/honk/flavor/ecc_vm.hpp" +#include "barretenberg/flavor/ecc_vm.hpp" #include "barretenberg/honk/sumcheck/sumcheck.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/folding_result.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/folding_result.hpp index 5888d866b04..e2eeb0a6e8d 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/folding_result.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/folding_result.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/proof_system/flavor/flavor.hpp" +#include "barretenberg/flavor/flavor.hpp" #include "barretenberg/proof_system/relations/relation_parameters.hpp" namespace proof_system::honk { template struct ProverFoldingResult { diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.hpp index cc1f417586c..a6d31866b41 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.hpp @@ -1,8 +1,8 @@ #pragma once #include "barretenberg/commitment_schemes/claim.hpp" -#include "barretenberg/honk/flavor/goblin_ultra.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/goblin_ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/proof_system/op_queue/ecc_op_queue.hpp" #include "barretenberg/transcript/transcript.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_verifier.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_verifier.hpp index 6635f04b6bd..d1da2f786ab 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_verifier.hpp @@ -1,8 +1,8 @@ #pragma once #include "barretenberg/commitment_schemes/claim.hpp" -#include "barretenberg/honk/flavor/goblin_ultra.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/goblin_ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/proof_system/op_queue/ecc_op_queue.hpp" #include "barretenberg/transcript/transcript.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.test.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.test.cpp index c66c876b98a..a3a3408c3a9 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.test.cpp @@ -1,7 +1,7 @@ #include "grand_product_library.hpp" #include "barretenberg/ecc/curves/bn254/bn254.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/srs/factories/file_crs_factory.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.cpp index ef64c21c924..de74529838f 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.cpp @@ -1,5 +1,5 @@ #include "protogalaxy_prover.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" +#include "barretenberg/flavor/flavor.hpp" namespace proof_system::honk { template void ProtoGalaxyProver_::prepare_for_folding() diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.hpp index abc4bc0059b..faf7260b84a 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.hpp @@ -1,13 +1,13 @@ #pragma once #include "barretenberg/common/thread.hpp" #include "barretenberg/ecc/curves/bn254/fr.hpp" -#include "barretenberg/honk/flavor/goblin_ultra.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/flavor.hpp" +#include "barretenberg/flavor/goblin_ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/honk/instance/instances.hpp" #include "barretenberg/honk/proof_system/folding_result.hpp" #include "barretenberg/polynomials/pow.hpp" #include "barretenberg/polynomials/univariate.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/proof_system/relations/relation_parameters.hpp" #include "barretenberg/proof_system/relations/utils.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_verifier.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_verifier.hpp index 145f44dc87e..6d14beebb93 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_verifier.hpp @@ -1,9 +1,9 @@ #pragma once -#include "barretenberg/honk/flavor/goblin_ultra.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/flavor.hpp" +#include "barretenberg/flavor/goblin_ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/honk/instance/instances.hpp" #include "barretenberg/honk/proof_system/folding_result.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/transcript/transcript.hpp" namespace proof_system::honk { diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp index ac7d4b4ad8c..a9c5a2deb87 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp @@ -1,7 +1,7 @@ #pragma once #include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp" -#include "barretenberg/honk/flavor/goblin_ultra.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/goblin_ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/honk/instance/prover_instance.hpp" #include "barretenberg/honk/sumcheck/sumcheck_output.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp index 51d0066ab07..4f4c9a4c05a 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp @@ -1,6 +1,6 @@ #pragma once -#include "barretenberg/honk/flavor/goblin_ultra.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/goblin_ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/honk/sumcheck/sumcheck.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/sumcheck/partial_evaluation.test.cpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/partial_evaluation.test.cpp index 2a5e49c4cf7..3257f23939f 100644 --- a/barretenberg/cpp/src/barretenberg/honk/sumcheck/partial_evaluation.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/sumcheck/partial_evaluation.test.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/honk/sumcheck/sumcheck.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp index 0048d7a4189..1c3a283cafe 100644 --- a/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp @@ -1,5 +1,5 @@ +#include "barretenberg/flavor/goblin_translator.hpp" #include "barretenberg/honk/composer/ultra_composer.hpp" -#include "barretenberg/honk/flavor/goblin_translator.hpp" #include "barretenberg/honk/proof_system/grand_product_library.hpp" #include "barretenberg/honk/proof_system/permutation_library.hpp" #include "barretenberg/proof_system/relations/auxiliary_relation.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp index e048c48fcbc..b9c9661fda7 100644 --- a/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp @@ -2,9 +2,9 @@ #include "barretenberg/common/log.hpp" #include "barretenberg/common/thread.hpp" #include "barretenberg/common/thread_utils.hpp" +#include "barretenberg/flavor/flavor.hpp" #include "barretenberg/polynomials/barycentric.hpp" #include "barretenberg/polynomials/pow.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/proof_system/relations/relation_parameters.hpp" #include "barretenberg/proof_system/relations/relation_types.hpp" #include "barretenberg/proof_system/relations/utils.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp index 2b4b4cb4c48..8b662ced869 100644 --- a/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp @@ -1,5 +1,5 @@ #include "sumcheck_round.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/proof_system/relations/utils.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/honk/utils/testing.test.cpp b/barretenberg/cpp/src/barretenberg/honk/utils/testing.test.cpp index a9416cedd9c..bcab2e59490 100644 --- a/barretenberg/cpp/src/barretenberg/honk/utils/testing.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/utils/testing.test.cpp @@ -1,5 +1,5 @@ #include "testing.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include namespace barretenberg::test_testing_utils { diff --git a/barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt index aa1a5dcf7d3..bb65163afa8 100644 --- a/barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt @@ -1 +1 @@ -barretenberg_module(plonk proof_system transcript crypto_pedersen_commitment polynomials crypto_sha256 ecc crypto_blake3s srs) \ No newline at end of file +barretenberg_module(plonk proof_system transcript crypto_pedersen_commitment polynomials crypto_sha256 ecc crypto_blake3s srs flavor) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp index 390bcc2f74f..b2da0704e9e 100644 --- a/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp +++ b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp @@ -1,7 +1,7 @@ #pragma once +#include "barretenberg/flavor/plonk_flavors.hpp" #include "barretenberg/plonk/composer/composer_lib.hpp" -#include "barretenberg/plonk/flavor/flavor.hpp" #include "barretenberg/plonk/proof_system/prover/prover.hpp" #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp" diff --git a/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp index 5dd90ca3492..2570f223952 100644 --- a/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp +++ b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp @@ -1,7 +1,7 @@ #pragma once +#include "barretenberg/flavor/plonk_flavors.hpp" #include "barretenberg/plonk/composer/composer_lib.hpp" -#include "barretenberg/plonk/flavor/flavor.hpp" #include "barretenberg/plonk/proof_system/prover/prover.hpp" #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" #include "barretenberg/plonk/proof_system/verifier/verifier.hpp" diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp index 78895165144..b9b58f7835d 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp @@ -7,7 +7,7 @@ #include "./msm_builder.hpp" #include "./precomputed_tables_builder.hpp" #include "./transcript_builder.hpp" -#include "barretenberg/honk/flavor/ecc_vm.hpp" +#include "barretenberg/flavor/ecc_vm.hpp" #include "barretenberg/honk/proof_system/lookup_library.hpp" #include "barretenberg/honk/proof_system/permutation_library.hpp" #include "barretenberg/proof_system/relations/relation_parameters.hpp" diff --git a/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp index c1bcc1fe754..3ab74f3b439 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp @@ -1,6 +1,6 @@ #pragma once +#include "barretenberg/flavor/flavor.hpp" #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp index fc692ab02de..8546d793f28 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp @@ -1,6 +1,6 @@ #include "barretenberg/proof_system/composer/composer_lib.hpp" #include "barretenberg/common/slab_allocator.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/proof_system/types/circuit_type.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp index 82ae802c1e4..0726a1ad5bf 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp @@ -8,10 +8,10 @@ #pragma once #include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/flavor/flavor.hpp" #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" #include "barretenberg/polynomials/iterate_over_domain.hpp" #include "barretenberg/polynomials/polynomial.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include #include diff --git a/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp index df0a67c537d..cdd8d362c06 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp @@ -1,5 +1,5 @@ #include "barretenberg/proof_system/composer/permutation_lib.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/flavor/ultra.hpp" #include "barretenberg/proof_system/composer/composer_lib.hpp" #include "barretenberg/proof_system/types/circuit_type.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_lookup_relation.cpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_lookup_relation.cpp index d577f9f328c..2bca2f74318 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_lookup_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_lookup_relation.cpp @@ -1,5 +1,5 @@ -#include "barretenberg/honk/flavor/ecc_vm.hpp" -#include "barretenberg/honk/sumcheck/relation_definitions_fwd.hpp" +#include "barretenberg/flavor/ecc_vm.hpp" +#include "barretenberg/flavor/relation_definitions_fwd.hpp" #include "ecc_msm_relation.hpp" namespace proof_system::honk::sumcheck { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_msm_relation.cpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_msm_relation.cpp index 23851ae5959..9ab0db87e8b 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_msm_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_msm_relation.cpp @@ -1,6 +1,6 @@ #include "ecc_msm_relation.hpp" -#include "barretenberg/honk/flavor/ecc_vm.hpp" -#include "barretenberg/honk/sumcheck/relation_definitions_fwd.hpp" +#include "barretenberg/flavor/ecc_vm.hpp" +#include "barretenberg/flavor/relation_definitions_fwd.hpp" namespace proof_system::honk::sumcheck { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_point_table_relation.cpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_point_table_relation.cpp index fbe6a299d36..1b047e4e761 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_point_table_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_point_table_relation.cpp @@ -1,6 +1,6 @@ #include "ecc_point_table_relation.hpp" -#include "barretenberg/honk/flavor/ecc_vm.hpp" -#include "barretenberg/honk/sumcheck/relation_definitions_fwd.hpp" +#include "barretenberg/flavor/ecc_vm.hpp" +#include "barretenberg/flavor/relation_definitions_fwd.hpp" namespace proof_system::honk::sumcheck { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_set_relation.cpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_set_relation.cpp index 40fff3619b5..b882402cfaf 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_set_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_set_relation.cpp @@ -1,5 +1,5 @@ -#include "barretenberg/honk/flavor/ecc_vm.hpp" -#include "barretenberg/honk/sumcheck/relation_definitions_fwd.hpp" +#include "barretenberg/flavor/ecc_vm.hpp" +#include "barretenberg/flavor/relation_definitions_fwd.hpp" #include "ecc_msm_relation.hpp" namespace proof_system::honk::sumcheck { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_transcript_relation.cpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_transcript_relation.cpp index 028fe269f40..02660993402 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_transcript_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_transcript_relation.cpp @@ -2,8 +2,8 @@ #include #include "./ecc_transcript_relation.hpp" -#include "barretenberg/honk/flavor/ecc_vm.hpp" -#include "barretenberg/honk/sumcheck/relation_definitions_fwd.hpp" +#include "barretenberg/flavor/ecc_vm.hpp" +#include "barretenberg/flavor/relation_definitions_fwd.hpp" namespace proof_system::honk::sumcheck { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_wnaf_relation.cpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_wnaf_relation.cpp index ec8412b7111..b0616a28595 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_wnaf_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_wnaf_relation.cpp @@ -1,6 +1,6 @@ #include "ecc_wnaf_relation.hpp" -#include "barretenberg/honk/flavor/ecc_vm.hpp" -#include "barretenberg/honk/sumcheck/relation_definitions_fwd.hpp" +#include "barretenberg/flavor/ecc_vm.hpp" +#include "barretenberg/flavor/relation_definitions_fwd.hpp" namespace proof_system::honk::sumcheck { diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp index 254224a6a88..bed3ccee7cb 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp @@ -2,8 +2,8 @@ #include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/ecc/curves/bn254/g1.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" -#include "barretenberg/honk/flavor/ultra_recursive.hpp" +#include "barretenberg/flavor/ultra.hpp" +#include "barretenberg/flavor/ultra_recursive.hpp" #include "barretenberg/polynomials/univariate.hpp" #include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp" #include "barretenberg/transcript/transcript.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp index 00a59673563..2a6dbfc2b4b 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp @@ -1,6 +1,6 @@ #include "barretenberg/common/test.hpp" +#include "barretenberg/flavor/ultra_recursive.hpp" #include "barretenberg/honk/composer/ultra_composer.hpp" -#include "barretenberg/honk/flavor/ultra_recursive.hpp" #include "barretenberg/honk/proof_system/ultra_verifier.hpp" #include "barretenberg/stdlib/hash/blake3s/blake3s.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp index 8d02fde7def..e3987ad0e51 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp @@ -1,8 +1,8 @@ #pragma once -#include "barretenberg/honk/flavor/goblin_ultra.hpp" -#include "barretenberg/honk/flavor/goblin_ultra_recursive.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" -#include "barretenberg/honk/flavor/ultra_recursive.hpp" +#include "barretenberg/flavor/goblin_ultra.hpp" +#include "barretenberg/flavor/goblin_ultra_recursive.hpp" +#include "barretenberg/flavor/ultra.hpp" +#include "barretenberg/flavor/ultra_recursive.hpp" #include "barretenberg/honk/sumcheck/sumcheck.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp index 83c7230544a..168b6f1938e 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp @@ -1,6 +1,6 @@ #include "barretenberg/common/test.hpp" +#include "barretenberg/flavor/ultra_recursive.hpp" #include "barretenberg/honk/composer/ultra_composer.hpp" -#include "barretenberg/honk/flavor/ultra_recursive.hpp" #include "barretenberg/honk/proof_system/ultra_verifier.hpp" #include "barretenberg/stdlib/hash/blake3s/blake3s.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp index 711ba736d59..0084585dbdc 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp @@ -2,7 +2,7 @@ #include "barretenberg/ecc/curves/bn254/fq12.hpp" #include "barretenberg/ecc/curves/bn254/pairing.hpp" -#include "barretenberg/plonk/flavor/flavor.hpp" +#include "barretenberg/flavor/plonk_flavors.hpp" #include "barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/plonk/proof_system/utils/kate_verification.hpp"