diff --git a/barretenberg/cpp/scripts/analyze_client_ivc_bench.py b/barretenberg/cpp/scripts/analyze_client_ivc_bench.py index 532079f847e..32dc147724c 100644 --- a/barretenberg/cpp/scripts/analyze_client_ivc_bench.py +++ b/barretenberg/cpp/scripts/analyze_client_ivc_bench.py @@ -17,7 +17,7 @@ to_keep = [ "construct_circuits(t)", "ProverInstance(Circuit&)(t)", - "ProtogalaxyProver::fold_instances(t)", + "ProtogalaxyProver::prove(t)", "Decider::construct_proof(t)", "ECCVMProver(CircuitBuilder&)(t)", "ECCVMProver::construct_proof(t)", @@ -64,7 +64,7 @@ time_ms = bench[key]/1e6 print(f"{key:<{max_label_length}}{time_ms:>8.0f} {time_ms/sum_of_kept_times_ms:>8.2%}") -print('\nBreakdown of ProtogalaxyProver::fold_instances:') +print('\nBreakdown of ProtogalaxyProver::prove:') protogalaxy_round_labels = [ "ProtoGalaxyProver_::preparation_round(t)", "ProtoGalaxyProver_::perturbator_round(t)", @@ -77,7 +77,7 @@ time_ms = 0 else: time_ms = bench[key]/1e6 - total_time_ms = bench["ProtogalaxyProver::fold_instances(t)"]/1e6 + total_time_ms = bench["ProtogalaxyProver::prove(t)"]/1e6 print(f"{key:<{max_label_length}}{time_ms:>8.0f} {time_ms/total_time_ms:>8.2%}") # Extract a set of components from the benchmark data and display timings and relative percentages diff --git a/barretenberg/cpp/scripts/analyze_protogalaxy_bench.py b/barretenberg/cpp/scripts/analyze_protogalaxy_bench.py index d450b6ca461..b518e3a8df5 100755 --- a/barretenberg/cpp/scripts/analyze_protogalaxy_bench.py +++ b/barretenberg/cpp/scripts/analyze_protogalaxy_bench.py @@ -7,7 +7,7 @@ # Single out an independent set of functions accounting for most of BENCHMARK's real_time to_keep = [ - "ProtogalaxyProver::fold_instances(t)", + "ProtogalaxyProver::prove(t)", ] with open(PREFIX/PROTOGALAXY_BENCH_JSON, "r") as read_file: read_result = json.load(read_file) @@ -45,7 +45,7 @@ time_ms = bench[key]/1e6 print(f"{key:<{max_label_length}}{time_ms:>8.0f} {time_ms/sum_of_kept_times_ms:>8.2%}") -print('\nBreakdown of ProtogalaxyProver::fold_instances:') +print('\nBreakdown of ProtogalaxyProver::prove:') protogalaxy_round_labels = [ "ProtoGalaxyProver_::preparation_round(t)", "ProtoGalaxyProver_::perturbator_round(t)", @@ -55,7 +55,7 @@ max_label_length = max(len(label) for label in protogalaxy_round_labels) for key in protogalaxy_round_labels: time_ms = bench[key]/1e6 - total_time_ms = bench["ProtogalaxyProver::fold_instances(t)"]/1e6 + total_time_ms = bench["ProtogalaxyProver::prove(t)"]/1e6 print(f"{key:<{max_label_length}}{time_ms:>8.0f} {time_ms/total_time_ms:>8.2%}") diff --git a/barretenberg/cpp/scripts/ultra_honk_tests.sh b/barretenberg/cpp/scripts/ultra_honk_tests.sh deleted file mode 100755 index 1671ca75e68..00000000000 --- a/barretenberg/cpp/scripts/ultra_honk_tests.sh +++ /dev/null @@ -1,25 +0,0 @@ -set -eu - -# Move above script dir. -cd $(dirname $0)/.. - -cmake --preset clang16-dbg-fast -cmake --build --preset clang16-dbg-fast - -cd build/ - -./bin/flavor_tests -./bin/relations_tests -./bin/transcript_tests -./bin/commitment_schemes_tests -./bin/sumcheck_tests -./bin/eccvm_tests -./bin/translator_vm_tests -./bin/protogalaxy_tests -./bin/ultra_honk_tests -./bin/stdlib_honk_recursion_tests --gtest_filter=Goblin* -./bin/stdlib_honk_recursion_tests --gtest_filter=Honk* -./bin/stdlib_honk_recursion_tests --gtest_filter=Proto* -./bin/stdlib_honk_recursion_tests --gtest_filter=RecursiveMerge* -./bin/goblin_tests -./bin/client_ivc_tests \ No newline at end of file diff --git a/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt index 6d8fe24a77c..924efbb9ab1 100644 --- a/barretenberg/cpp/src/CMakeLists.txt +++ b/barretenberg/cpp/src/CMakeLists.txt @@ -63,7 +63,6 @@ add_subdirectory(barretenberg/crypto) add_subdirectory(barretenberg/dsl) add_subdirectory(barretenberg/ecc) add_subdirectory(barretenberg/eccvm) -add_subdirectory(barretenberg/eccvm_recursion) add_subdirectory(barretenberg/env) add_subdirectory(barretenberg/execution_trace) add_subdirectory(barretenberg/examples) @@ -84,7 +83,6 @@ add_subdirectory(barretenberg/stdlib_circuit_builders) add_subdirectory(barretenberg/sumcheck) add_subdirectory(barretenberg/transcript) add_subdirectory(barretenberg/translator_vm) -add_subdirectory(barretenberg/translator_vm_recursion) add_subdirectory(barretenberg/ultra_honk) add_subdirectory(barretenberg/vm) add_subdirectory(barretenberg/wasi) @@ -122,7 +120,6 @@ set(BARRETENBERG_TARGET_OBJECTS $ $ $ - $ $ $ $ @@ -138,20 +135,24 @@ set(BARRETENBERG_TARGET_OBJECTS $ $ $ + $ + $ + $ + $ $ $ $ $ + $ $ $ - $ - $ + $ $ $ + $ $ $ $ - $ $) if(NOT DISABLE_AZTEC_VM) diff --git a/barretenberg/cpp/src/barretenberg/aztec_ivc/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/aztec_ivc/CMakeLists.txt index a4cbce17a68..80ffcb9aa60 100644 --- a/barretenberg/cpp/src/barretenberg/aztec_ivc/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/aztec_ivc/CMakeLists.txt @@ -1 +1 @@ -barretenberg_module(aztec_ivc goblin) \ No newline at end of file +barretenberg_module(aztec_ivc stdlib_protogalaxy_verifier stdlib_goblin_verifier) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp b/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp index ea6a7629476..e498f348143 100644 --- a/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp +++ b/barretenberg/cpp/src/barretenberg/aztec_ivc/aztec_ivc.cpp @@ -66,7 +66,7 @@ void AztecIVC::accumulate(ClientCircuit& circuit, const std::shared_ptr void fold_k(State& state) noexcept for (auto _ : state) { BB_REPORT_OP_COUNT_IN_BENCH(state); - auto proof = folding_prover.fold_instances(); + auto proof = folding_prover.prove(); } } // We stick to just k=1 for compile-time reasons. -BENCHMARK(fold_k)->/* vary the circuit size */ DenseRange(14, 20)->Unit(kMillisecond); BENCHMARK(fold_k)->/* vary the circuit size */ DenseRange(14, 20)->Unit(kMillisecond); } // namespace bb diff --git a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/CMakeLists.txt index 81f6d6e82aa..36c6f709810 100644 --- a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/CMakeLists.txt @@ -1,4 +1,4 @@ barretenberg_module( protogalaxy_round_bench - stdlib_honk_recursion + stdlib_protogalaxy_verifier ) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/protogalaxy_rounds.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/protogalaxy_rounds.bench.cpp index 1266c029abb..5faafc83037 100644 --- a/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/protogalaxy_rounds.bench.cpp +++ b/barretenberg/cpp/src/barretenberg/benchmark/protogalaxy_rounds_bench/protogalaxy_rounds.bench.cpp @@ -46,25 +46,11 @@ void _bench_round(::benchmark::State& state, void (*F)(ProtoGalaxyProver_>&)) -{ - _bench_round(state, F); -} - void bench_round_mega(::benchmark::State& state, void (*F)(ProtoGalaxyProver_>&)) { _bench_round(state, F); } -BENCHMARK_CAPTURE(bench_round_ultra, preparation, [](auto& prover) { prover.preparation_round(); }) - -> DenseRange(14, 20) -> Unit(kMillisecond); -BENCHMARK_CAPTURE(bench_round_ultra, perturbator, [](auto& prover) { prover.perturbator_round(); }) - -> DenseRange(14, 20) -> Unit(kMillisecond); -BENCHMARK_CAPTURE(bench_round_ultra, combiner_quotient, [](auto& prover) { prover.combiner_quotient_round(); }) - -> DenseRange(14, 20) -> Unit(kMillisecond); -BENCHMARK_CAPTURE(bench_round_ultra, accumulator_update, [](auto& prover) { prover.accumulator_update_round(); }) - -> DenseRange(14, 20) -> Unit(kMillisecond); - BENCHMARK_CAPTURE(bench_round_mega, preparation, [](auto& prover) { prover.preparation_round(); }) -> DenseRange(14, 20) -> Unit(kMillisecond); BENCHMARK_CAPTURE(bench_round_mega, perturbator, [](auto& prover) { prover.perturbator_round(); }) -> DenseRange(14, 20) diff --git a/barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/CMakeLists.txt index 9f91d3093e0..5cad28d95dc 100644 --- a/barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/benchmark/simulator_bench/CMakeLists.txt @@ -1 +1 @@ - barretenberg_module(simulator_bench stdlib_honk_recursion stdlib_sha256 crypto_merkle_tree) \ No newline at end of file + barretenberg_module(simulator_bench stdlib_honk_verifier stdlib_sha256 crypto_merkle_tree) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/client_ivc/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/client_ivc/CMakeLists.txt index e4f75e5e984..4cabbc72fbc 100644 --- a/barretenberg/cpp/src/barretenberg/client_ivc/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/client_ivc/CMakeLists.txt @@ -1 +1 @@ -barretenberg_module(client_ivc goblin) \ No newline at end of file +barretenberg_module(client_ivc stdlib_protogalaxy_verifier stdlib_goblin_verifier) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.cpp b/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.cpp index 209cbdee0e3..6f6bd69f6dc 100644 --- a/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.cpp +++ b/barretenberg/cpp/src/barretenberg/client_ivc/client_ivc.cpp @@ -50,7 +50,7 @@ void ClientIVC::accumulate(ClientCircuit& circuit, const std::shared_ptr diff --git a/barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt index 32440941621..1cd7f441909 100644 --- a/barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt @@ -11,7 +11,7 @@ set(DSL_DEPENDENCIES stdlib_poseidon2 crypto_merkle_tree stdlib_schnorr - stdlib_honk_recursion) + stdlib_honk_verifier) if (NOT WASM) list(APPEND DSL_DEPENDENCIES libdeflate::libdeflate_static) diff --git a/barretenberg/cpp/src/barretenberg/dsl/acir_format/honk_recursion_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/honk_recursion_constraint.cpp index 317a295e7c2..5d013cd65ae 100644 --- a/barretenberg/cpp/src/barretenberg/dsl/acir_format/honk_recursion_constraint.cpp +++ b/barretenberg/cpp/src/barretenberg/dsl/acir_format/honk_recursion_constraint.cpp @@ -1,7 +1,7 @@ #include "honk_recursion_constraint.hpp" #include "barretenberg/flavor/flavor.hpp" #include "barretenberg/plonk_honk_shared/types/aggregation_object_type.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp" +#include "barretenberg/stdlib/honk_verifier/ultra_recursive_verifier.hpp" #include "barretenberg/stdlib/plonk_recursion/aggregation_state/aggregation_state.hpp" #include "barretenberg/stdlib/primitives/bigfield/constants.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/eccvm_recursion/CMakeLists.txt deleted file mode 100644 index f97e8aa23cb..00000000000 --- a/barretenberg/cpp/src/barretenberg/eccvm_recursion/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -barretenberg_module(eccvm_recursion eccvm stdlib_honk_recursion) diff --git a/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt index c68507cd62d..ea1c0d52b91 100644 --- a/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/goblin/CMakeLists.txt @@ -1 +1 @@ -barretenberg_module(goblin stdlib_honk_recursion ultra_honk eccvm translator_vm stdlib_sha256 crypto_merkle_tree stdlib_primitives) \ No newline at end of file +barretenberg_module(goblin ultra_honk eccvm translator_vm stdlib_honk_verifier stdlib_pedersen_commitment stdlib_sha256 ) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp b/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp index dd108df0be6..1eeabc54192 100644 --- a/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp +++ b/barretenberg/cpp/src/barretenberg/goblin/goblin.hpp @@ -8,7 +8,7 @@ #include "barretenberg/goblin/types.hpp" #include "barretenberg/plonk_honk_shared/instance_inspector.hpp" #include "barretenberg/polynomials/polynomial.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp" +#include "barretenberg/stdlib/goblin_verifier/merge_recursive_verifier.hpp" #include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp" #include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp" #include "barretenberg/translator_vm/translator_circuit_builder.hpp" diff --git a/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp b/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp index fa4c5bc730a..c42b10c77c9 100644 --- a/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp +++ b/barretenberg/cpp/src/barretenberg/goblin/mock_circuits.hpp @@ -9,10 +9,10 @@ #include "barretenberg/srs/global_crs.hpp" #include "barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp" #include "barretenberg/stdlib/hash/sha256/sha256.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp" +#include "barretenberg/stdlib/honk_verifier/ultra_recursive_verifier.hpp" #include "barretenberg/stdlib/primitives/curves/secp256k1.hpp" #include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp" +#include "barretenberg/stdlib/protogalaxy_verifier/protogalaxy_recursive_verifier.hpp" #include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp" #include "barretenberg/stdlib_circuit_builders/mock_circuits.hpp" diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy.test.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy.test.cpp index 474391a6f19..1dfda9e7e9a 100644 --- a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy.test.cpp +++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy.test.cpp @@ -84,7 +84,7 @@ template class ProtoGalaxyTests : public testing::Test { FoldingProver folding_prover(prover_instances); FoldingVerifier folding_verifier(verifier_instances); - auto [prover_accumulator, folding_proof] = folding_prover.fold_instances(); + auto [prover_accumulator, folding_proof] = folding_prover.prove(); auto verifier_accumulator = folding_verifier.verify_folding_proof(folding_proof); return { prover_accumulator, verifier_accumulator }; } @@ -549,7 +549,7 @@ template class ProtoGalaxyTests : public testing::Test { ProtoGalaxyProver_> folding_prover(get<0>(insts)); ProtoGalaxyVerifier_> folding_verifier(get<1>(insts)); - auto [prover_accumulator, folding_proof] = folding_prover.fold_instances(); + auto [prover_accumulator, folding_proof] = folding_prover.prove(); auto verifier_accumulator = folding_verifier.verify_folding_proof(folding_proof); check_accumulator_target_sum_manual(prover_accumulator, true); @@ -558,7 +558,7 @@ template class ProtoGalaxyTests : public testing::Test { }; } // namespace -using FlavorTypes = testing::Types; +using FlavorTypes = testing::Types; TYPED_TEST_SUITE(ProtoGalaxyTests, FlavorTypes); TYPED_TEST(ProtoGalaxyTests, PerturbatorCoefficients) diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp index 537e044eb65..b88d5c2abe0 100644 --- a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp +++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover.hpp @@ -102,12 +102,13 @@ template class ProtoGalaxyProver_ { void finalise_and_send_instance(std::shared_ptr, const std::string& domain_separator); /** - * @brief Run the folding prover protocol to produce a new accumulator and a folding proof to be verified by the - * folding verifier. + * @brief Execute the folding prover. * - * TODO(https://github.com/AztecProtocol/barretenberg/issues/753): fold goblin polynomials + * @todo TODO(https://github.com/AztecProtocol/barretenberg/issues/753): fold goblin polynomials + * @return FoldingResult is a pair consisting of an accumulator and a folding proof, which is a proof that the + * accumulator was computed correctly. */ - BB_PROFILE FoldingResult fold_instances(); + BB_PROFILE FoldingResult prove(); /** * @brief For a new round challenge δ at each iteration of the ProtoGalaxy protocol, compute the vector diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover_impl.hpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover_impl.hpp index 37fa0c619e3..5dcc1ec2a95 100644 --- a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover_impl.hpp +++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover_impl.hpp @@ -413,9 +413,9 @@ template void ProtoGalaxyProver_::accum }; template -FoldingResult ProtoGalaxyProver_::fold_instances() +FoldingResult ProtoGalaxyProver_::prove() { - BB_OP_COUNT_TIME_NAME("ProtogalaxyProver::fold_instances"); + BB_OP_COUNT_TIME_NAME("ProtogalaxyProver::prove"); // Ensure instances are all of the same size for (size_t idx = 0; idx < ProverInstances::NUM - 1; ++idx) { if (instances[idx]->proving_key.circuit_size != instances[idx + 1]->proving_key.circuit_size) { diff --git a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover_ultra.cpp b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover_ultra.cpp index 1591bf34948..5084ec8824c 100644 --- a/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover_ultra.cpp +++ b/barretenberg/cpp/src/barretenberg/protogalaxy/protogalaxy_prover_ultra.cpp @@ -1,6 +1,7 @@ // Note: this is split up from protogalaxy_prover_impl.hpp for compile performance reasons #include "protogalaxy_prover_impl.hpp" +// TODO(https://github.com/AztecProtocol/barretenberg/issues/1076) Remove this instantiation. namespace bb { template class ProtoGalaxyProver_>; } // namespace bb \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation_impl.hpp b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation_impl.hpp index 49f60b08104..aa3953706f0 100644 --- a/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation_impl.hpp +++ b/barretenberg/cpp/src/barretenberg/relations/ecc_vm/ecc_msm_relation_impl.hpp @@ -1,4 +1,5 @@ #pragma once +#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "ecc_msm_relation.hpp" namespace bb { diff --git a/barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt index d1749028699..767e4e416a4 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt @@ -1,6 +1,12 @@ add_subdirectory(hash) +add_subdirectory(client_ivc_verifier) add_subdirectory(commitment) add_subdirectory(encryption) +add_subdirectory(eccvm_verifier) +add_subdirectory(goblin_verifier) add_subdirectory(primitives) -add_subdirectory(honk_recursion) -add_subdirectory(plonk_recursion) \ No newline at end of file +add_subdirectory(honk_verifier) +add_subdirectory(transcript) +add_subdirectory(translator_vm_verifier) +add_subdirectory(plonk_recursion) +add_subdirectory(protogalaxy_verifier) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/stdlib/client_ivc_verifier/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/client_ivc_verifier/CMakeLists.txt new file mode 100644 index 00000000000..9d2978bf9bc --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/stdlib/client_ivc_verifier/CMakeLists.txt @@ -0,0 +1,5 @@ +barretenberg_module( + stdlib_client_ivc_verifier + stdlib_goblin_verifier + client_ivc +) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/client_ivc_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/client_ivc_verifier/client_ivc_recursive_verifier.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/client_ivc_recursive_verifier.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/client_ivc_verifier/client_ivc_recursive_verifier.cpp diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/client_ivc_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/client_ivc_verifier/client_ivc_recursive_verifier.hpp similarity index 88% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/client_ivc_recursive_verifier.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/client_ivc_verifier/client_ivc_recursive_verifier.hpp index 2a489ec6d14..43c86f7c24f 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/client_ivc_recursive_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/client_ivc_verifier/client_ivc_recursive_verifier.hpp @@ -1,7 +1,7 @@ #pragma once #include "barretenberg/client_ivc/client_ivc.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/goblin_recursive_verifier.hpp" +#include "barretenberg/stdlib/goblin_verifier/goblin_recursive_verifier.hpp" +#include "barretenberg/stdlib/honk_verifier/decider_recursive_verifier.hpp" namespace bb::stdlib::recursion::honk { class ClientIVCRecursiveVerifier { diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/client_ivc_recursive_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/client_ivc_verifier/client_ivc_recursive_verifier.test.cpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/client_ivc_recursive_verifier.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/client_ivc_verifier/client_ivc_recursive_verifier.test.cpp index f0394c526e9..3c2b28d7db9 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/client_ivc_recursive_verifier.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/client_ivc_verifier/client_ivc_recursive_verifier.test.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/stdlib/honk_recursion/verifier/client_ivc_recursive_verifier.hpp" +#include "barretenberg/stdlib/client_ivc_verifier/client_ivc_recursive_verifier.hpp" #include "barretenberg/circuit_checker/circuit_checker.hpp" #include "barretenberg/client_ivc/client_ivc.hpp" #include "barretenberg/common/test.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/CMakeLists.txt new file mode 100644 index 00000000000..35f71293f0b --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/CMakeLists.txt @@ -0,0 +1 @@ +barretenberg_module(stdlib_eccvm_verifier eccvm stdlib_transcript) diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_bools_relation.cpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_bools_relation.cpp similarity index 89% rename from barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_bools_relation.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_bools_relation.cpp index e75efef6059..faa6ff43cf9 100644 --- a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_bools_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_bools_relation.cpp @@ -1,6 +1,6 @@ -#include "barretenberg/eccvm_recursion/eccvm_recursive_flavor.hpp" #include "barretenberg/flavor/relation_definitions.hpp" #include "barretenberg/relations/ecc_vm/ecc_bools_relation_impl.hpp" +#include "barretenberg/stdlib/eccvm_verifier/eccvm_recursive_flavor.hpp" #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" namespace bb { diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_lookup_relation.cpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_lookup_relation.cpp similarity index 89% rename from barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_lookup_relation.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_lookup_relation.cpp index 8912aae6f9e..02111088c5b 100644 --- a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_lookup_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_lookup_relation.cpp @@ -1,6 +1,6 @@ -#include "barretenberg/eccvm_recursion/eccvm_recursive_flavor.hpp" #include "barretenberg/flavor/relation_definitions.hpp" #include "barretenberg/relations/ecc_vm/ecc_lookup_relation_impl.hpp" +#include "barretenberg/stdlib/eccvm_verifier/eccvm_recursive_flavor.hpp" #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" namespace bb { diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_msm_relation.cpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_msm_relation.cpp similarity index 89% rename from barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_msm_relation.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_msm_relation.cpp index 1d0c3e9e79a..58e88bb83a7 100644 --- a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_msm_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_msm_relation.cpp @@ -1,6 +1,6 @@ -#include "barretenberg/eccvm_recursion/eccvm_recursive_flavor.hpp" #include "barretenberg/flavor/relation_definitions.hpp" #include "barretenberg/relations/ecc_vm/ecc_msm_relation_impl.hpp" +#include "barretenberg/stdlib/eccvm_verifier/eccvm_recursive_flavor.hpp" #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" namespace bb { diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_point_table_relation.cpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_point_table_relation.cpp similarity index 90% rename from barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_point_table_relation.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_point_table_relation.cpp index d8d9c39ca6b..07279655d4f 100644 --- a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_point_table_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_point_table_relation.cpp @@ -1,6 +1,6 @@ -#include "barretenberg/eccvm_recursion/eccvm_recursive_flavor.hpp" #include "barretenberg/flavor/relation_definitions.hpp" #include "barretenberg/relations/ecc_vm/ecc_point_table_relation_impl.hpp" +#include "barretenberg/stdlib/eccvm_verifier/eccvm_recursive_flavor.hpp" #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" namespace bb { diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_relation_consistency.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_relation_consistency.test.cpp similarity index 97% rename from barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_relation_consistency.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_relation_consistency.test.cpp index 50bf77b1084..6fb8c20f103 100644 --- a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_relation_consistency.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_relation_consistency.test.cpp @@ -1,7 +1,7 @@ -#include "barretenberg/eccvm_recursion/eccvm_recursive_flavor.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/stdlib/eccvm_verifier/eccvm_recursive_flavor.hpp" #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" #include namespace bb { diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_set_relation.cpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_set_relation.cpp similarity index 92% rename from barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_set_relation.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_set_relation.cpp index e39411f04ab..880ba79531e 100644 --- a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_set_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_set_relation.cpp @@ -1,6 +1,6 @@ -#include "barretenberg/eccvm_recursion/eccvm_recursive_flavor.hpp" #include "barretenberg/flavor/relation_definitions.hpp" #include "barretenberg/relations/ecc_vm/ecc_set_relation_impl.hpp" +#include "barretenberg/stdlib/eccvm_verifier/eccvm_recursive_flavor.hpp" #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" namespace bb { diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_transcript_relation.cpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_transcript_relation.cpp similarity index 90% rename from barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_transcript_relation.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_transcript_relation.cpp index 0301b708056..b4d540a3f5d 100644 --- a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_transcript_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_transcript_relation.cpp @@ -1,6 +1,6 @@ -#include "barretenberg/eccvm_recursion/eccvm_recursive_flavor.hpp" #include "barretenberg/flavor/relation_definitions.hpp" #include "barretenberg/relations/ecc_vm/ecc_transcript_relation_impl.hpp" +#include "barretenberg/stdlib/eccvm_verifier/eccvm_recursive_flavor.hpp" #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" namespace bb { diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_wnaf_relation.cpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_wnaf_relation.cpp similarity index 89% rename from barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_wnaf_relation.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_wnaf_relation.cpp index 5ec78820de6..c196158df9b 100644 --- a/barretenberg/cpp/src/barretenberg/eccvm_recursion/ecc_wnaf_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/ecc_wnaf_relation.cpp @@ -1,6 +1,6 @@ -#include "barretenberg/eccvm_recursion/eccvm_recursive_flavor.hpp" #include "barretenberg/flavor/relation_definitions.hpp" #include "barretenberg/relations/ecc_vm/ecc_wnaf_relation_impl.hpp" +#include "barretenberg/stdlib/eccvm_verifier/eccvm_recursive_flavor.hpp" #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" namespace bb { diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/eccvm_recursive_flavor.hpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/eccvm_recursive_flavor.hpp similarity index 97% rename from barretenberg/cpp/src/barretenberg/eccvm_recursion/eccvm_recursive_flavor.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/eccvm_recursive_flavor.hpp index cf11f8d8a30..7f22b00333c 100644 --- a/barretenberg/cpp/src/barretenberg/eccvm_recursion/eccvm_recursive_flavor.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/eccvm_recursive_flavor.hpp @@ -1,7 +1,6 @@ #pragma once #include "barretenberg/common/std_array.hpp" #include "barretenberg/eccvm/eccvm_flavor.hpp" -#include "barretenberg/eccvm_recursion/verifier_commitment_key.hpp" #include "barretenberg/flavor/flavor.hpp" #include "barretenberg/flavor/flavor_macros.hpp" #include "barretenberg/flavor/relation_definitions.hpp" @@ -13,8 +12,9 @@ #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/stdlib/honk_recursion/transcript/transcript.hpp" +#include "barretenberg/stdlib/eccvm_verifier/verifier_commitment_key.hpp" #include "barretenberg/stdlib/primitives/curves/grumpkin.hpp" +#include "barretenberg/stdlib/transcript/transcript.hpp" // NOLINTBEGIN(cppcoreguidelines-avoid-const-or-ref-data-members) ? diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/eccvm_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/eccvm_recursive_verifier.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/eccvm_recursion/eccvm_recursive_verifier.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/eccvm_recursive_verifier.cpp diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/eccvm_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/eccvm_recursive_verifier.hpp similarity index 94% rename from barretenberg/cpp/src/barretenberg/eccvm_recursion/eccvm_recursive_verifier.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/eccvm_recursive_verifier.hpp index e12f96f563c..9e536047778 100644 --- a/barretenberg/cpp/src/barretenberg/eccvm_recursion/eccvm_recursive_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/eccvm_recursive_verifier.hpp @@ -1,5 +1,5 @@ #pragma once -#include "barretenberg/eccvm_recursion/eccvm_recursive_flavor.hpp" +#include "barretenberg/stdlib/eccvm_verifier/eccvm_recursive_flavor.hpp" namespace bb { template class ECCVMRecursiveVerifier_ { diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/eccvm_recursive_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/eccvm_recursive_verifier.test.cpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/eccvm_recursion/eccvm_recursive_verifier.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/eccvm_recursive_verifier.test.cpp index 2d2c1fe93bf..99ffb765805 100644 --- a/barretenberg/cpp/src/barretenberg/eccvm_recursion/eccvm_recursive_verifier.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/eccvm_recursive_verifier.test.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/eccvm_recursion/eccvm_recursive_verifier.hpp" +#include "barretenberg/stdlib/eccvm_verifier/eccvm_recursive_verifier.hpp" #include "barretenberg/eccvm/eccvm_prover.hpp" #include "barretenberg/eccvm/eccvm_verifier.hpp" #include "barretenberg/ultra_honk/ultra_prover.hpp" diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/verifier_commitment_key.hpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/verifier_commitment_key.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/eccvm_recursion/verifier_commitment_key.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/verifier_commitment_key.hpp diff --git a/barretenberg/cpp/src/barretenberg/eccvm_recursion/verifier_commitment_key.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/verifier_commitment_key.test.cpp similarity index 96% rename from barretenberg/cpp/src/barretenberg/eccvm_recursion/verifier_commitment_key.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/verifier_commitment_key.test.cpp index b9496e39ca4..a49637a88aa 100644 --- a/barretenberg/cpp/src/barretenberg/eccvm_recursion/verifier_commitment_key.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/eccvm_verifier/verifier_commitment_key.test.cpp @@ -1,5 +1,5 @@ -#include "barretenberg/eccvm_recursion/verifier_commitment_key.hpp" +#include "barretenberg/stdlib/eccvm_verifier/verifier_commitment_key.hpp" #include "barretenberg/stdlib/primitives/curves/grumpkin.hpp" #include namespace bb { diff --git a/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/CMakeLists.txt new file mode 100644 index 00000000000..609d9d179c8 --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/CMakeLists.txt @@ -0,0 +1,8 @@ +barretenberg_module( + stdlib_goblin_verifier + goblin + stdlib_circuit_builders + stdlib_honk_verifier + stdlib_eccvm_verifier + stdlib_translator_vm_verifier +) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/goblin/goblin.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/goblin.test.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/goblin/goblin.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/goblin.test.cpp diff --git a/barretenberg/cpp/src/barretenberg/goblin/goblin_recursion.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/goblin_recursion.test.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/goblin/goblin_recursion.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/goblin_recursion.test.cpp diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/goblin_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/goblin_recursive_verifier.cpp similarity index 96% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/goblin_recursive_verifier.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/goblin_recursive_verifier.cpp index 5ad5a190621..8a6980ff4b0 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/goblin_recursive_verifier.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/goblin_recursive_verifier.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/stdlib/honk_recursion/verifier/goblin_recursive_verifier.hpp" +#include "barretenberg/stdlib/goblin_verifier/goblin_recursive_verifier.hpp" namespace bb::stdlib::recursion::honk { diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/goblin_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/goblin_recursive_verifier.hpp similarity index 87% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/goblin_recursive_verifier.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/goblin_recursive_verifier.hpp index c6b02b3ff71..92ae344af66 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/goblin_recursive_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/goblin_recursive_verifier.hpp @@ -1,8 +1,8 @@ #pragma once -#include "barretenberg/eccvm_recursion/eccvm_recursive_verifier.hpp" #include "barretenberg/goblin/goblin.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp" -#include "barretenberg/translator_vm_recursion/translator_recursive_verifier.hpp" +#include "barretenberg/stdlib/eccvm_verifier/eccvm_recursive_verifier.hpp" +#include "barretenberg/stdlib/goblin_verifier/merge_recursive_verifier.hpp" +#include "barretenberg/stdlib/translator_vm_verifier/translator_recursive_verifier.hpp" namespace bb::stdlib::recursion::honk { class GoblinRecursiveVerifier { diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/goblin_recursive_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/goblin_recursive_verifier.test.cpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/goblin_recursive_verifier.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/goblin_recursive_verifier.test.cpp index 84f46b394b6..17383b667d2 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/goblin_recursive_verifier.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/goblin_recursive_verifier.test.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/stdlib/honk_recursion/verifier/goblin_recursive_verifier.hpp" +#include "barretenberg/stdlib/goblin_verifier/goblin_recursive_verifier.hpp" #include "barretenberg/circuit_checker/circuit_checker.hpp" #include "barretenberg/common/test.hpp" #include "barretenberg/goblin/goblin.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/merge_recursive_verifier.cpp similarity index 97% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/merge_recursive_verifier.cpp index 0e0517aa541..593564fe4ed 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/merge_recursive_verifier.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp" +#include "barretenberg/stdlib/goblin_verifier/merge_recursive_verifier.hpp" namespace bb::stdlib::recursion::goblin { diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/merge_recursive_verifier.hpp similarity index 93% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/merge_recursive_verifier.hpp index 2cd864ebe38..6899d4a939c 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/merge_recursive_verifier.hpp @@ -1,8 +1,8 @@ #pragma once #include "barretenberg/commitment_schemes/kzg/kzg.hpp" #include "barretenberg/honk/proof_system/types/proof.hpp" -#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" +#include "barretenberg/stdlib/transcript/transcript.hpp" namespace bb::stdlib::recursion::goblin { template class MergeRecursiveVerifier_ { diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/merge_verifier.test.cpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_verifier.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/merge_verifier.test.cpp index 6eb0796749a..26fcefae8c1 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/merge_verifier.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/goblin_verifier/merge_verifier.test.cpp @@ -2,7 +2,7 @@ #include "barretenberg/circuit_checker/circuit_checker.hpp" #include "barretenberg/common/test.hpp" #include "barretenberg/goblin/mock_circuits.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/merge_recursive_verifier.hpp" +#include "barretenberg/stdlib/goblin_verifier/merge_recursive_verifier.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" #include "barretenberg/ultra_honk/merge_prover.hpp" #include "barretenberg/ultra_honk/ultra_prover.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/CMakeLists.txt deleted file mode 100644 index 947af5ea8f9..00000000000 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -barretenberg_module( - stdlib_honk_recursion - stdlib_circuit_builders - stdlib_pedersen_commitment - stdlib_blake3s - ultra_honk - stdlib_poseidon2 - protogalaxy - goblin - translator_vm_recursion - eccvm_recursion - client_ivc -) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/CMakeLists.txt new file mode 100644 index 00000000000..139b1edccd9 --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/CMakeLists.txt @@ -0,0 +1,4 @@ +barretenberg_module( + stdlib_honk_verifier + stdlib_transcript +) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/decider_recursive_verifier.cpp similarity index 97% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/decider_recursive_verifier.cpp index e3d29e360a5..6475ec73771 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/decider_recursive_verifier.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.hpp" +#include "barretenberg/stdlib/honk_verifier/decider_recursive_verifier.hpp" #include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" #include "barretenberg/transcript/transcript.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/decider_recursive_verifier.hpp similarity index 91% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/decider_recursive_verifier.hpp index e44a4c8a592..701d741c6b2 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/decider_recursive_verifier.hpp @@ -1,7 +1,7 @@ #pragma once #include "barretenberg/honk/proof_system/types/proof.hpp" -#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/recursive_verifier_instance.hpp" +#include "barretenberg/stdlib/protogalaxy_verifier/recursive_verifier_instance.hpp" +#include "barretenberg/stdlib/transcript/transcript.hpp" #include "barretenberg/stdlib_circuit_builders/mega_recursive_flavor.hpp" #include "barretenberg/stdlib_circuit_builders/ultra_recursive_flavor.hpp" #include "barretenberg/sumcheck/sumcheck.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/ultra_recursive_verifier.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/ultra_recursive_verifier.cpp index c68f7421e25..1c391b7c5ab 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/ultra_recursive_verifier.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp" +#include "barretenberg/stdlib/honk_verifier/ultra_recursive_verifier.hpp" #include "barretenberg/commitment_schemes/zeromorph/zeromorph.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" #include "barretenberg/plonk_honk_shared/library/grand_product_delta.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/ultra_recursive_verifier.hpp similarity index 96% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/ultra_recursive_verifier.hpp index 94ede01e462..3a88172901f 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/ultra_recursive_verifier.hpp @@ -1,7 +1,7 @@ #pragma once #include "barretenberg/honk/proof_system/types/proof.hpp" -#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp" #include "barretenberg/stdlib/plonk_recursion/aggregation_state/aggregation_state.hpp" +#include "barretenberg/stdlib/transcript/transcript.hpp" #include "barretenberg/stdlib_circuit_builders/mega_recursive_flavor.hpp" #include "barretenberg/stdlib_circuit_builders/ultra_recursive_flavor.hpp" #include "barretenberg/sumcheck/sumcheck.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/ultra_recursive_verifier.test.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/verifier.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/ultra_recursive_verifier.test.cpp index c072ad013ee..df7716a8f9b 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/verifier.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/honk_verifier/ultra_recursive_verifier.test.cpp @@ -1,8 +1,8 @@ +#include "barretenberg/stdlib/honk_verifier/ultra_recursive_verifier.hpp" #include "barretenberg/circuit_checker/circuit_checker.hpp" #include "barretenberg/common/test.hpp" #include "barretenberg/stdlib/hash/blake3s/blake3s.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/ultra_recursive_verifier.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" #include "barretenberg/stdlib_circuit_builders/ultra_recursive_flavor.hpp" #include "barretenberg/ultra_honk/ultra_prover.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.hpp index f7085bc1ea3..c9b0fcb751d 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/databus/databus.hpp @@ -1,8 +1,8 @@ #pragma once #include "../circuit_builders/circuit_builders_fwd.hpp" #include "../field/field.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" +#include "barretenberg/stdlib/protogalaxy_verifier/recursive_instances.hpp" #include "barretenberg/stdlib_circuit_builders/databus.hpp" namespace bb::stdlib { diff --git a/barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/CMakeLists.txt new file mode 100644 index 00000000000..ddabfd349da --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/CMakeLists.txt @@ -0,0 +1,6 @@ +barretenberg_module( + stdlib_protogalaxy_verifier + stdlib_goblin_verifier + stdlib_blake3s + protogalaxy +) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/protogalaxy_recursive_verifier.cpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/protogalaxy_recursive_verifier.cpp index 0d1bd6c1952..efdbfeb132d 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/protogalaxy_recursive_verifier.cpp @@ -1,6 +1,6 @@ #include "protogalaxy_recursive_verifier.hpp" #include "barretenberg/plonk_honk_shared/library/grand_product_delta.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp" +#include "barretenberg/stdlib/protogalaxy_verifier/recursive_instances.hpp" namespace bb::stdlib::recursion::honk { diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/protogalaxy_recursive_verifier.hpp similarity index 97% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/protogalaxy_recursive_verifier.hpp index 60d8e7adf43..938fd8787e5 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/protogalaxy_recursive_verifier.hpp @@ -2,8 +2,8 @@ #include "barretenberg/flavor/flavor.hpp" #include "barretenberg/honk/proof_system/types/proof.hpp" #include "barretenberg/protogalaxy/folding_result.hpp" -#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp" +#include "barretenberg/stdlib/protogalaxy_verifier/recursive_instances.hpp" +#include "barretenberg/stdlib/transcript/transcript.hpp" #include "barretenberg/stdlib_circuit_builders/mega_recursive_flavor.hpp" #include "barretenberg/stdlib_circuit_builders/ultra_recursive_flavor.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/protogalaxy_recursive_verifier.test.cpp similarity index 95% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/protogalaxy_recursive_verifier.test.cpp index 1c5a5697ec7..e166bd0dd5e 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/protogalaxy_recursive_verifier.test.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/stdlib/honk_recursion/verifier/protogalaxy_recursive_verifier.hpp" +#include "barretenberg/stdlib/protogalaxy_verifier/protogalaxy_recursive_verifier.hpp" #include "barretenberg/circuit_checker/circuit_checker.hpp" #include "barretenberg/common/test.hpp" #include "barretenberg/protogalaxy/decider_verifier.hpp" @@ -6,7 +6,7 @@ #include "barretenberg/protogalaxy/protogalaxy_verifier.hpp" #include "barretenberg/stdlib/hash/blake3s/blake3s.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/decider_recursive_verifier.hpp" +#include "barretenberg/stdlib/honk_verifier/decider_recursive_verifier.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" #include "barretenberg/stdlib_circuit_builders/ultra_recursive_flavor.hpp" #include "barretenberg/sumcheck/instance/instances.hpp" @@ -123,7 +123,7 @@ template class ProtoGalaxyRecursiveTests : public tes InnerFoldingProver folding_prover({ prover_instance_1, prover_instance_2 }); InnerFoldingVerifier folding_verifier({ verifier_instance_1, verifier_instance_2 }); - auto [prover_accumulator, folding_proof] = folding_prover.fold_instances(); + auto [prover_accumulator, folding_proof] = folding_prover.prove(); auto verifier_accumulator = folding_verifier.verify_folding_proof(folding_proof); return { prover_accumulator, verifier_accumulator }; } @@ -189,7 +189,7 @@ template class ProtoGalaxyRecursiveTests : public tes auto verifier_instance_2 = std::make_shared(verification_key_2); // Generate a folding proof InnerFoldingProver folding_prover({ prover_instance_1, prover_instance_2 }); - auto folding_proof = folding_prover.fold_instances(); + auto folding_proof = folding_prover.prove(); // Create a recursive folding verifier circuit for the folding proof of the two instances OuterBuilder folding_circuit; @@ -253,7 +253,7 @@ template class ProtoGalaxyRecursiveTests : public tes auto verifier_instance_2 = std::make_shared(verification_key_2); // Generate a folding proof InnerFoldingProver folding_prover({ prover_instance_1, prover_instance_2 }); - auto folding_proof = folding_prover.fold_instances(); + auto folding_proof = folding_prover.prove(); // Create a recursive folding verifier circuit for the folding proof of the two instances OuterBuilder folding_circuit; @@ -351,7 +351,7 @@ template class ProtoGalaxyRecursiveTests : public tes // Generate a folding proof with the incorrect polynomials which would result in the prover having the wrong // target sum InnerFoldingProver folding_prover({ prover_accumulator, prover_inst }); - auto folding_proof = folding_prover.fold_instances(); + auto folding_proof = folding_prover.prove(); // Create a recursive folding verifier circuit for the folding proof of the two instances with the untampered // commitments @@ -364,12 +364,8 @@ template class ProtoGalaxyRecursiveTests : public tes }; }; -using FlavorTypes = testing::Types, - MegaRecursiveFlavor_, - UltraRecursiveFlavor_, - UltraRecursiveFlavor_, - UltraRecursiveFlavor_, - MegaRecursiveFlavor_>; +using FlavorTypes = + testing::Types, MegaRecursiveFlavor_>; TYPED_TEST_SUITE(ProtoGalaxyRecursiveTests, FlavorTypes); TYPED_TEST(ProtoGalaxyRecursiveTests, InnerCircuit) diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp b/barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/recursive_instances.hpp similarity index 95% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/recursive_instances.hpp index 46471f797f6..63957ed97bc 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/recursive_instances.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/recursive_instances.hpp @@ -1,7 +1,7 @@ #pragma once #include "barretenberg/flavor/flavor.hpp" #include "barretenberg/relations/relation_parameters.hpp" -#include "barretenberg/stdlib/honk_recursion/verifier/recursive_verifier_instance.hpp" +#include "barretenberg/stdlib/protogalaxy_verifier/recursive_verifier_instance.hpp" namespace bb::stdlib::recursion::honk { template struct RecursiveVerifierInstances_ { diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/recursive_verifier_instance.hpp b/barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/recursive_verifier_instance.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/verifier/recursive_verifier_instance.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/protogalaxy_verifier/recursive_verifier_instance.hpp diff --git a/barretenberg/cpp/src/barretenberg/stdlib/transcript/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/transcript/CMakeLists.txt new file mode 100644 index 00000000000..1076d60eb87 --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/stdlib/transcript/CMakeLists.txt @@ -0,0 +1,5 @@ +barretenberg_module( + stdlib_transcript + stdlib_circuit_builders + stdlib_poseidon2 +) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/stdlib/transcript/transcript.cpp b/barretenberg/cpp/src/barretenberg/stdlib/transcript/transcript.cpp new file mode 100644 index 00000000000..f2c203d8bf4 --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/stdlib/transcript/transcript.cpp @@ -0,0 +1 @@ +#include "transcript.hpp" \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/stdlib/transcript/transcript.hpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/transcript/transcript.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/transcript/transcript.hpp diff --git a/barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/transcript/transcript.test.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/stdlib/honk_recursion/transcript/transcript.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/transcript/transcript.test.cpp diff --git a/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/CMakeLists.txt new file mode 100644 index 00000000000..99e8cdd77a5 --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/CMakeLists.txt @@ -0,0 +1 @@ +barretenberg_module(stdlib_translator_vm_verifier translator_vm stdlib_transcript) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_decomposition_relation_mega.cpp b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_decomposition_relation_mega.cpp similarity index 83% rename from barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_decomposition_relation_mega.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_decomposition_relation_mega.cpp index 698afdca41c..660fe2fb7ca 100644 --- a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_decomposition_relation_mega.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_decomposition_relation_mega.cpp @@ -1,6 +1,6 @@ #include "barretenberg/relations/translator_vm/translator_decomposition_relation_impl.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" -#include "barretenberg/translator_vm_recursion/translator_recursive_flavor.hpp" +#include "barretenberg/stdlib/translator_vm_verifier/translator_recursive_flavor.hpp" namespace bb { template class TranslatorDecompositionRelationImpl>; diff --git a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_decomposition_relation_ultra.cpp b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_decomposition_relation_ultra.cpp similarity index 83% rename from barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_decomposition_relation_ultra.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_decomposition_relation_ultra.cpp index d309742f8d1..b36ca76bf17 100644 --- a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_decomposition_relation_ultra.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_decomposition_relation_ultra.cpp @@ -1,6 +1,6 @@ #include "barretenberg/relations/translator_vm/translator_decomposition_relation_impl.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" -#include "barretenberg/translator_vm_recursion/translator_recursive_flavor.hpp" +#include "barretenberg/stdlib/translator_vm_verifier/translator_recursive_flavor.hpp" namespace bb { template class TranslatorDecompositionRelationImpl>; diff --git a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_delta_range_constraint_relation.cpp b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_delta_range_constraint_relation.cpp similarity index 89% rename from barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_delta_range_constraint_relation.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_delta_range_constraint_relation.cpp index 278657a801c..d504c56200c 100644 --- a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_delta_range_constraint_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_delta_range_constraint_relation.cpp @@ -1,6 +1,6 @@ #include "barretenberg/relations/translator_vm/translator_delta_range_constraint_relation_impl.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" -#include "barretenberg/translator_vm_recursion/translator_recursive_flavor.hpp" +#include "barretenberg/stdlib/translator_vm_verifier/translator_recursive_flavor.hpp" namespace bb { template class TranslatorDeltaRangeConstraintRelationImpl>; diff --git a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_extra_relations.cpp b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_extra_relations.cpp similarity index 93% rename from barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_extra_relations.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_extra_relations.cpp index 04d17bac02a..b1d8fa6f08e 100644 --- a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_extra_relations.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_extra_relations.cpp @@ -1,6 +1,6 @@ #include "barretenberg/relations/translator_vm/translator_extra_relations_impl.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" -#include "barretenberg/translator_vm_recursion/translator_recursive_flavor.hpp" +#include "barretenberg/stdlib/translator_vm_verifier/translator_recursive_flavor.hpp" namespace bb { template class TranslatorOpcodeConstraintRelationImpl>; diff --git a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_non_native_field_relation.cpp b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_non_native_field_relation.cpp similarity index 89% rename from barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_non_native_field_relation.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_non_native_field_relation.cpp index b42d7cb29e9..d5f4fd1ee74 100644 --- a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_non_native_field_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_non_native_field_relation.cpp @@ -1,6 +1,6 @@ #include "barretenberg/relations/translator_vm/translator_non_native_field_relation_impl.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" -#include "barretenberg/translator_vm_recursion/translator_recursive_flavor.hpp" +#include "barretenberg/stdlib/translator_vm_verifier/translator_recursive_flavor.hpp" namespace bb { template class TranslatorNonNativeFieldRelationImpl>; diff --git a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_permutation_relation.cpp b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_permutation_relation.cpp similarity index 88% rename from barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_permutation_relation.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_permutation_relation.cpp index 7eeda6473d6..186faa45047 100644 --- a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_permutation_relation.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_permutation_relation.cpp @@ -1,6 +1,6 @@ #include "barretenberg/relations/translator_vm/translator_permutation_relation_impl.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" -#include "barretenberg/translator_vm_recursion/translator_recursive_flavor.hpp" +#include "barretenberg/stdlib/translator_vm_verifier/translator_recursive_flavor.hpp" namespace bb { template class TranslatorPermutationRelationImpl>; diff --git a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_recursive_flavor.hpp b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_flavor.hpp similarity index 99% rename from barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_recursive_flavor.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_flavor.hpp index 104a7780ca4..c8331534405 100644 --- a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_recursive_flavor.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_flavor.hpp @@ -5,9 +5,9 @@ #include "barretenberg/flavor/flavor_macros.hpp" #include "barretenberg/polynomials/univariate.hpp" #include "barretenberg/relations/relation_parameters.hpp" -#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" +#include "barretenberg/stdlib/transcript/transcript.hpp" #include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp" #include "barretenberg/translator_vm/translator_flavor.hpp" diff --git a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_verifier.cpp similarity index 100% rename from barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_recursive_verifier.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_verifier.cpp diff --git a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_verifier.hpp similarity index 93% rename from barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_recursive_verifier.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_verifier.hpp index 94a4e143536..09e99118711 100644 --- a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_recursive_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_verifier.hpp @@ -1,10 +1,10 @@ #pragma once #include "barretenberg/goblin/translation_evaluations.hpp" #include "barretenberg/honk/proof_system/types/proof.hpp" -#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp" +#include "barretenberg/stdlib/transcript/transcript.hpp" +#include "barretenberg/stdlib/translator_vm_verifier/translator_recursive_flavor.hpp" #include "barretenberg/sumcheck/sumcheck.hpp" #include "barretenberg/translator_vm/translator_prover.hpp" -#include "barretenberg/translator_vm_recursion/translator_recursive_flavor.hpp" namespace bb { template class TranslatorRecursiveVerifier_ { diff --git a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_recursive_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_verifier.test.cpp similarity index 98% rename from barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_recursive_verifier.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_verifier.test.cpp index 12aebb7c93d..082bc4e9c08 100644 --- a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/translator_recursive_verifier.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/translator_vm_verifier/translator_recursive_verifier.test.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/translator_vm_recursion/translator_recursive_verifier.hpp" +#include "barretenberg/stdlib/translator_vm_verifier/translator_recursive_verifier.hpp" #include "barretenberg/common/log.hpp" #include "barretenberg/numeric/uint256/uint256.hpp" #include "barretenberg/relations/relation_parameters.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_recursive_flavor.hpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_recursive_flavor.hpp index 2b21fa3ca73..20d43632405 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_recursive_flavor.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/mega_recursive_flavor.hpp @@ -7,9 +7,9 @@ #include "barretenberg/polynomials/barycentric.hpp" #include "barretenberg/polynomials/evaluation_domain.hpp" #include "barretenberg/polynomials/univariate.hpp" -#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" +#include "barretenberg/stdlib/transcript/transcript.hpp" #include "barretenberg/stdlib_circuit_builders/mega_circuit_builder.hpp" #include "barretenberg/stdlib_circuit_builders/mega_flavor.hpp" diff --git a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_recursive_flavor.hpp b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_recursive_flavor.hpp index c1ef2c14190..c1f828e1516 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_recursive_flavor.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib_circuit_builders/ultra_recursive_flavor.hpp @@ -23,9 +23,9 @@ #include #include -#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" +#include "barretenberg/stdlib/transcript/transcript.hpp" namespace bb { diff --git a/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp index bdb94295634..38260aa5a4a 100644 --- a/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp +++ b/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp @@ -1,4 +1,4 @@ -#include "barretenberg/stdlib/honk_recursion/transcript/transcript.hpp" +#include "barretenberg/stdlib/transcript/transcript.hpp" #include using namespace bb; diff --git a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/translator_vm_recursion/CMakeLists.txt deleted file mode 100644 index c4377cbcd1c..00000000000 --- a/barretenberg/cpp/src/barretenberg/translator_vm_recursion/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -barretenberg_module(translator_vm_recursion translator_vm stdlib_honk_recursion) \ No newline at end of file