feat: Improve barretenberg headers

cpp/.dockerignore

@@ -3,9 +3,9 @@ docker*
 scripts
 .*
 src/wasi-sdk*
-src/aztec/rollup/proofs/root_*/fixtures/account
-src/aztec/rollup/proofs/root_*/fixtures/join_split
-src/aztec/rollup/proofs/root_*/fixtures/**/proving_key
+src/barretenberg/rollup/proofs/root_*/fixtures/account
+src/barretenberg/rollup/proofs/root_*/fixtures/join_split
+src/barretenberg/rollup/proofs/root_*/fixtures/**/proving_key
 srs_db/ignition/transcript*
 srs_db/lagrange
 srs_db/coset_lagrange

cpp/.gitignore

@@ -1,7 +1,7 @@
 .cache/
 build*/
 src/wasi-sdk-*
-src/aztec/proof_system/proving_key/fixtures
-src/aztec/rollup/proofs/*/fixtures
+src/barretenberg/proof_system/proving_key/fixtures
+src/barretenberg/rollup/proofs/*/fixtures
 srs_db/*/*/transcript*
 CMakeUserPresets.json

cpp/CMakeLists.txt

@@ -80,7 +80,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10")
         message(WARNING "GCC <10 is not supported")
     endif()
-else() 
+else()
     message(WARNING "Unsuported compiler, use Clang >10 or GCC >10")
 endif()
 
@@ -111,13 +111,13 @@ if(COVERAGE)
 
     # Add profiling compile options and disable optimisations
     add_compile_options(-fprofile-instr-generate -fcoverage-mapping -O0)
-    
+
     # Add a custom target for creating the report
     add_custom_target(create_full_coverage_report
     COMMAND "${CMAKE_SOURCE_DIR}/scripts/collect_coverage_information.sh" ${PROFDATA_EXECUTABLE} ${COV_EXECUTABLE}
     VERBATIM
     )
-endif() 
+endif()
 
 
 include(cmake/build.cmake)
@@ -127,4 +127,4 @@ include(cmake/threading.cmake)
 include(cmake/gtest.cmake)
 include(cmake/benchmark.cmake)
 include(cmake/module.cmake)
-add_subdirectory(src/aztec)
+add_subdirectory(src)

cpp/src/aztec/CMakeLists.txt → cpp/src/CMakeLists.txt

@@ -38,23 +38,23 @@ else()
     message(STATUS "Using optimized assembly for field arithmetic.")
 endif()
 
-add_subdirectory(common)
-add_subdirectory(env)
-add_subdirectory(numeric)
-add_subdirectory(srs)
-add_subdirectory(ecc)
-add_subdirectory(crypto)
-add_subdirectory(polynomials)
-add_subdirectory(proof_system)
-add_subdirectory(transcript)
-add_subdirectory(honk)
-add_subdirectory(plonk)
-add_subdirectory(stdlib)
-add_subdirectory(join_split_example)
-add_subdirectory(dsl)
+add_subdirectory(barretenberg/common)
+add_subdirectory(barretenberg/env)
+add_subdirectory(barretenberg/numeric)
+add_subdirectory(barretenberg/srs)
+add_subdirectory(barretenberg/ecc)
+add_subdirectory(barretenberg/crypto)
+add_subdirectory(barretenberg/polynomials)
+add_subdirectory(barretenberg/proof_system)
+add_subdirectory(barretenberg/transcript)
+add_subdirectory(barretenberg/honk)
+add_subdirectory(barretenberg/plonk)
+add_subdirectory(barretenberg/stdlib)
+add_subdirectory(barretenberg/join_split_example)
+add_subdirectory(barretenberg/dsl)
 
 if(BENCHMARKS)
-    add_subdirectory(benchmark)
+    add_subdirectory(barretenberg/benchmark)
 endif()
 
 include(GNUInstallDirs)

cpp/src/aztec/benchmark/decrypt_bench/main.cpp → cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp

@@ -1,4 +1,4 @@
-#include <ecc/curves/grumpkin/grumpkin.hpp>
+#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp"
 #include <chrono>
 
 int main(int, char**)
@@ -35,4 +35,4 @@ int main(int, char**)
     end = std::chrono::steady_clock::now();
     diff = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
     std::cout << "batched mul operations: " << diff.count() << "ms" << std::endl;
-}
+}

cpp/src/aztec/benchmark/honk_bench/honk.bench.cpp → cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp

@@ -1,11 +1,10 @@
-#include "ecc/curves/bn254/fr.hpp"
-#include "honk/proof_system/prover.hpp"
-#include "honk/proof_system/prover.hpp"
-#include "honk/proof_system/verifier.hpp"
+#include "barretenberg/ecc/curves/bn254/fr.hpp"
+#include "barretenberg/honk/proof_system/prover.hpp"
+#include "barretenberg/honk/proof_system/verifier.hpp"
 #include <benchmark/benchmark.h>
 #include <cstddef>
-#include <honk/composer/standard_honk_composer.hpp>
-#include <stdlib/primitives/field/field.hpp>
+#include "barretenberg/honk/composer/standard_honk_composer.hpp"
+#include "barretenberg/stdlib/primitives/field/field.hpp"
 
 using namespace benchmark;
 
@@ -107,4 +106,4 @@ void verify_proof_bench(State& state) noexcept
 // Note: disabling this bench for now since it is not of primary interest
 // BENCHMARK(verify_proof_bench)->DenseRange(MIN_LOG_NUM_GATES, MAX_LOG_NUM_GATES, 1)->Iterations(1);
 
-BENCHMARK_MAIN();
+BENCHMARK_MAIN();

cpp/src/aztec/benchmark/pippenger_bench/main.cpp → cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp

@@ -1,14 +1,14 @@
 #include <chrono>
-#include <common/assert.hpp>
+#include "barretenberg/common/assert.hpp"
 #include <cstdlib>
-#include <ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp>
-#include <srs/reference_string/file_reference_string.hpp>
-#include <polynomials/polynomial_arithmetic.hpp>
+#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp"
+#include "barretenberg/srs/reference_string/file_reference_string.hpp"
+#include "barretenberg/polynomials/polynomial_arithmetic.hpp"
 
-//#include <valgrind/callgrind.h>
-// CALLGRIND_START_INSTRUMENTATION;
-// CALLGRIND_STOP_INSTRUMENTATION;
-// CALLGRIND_DUMP_STATS;
+// #include <valgrind/callgrind.h>
+//  CALLGRIND_START_INSTRUMENTATION;
+//  CALLGRIND_STOP_INSTRUMENTATION;
+//  CALLGRIND_DUMP_STATS;
 
 using namespace barretenberg;
 
@@ -109,4 +109,4 @@ int main()
     pippenger();
     pippenger();
     return 0;
-}
+}

cpp/src/aztec/benchmark/plonk_bench/plonk.bench.cpp → cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp

@@ -1,10 +1,10 @@
 #include <benchmark/benchmark.h>
-#include <ecc/curves/bn254/fr.hpp>
-#include <numeric/bitop/get_msb.hpp>
-#include <plonk/composer/standard_composer.hpp>
-#include <plonk/proof_system/prover/prover.hpp>
-#include <plonk/proof_system/verifier/verifier.hpp>
-#include <stdlib/primitives/field/field.hpp>
+#include "barretenberg/ecc/curves/bn254/fr.hpp"
+#include "barretenberg/numeric/bitop/get_msb.hpp"
+#include "barretenberg/plonk/composer/standard_composer.hpp"
+#include "barretenberg/plonk/proof_system/prover/prover.hpp"
+#include "barretenberg/plonk/proof_system/verifier/verifier.hpp"
+#include "barretenberg/stdlib/primitives/field/field.hpp"
 
 using namespace benchmark;