move transcript dir out of plonk and into shared location (#8)

ledwards2225 · web-flow · commit 2edd4628196c · 2022-12-21T09:55:51.000-05:00
* moving transcript dir out of plonk and into shared location src/aztec/

* adding transcript to top level cmake; rejected in patch

* de-plonking honk
diff --git a/cpp/src/aztec/CMakeLists.txt b/cpp/src/aztec/CMakeLists.txt
@@ -32,6 +32,7 @@ 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)
diff --git a/cpp/src/aztec/honk/CMakeLists.txt b/cpp/src/aztec/honk/CMakeLists.txt
@@ -1 +1 @@
-barretenberg_module(honk numeric ecc srs plonk proof_system)
+barretenberg_module(honk numeric ecc srs proof_system transcript)
diff --git a/cpp/src/aztec/plonk/CMakeLists.txt b/cpp/src/aztec/plonk/CMakeLists.txt
@@ -1 +1 @@
-barretenberg_module(plonk proof_system crypto_pedersen polynomials crypto_sha256 ecc crypto_blake3s)
+barretenberg_module(plonk proof_system transcript crypto_pedersen polynomials crypto_sha256 ecc crypto_blake3s)
diff --git a/cpp/src/aztec/plonk/composer/standard_composer.hpp b/cpp/src/aztec/plonk/composer/standard_composer.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "composer_base.hpp"
-#include <plonk/transcript/manifest.hpp>
+#include <transcript/manifest.hpp>
 #include <srs/reference_string/file_reference_string.hpp>
 #include "../proof_system/types/polynomial_manifest.hpp"
 
diff --git a/cpp/src/aztec/plonk/proof_system/commitment_scheme/commitment_scheme.hpp b/cpp/src/aztec/plonk/proof_system/commitment_scheme/commitment_scheme.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "../../transcript/transcript_wrappers.hpp"
 #include "../../../polynomials/polynomial_arithmetic.hpp"
 #include "../../../proof_system/work_queue/work_queue.hpp"
 #include "../../../polynomials/polynomial.hpp"
diff --git a/cpp/src/aztec/plonk/proof_system/prover/prover.hpp b/cpp/src/aztec/plonk/proof_system/prover/prover.hpp
@@ -1,5 +1,4 @@
 #pragma once
-#include "../../transcript/transcript_wrappers.hpp"
 #include "../../../proof_system/proving_key/proving_key.hpp"
 #include "../types/plonk_proof.hpp"
 #include "../types/program_settings.hpp"
diff --git a/cpp/src/aztec/plonk/proof_system/types/program_settings.hpp b/cpp/src/aztec/plonk/proof_system/types/program_settings.hpp
@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-#include "../../transcript/transcript_wrappers.hpp"
+#include "../../../transcript/transcript.hpp"
 #include "../widgets/transition_widgets/arithmetic_widget.hpp"
 #include "../widgets/transition_widgets/turbo_arithmetic_widget.hpp"
 #include "../widgets/transition_widgets/plookup_arithmetic_widget.hpp"
diff --git a/cpp/src/aztec/plonk/proof_system/types/prover_settings.hpp b/cpp/src/aztec/plonk/proof_system/types/prover_settings.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../../transcript/transcript_wrappers.hpp"
+#include "../../../transcript/transcript.hpp"
 namespace waffle {
 class settings_base {
   public:
diff --git a/cpp/src/aztec/plonk/proof_system/utils/linearizer.hpp b/cpp/src/aztec/plonk/proof_system/utils/linearizer.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include <ecc/curves/bn254/fr.hpp>
-#include <plonk/transcript/transcript.hpp>
+#include <transcript/transcript.hpp>
 
 namespace waffle {
 template <typename Field> struct plonk_linear_terms {
diff --git a/cpp/src/aztec/plonk/proof_system/verifier/verifier.hpp b/cpp/src/aztec/plonk/proof_system/verifier/verifier.hpp
@@ -3,8 +3,7 @@
 #include "../types/program_settings.hpp"
 #include "../verification_key/verification_key.hpp"
 #include "../widgets/random_widgets/random_widget.hpp"
-#include <plonk/transcript/manifest.hpp>
-#include <plonk/transcript/transcript_wrappers.hpp>
+#include <transcript/manifest.hpp>
 #include <plonk/proof_system/commitment_scheme/commitment_scheme.hpp>
 
 namespace waffle {
diff --git a/cpp/src/aztec/plonk/proof_system/verifier/verifier.test.cpp b/cpp/src/aztec/plonk/proof_system/verifier/verifier.test.cpp
@@ -3,7 +3,7 @@
 #include "../utils/linearizer.hpp"
 #include "../utils/permutation.hpp"
 #include "../widgets/transition_widgets/arithmetic_widget.hpp"
-#include "../../transcript/transcript.hpp"
+#include "../../../transcript/transcript.hpp"
 #include "verifier.hpp"
 #include <ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp>
 #include <gtest/gtest.h>
diff --git a/cpp/src/aztec/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp b/cpp/src/aztec/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp
@@ -5,7 +5,7 @@
 #include <plonk/proof_system/public_inputs/public_inputs.hpp>
 #include <plonk/proof_system/utils/linearizer.hpp>
 
-#include <plonk/transcript/transcript.hpp>
+#include <transcript/transcript.hpp>
 #include <polynomials/iterate_over_domain.hpp>
 #include <polynomials/polynomial_arithmetic.hpp>
 
diff --git a/cpp/src/aztec/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp b/cpp/src/aztec/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <proof_system/proving_key/proving_key.hpp>
-#include <plonk/transcript/transcript.hpp>
+#include <transcript/transcript.hpp>
 #include <polynomials/iterate_over_domain.hpp>
 #include <ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp>
 #include <polynomials/polynomial_arithmetic.hpp>
diff --git a/cpp/src/aztec/plonk/proof_system/widgets/random_widgets/random_widget.hpp b/cpp/src/aztec/plonk/proof_system/widgets/random_widgets/random_widget.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../../../transcript/transcript_wrappers.hpp"
+#include "../../../../transcript/transcript.hpp"
 #include "../../verification_key/verification_key.hpp"
 #include "../../../../proof_system/work_queue/work_queue.hpp"
 #include <ecc/curves/bn254/fr.hpp>
diff --git a/cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/create_dummy_transcript.hpp b/cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/create_dummy_transcript.hpp
@@ -1,5 +1,5 @@
 #include <plonk/composer/standard_composer.hpp>
-#include <plonk/transcript/transcript.hpp>
+#include <transcript/transcript.hpp>
 
 namespace waffle {
 inline transcript::StandardTranscript create_dummy_standard_transcript()
diff --git a/cpp/src/aztec/proof_system/CMakeLists.txt b/cpp/src/aztec/proof_system/CMakeLists.txt
@@ -1 +1 @@
-barretenberg_module(proof_system plonk polynomials)
+barretenberg_module(proof_system plonk)
diff --git a/cpp/src/aztec/proof_system/work_queue/work_queue.hpp b/cpp/src/aztec/proof_system/work_queue/work_queue.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../plonk/transcript/transcript_wrappers.hpp"
+#include "../../transcript/transcript_wrappers.hpp"
 #include "../proving_key/proving_key.hpp"
 
 namespace waffle {
diff --git a/cpp/src/aztec/stdlib/recursion/transcript/transcript.hpp b/cpp/src/aztec/stdlib/recursion/transcript/transcript.hpp
@@ -3,7 +3,7 @@
 #include <ecc/curves/bn254/fq.hpp>
 #include <ecc/curves/bn254/fr.hpp>
 #include <ecc/curves/bn254/g1.hpp>
-#include <plonk/transcript/transcript.hpp>
+#include <transcript/transcript.hpp>
 
 #include "../../primitives/curves/bn254.hpp"
 #include "../verification_key/verification_key.hpp"
diff --git a/cpp/src/aztec/stdlib/recursion/transcript/transcript.test.cpp b/cpp/src/aztec/stdlib/recursion/transcript/transcript.test.cpp
@@ -4,7 +4,7 @@
 #include <ecc/curves/bn254/fr.hpp>
 #include <ecc/curves/bn254/g1.hpp>
 
-#include <plonk/transcript/transcript.hpp>
+#include <transcript/transcript.hpp>
 
 using namespace plonk;
 
diff --git a/cpp/src/aztec/stdlib/recursion/verifier/verifier.test.cpp b/cpp/src/aztec/stdlib/recursion/verifier/verifier.test.cpp
@@ -1,6 +1,6 @@
 #include "verifier.hpp"
 #include <common/test.hpp>
-#include <plonk/transcript/transcript.hpp>
+#include <transcript/transcript.hpp>
 #include <proof_system/proving_key/serialize.hpp>
 #include <stdlib/primitives/curves/bn254.hpp>
 #include <ecc/curves/bn254/fq12.hpp>
diff --git a/cpp/src/aztec/stdlib/recursion/verifier/verifier_turbo.test.cpp b/cpp/src/aztec/stdlib/recursion/verifier/verifier_turbo.test.cpp
@@ -1,6 +1,6 @@
 #include "verifier.hpp"
 #include <common/test.hpp>
-#include <plonk/transcript/transcript.hpp>
+#include <transcript/transcript.hpp>
 #include <proof_system/proving_key/serialize.hpp>
 #include <stdlib/primitives/curves/bn254.hpp>
 #include <ecc/curves/bn254/fq12.hpp>
diff --git a/cpp/src/aztec/transcript/CMakeLists.txt b/cpp/src/aztec/transcript/CMakeLists.txt
@@ -0,0 +1 @@
+barretenberg_module(transcript crypto_pedersen crypto_blake3s)
diff --git a/cpp/src/aztec/transcript/manifest.hpp b/cpp/src/aztec/transcript/manifest.hpp
diff --git a/cpp/src/aztec/transcript/transcript.cpp b/cpp/src/aztec/transcript/transcript.cpp
diff --git a/cpp/src/aztec/transcript/transcript.hpp b/cpp/src/aztec/transcript/transcript.hpp
@@ -6,7 +6,7 @@
 #include <vector>
 #include <exception>
 
-#include "../proof_system/verification_key/verification_key.hpp"
+#include "../plonk/proof_system/verification_key/verification_key.hpp"
 
 namespace transcript {
 
diff --git a/cpp/src/aztec/transcript/transcript.test.cpp b/cpp/src/aztec/transcript/transcript.test.cpp
diff --git a/cpp/src/aztec/transcript/transcript_wrappers.cpp b/cpp/src/aztec/transcript/transcript_wrappers.cpp
diff --git a/cpp/src/aztec/transcript/transcript_wrappers.hpp b/cpp/src/aztec/transcript/transcript_wrappers.hpp

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-barretenberg_module(honk numeric ecc srs plonk proof_system)`
	`1`	`+barretenberg_module(honk numeric ecc srs proof_system transcript)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-barretenberg_module(plonk proof_system crypto_pedersen polynomials crypto_sha256 ecc crypto_blake3s)`
	`1`	`+barretenberg_module(plonk proof_system transcript crypto_pedersen polynomials crypto_sha256 ecc crypto_blake3s)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#pragma once`
`2`		`-#include "../../transcript/transcript_wrappers.hpp"`
`3`	`2`	`#include "../../../polynomials/polynomial_arithmetic.hpp"`
`4`	`3`	`#include "../../../proof_system/work_queue/work_queue.hpp"`
`5`	`4`	`#include "../../../polynomials/polynomial.hpp"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-barretenberg_module(proof_system plonk polynomials)`
	`1`	`+barretenberg_module(proof_system plonk)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+barretenberg_module(transcript crypto_pedersen crypto_blake3s)`