Move transcripts.

AztecProtocol · Nov 1, 2023 · 98fb975 · 98fb975
1 parent 582150f
commit 98fb975
Show file tree

Hide file tree

Showing 65 changed files with 1,974 additions and 1,977 deletions.
diff --git a/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt
@@ -48,26 +48,26 @@ else()
     message(STATUS "Using optimized assembly for field arithmetic.")
 endif()
 
-add_subdirectory(barretenberg/env)
+add_subdirectory(barretenberg/bb)
 add_subdirectory(barretenberg/common)
-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)
+add_subdirectory(barretenberg/ecc)
+add_subdirectory(barretenberg/env)
 add_subdirectory(barretenberg/examples)
+add_subdirectory(barretenberg/grumpkin_srs_gen)
+add_subdirectory(barretenberg/honk)
+add_subdirectory(barretenberg/join_split_example)
+add_subdirectory(barretenberg/numeric)
+add_subdirectory(barretenberg/plonk)
+add_subdirectory(barretenberg/polynomials)
+add_subdirectory(barretenberg/proof_system)
 add_subdirectory(barretenberg/serialize)
 add_subdirectory(barretenberg/solidity_helpers)
+add_subdirectory(barretenberg/srs)
+add_subdirectory(barretenberg/stdlib)
+add_subdirectory(barretenberg/transcript)
 add_subdirectory(barretenberg/wasi)
-add_subdirectory(barretenberg/grumpkin_srs_gen)
-add_subdirectory(barretenberg/bb)
 
 
 if(SMT)
@@ -89,7 +89,6 @@ message(STATUS "Compiling all-in-one barretenberg archive")
 add_library(
     barretenberg
     STATIC
-    $<TARGET_OBJECTS:dsl_objects>
     $<TARGET_OBJECTS:common_objects>
     $<TARGET_OBJECTS:crypto_aes128_objects>
     $<TARGET_OBJECTS:crypto_blake2s_objects>
@@ -100,6 +99,7 @@ add_library(
     $<TARGET_OBJECTS:crypto_pedersen_hash_objects>
     $<TARGET_OBJECTS:crypto_schnorr_objects>
     $<TARGET_OBJECTS:crypto_sha256_objects>
+    $<TARGET_OBJECTS:dsl_objects>
     $<TARGET_OBJECTS:ecc_objects>
     $<TARGET_OBJECTS:examples_objects>
     $<TARGET_OBJECTS:honk_objects>
@@ -134,8 +134,6 @@ if(WASM)
     # to implement the functions in env.
     add_executable(
         barretenberg.wasm
-        $<TARGET_OBJECTS:wasi_objects>
-        $<TARGET_OBJECTS:dsl_objects>
         $<TARGET_OBJECTS:common_objects>
         $<TARGET_OBJECTS:crypto_aes128_objects>
         $<TARGET_OBJECTS:crypto_blake2s_objects>
@@ -146,6 +144,7 @@ if(WASM)
         $<TARGET_OBJECTS:crypto_pedersen_hash_objects>
         $<TARGET_OBJECTS:crypto_schnorr_objects>
         $<TARGET_OBJECTS:crypto_sha256_objects>
+        $<TARGET_OBJECTS:dsl_objects>
         $<TARGET_OBJECTS:ecc_objects>
         $<TARGET_OBJECTS:examples_objects>
         $<TARGET_OBJECTS:honk_objects>
@@ -165,6 +164,7 @@ if(WASM)
         $<TARGET_OBJECTS:stdlib_schnorr_objects>
         $<TARGET_OBJECTS:stdlib_sha256_objects>
         $<TARGET_OBJECTS:transcript_objects>
+        $<TARGET_OBJECTS:wasi_objects>
     )
 
     add_executable(

diff --git a/barretenberg/cpp/src/barretenberg/barretenberg.hpp b/barretenberg/cpp/src/barretenberg/barretenberg.hpp
@@ -47,6 +47,7 @@
 #include "stdlib/merkle_tree/merkle_tree.hpp"
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/728):
 //     Consider moving nullifier tree logic out of barretenberg into aztec repo
+#include "barretenberg/plonk/transcript/manifest.hpp"
 #include "stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp"
 #include "stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp"
 #include "stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp"
@@ -68,4 +69,3 @@
 #include "stdlib/recursion/verification_key/verification_key.hpp"
 #include "stdlib/recursion/verifier/program_settings.hpp"
 #include "stdlib/recursion/verifier/verifier.hpp"
-#include "transcript/manifest.hpp"
diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp
@@ -1,8 +1,8 @@
 #include "recursion_constraint.hpp"
 #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp"
+#include "barretenberg/plonk/transcript/transcript_wrappers.hpp"
 #include "barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp"
 #include "barretenberg/stdlib/recursion/verifier/verifier.hpp"
-#include "barretenberg/transcript/transcript_wrappers.hpp"
 
 namespace acir_format {
 

diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/eccvm_composer.cpp
@@ -118,4 +118,4 @@ std::shared_ptr<typename Flavor::VerificationKey> ECCVMComposer_<Flavor>::comput
 template class ECCVMComposer_<honk::flavor::ECCVM>;
 template class ECCVMComposer_<honk::flavor::ECCVMGrumpkin>;
 
-} // namespace proof_system::honk
+} // namespace proof_system::honk