From 79913930c011167cc06fc178ca70fcb35b7e6236 Mon Sep 17 00:00:00 2001 From: codygunton Date: Fri, 3 Nov 2023 15:22:43 +0000 Subject: [PATCH 01/11] Move relations --- .../relations/auxiliary_relation.hpp | 2 +- .../relations/ecc_op_queue_relation.hpp | 2 +- .../relations/ecc_vm/ecc_lookup_relation.cpp | 0 .../relations/ecc_vm/ecc_lookup_relation.hpp | 2 +- .../relations/ecc_vm/ecc_msm_relation.cpp | 0 .../relations/ecc_vm/ecc_msm_relation.hpp | 2 +- .../relations/ecc_vm/ecc_point_table_relation.cpp | 0 .../relations/ecc_vm/ecc_point_table_relation.hpp | 2 +- .../relations/ecc_vm/ecc_set_relation.cpp | 0 .../relations/ecc_vm/ecc_set_relation.hpp | 2 +- .../relations/ecc_vm/ecc_transcript_relation.cpp | 0 .../relations/ecc_vm/ecc_transcript_relation.hpp | 2 +- .../relations/ecc_vm/ecc_wnaf_relation.cpp | 0 .../relations/ecc_vm/ecc_wnaf_relation.hpp | 2 +- .../relations/elliptic_relation.hpp | 2 +- .../relations/gen_perm_sort_relation.hpp | 2 +- .../relations/lookup_relation.hpp | 2 +- .../relations/nested_containers.hpp | 0 .../relations/nested_containers.test.cpp | 2 +- .../relations/permutation_relation.hpp | 2 +- .../relations/relation_parameters.hpp | 0 .../relations/relation_types.hpp | 0 ...goblin_translator_relation_consistency.test.cpp | 12 ++++++------ .../translator_decomposition_relation.hpp | 2 +- .../translator_vm/translator_extra_relations.hpp | 2 +- .../translator_gen_perm_sort_relation.hpp | 2 +- .../translator_non_native_field_relation.hpp | 2 +- .../translator_permutation_relation.hpp | 2 +- .../relations/ultra_arithmetic_relation.hpp | 2 +- .../relations/ultra_relation_consistency.test.cpp | 14 +++++++------- .../{proof_system => }/relations/utils.hpp | 2 +- 31 files changed, 33 insertions(+), 33 deletions(-) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/auxiliary_relation.hpp (99%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ecc_op_queue_relation.hpp (98%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ecc_vm/ecc_lookup_relation.cpp (100%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ecc_vm/ecc_lookup_relation.hpp (99%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ecc_vm/ecc_msm_relation.cpp (100%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ecc_vm/ecc_msm_relation.hpp (97%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ecc_vm/ecc_point_table_relation.cpp (100%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ecc_vm/ecc_point_table_relation.hpp (95%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ecc_vm/ecc_set_relation.cpp (100%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ecc_vm/ecc_set_relation.hpp (96%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ecc_vm/ecc_transcript_relation.cpp (100%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ecc_vm/ecc_transcript_relation.hpp (97%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ecc_vm/ecc_wnaf_relation.cpp (100%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ecc_vm/ecc_wnaf_relation.hpp (97%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/elliptic_relation.hpp (98%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/gen_perm_sort_relation.hpp (98%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/lookup_relation.hpp (99%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/nested_containers.hpp (100%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/nested_containers.test.cpp (92%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/permutation_relation.hpp (98%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/relation_parameters.hpp (100%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/relation_types.hpp (100%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/translator_vm/goblin_translator_relation_consistency.test.cpp (99%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/translator_vm/translator_decomposition_relation.hpp (99%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/translator_vm/translator_extra_relations.hpp (99%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/translator_vm/translator_gen_perm_sort_relation.hpp (99%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/translator_vm/translator_non_native_field_relation.hpp (99%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/translator_vm/translator_permutation_relation.hpp (98%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ultra_arithmetic_relation.hpp (98%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/ultra_relation_consistency.test.cpp (98%) rename barretenberg/cpp/src/barretenberg/{proof_system => }/relations/utils.hpp (99%) diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/auxiliary_relation.hpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/auxiliary_relation.hpp index 1974006c6fe..ab01091632c 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/auxiliary_relation.hpp @@ -1,6 +1,6 @@ #pragma once #include "barretenberg/numeric/uint256/uint256.hpp" -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" namespace proof_system { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_op_queue_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_op_queue_relation.hpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_op_queue_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/ecc_op_queue_relation.hpp index ac6af95edaf..b854769de9c 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_op_queue_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/ecc_op_queue_relation.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" namespace proof_system { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_lookup_relation.cpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_lookup_relation.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_lookup_relation.cpp rename to barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_lookup_relation.cpp diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_lookup_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_lookup_relation.hpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_lookup_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_lookup_relation.hpp index a59d82936a3..2b0fcd0f4d2 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_lookup_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_lookup_relation.hpp @@ -5,7 +5,7 @@ #include "barretenberg/common/constexpr_utils.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/polynomials/univariate.hpp" -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.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/relations/ecc_vm/ecc_msm_relation.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_msm_relation.cpp rename to barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation.cpp diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_msm_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation.hpp similarity index 97% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_msm_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation.hpp index 93cd28d6de2..acc7006069c 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_msm_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.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/relations/ecc_vm/ecc_point_table_relation.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_point_table_relation.cpp rename to barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_point_table_relation.cpp diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_point_table_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_point_table_relation.hpp similarity index 95% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_point_table_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_point_table_relation.hpp index ffef181cc71..8b1e0a1ce5b 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_point_table_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_point_table_relation.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.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/relations/ecc_vm/ecc_set_relation.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_set_relation.cpp rename to barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_set_relation.cpp diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_set_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_set_relation.hpp similarity index 96% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_set_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_set_relation.hpp index efa01b6e177..879db1ff7fd 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_set_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_set_relation.hpp @@ -5,7 +5,7 @@ #include "barretenberg/common/constexpr_utils.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/polynomials/univariate.hpp" -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.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/relations/ecc_vm/ecc_transcript_relation.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_transcript_relation.cpp rename to barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_transcript_relation.cpp diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_transcript_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_transcript_relation.hpp similarity index 97% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_transcript_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_transcript_relation.hpp index 2bee205554f..bbbaf430ae6 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_transcript_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_transcript_relation.hpp @@ -2,7 +2,7 @@ #include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.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/relations/ecc_vm/ecc_wnaf_relation.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_wnaf_relation.cpp rename to barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_wnaf_relation.cpp diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_wnaf_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_wnaf_relation.hpp similarity index 97% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_wnaf_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_wnaf_relation.hpp index 73b3f08e814..13aa4cd2aeb 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_vm/ecc_wnaf_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_wnaf_relation.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" namespace proof_system::honk::sumcheck { /** diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/elliptic_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/elliptic_relation.hpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/elliptic_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/elliptic_relation.hpp index 87d84c1330c..da69eb2d282 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/elliptic_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/elliptic_relation.hpp @@ -1,7 +1,7 @@ #pragma once #include "barretenberg/ecc/curves/bn254/bn254.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" namespace proof_system { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/gen_perm_sort_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/gen_perm_sort_relation.hpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/gen_perm_sort_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/gen_perm_sort_relation.hpp index c61dda3e2be..b65e9c96a7f 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/gen_perm_sort_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/gen_perm_sort_relation.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" namespace proof_system { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/lookup_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/lookup_relation.hpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/lookup_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/lookup_relation.hpp index bd825b75d88..efca32c9b68 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/lookup_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/lookup_relation.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" namespace proof_system { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/nested_containers.hpp b/barretenberg/cpp/src/barretenberg/relations/nested_containers.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/nested_containers.hpp rename to barretenberg/cpp/src/barretenberg/relations/nested_containers.hpp diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/nested_containers.test.cpp b/barretenberg/cpp/src/barretenberg/relations/nested_containers.test.cpp similarity index 92% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/nested_containers.test.cpp rename to barretenberg/cpp/src/barretenberg/relations/nested_containers.test.cpp index 0272431c3c7..74ad603403a 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/nested_containers.test.cpp +++ b/barretenberg/cpp/src/barretenberg/relations/nested_containers.test.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/proof_system/relations/nested_containers.hpp" +#include "barretenberg/relations/nested_containers.hpp" #include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/polynomials/univariate.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/permutation_relation.hpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/permutation_relation.hpp index 8e4cdf1c107..56cf0c4a59f 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/permutation_relation.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" namespace proof_system { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/relation_parameters.hpp b/barretenberg/cpp/src/barretenberg/relations/relation_parameters.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/relation_parameters.hpp rename to barretenberg/cpp/src/barretenberg/relations/relation_parameters.hpp diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/relation_types.hpp b/barretenberg/cpp/src/barretenberg/relations/relation_types.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/relation_types.hpp rename to barretenberg/cpp/src/barretenberg/relations/relation_types.hpp diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/goblin_translator_relation_consistency.test.cpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/goblin_translator_relation_consistency.test.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/goblin_translator_relation_consistency.test.cpp rename to barretenberg/cpp/src/barretenberg/relations/translator_vm/goblin_translator_relation_consistency.test.cpp index 147515bf028..7ed763ba911 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/goblin_translator_relation_consistency.test.cpp +++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/goblin_translator_relation_consistency.test.cpp @@ -12,12 +12,12 @@ * */ #include "barretenberg/ecc/curves/bn254/fr.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.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 "barretenberg/relations/relation_parameters.hpp" +#include "barretenberg/relations/translator_vm/translator_decomposition_relation.hpp" +#include "barretenberg/relations/translator_vm/translator_extra_relations.hpp" +#include "barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp" +#include "barretenberg/relations/translator_vm/translator_non_native_field_relation.hpp" +#include "barretenberg/relations/translator_vm/translator_permutation_relation.hpp" #include using namespace proof_system; diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_decomposition_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_decomposition_relation.hpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_decomposition_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_decomposition_relation.hpp index c0a81d50d19..7eaccc85380 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_decomposition_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_decomposition_relation.hpp @@ -1,6 +1,6 @@ #pragma once #include "barretenberg/numeric/uint256/uint256.hpp" -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" namespace proof_system { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_extra_relations.hpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_extra_relations.hpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_extra_relations.hpp rename to barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_extra_relations.hpp index 00b99bdb34f..652d0358853 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_extra_relations.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_extra_relations.hpp @@ -1,6 +1,6 @@ #pragma once #include "barretenberg/numeric/uint256/uint256.hpp" -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" namespace proof_system { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_gen_perm_sort_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_gen_perm_sort_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp index 365c6044c36..b63ebe29a8d 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_gen_perm_sort_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" namespace proof_system { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_non_native_field_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_non_native_field_relation.hpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_non_native_field_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_non_native_field_relation.hpp index 2ba6be4eb95..134c5e28aab 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_non_native_field_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_non_native_field_relation.hpp @@ -1,7 +1,7 @@ #pragma once #include "barretenberg/ecc/curves/bn254/bn254.hpp" #include "barretenberg/numeric/uintx/uintx.hpp" -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" namespace proof_system { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_permutation_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_permutation_relation.hpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_permutation_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_permutation_relation.hpp index 448b9cc5b33..7f11672ba7c 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/translator_vm/translator_permutation_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/translator_vm/translator_permutation_relation.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" namespace proof_system { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp b/barretenberg/cpp/src/barretenberg/relations/ultra_arithmetic_relation.hpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp rename to barretenberg/cpp/src/barretenberg/relations/ultra_arithmetic_relation.hpp index 957b6baaa36..81d0c58582a 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/ultra_arithmetic_relation.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" namespace proof_system { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_relation_consistency.test.cpp b/barretenberg/cpp/src/barretenberg/relations/ultra_relation_consistency.test.cpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_relation_consistency.test.cpp rename to barretenberg/cpp/src/barretenberg/relations/ultra_relation_consistency.test.cpp index 6cd80499c4d..9320053a485 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_relation_consistency.test.cpp +++ b/barretenberg/cpp/src/barretenberg/relations/ultra_relation_consistency.test.cpp @@ -13,13 +13,13 @@ */ #include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.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" -#include "barretenberg/proof_system/relations/lookup_relation.hpp" -#include "barretenberg/proof_system/relations/permutation_relation.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" -#include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" +#include "barretenberg/relations/auxiliary_relation.hpp" +#include "barretenberg/relations/elliptic_relation.hpp" +#include "barretenberg/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/relations/lookup_relation.hpp" +#include "barretenberg/relations/permutation_relation.hpp" +#include "barretenberg/relations/relation_parameters.hpp" +#include "barretenberg/relations/ultra_arithmetic_relation.hpp" #include using namespace proof_system; diff --git a/barretenberg/cpp/src/barretenberg/proof_system/relations/utils.hpp b/barretenberg/cpp/src/barretenberg/relations/utils.hpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/proof_system/relations/utils.hpp rename to barretenberg/cpp/src/barretenberg/relations/utils.hpp index d4a0a9f5e4c..87349c5b943 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/relations/utils.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/utils.hpp @@ -1,6 +1,6 @@ #pragma once #include "barretenberg/polynomials/pow.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" +#include "barretenberg/relations/relation_parameters.hpp" namespace barretenberg { From 7260ed05072d73cd1a6f9aee5e1aa34f8220da48 Mon Sep 17 00:00:00 2001 From: codygunton Date: Fri, 3 Nov 2023 15:22:53 +0000 Subject: [PATCH 02/11] Update includes --- barretenberg/cpp/scripts/bb-tests.sh | 11 ++++++----- barretenberg/cpp/src/CMakeLists.txt | 1 + .../relations_bench/relations.bench.cpp | 16 ++++++++-------- .../cpp/src/barretenberg/flavor/ecc_vm.hpp | 16 ++++++++-------- .../barretenberg/flavor/goblin_translator.hpp | 10 +++++----- .../cpp/src/barretenberg/flavor/goblin_ultra.hpp | 14 +++++++------- .../flavor/goblin_ultra_recursive.hpp | 14 +++++++------- .../flavor/relation_definitions_fwd.hpp | 2 +- .../cpp/src/barretenberg/flavor/ultra.hpp | 12 ++++++------ .../src/barretenberg/flavor/ultra_recursive.hpp | 12 ++++++------ .../honk/composer/eccvm_composer.test.cpp | 4 ++-- .../honk/composer/relation_correctness.test.cpp | 16 ++++++++-------- .../barretenberg/honk/composer/sumcheck.test.cpp | 12 ++++++------ .../honk/composer/ultra_composer.test.cpp | 4 ++-- .../honk/proof_system/combiner.test.cpp | 2 +- .../honk/proof_system/eccvm_prover.cpp | 4 ++-- .../honk/proof_system/eccvm_prover.hpp | 2 +- .../honk/proof_system/folding_result.hpp | 2 +- .../honk/proof_system/protogalaxy_prover.hpp | 4 ++-- .../honk/proof_system/ultra_prover.hpp | 2 +- .../src/barretenberg/proof_system/CMakeLists.txt | 2 +- .../eccvm/eccvm_circuit_builder.hpp | 2 +- .../library/grand_product_library.hpp | 2 +- .../src/barretenberg/relations/CMakeLists.txt | 1 + .../sumcheck/instance/prover_instance.hpp | 2 +- .../sumcheck/instance/verifier_instance.hpp | 2 +- .../cpp/src/barretenberg/sumcheck/sumcheck.hpp | 2 +- .../src/barretenberg/sumcheck/sumcheck.test.cpp | 12 ++++++------ .../src/barretenberg/sumcheck/sumcheck_round.hpp | 6 +++--- .../sumcheck/sumcheck_round.test.cpp | 2 +- 30 files changed, 98 insertions(+), 95 deletions(-) create mode 100644 barretenberg/cpp/src/barretenberg/relations/CMakeLists.txt diff --git a/barretenberg/cpp/scripts/bb-tests.sh b/barretenberg/cpp/scripts/bb-tests.sh index 2d4299ffefa..0d703615231 100755 --- a/barretenberg/cpp/scripts/bb-tests.sh +++ b/barretenberg/cpp/scripts/bb-tests.sh @@ -16,21 +16,22 @@ TESTS=( crypto_blake2s_tests crypto_blake3s_tests crypto_ecdsa_tests - crypto_schnorr_tests - crypto_sha256_tests crypto_pedersen_commitment_tests crypto_pedersen_hash_tests + crypto_schnorr_tests + crypto_sha256_tests + dsl_tests ecc_tests flavor_tests + join_split_example_proofs_inner_proof_data_tests + join_split_example_proofs_notes_tests numeric_tests plonk_tests polynomials_tests - join_split_example_proofs_inner_proof_data_tests - join_split_example_proofs_notes_tests + relations_tests srs_tests sumcheck_tests transcript_tests - dsl_tests ) TESTS_STR="${TESTS[@]}" diff --git a/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt index 326127aac24..77aa9ffb631 100644 --- a/barretenberg/cpp/src/CMakeLists.txt +++ b/barretenberg/cpp/src/CMakeLists.txt @@ -64,6 +64,7 @@ add_subdirectory(barretenberg/numeric) add_subdirectory(barretenberg/plonk) add_subdirectory(barretenberg/polynomials) add_subdirectory(barretenberg/proof_system) +add_subdirectory(barretenberg/relations) add_subdirectory(barretenberg/serialize) add_subdirectory(barretenberg/solidity_helpers) add_subdirectory(barretenberg/srs) 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 04f3eff27a5..c98dae702c3 100644 --- a/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp +++ b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp @@ -1,13 +1,13 @@ #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" -#include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp" -#include "barretenberg/proof_system/relations/lookup_relation.hpp" -#include "barretenberg/proof_system/relations/permutation_relation.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" -#include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" +#include "barretenberg/relations/auxiliary_relation.hpp" +#include "barretenberg/relations/ecc_op_queue_relation.hpp" +#include "barretenberg/relations/elliptic_relation.hpp" +#include "barretenberg/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/relations/lookup_relation.hpp" +#include "barretenberg/relations/permutation_relation.hpp" +#include "barretenberg/relations/relation_parameters.hpp" +#include "barretenberg/relations/ultra_arithmetic_relation.hpp" #include namespace { diff --git a/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp b/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp index 251fdafa01c..ae896765dd3 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/ecc_vm.hpp @@ -6,14 +6,14 @@ #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "barretenberg/flavor/flavor.hpp" #include "barretenberg/polynomials/univariate.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" -#include "barretenberg/proof_system/relations/ecc_vm/ecc_set_relation.hpp" -#include "barretenberg/proof_system/relations/ecc_vm/ecc_transcript_relation.hpp" -#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 "barretenberg/relations/ecc_vm/ecc_lookup_relation.hpp" +#include "barretenberg/relations/ecc_vm/ecc_msm_relation.hpp" +#include "barretenberg/relations/ecc_vm/ecc_point_table_relation.hpp" +#include "barretenberg/relations/ecc_vm/ecc_set_relation.hpp" +#include "barretenberg/relations/ecc_vm/ecc_transcript_relation.hpp" +#include "barretenberg/relations/ecc_vm/ecc_wnaf_relation.hpp" +#include "barretenberg/relations/relation_parameters.hpp" +#include "barretenberg/relations/relation_types.hpp" #include "relation_definitions_fwd.hpp" #include #include diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp index 340e4f24554..9b0d5e20d57 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_translator.hpp @@ -6,11 +6,11 @@ #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/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 "barretenberg/relations/translator_vm/translator_decomposition_relation.hpp" +#include "barretenberg/relations/translator_vm/translator_extra_relations.hpp" +#include "barretenberg/relations/translator_vm/translator_gen_perm_sort_relation.hpp" +#include "barretenberg/relations/translator_vm/translator_non_native_field_relation.hpp" +#include "barretenberg/relations/translator_vm/translator_permutation_relation.hpp" #include "relation_definitions_fwd.hpp" #include #include diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp index efd9782229e..2c195baea85 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp @@ -3,13 +3,13 @@ #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/relations/auxiliary_relation.hpp" -#include "barretenberg/proof_system/relations/ecc_op_queue_relation.hpp" -#include "barretenberg/proof_system/relations/elliptic_relation.hpp" -#include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp" -#include "barretenberg/proof_system/relations/lookup_relation.hpp" -#include "barretenberg/proof_system/relations/permutation_relation.hpp" -#include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" +#include "barretenberg/relations/auxiliary_relation.hpp" +#include "barretenberg/relations/ecc_op_queue_relation.hpp" +#include "barretenberg/relations/elliptic_relation.hpp" +#include "barretenberg/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/relations/lookup_relation.hpp" +#include "barretenberg/relations/permutation_relation.hpp" +#include "barretenberg/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/transcript/transcript.hpp" namespace proof_system::honk::flavor { diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp index 0b42f56035c..9fcdbfcba3b 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp @@ -10,13 +10,13 @@ #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/relations/auxiliary_relation.hpp" -#include "barretenberg/proof_system/relations/ecc_op_queue_relation.hpp" -#include "barretenberg/proof_system/relations/elliptic_relation.hpp" -#include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp" -#include "barretenberg/proof_system/relations/lookup_relation.hpp" -#include "barretenberg/proof_system/relations/permutation_relation.hpp" -#include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" +#include "barretenberg/relations/auxiliary_relation.hpp" +#include "barretenberg/relations/ecc_op_queue_relation.hpp" +#include "barretenberg/relations/elliptic_relation.hpp" +#include "barretenberg/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/relations/lookup_relation.hpp" +#include "barretenberg/relations/permutation_relation.hpp" +#include "barretenberg/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" #include "barretenberg/transcript/transcript.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/flavor/relation_definitions_fwd.hpp b/barretenberg/cpp/src/barretenberg/flavor/relation_definitions_fwd.hpp index 4d2b3c9dbf8..af9e7a83bf3 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/relation_definitions_fwd.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/relation_definitions_fwd.hpp @@ -1,6 +1,6 @@ #pragma once -#include "barretenberg/proof_system/relations/relation_types.hpp" +#include "barretenberg/relations/relation_types.hpp" #define ExtendedEdge(Flavor) Flavor::ExtendedEdges #define EvaluationEdge(Flavor) Flavor::AllValues diff --git a/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp index 7ebee0e928f..28feb0c2a17 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp @@ -7,12 +7,12 @@ #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/polynomials/univariate.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.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" -#include "barretenberg/proof_system/relations/lookup_relation.hpp" -#include "barretenberg/proof_system/relations/permutation_relation.hpp" -#include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" +#include "barretenberg/relations/auxiliary_relation.hpp" +#include "barretenberg/relations/elliptic_relation.hpp" +#include "barretenberg/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/relations/lookup_relation.hpp" +#include "barretenberg/relations/permutation_relation.hpp" +#include "barretenberg/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/transcript/transcript.hpp" namespace proof_system::honk::flavor { diff --git a/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp index 08b6c3e6317..d4fbf11941d 100644 --- a/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp +++ b/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp @@ -10,12 +10,12 @@ #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/relations/auxiliary_relation.hpp" -#include "barretenberg/proof_system/relations/elliptic_relation.hpp" -#include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp" -#include "barretenberg/proof_system/relations/lookup_relation.hpp" -#include "barretenberg/proof_system/relations/permutation_relation.hpp" -#include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" +#include "barretenberg/relations/auxiliary_relation.hpp" +#include "barretenberg/relations/elliptic_relation.hpp" +#include "barretenberg/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/relations/lookup_relation.hpp" +#include "barretenberg/relations/permutation_relation.hpp" +#include "barretenberg/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" #include "barretenberg/transcript/transcript.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.test.cpp index 960318211ef..904260a4cfd 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.test.cpp @@ -8,8 +8,8 @@ #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp" #include "barretenberg/proof_system/library/grand_product_delta.hpp" -#include "barretenberg/proof_system/relations/permutation_relation.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" +#include "barretenberg/relations/permutation_relation.hpp" +#include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/sumcheck/sumcheck_round.hpp" using namespace proof_system::honk; diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/relation_correctness.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/relation_correctness.test.cpp index 534f4e88305..317c7f6383b 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/relation_correctness.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/composer/relation_correctness.test.cpp @@ -2,14 +2,14 @@ #include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/honk/proof_system/permutation_library.hpp" #include "barretenberg/proof_system/library/grand_product_library.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" -#include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp" -#include "barretenberg/proof_system/relations/lookup_relation.hpp" -#include "barretenberg/proof_system/relations/permutation_relation.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" -#include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" +#include "barretenberg/relations/auxiliary_relation.hpp" +#include "barretenberg/relations/ecc_op_queue_relation.hpp" +#include "barretenberg/relations/elliptic_relation.hpp" +#include "barretenberg/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/relations/lookup_relation.hpp" +#include "barretenberg/relations/permutation_relation.hpp" +#include "barretenberg/relations/relation_parameters.hpp" +#include "barretenberg/relations/ultra_arithmetic_relation.hpp" #include using namespace proof_system::honk; diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/sumcheck.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/sumcheck.test.cpp index 2e85847050d..ba1fb1bce1f 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/sumcheck.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/composer/sumcheck.test.cpp @@ -4,12 +4,12 @@ #include "barretenberg/proof_system/library/grand_product_delta.hpp" #include "barretenberg/proof_system/library/grand_product_library.hpp" #include "barretenberg/proof_system/plookup_tables/fixed_base/fixed_base.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" -#include "barretenberg/proof_system/relations/lookup_relation.hpp" -#include "barretenberg/proof_system/relations/permutation_relation.hpp" -#include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" +#include "barretenberg/relations/auxiliary_relation.hpp" +#include "barretenberg/relations/elliptic_relation.hpp" +#include "barretenberg/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/relations/lookup_relation.hpp" +#include "barretenberg/relations/permutation_relation.hpp" +#include "barretenberg/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/transcript/transcript.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp index cd8e33ba396..7fdf3dae6a4 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp @@ -7,8 +7,8 @@ #include "barretenberg/proof_system/library/grand_product_delta.hpp" #include "barretenberg/proof_system/plookup_tables/fixed_base/fixed_base.hpp" #include "barretenberg/proof_system/plookup_tables/types.hpp" -#include "barretenberg/proof_system/relations/permutation_relation.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" +#include "barretenberg/relations/permutation_relation.hpp" +#include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/sumcheck/sumcheck_round.hpp" #include #include 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 0eb443bf38d..bc934b98108 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/combiner.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/combiner.test.cpp @@ -1,7 +1,7 @@ #include "barretenberg/flavor/ultra.hpp" #include "barretenberg/honk/proof_system/protogalaxy_prover.hpp" #include "barretenberg/honk/utils/testing.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" +#include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/sumcheck/instance/instances.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.cpp index 6707710c99b..a5b885f6443 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.cpp @@ -6,8 +6,8 @@ #include "barretenberg/honk/proof_system/power_polynomial.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/proof_system/library/grand_product_library.hpp" -#include "barretenberg/proof_system/relations/lookup_relation.hpp" -#include "barretenberg/proof_system/relations/permutation_relation.hpp" +#include "barretenberg/relations/lookup_relation.hpp" +#include "barretenberg/relations/permutation_relation.hpp" #include "barretenberg/sumcheck/sumcheck.hpp" #include #include 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 7093d6dc05f..958c1bad95f 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.hpp @@ -3,7 +3,7 @@ #include "barretenberg/commitment_schemes/shplonk/shplonk.hpp" #include "barretenberg/flavor/ecc_vm.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" +#include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/sumcheck/sumcheck_output.hpp" #include "barretenberg/transcript/transcript.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 e2eeb0a6e8d..1d177e252aa 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/folding_result.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/folding_result.hpp @@ -1,6 +1,6 @@ #pragma once #include "barretenberg/flavor/flavor.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" +#include "barretenberg/relations/relation_parameters.hpp" namespace proof_system::honk { template struct ProverFoldingResult { public: 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 55c259f0fe3..aba538bba98 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.hpp @@ -7,8 +7,8 @@ #include "barretenberg/honk/proof_system/folding_result.hpp" #include "barretenberg/polynomials/pow.hpp" #include "barretenberg/polynomials/univariate.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" -#include "barretenberg/proof_system/relations/utils.hpp" +#include "barretenberg/relations/relation_parameters.hpp" +#include "barretenberg/relations/utils.hpp" #include "barretenberg/sumcheck/instance/instances.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 69841fddee8..058f5852c0e 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp @@ -3,7 +3,7 @@ #include "barretenberg/flavor/goblin_ultra.hpp" #include "barretenberg/flavor/ultra.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" +#include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/sumcheck/instance/prover_instance.hpp" #include "barretenberg/sumcheck/sumcheck_output.hpp" #include "barretenberg/transcript/transcript.hpp" diff --git a/barretenberg/cpp/src/barretenberg/proof_system/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/proof_system/CMakeLists.txt index 1e962edd3a8..68283003435 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/proof_system/CMakeLists.txt @@ -1 +1 @@ -barretenberg_module(proof_system polynomials crypto_pedersen_commitment crypto_pedersen_hash) \ No newline at end of file +barretenberg_module(proof_system relations polynomials crypto_pedersen_commitment crypto_pedersen_hash) \ No newline at end of file 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 bca60677477..507e5b42c70 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 @@ -9,7 +9,7 @@ #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" +#include "barretenberg/relations/relation_parameters.hpp" namespace proof_system { diff --git a/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.hpp b/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.hpp index 8e28b43eb22..b23bcdd5ae5 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/library/grand_product_library.hpp @@ -3,7 +3,7 @@ #include "barretenberg/common/thread.hpp" #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" #include "barretenberg/polynomials/polynomial.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" +#include "barretenberg/relations/relation_parameters.hpp" #include namespace proof_system::honk::grand_product_library { diff --git a/barretenberg/cpp/src/barretenberg/relations/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/relations/CMakeLists.txt new file mode 100644 index 00000000000..9e0da61e113 --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/relations/CMakeLists.txt @@ -0,0 +1 @@ +barretenberg_module(relations proof_system) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp index 596f3389b46..8f4dbde8afe 100644 --- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp +++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp @@ -4,7 +4,7 @@ #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/relations/relation_parameters.hpp" +#include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/srs/factories/file_crs_factory.hpp" namespace proof_system::honk { diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/verifier_instance.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/verifier_instance.hpp index af2b89a4378..bdb23398fe4 100644 --- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/verifier_instance.hpp +++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/verifier_instance.hpp @@ -1,6 +1,6 @@ #pragma once #include "barretenberg/flavor/flavor.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" +#include "barretenberg/relations/relation_parameters.hpp" namespace proof_system::honk { template class VerifierInstance_ { diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.hpp index b8961f82788..29a82b4f556 100644 --- a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.hpp +++ b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.hpp @@ -3,7 +3,7 @@ #include "barretenberg/common/throw_or_abort.hpp" #include "barretenberg/polynomials/univariate.hpp" #include "barretenberg/proof_system/library/grand_product_delta.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" +#include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/sumcheck/instance/prover_instance.hpp" #include "barretenberg/sumcheck/sumcheck_output.hpp" #include "barretenberg/transcript/transcript.hpp" diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp index cb31deefaba..d836ab03e45 100644 --- a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp +++ b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp @@ -2,12 +2,12 @@ #include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/proof_system/plookup_tables/fixed_base/fixed_base.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" -#include "barretenberg/proof_system/relations/lookup_relation.hpp" -#include "barretenberg/proof_system/relations/permutation_relation.hpp" -#include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" +#include "barretenberg/relations/auxiliary_relation.hpp" +#include "barretenberg/relations/elliptic_relation.hpp" +#include "barretenberg/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/relations/lookup_relation.hpp" +#include "barretenberg/relations/permutation_relation.hpp" +#include "barretenberg/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/transcript/transcript.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp index b9c9661fda7..f2927c6ae46 100644 --- a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp +++ b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.hpp @@ -5,9 +5,9 @@ #include "barretenberg/flavor/flavor.hpp" #include "barretenberg/polynomials/barycentric.hpp" #include "barretenberg/polynomials/pow.hpp" -#include "barretenberg/proof_system/relations/relation_parameters.hpp" -#include "barretenberg/proof_system/relations/relation_types.hpp" -#include "barretenberg/proof_system/relations/utils.hpp" +#include "barretenberg/relations/relation_parameters.hpp" +#include "barretenberg/relations/relation_types.hpp" +#include "barretenberg/relations/utils.hpp" namespace proof_system::honk::sumcheck { diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.test.cpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.test.cpp index 8b662ced869..dd2a6776a2b 100644 --- a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.test.cpp +++ b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck_round.test.cpp @@ -1,6 +1,6 @@ #include "sumcheck_round.hpp" #include "barretenberg/flavor/ultra.hpp" -#include "barretenberg/proof_system/relations/utils.hpp" +#include "barretenberg/relations/utils.hpp" #include From 3e0dde6d068dc833414d3cea42b3057e15169c80 Mon Sep 17 00:00:00 2001 From: codygunton Date: Fri, 3 Nov 2023 16:28:12 +0000 Subject: [PATCH 03/11] Move ECCVM --- .../barretenberg/{honk/composer => eccvm}/eccvm_composer.cpp | 3 +-- .../barretenberg/{honk/composer => eccvm}/eccvm_composer.hpp | 4 ++-- .../{honk/composer => eccvm}/eccvm_composer.test.cpp | 2 +- .../{honk/proof_system => eccvm}/eccvm_prover.cpp | 0 .../{honk/proof_system => eccvm}/eccvm_prover.hpp | 0 .../{honk/composer => eccvm}/eccvm_transcript.test.cpp | 2 +- .../{honk/proof_system => eccvm}/eccvm_verifier.cpp | 0 .../{honk/proof_system => eccvm}/eccvm_verifier.hpp | 0 8 files changed, 5 insertions(+), 6 deletions(-) rename barretenberg/cpp/src/barretenberg/{honk/composer => eccvm}/eccvm_composer.cpp (97%) rename barretenberg/cpp/src/barretenberg/{honk/composer => eccvm}/eccvm_composer.hpp (96%) rename barretenberg/cpp/src/barretenberg/{honk/composer => eccvm}/eccvm_composer.test.cpp (98%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => eccvm}/eccvm_prover.cpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => eccvm}/eccvm_prover.hpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/composer => eccvm}/eccvm_transcript.test.cpp (99%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => eccvm}/eccvm_verifier.cpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => eccvm}/eccvm_verifier.hpp (100%) diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.cpp similarity index 97% rename from barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.cpp rename to barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.cpp index 6ceb44ec11b..7ed34e4990d 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.cpp +++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.cpp @@ -1,5 +1,4 @@ -#include "./eccvm_composer.hpp" -#include "barretenberg/honk/proof_system/ultra_prover.hpp" +#include "eccvm_composer.hpp" #include "barretenberg/proof_system/composer/composer_lib.hpp" #include "barretenberg/proof_system/composer/permutation_lib.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.hpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.hpp similarity index 96% rename from barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.hpp rename to barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.hpp index 7d8dd2c6ebb..416e9154f46 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.hpp +++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.hpp @@ -1,7 +1,7 @@ #pragma once -#include "barretenberg/honk/proof_system/eccvm_prover.hpp" -#include "barretenberg/honk/proof_system/eccvm_verifier.hpp" +#include "barretenberg/eccvm/eccvm_prover.hpp" +#include "barretenberg/eccvm/eccvm_verifier.hpp" #include "barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp" #include "barretenberg/proof_system/composer/composer_lib.hpp" #include "barretenberg/srs/factories/file_crs_factory.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.test.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.test.cpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.test.cpp rename to barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.test.cpp index 904260a4cfd..e9296485e3d 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.test.cpp +++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_composer.test.cpp @@ -3,7 +3,7 @@ #include #include -#include "barretenberg/honk/composer/eccvm_composer.hpp" +#include "barretenberg/eccvm/eccvm_composer.hpp" #include "barretenberg/numeric/uint256/uint256.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.cpp rename to barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.hpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_prover.hpp rename to barretenberg/cpp/src/barretenberg/eccvm/eccvm_prover.hpp diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_transcript.test.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_transcript.test.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/honk/composer/eccvm_transcript.test.cpp rename to barretenberg/cpp/src/barretenberg/eccvm/eccvm_transcript.test.cpp index e30ca1e4ffe..423075428d5 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_transcript.test.cpp +++ b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_transcript.test.cpp @@ -1,6 +1,6 @@ #include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/eccvm/eccvm_composer.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/transcript/transcript.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_verifier.cpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_verifier.cpp rename to barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_verifier.hpp b/barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/eccvm_verifier.hpp rename to barretenberg/cpp/src/barretenberg/eccvm/eccvm_verifier.hpp From a1a75a5a0265035aab7045280f040fe7f0f89e3f Mon Sep 17 00:00:00 2001 From: codygunton Date: Fri, 3 Nov 2023 16:36:57 +0000 Subject: [PATCH 04/11] Move Goblin test --- .../{honk/composer => }/goblin/full_goblin_composer.test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename barretenberg/cpp/src/barretenberg/{honk/composer => }/goblin/full_goblin_composer.test.cpp (99%) diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/goblin/full_goblin_composer.test.cpp b/barretenberg/cpp/src/barretenberg/goblin/full_goblin_composer.test.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/honk/composer/goblin/full_goblin_composer.test.cpp rename to barretenberg/cpp/src/barretenberg/goblin/full_goblin_composer.test.cpp index 2012cb1547a..9e4be6c4f49 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/goblin/full_goblin_composer.test.cpp +++ b/barretenberg/cpp/src/barretenberg/goblin/full_goblin_composer.test.cpp @@ -3,7 +3,7 @@ #include #include "barretenberg/common/log.hpp" -#include "barretenberg/honk/composer/eccvm_composer.hpp" +#include "barretenberg/eccvm/eccvm_composer.hpp" #include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/honk/proof_system/ultra_prover.hpp" #include "barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp" From 5cb79dcbddab1cda26eeb1d47d0a474c006e145e Mon Sep 17 00:00:00 2001 From: codygunton Date: Fri, 3 Nov 2023 16:37:17 +0000 Subject: [PATCH 05/11] ECCVM and Goblin move --- barretenberg/cpp/scripts/bb-tests.sh | 2 ++ barretenberg/cpp/src/CMakeLists.txt | 2 ++ barretenberg/cpp/src/barretenberg/eccvm/CMakeLists.txt | 1 + barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt | 1 + 4 files changed, 6 insertions(+) create mode 100644 barretenberg/cpp/src/barretenberg/eccvm/CMakeLists.txt create mode 100644 barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt diff --git a/barretenberg/cpp/scripts/bb-tests.sh b/barretenberg/cpp/scripts/bb-tests.sh index 0d703615231..264c8a5134c 100755 --- a/barretenberg/cpp/scripts/bb-tests.sh +++ b/barretenberg/cpp/scripts/bb-tests.sh @@ -22,7 +22,9 @@ TESTS=( crypto_sha256_tests dsl_tests ecc_tests + eccvm_tests flavor_tests + goblin_tests join_split_example_proofs_inner_proof_data_tests join_split_example_proofs_notes_tests numeric_tests diff --git a/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt index 77aa9ffb631..3ae9a4180c4 100644 --- a/barretenberg/cpp/src/CMakeLists.txt +++ b/barretenberg/cpp/src/CMakeLists.txt @@ -54,10 +54,12 @@ add_subdirectory(barretenberg/common) add_subdirectory(barretenberg/crypto) add_subdirectory(barretenberg/dsl) add_subdirectory(barretenberg/ecc) +add_subdirectory(barretenberg/eccvm) add_subdirectory(barretenberg/env) add_subdirectory(barretenberg/examples) add_subdirectory(barretenberg/flavor) add_subdirectory(barretenberg/grumpkin_srs_gen) +add_subdirectory(barretenberg/goblin) add_subdirectory(barretenberg/honk) add_subdirectory(barretenberg/join_split_example) add_subdirectory(barretenberg/numeric) diff --git a/barretenberg/cpp/src/barretenberg/eccvm/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/eccvm/CMakeLists.txt new file mode 100644 index 00000000000..b5b480745e7 --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/eccvm/CMakeLists.txt @@ -0,0 +1 @@ +barretenberg_module(eccvm honk sumcheck) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt new file mode 100644 index 00000000000..3da9fafe9cf --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt @@ -0,0 +1 @@ +barretenberg_module(goblin honk eccvm) \ No newline at end of file From 50d6c6c8f4aeaa3757f33c904a52e322a7fc5675 Mon Sep 17 00:00:00 2001 From: codygunton Date: Fri, 3 Nov 2023 17:40:57 +0000 Subject: [PATCH 06/11] Move Ultra Honk --- .../composer => ultra_honk}/goblin_ultra_composer.test.cpp | 4 ++-- .../composer => ultra_honk}/goblin_ultra_transcript.test.cpp | 2 +- .../composer => ultra_honk}/relation_correctness.test.cpp | 2 +- .../{honk/composer => ultra_honk}/sumcheck.test.cpp | 2 +- .../{honk/composer => ultra_honk}/ultra_composer.cpp | 2 +- .../{honk/composer => ultra_honk}/ultra_composer.hpp | 4 ++-- .../{honk/composer => ultra_honk}/ultra_composer.test.cpp | 4 ++-- .../{honk/proof_system => ultra_honk}/ultra_prover.cpp | 0 .../{honk/proof_system => ultra_honk}/ultra_prover.hpp | 0 .../{honk/composer => ultra_honk}/ultra_transcript.test.cpp | 2 +- .../{honk/proof_system => ultra_honk}/ultra_verifier.cpp | 0 .../{honk/proof_system => ultra_honk}/ultra_verifier.hpp | 0 12 files changed, 11 insertions(+), 11 deletions(-) rename barretenberg/cpp/src/barretenberg/{honk/composer => ultra_honk}/goblin_ultra_composer.test.cpp (98%) rename barretenberg/cpp/src/barretenberg/{honk/composer => ultra_honk}/goblin_ultra_transcript.test.cpp (99%) rename barretenberg/cpp/src/barretenberg/{honk/composer => ultra_honk}/relation_correctness.test.cpp (99%) rename barretenberg/cpp/src/barretenberg/{honk/composer => ultra_honk}/sumcheck.test.cpp (99%) rename barretenberg/cpp/src/barretenberg/{honk/composer => ultra_honk}/ultra_composer.cpp (96%) rename barretenberg/cpp/src/barretenberg/{honk/composer => ultra_honk}/ultra_composer.hpp (97%) rename barretenberg/cpp/src/barretenberg/{honk/composer => ultra_honk}/ultra_composer.test.cpp (99%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => ultra_honk}/ultra_prover.cpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => ultra_honk}/ultra_prover.hpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/composer => ultra_honk}/ultra_transcript.test.cpp (99%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => ultra_honk}/ultra_verifier.cpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => ultra_honk}/ultra_verifier.hpp (100%) diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_composer.test.cpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_composer.test.cpp index 584fb41d7a2..d23b2f6b393 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp +++ b/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_composer.test.cpp @@ -3,10 +3,10 @@ #include #include "barretenberg/common/log.hpp" -#include "barretenberg/honk/composer/ultra_composer.hpp" -#include "barretenberg/honk/proof_system/ultra_prover.hpp" #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" +#include "barretenberg/ultra_honk/ultra_prover.hpp" using namespace proof_system::honk; diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_transcript.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_transcript.test.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_transcript.test.cpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_transcript.test.cpp index 6fedc40f1ba..02dcb467a28 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_transcript.test.cpp +++ b/barretenberg/cpp/src/barretenberg/ultra_honk/goblin_ultra_transcript.test.cpp @@ -1,9 +1,9 @@ #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/transcript/transcript.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" #include using namespace proof_system::honk; diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/relation_correctness.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/honk/composer/relation_correctness.test.cpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp index 317c7f6383b..a40555af5b4 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/relation_correctness.test.cpp +++ b/barretenberg/cpp/src/barretenberg/ultra_honk/relation_correctness.test.cpp @@ -1,5 +1,4 @@ #include "barretenberg/flavor/goblin_translator.hpp" -#include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/honk/proof_system/permutation_library.hpp" #include "barretenberg/proof_system/library/grand_product_library.hpp" #include "barretenberg/relations/auxiliary_relation.hpp" @@ -10,6 +9,7 @@ #include "barretenberg/relations/permutation_relation.hpp" #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/ultra_arithmetic_relation.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" #include using namespace proof_system::honk; diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/sumcheck.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/sumcheck.test.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/honk/composer/sumcheck.test.cpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/sumcheck.test.cpp index ba1fb1bce1f..0dbf1bae5b2 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/sumcheck.test.cpp +++ b/barretenberg/cpp/src/barretenberg/ultra_honk/sumcheck.test.cpp @@ -1,6 +1,5 @@ #include "barretenberg/sumcheck/sumcheck.hpp" #include "barretenberg/ecc/curves/bn254/fr.hpp" -#include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/proof_system/library/grand_product_delta.hpp" #include "barretenberg/proof_system/library/grand_product_library.hpp" #include "barretenberg/proof_system/plookup_tables/fixed_base/fixed_base.hpp" @@ -11,6 +10,7 @@ #include "barretenberg/relations/permutation_relation.hpp" #include "barretenberg/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/transcript/transcript.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.cpp similarity index 96% rename from barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.cpp index 5c4f701b6dd..ff8cf11b869 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp +++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/honk/composer/ultra_composer.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" #include "barretenberg/proof_system/composer/composer_lib.hpp" #include "barretenberg/proof_system/composer/permutation_lib.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.hpp similarity index 97% rename from barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.hpp index a7bc4777027..eb5a2abdf07 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp +++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.hpp @@ -4,11 +4,11 @@ #include "barretenberg/honk/proof_system/goblin_merge/merge_verifier.hpp" #include "barretenberg/honk/proof_system/protogalaxy_prover.hpp" #include "barretenberg/honk/proof_system/protogalaxy_verifier.hpp" -#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/srs/global_crs.hpp" #include "barretenberg/sumcheck/instance/prover_instance.hpp" +#include "barretenberg/ultra_honk/ultra_prover.hpp" +#include "barretenberg/ultra_honk/ultra_verifier.hpp" namespace proof_system::honk { template class UltraComposer_ { diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.test.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.test.cpp index 7fdf3dae6a4..6b9cdbd7484 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp +++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.test.cpp @@ -1,7 +1,6 @@ -#include "barretenberg/honk/composer/ultra_composer.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" #include "barretenberg/common/serialize.hpp" #include "barretenberg/ecc/curves/bn254/fr.hpp" -#include "barretenberg/honk/proof_system/ultra_prover.hpp" #include "barretenberg/numeric/uint256/uint256.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" #include "barretenberg/proof_system/library/grand_product_delta.hpp" @@ -10,6 +9,7 @@ #include "barretenberg/relations/permutation_relation.hpp" #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/sumcheck/sumcheck_round.hpp" +#include "barretenberg/ultra_honk/ultra_prover.hpp" #include #include #include diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/ultra_prover.hpp diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/ultra_transcript.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_transcript.test.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/honk/composer/ultra_transcript.test.cpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/ultra_transcript.test.cpp index f4f17bb0368..877e0589b04 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/ultra_transcript.test.cpp +++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_transcript.test.cpp @@ -1,9 +1,9 @@ #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/transcript/transcript.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" #include using namespace proof_system::honk; diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/ultra_verifier.hpp From 79932c88fbf9eec3e336d9f6988374fce8d03cb6 Mon Sep 17 00:00:00 2001 From: codygunton Date: Fri, 3 Nov 2023 17:56:52 +0000 Subject: [PATCH 07/11] Move protogalaxy --- .../{honk/proof_system => protogalaxy}/combiner.test.cpp | 2 +- .../proof_system => protogalaxy}/combiner_example_gen.py | 0 .../{honk/proof_system => protogalaxy}/folding_result.hpp | 0 .../{honk/proof_system => protogalaxy}/protogalaxy_prover.cpp | 0 .../{honk/proof_system => protogalaxy}/protogalaxy_prover.hpp | 2 +- .../proof_system => protogalaxy}/protogalaxy_verifier.cpp | 0 .../proof_system => protogalaxy}/protogalaxy_verifier.hpp | 2 +- .../{honk/proof_system => ultra_honk}/protogalaxy.test.cpp | 4 ++-- 8 files changed, 5 insertions(+), 5 deletions(-) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => protogalaxy}/combiner.test.cpp (99%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => protogalaxy}/combiner_example_gen.py (100%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => protogalaxy}/folding_result.hpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => protogalaxy}/protogalaxy_prover.cpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => protogalaxy}/protogalaxy_prover.hpp (99%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => protogalaxy}/protogalaxy_verifier.cpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => protogalaxy}/protogalaxy_verifier.hpp (96%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system => ultra_honk}/protogalaxy.test.cpp (98%) diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/combiner.test.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/combiner.test.cpp rename to barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp index bc934b98108..3cdc96707d1 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/combiner.test.cpp +++ b/barretenberg/cpp/src/barretenberg/protogalaxy/combiner.test.cpp @@ -1,6 +1,6 @@ #include "barretenberg/flavor/ultra.hpp" -#include "barretenberg/honk/proof_system/protogalaxy_prover.hpp" #include "barretenberg/honk/utils/testing.hpp" +#include "barretenberg/protogalaxy/protogalaxy_prover.hpp" #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/sumcheck/instance/instances.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/combiner_example_gen.py b/barretenberg/cpp/src/barretenberg/protogalaxy/combiner_example_gen.py similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/combiner_example_gen.py rename to barretenberg/cpp/src/barretenberg/protogalaxy/combiner_example_gen.py diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/folding_result.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/folding_result.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/folding_result.hpp rename to barretenberg/cpp/src/barretenberg/protogalaxy/folding_result.hpp diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.cpp rename to barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.hpp rename to barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp index aba538bba98..cbddd5cbaeb 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_prover.hpp +++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp @@ -4,9 +4,9 @@ #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/polynomials/pow.hpp" #include "barretenberg/polynomials/univariate.hpp" +#include "barretenberg/protogalaxy/folding_result.hpp" #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/relations/utils.hpp" #include "barretenberg/sumcheck/instance/instances.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_verifier.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_verifier.cpp rename to barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_verifier.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.hpp similarity index 96% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_verifier.hpp rename to barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.hpp index eea13435e8a..524c50a2f1a 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_verifier.hpp @@ -2,7 +2,7 @@ #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/protogalaxy/folding_result.hpp" #include "barretenberg/sumcheck/instance/instances.hpp" #include "barretenberg/transcript/transcript.hpp" diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy.test.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/protogalaxy.test.cpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy.test.cpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/protogalaxy.test.cpp index 4d077d85628..f700fe2ac19 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/protogalaxy.test.cpp +++ b/barretenberg/cpp/src/barretenberg/ultra_honk/protogalaxy.test.cpp @@ -1,5 +1,5 @@ -#include "barretenberg/honk/composer/ultra_composer.hpp" -#include "protogalaxy_prover.hpp" +#include "barretenberg/protogalaxy/protogalaxy_prover.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" #include using namespace barretenberg; From ae891c8abccec4541b5310a0fe713f6eff967ab0 Mon Sep 17 00:00:00 2001 From: codygunton Date: Fri, 3 Nov 2023 18:30:10 +0000 Subject: [PATCH 08/11] Move merge stuff --- .../proof_system/goblin_merge => ultra_honk}/merge_prover.cpp | 0 .../proof_system/goblin_merge => ultra_honk}/merge_prover.hpp | 0 .../proof_system/goblin_merge => ultra_honk}/merge_verifier.cpp | 0 .../proof_system/goblin_merge => ultra_honk}/merge_verifier.hpp | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename barretenberg/cpp/src/barretenberg/{honk/proof_system/goblin_merge => ultra_honk}/merge_prover.cpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system/goblin_merge => ultra_honk}/merge_prover.hpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system/goblin_merge => ultra_honk}/merge_verifier.cpp (100%) rename barretenberg/cpp/src/barretenberg/{honk/proof_system/goblin_merge => ultra_honk}/merge_verifier.hpp (100%) diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.cpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.hpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/merge_prover.hpp diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_verifier.cpp b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_verifier.cpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_verifier.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_verifier.hpp rename to barretenberg/cpp/src/barretenberg/ultra_honk/merge_verifier.hpp From 5b8d4e456d0fd4c4b0e695a6c68f06d01c2420b8 Mon Sep 17 00:00:00 2001 From: codygunton Date: Fri, 3 Nov 2023 18:34:37 +0000 Subject: [PATCH 09/11] Resolve inncludes etc --- barretenberg/cpp/scripts/bb-tests.sh | 2 ++ barretenberg/cpp/src/CMakeLists.txt | 2 ++ .../src/barretenberg/benchmark/honk_bench/CMakeLists.txt | 1 + .../benchmark/honk_bench/benchmark_utilities.hpp | 4 ++-- .../benchmark/honk_bench/ultra_honk.bench.cpp | 2 +- .../benchmark/honk_bench/ultra_honk_rounds.bench.cpp | 4 ++-- barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt | 2 +- .../src/barretenberg/goblin/full_goblin_composer.test.cpp | 4 ++-- .../honk/proof_system/goblin_merge/merge_prover.cpp | 0 .../cpp/src/barretenberg/join_split_example/types.hpp | 2 +- .../cpp/src/barretenberg/protogalaxy/CMakeLists.txt | 1 + .../cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt | 2 +- .../cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt | 2 +- .../recursion/honk/verifier/goblin_verifier.test.cpp | 4 ++-- .../stdlib/recursion/honk/verifier/verifier.test.cpp | 4 ++-- .../barretenberg/sumcheck/instance/prover_instance.hpp | 2 +- .../cpp/src/barretenberg/sumcheck/sumcheck.test.cpp | 2 +- .../cpp/src/barretenberg/ultra_honk/CMakeLists.txt | 1 + .../cpp/src/barretenberg/ultra_honk/ultra_composer.hpp | 8 ++++---- 19 files changed, 28 insertions(+), 21 deletions(-) create mode 100644 barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.cpp create mode 100644 barretenberg/cpp/src/barretenberg/protogalaxy/CMakeLists.txt create mode 100644 barretenberg/cpp/src/barretenberg/ultra_honk/CMakeLists.txt diff --git a/barretenberg/cpp/scripts/bb-tests.sh b/barretenberg/cpp/scripts/bb-tests.sh index 264c8a5134c..d0ca404757e 100755 --- a/barretenberg/cpp/scripts/bb-tests.sh +++ b/barretenberg/cpp/scripts/bb-tests.sh @@ -30,10 +30,12 @@ TESTS=( numeric_tests plonk_tests polynomials_tests + protogalaxy_tests relations_tests srs_tests sumcheck_tests transcript_tests + ultra_honk_tests ) TESTS_STR="${TESTS[@]}" diff --git a/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt index 3ae9a4180c4..2637c16bb4a 100644 --- a/barretenberg/cpp/src/CMakeLists.txt +++ b/barretenberg/cpp/src/CMakeLists.txt @@ -66,6 +66,7 @@ add_subdirectory(barretenberg/numeric) add_subdirectory(barretenberg/plonk) add_subdirectory(barretenberg/polynomials) add_subdirectory(barretenberg/proof_system) +add_subdirectory(barretenberg/protogalaxy) add_subdirectory(barretenberg/relations) add_subdirectory(barretenberg/serialize) add_subdirectory(barretenberg/solidity_helpers) @@ -73,6 +74,7 @@ add_subdirectory(barretenberg/srs) add_subdirectory(barretenberg/stdlib) add_subdirectory(barretenberg/sumcheck) add_subdirectory(barretenberg/transcript) +add_subdirectory(barretenberg/ultra_honk) add_subdirectory(barretenberg/wasi) diff --git a/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt index fa33b5a6567..1de8756be42 100644 --- a/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt @@ -9,6 +9,7 @@ set(BENCHMARK_SOURCES # Required libraries for benchmark suites set(LINKED_LIBRARIES + ultra_honk stdlib_sha256 stdlib_keccak stdlib_merkle_tree diff --git a/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp index 84949504692..6f223939a4b 100644 --- a/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp +++ b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp @@ -2,8 +2,6 @@ #include #include -#include "barretenberg/honk/composer/ultra_composer.hpp" -#include "barretenberg/honk/proof_system/ultra_prover.hpp" #include "barretenberg/plonk/composer/standard_composer.hpp" #include "barretenberg/plonk/composer/ultra_composer.hpp" #include "barretenberg/proof_system/types/circuit_type.hpp" @@ -19,6 +17,8 @@ #include "barretenberg/stdlib/primitives/field/field.hpp" #include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp" #include "barretenberg/stdlib/primitives/witness/witness.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" +#include "barretenberg/ultra_honk/ultra_prover.hpp" using namespace benchmark; diff --git a/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp index 7d1bd15b413..471e7db76e0 100644 --- a/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp +++ b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp @@ -1,8 +1,8 @@ #include #include "barretenberg/benchmark/honk_bench/benchmark_utilities.hpp" -#include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" using namespace benchmark; using namespace proof_system; diff --git a/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk_rounds.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk_rounds.bench.cpp index 8f7afaa181d..46642345ef4 100644 --- a/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk_rounds.bench.cpp +++ b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk_rounds.bench.cpp @@ -1,9 +1,9 @@ #include #include "barretenberg/benchmark/honk_bench/benchmark_utilities.hpp" -#include "barretenberg/honk/composer/ultra_composer.hpp" -#include "barretenberg/honk/proof_system/ultra_prover.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" +#include "barretenberg/ultra_honk/ultra_prover.hpp" using namespace benchmark; using namespace proof_system; diff --git a/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt index 3da9fafe9cf..f0316f56dcc 100644 --- a/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt @@ -1 +1 @@ -barretenberg_module(goblin honk eccvm) \ No newline at end of file +barretenberg_module(goblin ultra_honk eccvm) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/goblin/full_goblin_composer.test.cpp b/barretenberg/cpp/src/barretenberg/goblin/full_goblin_composer.test.cpp index 9e4be6c4f49..19f4ceb9ece 100644 --- a/barretenberg/cpp/src/barretenberg/goblin/full_goblin_composer.test.cpp +++ b/barretenberg/cpp/src/barretenberg/goblin/full_goblin_composer.test.cpp @@ -4,11 +4,11 @@ #include "barretenberg/common/log.hpp" #include "barretenberg/eccvm/eccvm_composer.hpp" -#include "barretenberg/honk/composer/ultra_composer.hpp" -#include "barretenberg/honk/proof_system/ultra_prover.hpp" #include "barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp" #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" +#include "barretenberg/ultra_honk/ultra_prover.hpp" namespace test_full_goblin_composer { diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.cpp new file mode 100644 index 00000000000..e69de29bb2d diff --git a/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp index 77862e93281..2c267208797 100644 --- a/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp +++ b/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp @@ -1,8 +1,8 @@ #pragma once -#include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/plonk/composer/standard_composer.hpp" #include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" #include "barretenberg/plonk/proof_system/prover/prover.hpp" #include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/protogalaxy/CMakeLists.txt new file mode 100644 index 00000000000..f1467c96f4c --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/protogalaxy/CMakeLists.txt @@ -0,0 +1 @@ +barretenberg_module(protogalaxy honk flavor relations) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt index d3ec5d6738b..d81cfbdf28a 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt @@ -1 +1 @@ -barretenberg_module(stdlib_primitives plonk honk) \ No newline at end of file +barretenberg_module(stdlib_primitives proof_system plonk) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt index 325069d4465..7ba574b2604 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt @@ -1 +1 @@ -barretenberg_module(stdlib_recursion ecc proof_system stdlib_primitives stdlib_pedersen_commitment stdlib_blake3s) \ No newline at end of file +barretenberg_module(stdlib_recursion ecc proof_system stdlib_primitives stdlib_pedersen_commitment stdlib_blake3s ultra_honk) \ No newline at end of file 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 2a6dbfc2b4b..4dbdf3bc178 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,11 +1,11 @@ #include "barretenberg/common/test.hpp" #include "barretenberg/flavor/ultra_recursive.hpp" -#include "barretenberg/honk/composer/ultra_composer.hpp" -#include "barretenberg/honk/proof_system/ultra_verifier.hpp" #include "barretenberg/stdlib/hash/blake3s/blake3s.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" #include "barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" +#include "barretenberg/ultra_honk/ultra_verifier.hpp" namespace proof_system::plonk::stdlib::recursion::honk { 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 168b6f1938e..29c5b9bd639 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,11 +1,11 @@ #include "barretenberg/common/test.hpp" #include "barretenberg/flavor/ultra_recursive.hpp" -#include "barretenberg/honk/composer/ultra_composer.hpp" -#include "barretenberg/honk/proof_system/ultra_verifier.hpp" #include "barretenberg/stdlib/hash/blake3s/blake3s.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" #include "barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" +#include "barretenberg/ultra_honk/ultra_verifier.hpp" namespace proof_system::plonk::stdlib::recursion::honk { diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp index 8f4dbde8afe..b54ee42ae2d 100644 --- a/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp +++ b/barretenberg/cpp/src/barretenberg/sumcheck/instance/prover_instance.hpp @@ -2,8 +2,8 @@ #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/protogalaxy/folding_result.hpp" #include "barretenberg/relations/relation_parameters.hpp" #include "barretenberg/srs/factories/file_crs_factory.hpp" diff --git a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp index d836ab03e45..f175bdf7361 100644 --- a/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp +++ b/barretenberg/cpp/src/barretenberg/sumcheck/sumcheck.test.cpp @@ -1,6 +1,5 @@ #include "sumcheck.hpp" #include "barretenberg/ecc/curves/bn254/fr.hpp" -#include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/proof_system/plookup_tables/fixed_base/fixed_base.hpp" #include "barretenberg/relations/auxiliary_relation.hpp" #include "barretenberg/relations/elliptic_relation.hpp" @@ -9,6 +8,7 @@ #include "barretenberg/relations/permutation_relation.hpp" #include "barretenberg/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/transcript/transcript.hpp" +#include "barretenberg/ultra_honk/ultra_composer.hpp" #include diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/ultra_honk/CMakeLists.txt new file mode 100644 index 00000000000..92b3b0fd1c9 --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/ultra_honk/CMakeLists.txt @@ -0,0 +1 @@ +barretenberg_module(ultra_honk honk sumcheck protogalaxy) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.hpp b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.hpp index eb5a2abdf07..3100efad8e9 100644 --- a/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.hpp +++ b/barretenberg/cpp/src/barretenberg/ultra_honk/ultra_composer.hpp @@ -1,12 +1,12 @@ #pragma once #include "barretenberg/flavor/flavor.hpp" -#include "barretenberg/honk/proof_system/goblin_merge/merge_prover.hpp" -#include "barretenberg/honk/proof_system/goblin_merge/merge_verifier.hpp" -#include "barretenberg/honk/proof_system/protogalaxy_prover.hpp" -#include "barretenberg/honk/proof_system/protogalaxy_verifier.hpp" #include "barretenberg/proof_system/composer/composer_lib.hpp" +#include "barretenberg/protogalaxy/protogalaxy_prover.hpp" +#include "barretenberg/protogalaxy/protogalaxy_verifier.hpp" #include "barretenberg/srs/global_crs.hpp" #include "barretenberg/sumcheck/instance/prover_instance.hpp" +#include "barretenberg/ultra_honk/merge_prover.hpp" +#include "barretenberg/ultra_honk/merge_verifier.hpp" #include "barretenberg/ultra_honk/ultra_prover.hpp" #include "barretenberg/ultra_honk/ultra_verifier.hpp" From 830c346f1956f18bc2e61398d33e451dd90273c1 Mon Sep 17 00:00:00 2001 From: codygunton Date: Fri, 3 Nov 2023 18:53:21 +0000 Subject: [PATCH 10/11] Delete unused file --- .../barretenberg/honk/proof_system/goblin_merge/merge_prover.cpp | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/goblin_merge/merge_prover.cpp deleted file mode 100644 index e69de29bb2d..00000000000 From 7c60f3fae3c704f4e6ca77e7b62e06df1209dbfd Mon Sep 17 00:00:00 2001 From: codygunton Date: Fri, 3 Nov 2023 18:53:33 +0000 Subject: [PATCH 11/11] Add this so honk builds. --- barretenberg/cpp/src/barretenberg/honk/utils/testing.cpp | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 barretenberg/cpp/src/barretenberg/honk/utils/testing.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/utils/testing.cpp b/barretenberg/cpp/src/barretenberg/honk/utils/testing.cpp new file mode 100644 index 00000000000..8a315566407 --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/honk/utils/testing.cpp @@ -0,0 +1,3 @@ +#include "testing.hpp" + +// Adding this file so that an object file is created. Otherwise CMake configure complains \ No newline at end of file