From 53b5640f95a8ec30ae1435a209da78e8ce94081d Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Fri, 3 Mar 2023 14:59:01 -0700 Subject: [PATCH 01/10] fix!: Move the include root up 1 directory & rename aztec to barretenberg --- cpp/.dockerignore | 6 +- cpp/.gitignore | 4 +- cpp/CMakeLists.txt | 8 +- cpp/src/{aztec => }/CMakeLists.txt | 29 ++- cpp/src/aztec/common/max_threads.hpp | 30 --- .../benchmark/CMakeLists.txt | 0 .../benchmark/decrypt_bench/CMakeLists.txt | 0 .../benchmark/decrypt_bench/main.cpp | 4 +- .../benchmark/honk_bench/CMakeLists.txt | 0 .../honk_bench/compare_honk_bench.sh | 0 .../benchmark/honk_bench/honk.bench.cpp | 14 +- .../benchmark/pippenger_bench/CMakeLists.txt | 0 .../benchmark/pippenger_bench/main.cpp | 18 +- .../benchmark/plonk_bench/CMakeLists.txt | 0 .../benchmark/plonk_bench/plonk.bench.cpp | 12 +- .../common/CMakeLists.txt | 0 .../{aztec => barretenberg}/common/assert.hpp | 0 .../common/constexpr_utils.hpp | 0 .../common/container.hpp | 0 .../{aztec => barretenberg}/common/fuzzer.hpp | 141 +++++++------ .../common/fuzzer_constants.hpp | 0 .../{aztec => barretenberg}/common/inline.hpp | 0 .../{aztec => barretenberg}/common/log.hpp | 16 +- .../{aztec => barretenberg}/common/map.hpp | 0 cpp/src/barretenberg/common/max_threads.hpp | 28 +++ .../{aztec => barretenberg}/common/mem.hpp | 0 .../{aztec => barretenberg}/common/net.hpp | 0 .../{aztec => barretenberg}/common/printf.hpp | 0 .../common/serialize.hpp | 6 +- .../common/streams.hpp | 0 .../{aztec => barretenberg}/common/test.hpp | 0 .../common/throw_or_abort.hpp | 0 .../{aztec => barretenberg}/common/timer.hpp | 0 .../crypto/CMakeLists.txt | 0 .../crypto/aes128/CMakeLists.txt | 0 .../crypto/aes128/aes128.cpp | 0 .../crypto/aes128/aes128.hpp | 0 .../crypto/aes128/aes128.test.cpp | 0 .../crypto/aes128/c_bind.cpp | 0 .../crypto/blake2s/CMakeLists.txt | 0 .../crypto/blake2s/blake2-impl.hpp | 0 .../crypto/blake2s/blake2s.cpp | 0 .../crypto/blake2s/blake2s.hpp | 0 .../crypto/blake2s/blake2s.test.cpp | 0 .../crypto/blake2s/c_bind.cpp | 4 +- .../crypto/blake2s/c_bind.hpp | 0 .../crypto/blake3s/CMakeLists.txt | 0 .../crypto/blake3s/blake3-impl.hpp | 0 .../crypto/blake3s/blake3s.cpp | 0 .../crypto/blake3s/blake3s.hpp | 0 .../crypto/blake3s/blake3s.test.cpp | 0 .../crypto/blake3s/c_bind.cpp | 4 +- .../crypto/blake3s_full/CMakeLists.txt | 0 .../crypto/blake3s_full/blake3-impl.hpp | 0 .../crypto/blake3s_full/blake3s.cpp | 0 .../crypto/blake3s_full/blake3s.hpp | 0 .../crypto/blake3s_full/blake3s.test.cpp | 0 .../crypto/ecdsa/CMakeLists.txt | 0 .../crypto/ecdsa/ecdsa.hpp | 0 .../crypto/ecdsa/ecdsa.test.cpp | 8 +- .../crypto/ecdsa/ecdsa_impl.hpp | 6 +- .../crypto/hashers/hashers.hpp | 0 .../crypto/hmac/CMakeLists.txt | 0 .../crypto/hmac/hmac.hpp | 8 +- .../crypto/hmac/hmac.test.cpp | 0 .../crypto/keccak/CMakeLists.txt | 0 .../crypto/keccak/hash_types.hpp | 0 .../crypto/keccak/keccak.cpp | 0 .../crypto/keccak/keccak.hpp | 0 .../crypto/keccak/keccakf1600.cpp | 0 .../crypto/pedersen/CMakeLists.txt | 0 .../crypto/pedersen/c_bind.cpp | 8 +- .../crypto/pedersen/c_bind.hpp | 8 +- .../pedersen/convert_buffer_to_field.hpp | 4 +- .../crypto/pedersen/fixed_base_scalar_mul.hpp | 2 +- .../crypto/pedersen/generator_data.cpp | 0 .../crypto/pedersen/generator_data.hpp | 2 +- .../crypto/pedersen/pedersen.cpp | 4 +- .../crypto/pedersen/pedersen.hpp | 2 +- .../crypto/pedersen/pedersen.test.cpp | 2 +- .../crypto/pedersen/pedersen_lookup.cpp | 4 +- .../crypto/pedersen/pedersen_lookup.hpp | 4 +- .../crypto/pedersen/pedersen_lookup.test.cpp | 4 +- .../crypto/pedersen/sidon_set/sidon_set.hpp | 8 +- .../pedersen/sidon_set/sidon_set.test.cpp | 6 +- .../crypto/schnorr/CMakeLists.txt | 0 .../crypto/schnorr/c_bind.cpp | 2 +- .../crypto/schnorr/c_bind.hpp | 2 +- .../crypto/schnorr/multisig.hpp | 0 .../crypto/schnorr/multisig.test.cpp | 2 +- .../crypto/schnorr/proof_of_possession.hpp | 4 +- .../schnorr/proof_of_possession.test.cpp | 4 +- .../crypto/schnorr/schnorr.hpp | 10 +- .../crypto/schnorr/schnorr.tcc | 6 +- .../crypto/schnorr/schnorr.test.cpp | 4 +- .../crypto/sha256/CMakeLists.txt | 0 .../crypto/sha256/c_bind.cpp | 0 .../crypto/sha256/sha256.cpp | 6 +- .../crypto/sha256/sha256.hpp | 4 +- .../crypto/sha256/sha256.test.cpp | 0 .../dsl/CMakeLists.txt | 0 .../dsl/acir_format/CMakeLists.txt | 0 .../dsl/acir_format/acir_format.cpp | 0 .../dsl/acir_format/acir_format.hpp | 0 .../dsl/acir_format/blake2s_constraint.cpp | 2 +- .../dsl/acir_format/blake2s_constraint.hpp | 2 +- .../dsl/acir_format/ecdsa_secp256k1.cpp | 6 +- .../dsl/acir_format/ecdsa_secp256k1.hpp | 2 +- .../dsl/acir_format/fixed_base_scalar_mul.cpp | 2 +- .../dsl/acir_format/fixed_base_scalar_mul.hpp | 2 +- .../dsl/acir_format/hash_to_field.cpp | 2 +- .../dsl/acir_format/hash_to_field.hpp | 2 +- .../dsl/acir_format/logic_constraint.cpp | 0 .../dsl/acir_format/logic_constraint.hpp | 2 +- .../merkle_membership_constraint.cpp | 4 +- .../merkle_membership_constraint.hpp | 2 +- .../dsl/acir_format/pedersen.cpp | 2 +- .../dsl/acir_format/pedersen.hpp | 2 +- .../dsl/acir_format/range_constraint.hpp | 2 +- .../dsl/acir_format/round.cpp | 0 .../dsl/acir_format/round.hpp | 0 .../dsl/acir_format/schnorr_verify.cpp | 4 +- .../dsl/acir_format/schnorr_verify.hpp | 2 +- .../dsl/acir_format/sha256_constraint.cpp | 4 +- .../dsl/acir_format/sha256_constraint.hpp | 2 +- .../dsl/turbo_proofs/CMakeLists.txt | 0 .../dsl/turbo_proofs/c_bind.cpp | 0 .../dsl/turbo_proofs/c_bind.hpp | 0 .../dsl/turbo_proofs/turbo_proofs.cpp | 10 +- .../dsl/turbo_proofs/turbo_proofs.hpp | 0 .../ecc/CMakeLists.txt | 6 +- .../ecc/curves/bn254/fq.hpp | 0 .../ecc/curves/bn254/fq.test.cpp | 0 .../ecc/curves/bn254/fq12.hpp | 0 .../ecc/curves/bn254/fq12.test.cpp | 0 .../ecc/curves/bn254/fq2.hpp | 0 .../ecc/curves/bn254/fq2.test.cpp | 0 .../ecc/curves/bn254/fq6.hpp | 0 .../ecc/curves/bn254/fq6.test.cpp | 0 .../ecc/curves/bn254/fr.bench.cpp | 0 .../ecc/curves/bn254/fr.hpp | 0 .../ecc/curves/bn254/fr.test.cpp | 0 .../ecc/curves/bn254/g1.hpp | 0 .../ecc/curves/bn254/g1.test.cpp | 0 .../ecc/curves/bn254/g2.hpp | 0 .../ecc/curves/bn254/g2.test.cpp | 0 .../ecc/curves/bn254/pairing.hpp | 0 .../ecc/curves/bn254/pairing.test.cpp | 0 .../ecc/curves/bn254/pairing_impl.hpp | 0 .../ecc/curves/bn254/pseudorandom.hpp | 0 .../bn254/scalar_multiplication/c_bind.cpp | 2 +- .../bn254/scalar_multiplication/c_bind.hpp | 0 .../bn254/scalar_multiplication/pippenger.cpp | 4 +- .../bn254/scalar_multiplication/pippenger.hpp | 6 +- .../scalar_multiplication/process_buckets.cpp | 0 .../scalar_multiplication/process_buckets.hpp | 0 .../scalar_multiplication/runtime_states.cpp | 8 +- .../scalar_multiplication/runtime_states.hpp | 0 .../scalar_multiplication.cpp | 10 +- .../scalar_multiplication.hpp | 0 .../scalar_multiplication.test.cpp | 8 +- .../ecc/curves/grumpkin/c_bind.cpp | 0 .../ecc/curves/grumpkin/grumpkin.cpp | 0 .../ecc/curves/grumpkin/grumpkin.hpp | 0 .../ecc/curves/grumpkin/grumpkin.test.cpp | 0 .../ecc/curves/secp256k1/secp256k1.cpp | 0 .../ecc/curves/secp256k1/secp256k1.hpp | 6 +- .../ecc/curves/secp256k1/secp256k1.test.cpp | 4 +- .../curves/secp256k1/secp256k1_endo_notes.hpp | 4 +- .../ecc/curves/secp256r1/secp256r1.cpp | 0 .../ecc/curves/secp256r1/secp256r1.hpp | 6 +- .../ecc/curves/secp256r1/secp256r1.test.cpp | 4 +- .../ecc/curves/types.hpp | 0 .../ecc/fields/asm_macros.hpp | 0 .../ecc/fields/extra_flag_solver.py | 0 .../ecc/fields/field.hpp | 12 +- .../ecc/fields/field12.hpp | 2 +- .../ecc/fields/field2.hpp | 4 +- .../ecc/fields/field2_impl.hpp | 0 .../ecc/fields/field6.hpp | 2 +- .../ecc/fields/field_impl.hpp | 8 +- .../ecc/fields/field_impl_generic.hpp | 0 .../ecc/fields/field_impl_x64.hpp | 128 ++++++------ .../ecc/fields/macro_scrapbook.hpp | 0 .../ecc/groups/affine_element.hpp | 6 +- .../ecc/groups/affine_element.test.cpp | 14 +- .../ecc/groups/affine_element_impl.hpp | 2 +- .../ecc/groups/element.hpp | 10 +- .../ecc/groups/element_impl.hpp | 0 .../ecc/groups/group.hpp | 0 .../ecc/groups/group_impl_asm.tcc | 16 +- .../ecc/groups/group_impl_int128.tcc | 0 .../ecc/groups/wnaf.hpp | 2 +- .../ecc/groups/wnaf.test.cpp | 4 +- .../{aztec => barretenberg}/ecc/pippenger.md | 0 .../env/CMakeLists.txt | 0 .../env/data_store.hpp | 0 .../{aztec => barretenberg}/env/logstr.cpp | 0 .../{aztec => barretenberg}/env/logstr.hpp | 0 .../honk/CMakeLists.txt | 0 .../circuit_constructor_base.cpp | 0 .../circuit_constructor_base.hpp | 6 +- .../standard_circuit_constructor.cpp | 0 .../standard_circuit_constructor.hpp | 4 +- .../standard_circuit_constructor.test.cpp | 6 +- .../composer_helper/composer_helper.cpp | 188 ++++++++++++++++++ .../composer_helper/composer_helper.hpp | 74 +++++++ .../composer_helper/composer_helper_lib.cpp | 6 +- .../composer_helper/composer_helper_lib.hpp | 10 +- .../composer_helper/permutation_helper.hpp | 6 +- .../standard_honk_composer_helper.cpp | 9 +- .../standard_honk_composer_helper.hpp | 22 +- .../standard_plonk_composer_helper.cpp | 14 +- .../standard_plonk_composer_helper.hpp | 28 +-- .../honk/composer/standard_honk_composer.hpp | 10 +- .../composer/standard_honk_composer.test.cpp | 16 +- .../honk/composer/standard_plonk_composer.hpp | 10 +- .../composer/standard_plonk_composer.test.cpp | 8 +- .../honk/oracle/oracle.hpp | 0 .../honk/pcs/claim.hpp | 4 +- .../honk/pcs/commitment_key.hpp | 14 +- .../honk/pcs/commitment_key.test.hpp | 8 +- .../honk/pcs/gemini/gemini.hpp | 10 +- .../honk/pcs/gemini/gemini.test.cpp | 4 +- .../honk/pcs/ipa/ipa.hpp | 6 +- .../honk/pcs/ipa/ipa.test.cpp | 8 +- .../honk/pcs/kzg/kzg.hpp | 4 +- .../honk/pcs/kzg/kzg.test.cpp | 10 +- .../honk/pcs/shplonk/shplonk.hpp | 4 +- .../honk/pcs/shplonk/shplonk.test.cpp | 6 +- .../honk/pcs/shplonk/shplonk_single.hpp | 4 +- .../honk/pcs/wrapper.hpp | 4 +- .../honk/proof_system/program_settings.hpp | 4 +- .../honk/proof_system/prover.cpp | 26 +-- .../honk/proof_system/prover.hpp | 24 +-- .../honk/proof_system/prover.test.cpp | 8 +- .../honk/proof_system/verifier.cpp | 38 ++-- .../honk/proof_system/verifier.hpp | 20 +- .../honk/proof_system/verifier.test.cpp | 24 +-- .../sumcheck/polynomials/barycentric_data.hpp | 0 .../polynomials/barycentric_data.test.cpp | 6 +- .../polynomials/multivariates.test.cpp | 10 +- .../honk/sumcheck/polynomials/pow.hpp | 0 .../honk/sumcheck/polynomials/pow.test.cpp | 6 +- .../honk/sumcheck/polynomials/univariate.hpp | 4 +- .../sumcheck/polynomials/univariate.test.cpp | 4 +- .../relations/arithmetic_relation.hpp | 2 +- .../grand_product_computation_relation.hpp | 10 +- .../grand_product_initialization_relation.hpp | 2 +- .../honk/sumcheck/relations/relation.hpp | 0 .../honk/sumcheck/relations/relation.test.cpp | 8 +- .../honk/sumcheck/sumcheck.hpp | 10 +- .../honk/sumcheck/sumcheck.test.cpp | 10 +- .../honk/sumcheck/sumcheck_round.hpp | 4 +- .../honk/sumcheck/sumcheck_round.test.cpp | 8 +- .../honk/utils/power_polynomial.hpp | 4 +- .../honk/utils/power_polynomial.test.cpp | 4 +- .../honk/utils/public_inputs.hpp | 0 .../join_split_example/CMakeLists.txt | 0 .../join_split_example/constants.hpp | 6 +- .../fixtures/user_context.hpp | 8 +- .../join_split_example/proofs/CMakeLists.txt | 0 .../proofs/compute_circuit_data.hpp | 4 +- .../proofs/inner_proof_data/CMakeLists.txt | 0 .../inner_proof_data/inner_proof_data.cpp | 0 .../inner_proof_data/inner_proof_data.hpp | 8 +- .../inner_proof_data.test.cpp | 0 .../proofs/join_split/CMakeLists.txt | 0 .../proofs/join_split/c_bind.cpp | 12 +- .../proofs/join_split/c_bind.h | 0 .../join_split/compute_circuit_data.cpp | 4 +- .../join_split/compute_circuit_data.hpp | 0 .../join_split/compute_signing_data.cpp | 4 +- .../join_split/compute_signing_data.hpp | 0 .../proofs/join_split/create_proof.hpp | 0 .../proofs/join_split/index.hpp | 0 .../proofs/join_split/join_split.cpp | 2 +- .../proofs/join_split/join_split.hpp | 4 +- .../proofs/join_split/join_split.test.cpp | 12 +- .../proofs/join_split/join_split_circuit.cpp | 2 +- .../proofs/join_split/join_split_circuit.hpp | 4 +- .../join_split/join_split_js_parity.test.cpp | 12 +- .../proofs/join_split/join_split_tx.cpp | 2 +- .../proofs/join_split/join_split_tx.hpp | 6 +- .../proofs/join_split/join_split_tx.test.cpp | 10 +- .../proofs/join_split/sign_join_split_tx.cpp | 4 +- .../proofs/join_split/sign_join_split_tx.hpp | 4 +- .../proofs/join_split/verify_signature.hpp | 6 +- .../proofs/mock/CMakeLists.txt | 0 .../proofs/mock/mock_circuit.hpp | 8 +- .../proofs/mock/mock_circuit.test.cpp | 6 +- .../proofs/notes/CMakeLists.txt | 0 .../notes/circuit/account/account_note.hpp | 4 +- .../proofs/notes/circuit/account/commit.hpp | 4 +- .../proofs/notes/circuit/account/index.hpp | 0 .../proofs/notes/circuit/asset_id.cpp | 4 +- .../proofs/notes/circuit/asset_id.hpp | 4 +- .../proofs/notes/circuit/bridge_call_data.hpp | 4 +- .../proofs/notes/circuit/claim/claim_note.hpp | 4 +- .../claim/complete_partial_commitment.hpp | 4 +- .../notes/circuit/claim/compute_nullifier.hpp | 6 +- .../claim/create_partial_commitment.hpp | 6 +- .../proofs/notes/circuit/claim/index.hpp | 0 .../notes/circuit/claim/witness_data.hpp | 4 +- .../proofs/notes/circuit/index.hpp | 0 .../proofs/notes/circuit/value/commit.hpp | 0 .../value/complete_partial_commitment.hpp | 6 +- .../notes/circuit/value/compute_nullifier.cpp | 4 +- .../notes/circuit/value/compute_nullifier.hpp | 4 +- .../circuit/value/compute_nullifier.test.cpp | 4 +- .../value/create_partial_commitment.hpp | 6 +- .../proofs/notes/circuit/value/index.hpp | 0 .../proofs/notes/circuit/value/value_note.hpp | 4 +- .../notes/circuit/value/value_note.test.cpp | 0 .../notes/circuit/value/witness_data.hpp | 4 +- .../proofs/notes/constants.hpp | 4 +- .../notes/native/account/account_note.cpp | 4 +- .../notes/native/account/account_note.hpp | 6 +- .../compute_account_alias_hash_nullifier.hpp | 4 +- .../compute_account_public_key_nullifier.hpp | 2 +- .../proofs/notes/native/account/index.hpp | 0 .../proofs/notes/native/asset_id.cpp | 0 .../proofs/notes/native/asset_id.hpp | 0 .../proofs/notes/native/bridge_call_data.hpp | 10 +- .../proofs/notes/native/claim/claim_note.hpp | 8 +- .../notes/native/claim/claim_note_tx_data.hpp | 8 +- .../claim/complete_partial_commitment.hpp | 8 +- .../notes/native/claim/compute_nullifier.hpp | 8 +- .../claim/create_partial_commitment.hpp | 4 +- .../proofs/notes/native/claim/index.hpp | 0 .../proofs/notes/native/index.hpp | 0 .../value/complete_partial_commitment.hpp | 4 +- .../notes/native/value/compute_nullifier.cpp | 6 +- .../notes/native/value/compute_nullifier.hpp | 4 +- .../value/create_partial_commitment.hpp | 8 +- .../proofs/notes/native/value/index.hpp | 0 .../proofs/notes/native/value/value_note.hpp | 8 +- .../join_split_example/proofs/verify.hpp | 6 +- .../numeric/CMakeLists.txt | 0 .../numeric/bitop/bitop.bench.cpp | 0 .../numeric/bitop/count_leading_zeros.hpp | 0 .../bitop/count_leading_zeros.test.cpp | 0 .../numeric/bitop/get_msb.hpp | 0 .../numeric/bitop/get_msb.test.cpp | 0 .../numeric/bitop/keep_n_lsb.hpp | 0 .../numeric/bitop/pow.hpp | 0 .../numeric/bitop/rotate.hpp | 0 .../numeric/bitop/sparse_form.hpp | 4 +- .../numeric/random/engine.cpp | 4 +- .../numeric/random/engine.hpp | 0 .../numeric/random/engine.test.cpp | 6 +- .../numeric/uint128/uint128.hpp | 4 +- .../numeric/uint128/uint128.test.cpp | 0 .../numeric/uint128/uint128_impl.hpp | 4 +- .../numeric/uint256/uint256.hpp | 4 +- .../numeric/uint256/uint256.test.cpp | 0 .../numeric/uint256/uint256_impl.hpp | 4 +- .../numeric/uintx/uintx.hpp | 6 +- .../numeric/uintx/uintx.test.cpp | 0 .../numeric/uintx/uintx_impl.hpp | 4 +- .../plonk/CMakeLists.txt | 0 .../plonk/composer/composer_base.cpp | 6 +- .../plonk/composer/composer_base.hpp | 14 +- .../plonk/composer/plookup_tables/aes128.hpp | 10 +- .../plonk/composer/plookup_tables/blake2s.hpp | 2 +- .../plookup_tables/keccak/keccak_chi.hpp | 6 +- .../plookup_tables/keccak/keccak_input.hpp | 8 +- .../plookup_tables/keccak/keccak_output.hpp | 8 +- .../plookup_tables/keccak/keccak_rho.hpp | 6 +- .../plookup_tables/keccak/keccak_theta.hpp | 6 +- .../non_native_group_generator.cpp | 0 .../non_native_group_generator.hpp | 8 +- .../composer/plookup_tables/pedersen.hpp | 10 +- .../plookup_tables/plookup_tables.cpp | 4 +- .../plookup_tables/plookup_tables.hpp | 4 +- .../plonk/composer/plookup_tables/sha256.hpp | 10 +- .../plonk/composer/plookup_tables/sparse.hpp | 10 +- .../plonk/composer/plookup_tables/types.hpp | 4 +- .../plonk/composer/plookup_tables/uint.hpp | 4 +- .../plonk/composer/standard_composer.cpp | 14 +- .../plonk/composer/standard_composer.hpp | 12 +- .../plonk/composer/standard_composer.test.cpp | 8 +- .../plonk/composer/turbo_composer.cpp | 18 +- .../plonk/composer/turbo_composer.hpp | 0 .../plonk/composer/turbo_composer.test.cpp | 4 +- .../plonk/composer/ultra_composer.cpp | 22 +- .../plonk/composer/ultra_composer.hpp | 0 .../plonk/composer/ultra_composer.test.cpp | 10 +- .../commitment_scheme/commitment_scheme.hpp | 0 .../commitment_scheme.test.cpp | 12 +- .../kate_commitment_scheme.cpp | 2 +- .../kate_commitment_scheme.hpp | 0 .../plonk/proof_system/constants.hpp | 0 .../plonk/proof_system/prover/c_bind.cpp | 2 +- .../proof_system/prover/c_bind_unrolled.cpp | 0 .../plonk/proof_system/prover/prover.cpp | 10 +- .../plonk/proof_system/prover/prover.hpp | 0 .../plonk/proof_system/prover/prover.test.cpp | 6 +- .../public_inputs/public_inputs.hpp | 4 +- .../public_inputs/public_inputs.test.cpp | 4 +- .../public_inputs/public_inputs_impl.hpp | 0 .../types/commitment_open_proof.hpp | 0 .../proof_system/types/program_settings.hpp | 0 .../plonk/proof_system/types/proof.hpp | 0 .../proof_system/types/prover_settings.hpp | 4 +- .../utils/generalized_permutation.hpp | 6 +- .../proof_system/utils/kate_verification.hpp | 0 .../plonk/proof_system/utils/permutation.hpp | 8 +- .../plonk/proof_system/verifier/verifier.cpp | 12 +- .../plonk/proof_system/verifier/verifier.hpp | 6 +- .../proof_system/verifier/verifier.test.cpp | 12 +- .../random_widgets/permutation_widget.hpp | 0 .../permutation_widget_impl.hpp | 18 +- .../widgets/random_widgets/plookup_widget.hpp | 0 .../random_widgets/plookup_widget_impl.hpp | 14 +- .../widgets/random_widgets/random_widget.hpp | 2 +- .../transition_widgets/arithmetic_widget.hpp | 0 .../transition_widgets/elliptic_widget.hpp | 0 .../transition_widgets/fixed_base_widget.hpp | 0 .../genperm_sort_widget.hpp | 0 .../plookup_arithmetic_widget.hpp | 0 .../plookup_auxiliary_widget.hpp | 0 .../transition_widgets/transition_widget.hpp | 4 +- .../turbo_arithmetic_widget.hpp | 0 .../transition_widgets/turbo_logic_widget.hpp | 0 .../transition_widgets/turbo_range_widget.hpp | 0 .../polynomials/CMakeLists.txt | 0 .../polynomials/evaluation_domain.cpp | 12 +- .../polynomials/evaluation_domain.hpp | 4 +- .../polynomials/iterate_over_domain.hpp | 0 .../polynomials/polynomial.cpp | 8 +- .../polynomials/polynomial.hpp | 6 +- .../polynomials/polynomial_arithmetic.cpp | 8 +- .../polynomials/polynomial_arithmetic.hpp | 0 .../polynomial_arithmetic.test.cpp | 8 +- .../polynomials/polynomials.bench.cpp | 22 +- .../polynomials/serialize.hpp | 0 .../proof_system/CMakeLists.txt | 0 .../proof_system/composer/composer_base.hpp | 6 +- .../proof_system/flavor/flavor.hpp | 26 +-- .../proof_system/flavor/flavor.test.cpp | 0 .../polynomial_cache/polynomial_cache.cpp | 6 +- .../polynomial_cache/polynomial_cache.hpp | 0 .../polynomial_cache.test.cpp | 6 +- .../polynomial_cache/polynomial_store.hpp | 0 .../polynomial_store.test.cpp | 6 +- .../polynomial_cache/polynomial_store_mem.cpp | 4 +- .../polynomial_store_wasm.cpp | 4 +- .../proof_system/proving_key/proving_key.cpp | 8 +- .../proof_system/proving_key/proving_key.hpp | 12 +- .../proving_key/proving_key.test.cpp | 10 +- .../proof_system/proving_key/serialize.hpp | 6 +- .../types/polynomial_manifest.hpp | 4 +- .../proof_system/verification_key/sol_gen.hpp | 0 .../verification_key/verification_key.cpp | 4 +- .../verification_key/verification_key.hpp | 8 +- .../verification_key.test.cpp | 6 +- .../proof_system/work_queue/work_queue.cpp | 6 +- .../proof_system/work_queue/work_queue.hpp | 0 .../srs/CMakeLists.txt | 0 cpp/src/{aztec => barretenberg}/srs/io.cpp | 8 +- cpp/src/{aztec => barretenberg}/srs/io.hpp | 0 .../{aztec => barretenberg}/srs/io.test.cpp | 8 +- .../lagrange_base.hpp | 11 + .../file_reference_string.cpp | 2 +- .../file_reference_string.hpp | 6 +- .../reference_string/mem_reference_string.cpp | 6 +- .../reference_string/mem_reference_string.hpp | 2 +- .../mem_reference_string.test.cpp | 4 +- .../pippenger_reference_string.hpp | 0 .../srs/reference_string/reference_string.hpp | 6 +- .../stdlib/CMakeLists.txt | 0 .../stdlib/encryption/CMakeLists.txt | 0 .../stdlib/encryption/aes128/CMakeLists.txt | 0 .../stdlib/encryption/aes128/aes128.cpp | 10 +- .../stdlib/encryption/aes128/aes128.hpp | 0 .../stdlib/encryption/aes128/aes128.test.cpp | 6 +- .../stdlib/encryption/ecdsa/CMakeLists.txt | 0 .../stdlib/encryption/ecdsa/ecdsa.hpp | 0 .../stdlib/encryption/ecdsa/ecdsa.test.cpp | 6 +- .../stdlib/encryption/ecdsa/ecdsa_impl.hpp | 0 .../stdlib/encryption/schnorr/CMakeLists.txt | 0 .../stdlib/encryption/schnorr/schnorr.cpp | 6 +- .../stdlib/encryption/schnorr/schnorr.hpp | 2 +- .../encryption/schnorr/schnorr.test.cpp | 8 +- .../stdlib/hash/CMakeLists.txt | 0 .../stdlib/hash/blake2s/CMakeLists.txt | 0 .../stdlib/hash/blake2s/blake2s.cpp | 8 +- .../stdlib/hash/blake2s/blake2s.hpp | 2 +- .../stdlib/hash/blake2s/blake2s.test.cpp | 4 +- .../stdlib/hash/blake2s/blake2s_plookup.cpp | 14 +- .../stdlib/hash/blake2s/blake2s_plookup.hpp | 6 +- .../stdlib/hash/blake2s/blake_util.hpp | 12 +- .../stdlib/hash/blake3s/CMakeLists.txt | 0 .../stdlib/hash/blake3s/blake3s.cpp | 6 +- .../stdlib/hash/blake3s/blake3s.hpp | 2 +- .../stdlib/hash/blake3s/blake3s.test.cpp | 6 +- .../stdlib/hash/blake3s/blake3s_plookup.cpp | 12 +- .../stdlib/hash/blake3s/blake3s_plookup.hpp | 6 +- .../stdlib/hash/keccak/CMakeLists.txt | 0 .../stdlib/hash/keccak/keccak.cpp | 10 +- .../stdlib/hash/keccak/keccak.hpp | 6 +- .../stdlib/hash/keccak/keccak.test.cpp | 6 +- .../stdlib/hash/pedersen/CMakeLists.txt | 0 .../stdlib/hash/pedersen/pedersen.bench.cpp | 12 +- .../stdlib/hash/pedersen/pedersen.cpp | 6 +- .../stdlib/hash/pedersen/pedersen.hpp | 4 +- .../stdlib/hash/pedersen/pedersen.test.cpp | 12 +- .../stdlib/hash/pedersen/pedersen_plookup.cpp | 8 +- .../stdlib/hash/pedersen/pedersen_plookup.hpp | 0 .../stdlib/hash/sha256/CMakeLists.txt | 0 .../stdlib/hash/sha256/sha256.bench.cpp | 8 +- .../stdlib/hash/sha256/sha256.cpp | 8 +- .../stdlib/hash/sha256/sha256.hpp | 6 +- .../stdlib/hash/sha256/sha256.test.cpp | 18 +- .../stdlib/hash/sha256/sha256_plookup.cpp | 14 +- .../stdlib/hash/sha256/sha256_plookup.hpp | 8 +- .../stdlib/merkle_tree/CMakeLists.txt | 0 .../stdlib/merkle_tree/hash.hpp | 14 +- .../stdlib/merkle_tree/hash.test.cpp | 6 +- .../stdlib/merkle_tree/hash_path.hpp | 2 +- .../stdlib/merkle_tree/index.hpp | 0 .../stdlib/merkle_tree/membership.hpp | 6 +- .../stdlib/merkle_tree/membership.test.cpp | 4 +- .../stdlib/merkle_tree/memory_store.hpp | 2 +- .../stdlib/merkle_tree/memory_tree.cpp | 0 .../stdlib/merkle_tree/memory_tree.hpp | 0 .../stdlib/merkle_tree/memory_tree.test.cpp | 4 +- .../stdlib/merkle_tree/merkle_tree.bench.cpp | 2 +- .../stdlib/merkle_tree/merkle_tree.cpp | 10 +- .../stdlib/merkle_tree/merkle_tree.hpp | 4 +- .../stdlib/merkle_tree/merkle_tree.test.cpp | 10 +- .../stdlib/primitives/CMakeLists.txt | 0 .../primitives/bigfield/bigfield.fuzzer.hpp | 30 +-- .../stdlib/primitives/bigfield/bigfield.hpp | 12 +- .../primitives/bigfield/bigfield.test.cpp | 20 +- .../bigfield/bigfield_all.fuzzer.cpp | 2 +- .../primitives/bigfield/bigfield_impl.hpp | 6 +- .../bigfield/bigfield_standard.fuzzer.cpp | 2 +- .../bigfield/bigfield_turbo.fuzzer.cpp | 2 +- .../stdlib/primitives/biggroup/biggroup.hpp | 8 +- .../primitives/biggroup/biggroup.test.cpp | 14 +- .../biggroup/biggroup_batch_mul.hpp | 0 .../primitives/biggroup/biggroup_bn254.hpp | 0 .../primitives/biggroup/biggroup_impl.hpp | 6 +- .../primitives/biggroup/biggroup_nafs.hpp | 4 +- .../biggroup/biggroup_secp256k1.hpp | 0 .../primitives/biggroup/biggroup_tables.hpp | 0 .../stdlib/primitives/bit_array/bit_array.cpp | 0 .../primitives/bit_array/bit_array.fuzzer.hpp | 17 +- .../stdlib/primitives/bit_array/bit_array.hpp | 2 +- .../primitives/bit_array/bit_array.test.cpp | 4 +- .../bit_array/bit_array_all.fuzzer.cpp | 2 +- .../bit_array/bit_array_standard.fuzzer.cpp | 2 +- .../bit_array/bit_array_turbo.fuzzer.cpp | 2 +- .../stdlib/primitives/bool/bool.cpp | 2 +- .../stdlib/primitives/bool/bool.fuzzer.hpp | 17 +- .../stdlib/primitives/bool/bool.hpp | 2 +- .../stdlib/primitives/bool/bool.test.cpp | 6 +- .../primitives/bool/bool_all.fuzzer.cpp | 2 +- .../primitives/bool/bool_standard.fuzzer.cpp | 2 +- .../primitives/bool/bool_turbo.fuzzer.cpp | 2 +- .../primitives/byte_array/byte_array.cpp | 0 .../byte_array/byte_array.fuzzer.hpp | 19 +- .../primitives/byte_array/byte_array.hpp | 2 +- .../primitives/byte_array/byte_array.test.cpp | 8 +- .../byte_array/byte_array_all.fuzzer.cpp | 2 +- .../byte_array/byte_array_standard.fuzzer.cpp | 2 +- .../byte_array/byte_array_turbo.fuzzer.cpp | 2 +- .../stdlib/primitives/composers/composers.hpp | 10 +- .../primitives/composers/composers_fwd.hpp | 0 .../stdlib/primitives/curves/bn254.hpp | 4 +- .../stdlib/primitives/curves/secp256k1.hpp | 4 +- .../stdlib/primitives/curves/secp256r1.hpp | 4 +- .../stdlib/primitives/field/field.cpp | 2 +- .../stdlib/primitives/field/field.fuzzer.hpp | 34 ++-- .../stdlib/primitives/field/field.hpp | 6 +- .../stdlib/primitives/field/field.test.cpp | 14 +- .../primitives/field/field_all.fuzzer.cpp | 2 +- .../field/field_standard.fuzzer.cpp | 2 +- .../primitives/field/field_turbo.fuzzer.cpp | 2 +- .../stdlib/primitives/group/group.hpp | 6 +- .../stdlib/primitives/group/group.test.cpp | 10 +- .../stdlib/primitives/memory/rom_table.cpp | 0 .../stdlib/primitives/memory/rom_table.hpp | 0 .../primitives/memory/rom_table.test.cpp | 6 +- .../primitives/memory/twin_rom_table.cpp | 0 .../primitives/memory/twin_rom_table.hpp | 0 .../packed_byte_array/packed_byte_array.cpp | 0 .../packed_byte_array/packed_byte_array.hpp | 4 +- .../packed_byte_array.test.cpp | 6 +- .../stdlib/primitives/plookup/plookup.cpp | 6 +- .../stdlib/primitives/plookup/plookup.hpp | 8 +- .../primitives/plookup/plookup.test.cpp | 16 +- .../stdlib/primitives/point/point.hpp | 4 +- .../stdlib/primitives/safe_uint/safe_uint.cpp | 2 +- .../primitives/safe_uint/safe_uint.fuzzer.hpp | 24 ++- .../stdlib/primitives/safe_uint/safe_uint.hpp | 4 +- .../primitives/safe_uint/safe_uint.test.cpp | 8 +- .../safe_uint/safe_uint_all.fuzzer.cpp | 2 +- .../safe_uint/safe_uint_standard.fuzzer.cpp | 2 +- .../safe_uint/safe_uint_turbo.fuzzer.cpp | 2 +- .../stdlib/primitives/uint/arithmetic.cpp | 0 .../stdlib/primitives/uint/comparison.cpp | 0 .../stdlib/primitives/uint/logic.cpp | 4 +- .../primitives/uint/plookup/arithmetic.cpp | 0 .../primitives/uint/plookup/comparison.cpp | 0 .../stdlib/primitives/uint/plookup/logic.cpp | 0 .../stdlib/primitives/uint/plookup/uint.cpp | 0 .../stdlib/primitives/uint/plookup/uint.hpp | 0 .../stdlib/primitives/uint/uint.cpp | 0 .../stdlib/primitives/uint/uint.fuzzer.hpp | 23 ++- .../stdlib/primitives/uint/uint.hpp | 10 +- .../stdlib/primitives/uint/uint.test.cpp | 4 +- .../primitives/uint/uint_all.fuzzer.cpp | 2 +- .../primitives/uint/uint_standard.fuzzer.cpp | 2 +- .../primitives/uint/uint_turbo.fuzzer.cpp | 2 +- .../stdlib/primitives/witness/witness.hpp | 6 +- .../stdlib/recursion/CMakeLists.txt | 0 .../recursion/transcript/transcript.hpp | 10 +- .../recursion/transcript/transcript.test.cpp | 8 +- .../verification_key/verification_key.hpp | 22 +- .../recursion/verifier/program_settings.hpp | 2 +- .../stdlib/recursion/verifier/verifier.hpp | 16 +- .../recursion/verifier/verifier.test.cpp | 17 +- .../verifier/verifier_turbo.test.cpp | 15 +- .../stdlib/types/types.hpp | 51 +++-- .../transcript/CMakeLists.txt | 0 .../transcript/manifest.hpp | 0 .../transcript/transcript.cpp | 18 +- .../transcript/transcript.hpp | 0 .../transcript/transcript.test.cpp | 0 .../transcript/transcript_wrappers.cpp | 3 +- .../transcript/transcript_wrappers.hpp | 4 +- 634 files changed, 1817 insertions(+), 1549 deletions(-) rename cpp/src/{aztec => }/CMakeLists.txt (93%) delete mode 100644 cpp/src/aztec/common/max_threads.hpp rename cpp/src/{aztec => barretenberg}/benchmark/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/benchmark/decrypt_bench/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/benchmark/decrypt_bench/main.cpp (96%) rename cpp/src/{aztec => barretenberg}/benchmark/honk_bench/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/benchmark/honk_bench/compare_honk_bench.sh (100%) rename cpp/src/{aztec => barretenberg}/benchmark/honk_bench/honk.bench.cpp (91%) rename cpp/src/{aztec => barretenberg}/benchmark/pippenger_bench/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/benchmark/pippenger_bench/main.cpp (89%) rename cpp/src/{aztec => barretenberg}/benchmark/plonk_bench/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/benchmark/plonk_bench/plonk.bench.cpp (91%) rename cpp/src/{aztec => barretenberg}/common/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/common/assert.hpp (100%) rename cpp/src/{aztec => barretenberg}/common/constexpr_utils.hpp (100%) rename cpp/src/{aztec => barretenberg}/common/container.hpp (100%) rename cpp/src/{aztec => barretenberg}/common/fuzzer.hpp (87%) rename cpp/src/{aztec => barretenberg}/common/fuzzer_constants.hpp (100%) rename cpp/src/{aztec => barretenberg}/common/inline.hpp (100%) rename cpp/src/{aztec => barretenberg}/common/log.hpp (82%) rename cpp/src/{aztec => barretenberg}/common/map.hpp (100%) create mode 100644 cpp/src/barretenberg/common/max_threads.hpp rename cpp/src/{aztec => barretenberg}/common/mem.hpp (100%) rename cpp/src/{aztec => barretenberg}/common/net.hpp (100%) rename cpp/src/{aztec => barretenberg}/common/printf.hpp (100%) rename cpp/src/{aztec => barretenberg}/common/serialize.hpp (99%) rename cpp/src/{aztec => barretenberg}/common/streams.hpp (100%) rename cpp/src/{aztec => barretenberg}/common/test.hpp (100%) rename cpp/src/{aztec => barretenberg}/common/throw_or_abort.hpp (100%) rename cpp/src/{aztec => barretenberg}/common/timer.hpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/crypto/aes128/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/crypto/aes128/aes128.cpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/aes128/aes128.hpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/aes128/aes128.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/aes128/c_bind.cpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake2s/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake2s/blake2-impl.hpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake2s/blake2s.cpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake2s/blake2s.hpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake2s/blake2s.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake2s/c_bind.cpp (89%) rename cpp/src/{aztec => barretenberg}/crypto/blake2s/c_bind.hpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake3s/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake3s/blake3-impl.hpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake3s/blake3s.cpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake3s/blake3s.hpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake3s/blake3s.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake3s/c_bind.cpp (89%) rename cpp/src/{aztec => barretenberg}/crypto/blake3s_full/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake3s_full/blake3-impl.hpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake3s_full/blake3s.cpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake3s_full/blake3s.hpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/blake3s_full/blake3s.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/ecdsa/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/crypto/ecdsa/ecdsa.hpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/ecdsa/ecdsa.test.cpp (97%) rename cpp/src/{aztec => barretenberg}/crypto/ecdsa/ecdsa_impl.hpp (94%) rename cpp/src/{aztec => barretenberg}/crypto/hashers/hashers.hpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/hmac/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/crypto/hmac/hmac.hpp (96%) rename cpp/src/{aztec => barretenberg}/crypto/hmac/hmac.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/keccak/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/crypto/keccak/hash_types.hpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/keccak/keccak.cpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/keccak/keccak.hpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/keccak/keccakf1600.cpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/c_bind.cpp (93%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/c_bind.hpp (84%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/convert_buffer_to_field.hpp (93%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/fixed_base_scalar_mul.hpp (96%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/generator_data.cpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/generator_data.hpp (97%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/pedersen.cpp (97%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/pedersen.hpp (93%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/pedersen.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/pedersen_lookup.cpp (98%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/pedersen_lookup.hpp (96%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/pedersen_lookup.test.cpp (97%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/sidon_set/sidon_set.hpp (97%) rename cpp/src/{aztec => barretenberg}/crypto/pedersen/sidon_set/sidon_set.test.cpp (95%) rename cpp/src/{aztec => barretenberg}/crypto/schnorr/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/crypto/schnorr/c_bind.cpp (99%) rename cpp/src/{aztec => barretenberg}/crypto/schnorr/c_bind.hpp (97%) rename cpp/src/{aztec => barretenberg}/crypto/schnorr/multisig.hpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/schnorr/multisig.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/crypto/schnorr/proof_of_possession.hpp (98%) rename cpp/src/{aztec => barretenberg}/crypto/schnorr/proof_of_possession.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/crypto/schnorr/schnorr.hpp (91%) rename cpp/src/{aztec => barretenberg}/crypto/schnorr/schnorr.tcc (98%) rename cpp/src/{aztec => barretenberg}/crypto/schnorr/schnorr.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/crypto/sha256/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/crypto/sha256/c_bind.cpp (100%) rename cpp/src/{aztec => barretenberg}/crypto/sha256/sha256.cpp (98%) rename cpp/src/{aztec => barretenberg}/crypto/sha256/sha256.hpp (95%) rename cpp/src/{aztec => barretenberg}/crypto/sha256/sha256.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/dsl/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/acir_format.cpp (100%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/acir_format.hpp (100%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/blake2s_constraint.cpp (96%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/blake2s_constraint.hpp (95%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/ecdsa_secp256k1.cpp (96%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/ecdsa_secp256k1.hpp (96%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/fixed_base_scalar_mul.cpp (92%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/fixed_base_scalar_mul.hpp (93%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/hash_to_field.cpp (96%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/hash_to_field.hpp (95%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/logic_constraint.cpp (100%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/logic_constraint.hpp (95%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/merkle_membership_constraint.cpp (94%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/merkle_membership_constraint.hpp (95%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/pedersen.cpp (93%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/pedersen.hpp (93%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/range_constraint.hpp (93%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/round.cpp (100%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/round.hpp (100%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/schnorr_verify.cpp (96%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/schnorr_verify.hpp (96%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/sha256_constraint.cpp (93%) rename cpp/src/{aztec => barretenberg}/dsl/acir_format/sha256_constraint.hpp (96%) rename cpp/src/{aztec => barretenberg}/dsl/turbo_proofs/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/dsl/turbo_proofs/c_bind.cpp (100%) rename cpp/src/{aztec => barretenberg}/dsl/turbo_proofs/c_bind.hpp (100%) rename cpp/src/{aztec => barretenberg}/dsl/turbo_proofs/turbo_proofs.cpp (95%) rename cpp/src/{aztec => barretenberg}/dsl/turbo_proofs/turbo_proofs.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/CMakeLists.txt (80%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/fq.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/fq.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/fq12.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/fq12.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/fq2.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/fq2.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/fq6.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/fq6.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/fr.bench.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/fr.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/fr.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/g1.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/g1.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/g2.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/g2.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/pairing.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/pairing.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/pairing_impl.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/pseudorandom.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/scalar_multiplication/c_bind.cpp (97%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/scalar_multiplication/c_bind.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/scalar_multiplication/pippenger.cpp (95%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/scalar_multiplication/pippenger.hpp (93%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/scalar_multiplication/process_buckets.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/scalar_multiplication/process_buckets.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/scalar_multiplication/runtime_states.cpp (97%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/scalar_multiplication/runtime_states.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.cpp (99%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/ecc/curves/grumpkin/c_bind.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/grumpkin/grumpkin.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/grumpkin/grumpkin.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/grumpkin/grumpkin.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/secp256k1/secp256k1.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/secp256k1/secp256k1.hpp (97%) rename cpp/src/{aztec => barretenberg}/ecc/curves/secp256k1/secp256k1.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/ecc/curves/secp256k1/secp256k1_endo_notes.hpp (98%) rename cpp/src/{aztec => barretenberg}/ecc/curves/secp256r1/secp256r1.cpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/curves/secp256r1/secp256r1.hpp (97%) rename cpp/src/{aztec => barretenberg}/ecc/curves/secp256r1/secp256r1.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/ecc/curves/types.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/fields/asm_macros.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/fields/extra_flag_solver.py (100%) rename cpp/src/{aztec => barretenberg}/ecc/fields/field.hpp (98%) rename cpp/src/{aztec => barretenberg}/ecc/fields/field12.hpp (99%) rename cpp/src/{aztec => barretenberg}/ecc/fields/field2.hpp (98%) rename cpp/src/{aztec => barretenberg}/ecc/fields/field2_impl.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/fields/field6.hpp (99%) rename cpp/src/{aztec => barretenberg}/ecc/fields/field_impl.hpp (99%) rename cpp/src/{aztec => barretenberg}/ecc/fields/field_impl_generic.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/fields/field_impl_x64.hpp (83%) rename cpp/src/{aztec => barretenberg}/ecc/fields/macro_scrapbook.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/groups/affine_element.hpp (97%) rename cpp/src/{aztec => barretenberg}/ecc/groups/affine_element.test.cpp (89%) rename cpp/src/{aztec => barretenberg}/ecc/groups/affine_element_impl.hpp (99%) rename cpp/src/{aztec => barretenberg}/ecc/groups/element.hpp (97%) rename cpp/src/{aztec => barretenberg}/ecc/groups/element_impl.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/groups/group.hpp (100%) rename cpp/src/{aztec => barretenberg}/ecc/groups/group_impl_asm.tcc (94%) rename cpp/src/{aztec => barretenberg}/ecc/groups/group_impl_int128.tcc (100%) rename cpp/src/{aztec => barretenberg}/ecc/groups/wnaf.hpp (99%) rename cpp/src/{aztec => barretenberg}/ecc/groups/wnaf.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/ecc/pippenger.md (100%) rename cpp/src/{aztec => barretenberg}/env/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/env/data_store.hpp (100%) rename cpp/src/{aztec => barretenberg}/env/logstr.cpp (100%) rename cpp/src/{aztec => barretenberg}/env/logstr.hpp (100%) rename cpp/src/{aztec => barretenberg}/honk/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/honk/circuit_constructors/circuit_constructor_base.cpp (100%) rename cpp/src/{aztec => barretenberg}/honk/circuit_constructors/circuit_constructor_base.hpp (99%) rename cpp/src/{aztec => barretenberg}/honk/circuit_constructors/standard_circuit_constructor.cpp (100%) rename cpp/src/{aztec => barretenberg}/honk/circuit_constructors/standard_circuit_constructor.hpp (97%) rename cpp/src/{aztec => barretenberg}/honk/circuit_constructors/standard_circuit_constructor.test.cpp (99%) create mode 100644 cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.cpp create mode 100644 cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.hpp rename cpp/src/{aztec => barretenberg}/honk/composer/composer_helper/composer_helper_lib.cpp (98%) rename cpp/src/{aztec => barretenberg}/honk/composer/composer_helper/composer_helper_lib.hpp (92%) rename cpp/src/{aztec => barretenberg}/honk/composer/composer_helper/permutation_helper.hpp (99%) rename cpp/src/{aztec => barretenberg}/honk/composer/composer_helper/standard_honk_composer_helper.cpp (97%) rename cpp/src/{aztec => barretenberg}/honk/composer/composer_helper/standard_honk_composer_helper.hpp (83%) rename cpp/src/{aztec => barretenberg}/honk/composer/composer_helper/standard_plonk_composer_helper.cpp (94%) rename cpp/src/{aztec => barretenberg}/honk/composer/composer_helper/standard_plonk_composer_helper.hpp (92%) rename cpp/src/{aztec => barretenberg}/honk/composer/standard_honk_composer.hpp (96%) rename cpp/src/{aztec => barretenberg}/honk/composer/standard_honk_composer.test.cpp (97%) rename cpp/src/{aztec => barretenberg}/honk/composer/standard_plonk_composer.hpp (97%) rename cpp/src/{aztec => barretenberg}/honk/composer/standard_plonk_composer.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/honk/oracle/oracle.hpp (100%) rename cpp/src/{aztec => barretenberg}/honk/pcs/claim.hpp (97%) rename cpp/src/{aztec => barretenberg}/honk/pcs/commitment_key.hpp (93%) rename cpp/src/{aztec => barretenberg}/honk/pcs/commitment_key.test.hpp (97%) rename cpp/src/{aztec => barretenberg}/honk/pcs/gemini/gemini.hpp (98%) rename cpp/src/{aztec => barretenberg}/honk/pcs/gemini/gemini.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/honk/pcs/ipa/ipa.hpp (98%) rename cpp/src/{aztec => barretenberg}/honk/pcs/ipa/ipa.test.cpp (92%) rename cpp/src/{aztec => barretenberg}/honk/pcs/kzg/kzg.hpp (97%) rename cpp/src/{aztec => barretenberg}/honk/pcs/kzg/kzg.test.cpp (96%) rename cpp/src/{aztec => barretenberg}/honk/pcs/shplonk/shplonk.hpp (94%) rename cpp/src/{aztec => barretenberg}/honk/pcs/shplonk/shplonk.test.cpp (96%) rename cpp/src/{aztec => barretenberg}/honk/pcs/shplonk/shplonk_single.hpp (98%) rename cpp/src/{aztec => barretenberg}/honk/pcs/wrapper.hpp (79%) rename cpp/src/{aztec => barretenberg}/honk/proof_system/program_settings.hpp (90%) rename cpp/src/{aztec => barretenberg}/honk/proof_system/prover.cpp (95%) rename cpp/src/{aztec => barretenberg}/honk/proof_system/prover.hpp (82%) rename cpp/src/{aztec => barretenberg}/honk/proof_system/prover.test.cpp (97%) rename cpp/src/{aztec => barretenberg}/honk/proof_system/verifier.cpp (87%) rename cpp/src/{aztec => barretenberg}/honk/proof_system/verifier.hpp (72%) rename cpp/src/{aztec => barretenberg}/honk/proof_system/verifier.test.cpp (93%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/polynomials/barycentric_data.hpp (100%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/polynomials/barycentric_data.test.cpp (95%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/polynomials/multivariates.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/polynomials/pow.hpp (100%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/polynomials/pow.test.cpp (80%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/polynomials/univariate.hpp (99%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/polynomials/univariate.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/relations/arithmetic_relation.hpp (98%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/relations/grand_product_computation_relation.hpp (94%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/relations/grand_product_initialization_relation.hpp (97%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/relations/relation.hpp (100%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/relations/relation.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/sumcheck.hpp (97%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/sumcheck.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/sumcheck_round.hpp (99%) rename cpp/src/{aztec => barretenberg}/honk/sumcheck/sumcheck_round.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/honk/utils/power_polynomial.hpp (96%) rename cpp/src/{aztec => barretenberg}/honk/utils/power_polynomial.test.cpp (96%) rename cpp/src/{aztec => barretenberg}/honk/utils/public_inputs.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/constants.hpp (84%) rename cpp/src/{aztec => barretenberg}/join_split_example/fixtures/user_context.hpp (88%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/compute_circuit_data.hpp (99%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/inner_proof_data/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp (93%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/c_bind.cpp (91%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/c_bind.h (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/compute_circuit_data.cpp (96%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/compute_circuit_data.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/compute_signing_data.cpp (95%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/compute_signing_data.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/create_proof.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/index.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/join_split.cpp (97%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/join_split.hpp (89%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/join_split.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/join_split_circuit.cpp (99%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/join_split_circuit.hpp (94%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/join_split_js_parity.test.cpp (95%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/join_split_tx.cpp (98%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/join_split_tx.hpp (90%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/join_split_tx.test.cpp (90%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/sign_join_split_tx.cpp (88%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/sign_join_split_tx.hpp (82%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/join_split/verify_signature.hpp (88%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/mock/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/mock/mock_circuit.hpp (74%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/mock/mock_circuit.test.cpp (89%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/account/account_note.hpp (91%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/account/commit.hpp (88%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/account/index.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/asset_id.cpp (90%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/asset_id.hpp (69%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/bridge_call_data.hpp (99%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/claim/claim_note.hpp (96%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp (88%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp (88%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp (84%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/claim/index.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/claim/witness_data.hpp (97%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/index.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/value/commit.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp (84%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp (96%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp (83%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp (96%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp (83%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/value/index.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/value/value_note.hpp (92%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/value/value_note.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/circuit/value/witness_data.hpp (93%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/constants.hpp (94%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/account/account_note.cpp (90%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/account/account_note.hpp (81%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp (86%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp (92%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/account/index.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/asset_id.cpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/asset_id.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/bridge_call_data.hpp (97%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/claim/claim_note.hpp (92%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp (87%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp (77%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp (70%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp (89%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/claim/index.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/index.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp (89%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/value/compute_nullifier.cpp (87%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/value/compute_nullifier.hpp (80%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp (79%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/value/index.hpp (100%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/notes/native/value/value_note.hpp (90%) rename cpp/src/{aztec => barretenberg}/join_split_example/proofs/verify.hpp (97%) rename cpp/src/{aztec => barretenberg}/numeric/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/numeric/bitop/bitop.bench.cpp (100%) rename cpp/src/{aztec => barretenberg}/numeric/bitop/count_leading_zeros.hpp (100%) rename cpp/src/{aztec => barretenberg}/numeric/bitop/count_leading_zeros.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/numeric/bitop/get_msb.hpp (100%) rename cpp/src/{aztec => barretenberg}/numeric/bitop/get_msb.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/numeric/bitop/keep_n_lsb.hpp (100%) rename cpp/src/{aztec => barretenberg}/numeric/bitop/pow.hpp (100%) rename cpp/src/{aztec => barretenberg}/numeric/bitop/rotate.hpp (100%) rename cpp/src/{aztec => barretenberg}/numeric/bitop/sparse_form.hpp (98%) rename cpp/src/{aztec => barretenberg}/numeric/random/engine.cpp (98%) rename cpp/src/{aztec => barretenberg}/numeric/random/engine.hpp (100%) rename cpp/src/{aztec => barretenberg}/numeric/random/engine.test.cpp (95%) rename cpp/src/{aztec => barretenberg}/numeric/uint128/uint128.hpp (99%) rename cpp/src/{aztec => barretenberg}/numeric/uint128/uint128.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/numeric/uint128/uint128_impl.hpp (99%) rename cpp/src/{aztec => barretenberg}/numeric/uint256/uint256.hpp (98%) rename cpp/src/{aztec => barretenberg}/numeric/uint256/uint256.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/numeric/uint256/uint256_impl.hpp (99%) rename cpp/src/{aztec => barretenberg}/numeric/uintx/uintx.hpp (97%) rename cpp/src/{aztec => barretenberg}/numeric/uintx/uintx.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/numeric/uintx/uintx_impl.hpp (99%) rename cpp/src/{aztec => barretenberg}/plonk/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/plonk/composer/composer_base.cpp (98%) rename cpp/src/{aztec => barretenberg}/plonk/composer/composer_base.hpp (98%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/aes128.hpp (96%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/blake2s.hpp (99%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/keccak/keccak_chi.hpp (98%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/keccak/keccak_input.hpp (96%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/keccak/keccak_output.hpp (97%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/keccak/keccak_rho.hpp (99%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/keccak/keccak_theta.hpp (98%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/non_native_group_generator.cpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/non_native_group_generator.hpp (95%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/pedersen.hpp (97%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/plookup_tables.cpp (99%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/plookup_tables.hpp (99%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/sha256.hpp (98%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/sparse.hpp (94%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/types.hpp (99%) rename cpp/src/{aztec => barretenberg}/plonk/composer/plookup_tables/uint.hpp (97%) rename cpp/src/{aztec => barretenberg}/plonk/composer/standard_composer.cpp (98%) rename cpp/src/{aztec => barretenberg}/plonk/composer/standard_composer.hpp (97%) rename cpp/src/{aztec => barretenberg}/plonk/composer/standard_composer.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/plonk/composer/turbo_composer.cpp (98%) rename cpp/src/{aztec => barretenberg}/plonk/composer/turbo_composer.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/composer/turbo_composer.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/plonk/composer/ultra_composer.cpp (99%) rename cpp/src/{aztec => barretenberg}/plonk/composer/ultra_composer.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/composer/ultra_composer.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/commitment_scheme/commitment_scheme.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp (94%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp (99%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/constants.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/prover/c_bind.cpp (98%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/prover/c_bind_unrolled.cpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/prover/prover.cpp (98%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/prover/prover.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/prover/prover.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/public_inputs/public_inputs.hpp (79%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/public_inputs/public_inputs.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/public_inputs/public_inputs_impl.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/types/commitment_open_proof.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/types/program_settings.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/types/proof.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/types/prover_settings.hpp (97%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/utils/generalized_permutation.hpp (95%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/utils/kate_verification.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/utils/permutation.hpp (96%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/verifier/verifier.cpp (97%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/verifier/verifier.hpp (90%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/verifier/verifier.test.cpp (97%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp (98%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp (98%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/random_widgets/random_widget.hpp (96%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp (99%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp (100%) rename cpp/src/{aztec => barretenberg}/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp (100%) rename cpp/src/{aztec => barretenberg}/polynomials/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/polynomials/evaluation_domain.cpp (96%) rename cpp/src/{aztec => barretenberg}/polynomials/evaluation_domain.hpp (95%) rename cpp/src/{aztec => barretenberg}/polynomials/iterate_over_domain.hpp (100%) rename cpp/src/{aztec => barretenberg}/polynomials/polynomial.cpp (98%) rename cpp/src/{aztec => barretenberg}/polynomials/polynomial.hpp (98%) rename cpp/src/{aztec => barretenberg}/polynomials/polynomial_arithmetic.cpp (99%) rename cpp/src/{aztec => barretenberg}/polynomials/polynomial_arithmetic.hpp (100%) rename cpp/src/{aztec => barretenberg}/polynomials/polynomial_arithmetic.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/polynomials/polynomials.bench.cpp (95%) rename cpp/src/{aztec => barretenberg}/polynomials/serialize.hpp (100%) rename cpp/src/{aztec => barretenberg}/proof_system/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/proof_system/composer/composer_base.hpp (95%) rename cpp/src/{aztec => barretenberg}/proof_system/flavor/flavor.hpp (97%) rename cpp/src/{aztec => barretenberg}/proof_system/flavor/flavor.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/proof_system/polynomial_cache/polynomial_cache.cpp (97%) rename cpp/src/{aztec => barretenberg}/proof_system/polynomial_cache/polynomial_cache.hpp (100%) rename cpp/src/{aztec => barretenberg}/proof_system/polynomial_cache/polynomial_cache.test.cpp (97%) rename cpp/src/{aztec => barretenberg}/proof_system/polynomial_cache/polynomial_store.hpp (100%) rename cpp/src/{aztec => barretenberg}/proof_system/polynomial_cache/polynomial_store.test.cpp (90%) rename cpp/src/{aztec => barretenberg}/proof_system/polynomial_cache/polynomial_store_mem.cpp (91%) rename cpp/src/{aztec => barretenberg}/proof_system/polynomial_cache/polynomial_store_wasm.cpp (91%) rename cpp/src/{aztec => barretenberg}/proof_system/proving_key/proving_key.cpp (93%) rename cpp/src/{aztec => barretenberg}/proof_system/proving_key/proving_key.hpp (86%) rename cpp/src/{aztec => barretenberg}/proof_system/proving_key/proving_key.test.cpp (95%) rename cpp/src/{aztec => barretenberg}/proof_system/proving_key/serialize.hpp (96%) rename cpp/src/{aztec => barretenberg}/proof_system/types/polynomial_manifest.hpp (99%) rename cpp/src/{aztec => barretenberg}/proof_system/verification_key/sol_gen.hpp (100%) rename cpp/src/{aztec => barretenberg}/proof_system/verification_key/verification_key.cpp (98%) rename cpp/src/{aztec => barretenberg}/proof_system/verification_key/verification_key.hpp (94%) rename cpp/src/{aztec => barretenberg}/proof_system/verification_key/verification_key.test.cpp (93%) rename cpp/src/{aztec => barretenberg}/proof_system/work_queue/work_queue.cpp (98%) rename cpp/src/{aztec => barretenberg}/proof_system/work_queue/work_queue.hpp (100%) rename cpp/src/{aztec => barretenberg}/srs/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/srs/io.cpp (98%) rename cpp/src/{aztec => barretenberg}/srs/io.hpp (100%) rename cpp/src/{aztec => barretenberg}/srs/io.test.cpp (85%) create mode 100644 cpp/src/barretenberg/srs/lagrange_base_transformation/lagrange_base.hpp rename cpp/src/{aztec => barretenberg}/srs/reference_string/file_reference_string.cpp (92%) rename cpp/src/{aztec => barretenberg}/srs/reference_string/file_reference_string.hpp (94%) rename cpp/src/{aztec => barretenberg}/srs/reference_string/mem_reference_string.cpp (85%) rename cpp/src/{aztec => barretenberg}/srs/reference_string/mem_reference_string.hpp (90%) rename cpp/src/{aztec => barretenberg}/srs/reference_string/mem_reference_string.test.cpp (95%) rename cpp/src/{aztec => barretenberg}/srs/reference_string/pippenger_reference_string.hpp (100%) rename cpp/src/{aztec => barretenberg}/srs/reference_string/reference_string.hpp (88%) rename cpp/src/{aztec => barretenberg}/stdlib/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/stdlib/encryption/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/stdlib/encryption/aes128/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/stdlib/encryption/aes128/aes128.cpp (97%) rename cpp/src/{aztec => barretenberg}/stdlib/encryption/aes128/aes128.hpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/encryption/aes128/aes128.test.cpp (96%) rename cpp/src/{aztec => barretenberg}/stdlib/encryption/ecdsa/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/stdlib/encryption/ecdsa/ecdsa.hpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/encryption/ecdsa/ecdsa.test.cpp (94%) rename cpp/src/{aztec => barretenberg}/stdlib/encryption/ecdsa/ecdsa_impl.hpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/encryption/schnorr/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/stdlib/encryption/schnorr/schnorr.cpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/encryption/schnorr/schnorr.hpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/encryption/schnorr/schnorr.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/blake2s/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/blake2s/blake2s.cpp (94%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/blake2s/blake2s.hpp (90%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/blake2s/blake2s.test.cpp (97%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/blake2s/blake2s_plookup.cpp (93%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/blake2s/blake2s_plookup.hpp (74%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/blake2s/blake_util.hpp (96%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/blake3s/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/blake3s/blake3s.cpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/blake3s/blake3s.hpp (89%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/blake3s/blake3s.test.cpp (95%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/blake3s/blake3s_plookup.cpp (96%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/blake3s/blake3s_plookup.hpp (74%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/keccak/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/keccak/keccak.cpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/keccak/keccak.hpp (96%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/keccak/keccak.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/pedersen/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/pedersen/pedersen.bench.cpp (94%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/pedersen/pedersen.cpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/pedersen/pedersen.hpp (96%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/pedersen/pedersen.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/pedersen/pedersen_plookup.cpp (96%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/pedersen/pedersen_plookup.hpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/sha256/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/sha256/sha256.bench.cpp (94%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/sha256/sha256.cpp (96%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/sha256/sha256.hpp (88%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/sha256/sha256.test.cpp (97%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/sha256/sha256_plookup.cpp (96%) rename cpp/src/{aztec => barretenberg}/stdlib/hash/sha256/sha256_plookup.hpp (92%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/hash.hpp (65%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/hash.test.cpp (88%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/hash_path.hpp (97%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/index.hpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/membership.hpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/membership.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/memory_store.hpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/memory_tree.cpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/memory_tree.hpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/memory_tree.test.cpp (95%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/merkle_tree.bench.cpp (97%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/merkle_tree.cpp (97%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/merkle_tree.hpp (97%) rename cpp/src/{aztec => barretenberg}/stdlib/merkle_tree/merkle_tree.test.cpp (94%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bigfield/bigfield.fuzzer.hpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bigfield/bigfield.hpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bigfield/bigfield.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp (69%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bigfield/bigfield_impl.hpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp (64%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp (64%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/biggroup/biggroup.hpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/biggroup/biggroup.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/biggroup/biggroup_batch_mul.hpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/biggroup/biggroup_bn254.hpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/biggroup/biggroup_impl.hpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/biggroup/biggroup_nafs.hpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/biggroup/biggroup_secp256k1.hpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/biggroup/biggroup_tables.hpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bit_array/bit_array.cpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bit_array/bit_array.fuzzer.hpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bit_array/bit_array.hpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bit_array/bit_array.test.cpp (97%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp (69%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp (65%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp (64%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bool/bool.cpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bool/bool.fuzzer.hpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bool/bool.hpp (97%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bool/bool.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bool/bool_all.fuzzer.cpp (68%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bool/bool_standard.fuzzer.cpp (63%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/bool/bool_turbo.fuzzer.cpp (63%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/byte_array/byte_array.cpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/byte_array/byte_array.fuzzer.hpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/byte_array/byte_array.hpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/byte_array/byte_array.test.cpp (94%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp (69%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp (65%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp (64%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/composers/composers.hpp (88%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/composers/composers_fwd.hpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/curves/bn254.hpp (93%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/curves/secp256k1.hpp (92%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/curves/secp256r1.hpp (92%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/field/field.cpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/field/field.fuzzer.hpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/field/field.hpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/field/field.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/field/field_all.fuzzer.cpp (68%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/field/field_standard.fuzzer.cpp (64%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/field/field_turbo.fuzzer.cpp (63%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/group/group.hpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/group/group.test.cpp (92%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/memory/rom_table.cpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/memory/rom_table.hpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/memory/rom_table.test.cpp (93%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/memory/twin_rom_table.cpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/memory/twin_rom_table.hpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/packed_byte_array/packed_byte_array.cpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/packed_byte_array/packed_byte_array.hpp (96%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp (97%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/plookup/plookup.cpp (95%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/plookup/plookup.hpp (79%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/plookup/plookup.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/point/point.hpp (96%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/safe_uint/safe_uint.cpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/safe_uint/safe_uint.hpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/safe_uint/safe_uint.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp (69%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp (65%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp (64%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/arithmetic.cpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/comparison.cpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/logic.cpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/plookup/arithmetic.cpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/plookup/comparison.cpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/plookup/logic.cpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/plookup/uint.cpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/plookup/uint.hpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/uint.cpp (100%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/uint.fuzzer.hpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/uint.hpp (96%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/uint.test.cpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/uint_all.fuzzer.cpp (68%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/uint_standard.fuzzer.cpp (63%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/uint/uint_turbo.fuzzer.cpp (63%) rename cpp/src/{aztec => barretenberg}/stdlib/primitives/witness/witness.hpp (95%) rename cpp/src/{aztec => barretenberg}/stdlib/recursion/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/stdlib/recursion/transcript/transcript.hpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/recursion/transcript/transcript.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/recursion/verification_key/verification_key.hpp (94%) rename cpp/src/{aztec => barretenberg}/stdlib/recursion/verifier/program_settings.hpp (99%) rename cpp/src/{aztec => barretenberg}/stdlib/recursion/verifier/verifier.hpp (97%) rename cpp/src/{aztec => barretenberg}/stdlib/recursion/verifier/verifier.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/recursion/verifier/verifier_turbo.test.cpp (98%) rename cpp/src/{aztec => barretenberg}/stdlib/types/types.hpp (62%) rename cpp/src/{aztec => barretenberg}/transcript/CMakeLists.txt (100%) rename cpp/src/{aztec => barretenberg}/transcript/manifest.hpp (100%) rename cpp/src/{aztec => barretenberg}/transcript/transcript.cpp (97%) rename cpp/src/{aztec => barretenberg}/transcript/transcript.hpp (100%) rename cpp/src/{aztec => barretenberg}/transcript/transcript.test.cpp (100%) rename cpp/src/{aztec => barretenberg}/transcript/transcript_wrappers.cpp (96%) rename cpp/src/{aztec => barretenberg}/transcript/transcript_wrappers.hpp (96%) diff --git a/cpp/.dockerignore b/cpp/.dockerignore index 59481ff765..e20821f087 100644 --- a/cpp/.dockerignore +++ b/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 diff --git a/cpp/.gitignore b/cpp/.gitignore index e34119cce8..6a33a19de1 100644 --- a/cpp/.gitignore +++ b/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 diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 5cc744d9ed..3b5d8dd016 100644 --- a/cpp/CMakeLists.txt +++ b/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) \ No newline at end of file +add_subdirectory(src) diff --git a/cpp/src/aztec/CMakeLists.txt b/cpp/src/CMakeLists.txt similarity index 93% rename from cpp/src/aztec/CMakeLists.txt rename to cpp/src/CMakeLists.txt index 09d17e8bcc..7e572edd91 100644 --- a/cpp/src/aztec/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -38,23 +38,22 @@ 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/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) diff --git a/cpp/src/aztec/common/max_threads.hpp b/cpp/src/aztec/common/max_threads.hpp deleted file mode 100644 index 7df0cd6f08..0000000000 --- a/cpp/src/aztec/common/max_threads.hpp +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -// #include -#ifndef NO_MULTITHREADING -#include -#endif -#include - - -namespace max_threads { - // - // This method will compute the number of threads which would be used - // for computation in barretenberg. We set it to the max number of threads - // possible for a system (using the openmp package). However, if any system - // has max number of threads which is NOT a power of two, we set number of threads - // to be used as the previous power of two. - inline size_t compute_num_threads() - { - #ifndef NO_MULTITHREADING - size_t num_threads = static_cast(omp_get_max_threads()); - #else - size_t num_threads = 1; - #endif - - // ensure that num_threads is a power of two - num_threads = static_cast(1ULL << numeric::get_msb(num_threads)); - return num_threads; - } -} - diff --git a/cpp/src/aztec/benchmark/CMakeLists.txt b/cpp/src/barretenberg/benchmark/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/benchmark/CMakeLists.txt rename to cpp/src/barretenberg/benchmark/CMakeLists.txt diff --git a/cpp/src/aztec/benchmark/decrypt_bench/CMakeLists.txt b/cpp/src/barretenberg/benchmark/decrypt_bench/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/benchmark/decrypt_bench/CMakeLists.txt rename to cpp/src/barretenberg/benchmark/decrypt_bench/CMakeLists.txt diff --git a/cpp/src/aztec/benchmark/decrypt_bench/main.cpp b/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp similarity index 96% rename from cpp/src/aztec/benchmark/decrypt_bench/main.cpp rename to cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp index 773d5c6b1d..be87be56b8 100644 --- a/cpp/src/aztec/benchmark/decrypt_bench/main.cpp +++ b/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include int main(int, char**) @@ -35,4 +35,4 @@ int main(int, char**) end = std::chrono::steady_clock::now(); diff = std::chrono::duration_cast(end - start); std::cout << "batched mul operations: " << diff.count() << "ms" << std::endl; -} \ No newline at end of file +} diff --git a/cpp/src/aztec/benchmark/honk_bench/CMakeLists.txt b/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/benchmark/honk_bench/CMakeLists.txt rename to cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt diff --git a/cpp/src/aztec/benchmark/honk_bench/compare_honk_bench.sh b/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_bench.sh similarity index 100% rename from cpp/src/aztec/benchmark/honk_bench/compare_honk_bench.sh rename to cpp/src/barretenberg/benchmark/honk_bench/compare_honk_bench.sh diff --git a/cpp/src/aztec/benchmark/honk_bench/honk.bench.cpp b/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp similarity index 91% rename from cpp/src/aztec/benchmark/honk_bench/honk.bench.cpp rename to cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp index 83c2b81245..ed06bb552a 100644 --- a/cpp/src/aztec/benchmark/honk_bench/honk.bench.cpp +++ b/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp @@ -1,11 +1,11 @@ -#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/prover.hpp" +#include "barretenberg/honk/proof_system/verifier.hpp" #include #include -#include -#include +#include +#include using namespace benchmark; @@ -107,4 +107,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(); \ No newline at end of file +BENCHMARK_MAIN(); diff --git a/cpp/src/aztec/benchmark/pippenger_bench/CMakeLists.txt b/cpp/src/barretenberg/benchmark/pippenger_bench/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/benchmark/pippenger_bench/CMakeLists.txt rename to cpp/src/barretenberg/benchmark/pippenger_bench/CMakeLists.txt diff --git a/cpp/src/aztec/benchmark/pippenger_bench/main.cpp b/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp similarity index 89% rename from cpp/src/aztec/benchmark/pippenger_bench/main.cpp rename to cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp index 635ec4b1c8..582257db10 100644 --- a/cpp/src/aztec/benchmark/pippenger_bench/main.cpp +++ b/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp @@ -1,14 +1,14 @@ #include -#include +#include #include -#include -#include -#include +#include +#include +#include -//#include -// CALLGRIND_START_INSTRUMENTATION; -// CALLGRIND_STOP_INSTRUMENTATION; -// CALLGRIND_DUMP_STATS; +// #include +// CALLGRIND_START_INSTRUMENTATION; +// CALLGRIND_STOP_INSTRUMENTATION; +// CALLGRIND_DUMP_STATS; using namespace barretenberg; @@ -109,4 +109,4 @@ int main() pippenger(); pippenger(); return 0; -} \ No newline at end of file +} diff --git a/cpp/src/aztec/benchmark/plonk_bench/CMakeLists.txt b/cpp/src/barretenberg/benchmark/plonk_bench/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/benchmark/plonk_bench/CMakeLists.txt rename to cpp/src/barretenberg/benchmark/plonk_bench/CMakeLists.txt diff --git a/cpp/src/aztec/benchmark/plonk_bench/plonk.bench.cpp b/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp similarity index 91% rename from cpp/src/aztec/benchmark/plonk_bench/plonk.bench.cpp rename to cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp index 1ade8a2b0e..5032420ff8 100644 --- a/cpp/src/aztec/benchmark/plonk_bench/plonk.bench.cpp +++ b/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp @@ -1,10 +1,10 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include using namespace benchmark; diff --git a/cpp/src/aztec/common/CMakeLists.txt b/cpp/src/barretenberg/common/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/common/CMakeLists.txt rename to cpp/src/barretenberg/common/CMakeLists.txt diff --git a/cpp/src/aztec/common/assert.hpp b/cpp/src/barretenberg/common/assert.hpp similarity index 100% rename from cpp/src/aztec/common/assert.hpp rename to cpp/src/barretenberg/common/assert.hpp diff --git a/cpp/src/aztec/common/constexpr_utils.hpp b/cpp/src/barretenberg/common/constexpr_utils.hpp similarity index 100% rename from cpp/src/aztec/common/constexpr_utils.hpp rename to cpp/src/barretenberg/common/constexpr_utils.hpp diff --git a/cpp/src/aztec/common/container.hpp b/cpp/src/barretenberg/common/container.hpp similarity index 100% rename from cpp/src/aztec/common/container.hpp rename to cpp/src/barretenberg/common/container.hpp diff --git a/cpp/src/aztec/common/fuzzer.hpp b/cpp/src/barretenberg/common/fuzzer.hpp similarity index 87% rename from cpp/src/aztec/common/fuzzer.hpp rename to cpp/src/barretenberg/common/fuzzer.hpp index f4f9bb2a0f..76b3f41618 100644 --- a/cpp/src/aztec/common/fuzzer.hpp +++ b/cpp/src/barretenberg/common/fuzzer.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include #include #define PARENS () @@ -84,83 +84,80 @@ class FastRandom { * * @tparam T */ -template concept SimpleRng = requires(T a) -{ - { - a.next() - } - ->std::convertible_to; -}; +template +concept SimpleRng = requires(T a) { + { + a.next() + } -> std::convertible_to; + }; /** * @brief Concept for forcing ArgumentSizes to be size_t * * @tparam T */ -template concept InstructionArgumentSizes = requires -{ - { - std::make_tuple(T::CONSTANT, - T::WITNESS, - T::CONSTANT_WITNESS, - T::ADD, - T::SUBTRACT, - T::MULTIPLY, - T::DIVIDE, - T::ADD_TWO, - T::MADD, - T::MULT_MADD, - T::MSUB_DIV, - T::SQR, - T::SQR_ADD, - T::SUBTRACT_WITH_CONSTRAINT, - T::DIVIDE_WITH_CONSTRAINTS, - T::SLICE, - T::ASSERT_ZERO, - T::ASSERT_NOT_ZERO) - } - ->std::same_as>; -}; +template +concept InstructionArgumentSizes = requires { + { + std::make_tuple(T::CONSTANT, + T::WITNESS, + T::CONSTANT_WITNESS, + T::ADD, + T::SUBTRACT, + T::MULTIPLY, + T::DIVIDE, + T::ADD_TWO, + T::MADD, + T::MULT_MADD, + T::MSUB_DIV, + T::SQR, + T::SQR_ADD, + T::SUBTRACT_WITH_CONSTRAINT, + T::DIVIDE_WITH_CONSTRAINTS, + T::SLICE, + T::ASSERT_ZERO, + T::ASSERT_NOT_ZERO) + } -> std::same_as>; + }; /** * @brief Concept for Havoc Configurations * * @tparam T */ -template concept HavocConfigConstraint = requires -{ - { - std::make_tuple(T::GEN_MUTATION_COUNT_LOG, T::GEN_STRUCTURAL_MUTATION_PROBABILITY) - } - ->std::same_as>; - T::GEN_MUTATION_COUNT_LOG <= 7; -}; +template +concept HavocConfigConstraint = + requires { + { + std::make_tuple(T::GEN_MUTATION_COUNT_LOG, T::GEN_STRUCTURAL_MUTATION_PROBABILITY) + } -> std::same_as>; + T::GEN_MUTATION_COUNT_LOG <= 7; + }; /** * @brief Concept specifying the class used by the fuzzer * * @tparam T */ -template concept ArithmeticFuzzHelperConstraint = requires -{ - typename T::ArgSizes; - typename T::Instruction; - typename T::ExecutionState; - typename T::ExecutionHandler; - InstructionArgumentSizes; - // HavocConfigConstraint; -}; +template +concept ArithmeticFuzzHelperConstraint = requires { + typename T::ArgSizes; + typename T::Instruction; + typename T::ExecutionState; + typename T::ExecutionHandler; + InstructionArgumentSizes; + // HavocConfigConstraint; + }; /** * @brief Fuzzer uses only composers with check_circuit function * * @tparam T */ -template concept CheckableComposer = requires(T a) -{ - { - a.check_circuit() - } - ->std::same_as; -}; +template +concept CheckableComposer = requires(T a) { + { + a.check_circuit() + } -> std::same_as; + }; /** * @brief The fuzzer can use a postprocessing function that is specific to the type being fuzzed @@ -170,13 +167,11 @@ template concept CheckableComposer = requires(T a) * @tparam Context The class containing the full context */ template -concept PostProcessingEnabled = requires(Composer composer, Context context) -{ - { - T::postProcess(&composer, context) - } - ->std::same_as; -}; +concept PostProcessingEnabled = requires(Composer composer, Context context) { + { + T::postProcess(&composer, context) + } -> std::same_as; + }; /** * @brief This concept is used when we want to limit the number of executions of certain instructions (for example, @@ -184,17 +179,19 @@ concept PostProcessingEnabled = requires(Composer composer, Context context) * * @tparam T */ -template concept InstructionWeightsEnabled = requires -{ - typename T::InstructionWeights; - T::InstructionWeights::_LIMIT; -}; +template +concept InstructionWeightsEnabled = requires { + typename T::InstructionWeights; + T::InstructionWeights::_LIMIT; + }; /** * @brief A templated class containing most of the fuzzing logic for a generic Arithmetic class * * @tparam T */ -template requires ArithmeticFuzzHelperConstraint class ArithmeticFuzzHelper { +template + requires ArithmeticFuzzHelperConstraint +class ArithmeticFuzzHelper { private: /** * @brief Mutator swapping two instructions together @@ -497,8 +494,8 @@ template requires ArithmeticFuzzHelperConstraint class Arithmeti * @param instructions */ template - inline static void executeInstructions( - std::vector& instructions) requires CheckableComposer + inline static void executeInstructions(std::vector& instructions) + requires CheckableComposer { typename T::ExecutionState state; Composer composer = Composer(); diff --git a/cpp/src/aztec/common/fuzzer_constants.hpp b/cpp/src/barretenberg/common/fuzzer_constants.hpp similarity index 100% rename from cpp/src/aztec/common/fuzzer_constants.hpp rename to cpp/src/barretenberg/common/fuzzer_constants.hpp diff --git a/cpp/src/aztec/common/inline.hpp b/cpp/src/barretenberg/common/inline.hpp similarity index 100% rename from cpp/src/aztec/common/inline.hpp rename to cpp/src/barretenberg/common/inline.hpp diff --git a/cpp/src/aztec/common/log.hpp b/cpp/src/barretenberg/common/log.hpp similarity index 82% rename from cpp/src/aztec/common/log.hpp rename to cpp/src/barretenberg/common/log.hpp index 21fb5c28db..8d133be845 100644 --- a/cpp/src/aztec/common/log.hpp +++ b/cpp/src/barretenberg/common/log.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include #include @@ -10,13 +10,11 @@ #define BENCHMARK_INFO_SUFFIX "##BENCHMARK_INFO_SUFFIX##" #define GET_COMPOSER_NAME_STRING(composer) \ - (typeid(composer) == typeid(plonk::StandardComposer) \ - ? "StandardPlonk" \ - : typeid(composer) == typeid(plonk::TurboComposer) \ - ? "TurboPlonk" \ - : typeid(composer) == typeid(plonk::UltraComposer) \ - ? "UltraPlonk" \ - : typeid(composer) == typeid(honk::StandardHonkComposer) ? "StandardHonk" : "NULLPlonk") + (typeid(composer) == typeid(plonk::StandardComposer) ? "StandardPlonk" \ + : typeid(composer) == typeid(plonk::TurboComposer) ? "TurboPlonk" \ + : typeid(composer) == typeid(plonk::UltraComposer) ? "UltraPlonk" \ + : typeid(composer) == typeid(honk::StandardHonkComposer) ? "StandardHonk" \ + : "NULLPlonk") namespace { @@ -136,4 +134,4 @@ class BenchmarkInfoCollator { logstr(x.c_str()); } } -}; \ No newline at end of file +}; diff --git a/cpp/src/aztec/common/map.hpp b/cpp/src/barretenberg/common/map.hpp similarity index 100% rename from cpp/src/aztec/common/map.hpp rename to cpp/src/barretenberg/common/map.hpp diff --git a/cpp/src/barretenberg/common/max_threads.hpp b/cpp/src/barretenberg/common/max_threads.hpp new file mode 100644 index 0000000000..58ed8eddbf --- /dev/null +++ b/cpp/src/barretenberg/common/max_threads.hpp @@ -0,0 +1,28 @@ +#pragma once + +// #include +#ifndef NO_MULTITHREADING +#include +#endif +#include + +namespace max_threads { +// +// This method will compute the number of threads which would be used +// for computation in barretenberg. We set it to the max number of threads +// possible for a system (using the openmp package). However, if any system +// has max number of threads which is NOT a power of two, we set number of threads +// to be used as the previous power of two. +inline size_t compute_num_threads() +{ +#ifndef NO_MULTITHREADING + size_t num_threads = static_cast(omp_get_max_threads()); +#else + size_t num_threads = 1; +#endif + + // ensure that num_threads is a power of two + num_threads = static_cast(1ULL << numeric::get_msb(num_threads)); + return num_threads; +} +} // namespace max_threads diff --git a/cpp/src/aztec/common/mem.hpp b/cpp/src/barretenberg/common/mem.hpp similarity index 100% rename from cpp/src/aztec/common/mem.hpp rename to cpp/src/barretenberg/common/mem.hpp diff --git a/cpp/src/aztec/common/net.hpp b/cpp/src/barretenberg/common/net.hpp similarity index 100% rename from cpp/src/aztec/common/net.hpp rename to cpp/src/barretenberg/common/net.hpp diff --git a/cpp/src/aztec/common/printf.hpp b/cpp/src/barretenberg/common/printf.hpp similarity index 100% rename from cpp/src/aztec/common/printf.hpp rename to cpp/src/barretenberg/common/printf.hpp diff --git a/cpp/src/aztec/common/serialize.hpp b/cpp/src/barretenberg/common/serialize.hpp similarity index 99% rename from cpp/src/aztec/common/serialize.hpp rename to cpp/src/barretenberg/common/serialize.hpp index 72833eb1dc..dbc3faa455 100644 --- a/cpp/src/aztec/common/serialize.hpp +++ b/cpp/src/barretenberg/common/serialize.hpp @@ -28,12 +28,12 @@ */ #pragma once #include -#include +#include #include #include #include #include -#include +#include #ifndef __i386__ __extension__ using uint128_t = unsigned __int128; @@ -354,4 +354,4 @@ template std::vector to_buffer( } } return buf; -} \ No newline at end of file +} diff --git a/cpp/src/aztec/common/streams.hpp b/cpp/src/barretenberg/common/streams.hpp similarity index 100% rename from cpp/src/aztec/common/streams.hpp rename to cpp/src/barretenberg/common/streams.hpp diff --git a/cpp/src/aztec/common/test.hpp b/cpp/src/barretenberg/common/test.hpp similarity index 100% rename from cpp/src/aztec/common/test.hpp rename to cpp/src/barretenberg/common/test.hpp diff --git a/cpp/src/aztec/common/throw_or_abort.hpp b/cpp/src/barretenberg/common/throw_or_abort.hpp similarity index 100% rename from cpp/src/aztec/common/throw_or_abort.hpp rename to cpp/src/barretenberg/common/throw_or_abort.hpp diff --git a/cpp/src/aztec/common/timer.hpp b/cpp/src/barretenberg/common/timer.hpp similarity index 100% rename from cpp/src/aztec/common/timer.hpp rename to cpp/src/barretenberg/common/timer.hpp diff --git a/cpp/src/aztec/crypto/CMakeLists.txt b/cpp/src/barretenberg/crypto/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/crypto/CMakeLists.txt rename to cpp/src/barretenberg/crypto/CMakeLists.txt diff --git a/cpp/src/aztec/crypto/aes128/CMakeLists.txt b/cpp/src/barretenberg/crypto/aes128/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/crypto/aes128/CMakeLists.txt rename to cpp/src/barretenberg/crypto/aes128/CMakeLists.txt diff --git a/cpp/src/aztec/crypto/aes128/aes128.cpp b/cpp/src/barretenberg/crypto/aes128/aes128.cpp similarity index 100% rename from cpp/src/aztec/crypto/aes128/aes128.cpp rename to cpp/src/barretenberg/crypto/aes128/aes128.cpp diff --git a/cpp/src/aztec/crypto/aes128/aes128.hpp b/cpp/src/barretenberg/crypto/aes128/aes128.hpp similarity index 100% rename from cpp/src/aztec/crypto/aes128/aes128.hpp rename to cpp/src/barretenberg/crypto/aes128/aes128.hpp diff --git a/cpp/src/aztec/crypto/aes128/aes128.test.cpp b/cpp/src/barretenberg/crypto/aes128/aes128.test.cpp similarity index 100% rename from cpp/src/aztec/crypto/aes128/aes128.test.cpp rename to cpp/src/barretenberg/crypto/aes128/aes128.test.cpp diff --git a/cpp/src/aztec/crypto/aes128/c_bind.cpp b/cpp/src/barretenberg/crypto/aes128/c_bind.cpp similarity index 100% rename from cpp/src/aztec/crypto/aes128/c_bind.cpp rename to cpp/src/barretenberg/crypto/aes128/c_bind.cpp diff --git a/cpp/src/aztec/crypto/blake2s/CMakeLists.txt b/cpp/src/barretenberg/crypto/blake2s/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/crypto/blake2s/CMakeLists.txt rename to cpp/src/barretenberg/crypto/blake2s/CMakeLists.txt diff --git a/cpp/src/aztec/crypto/blake2s/blake2-impl.hpp b/cpp/src/barretenberg/crypto/blake2s/blake2-impl.hpp similarity index 100% rename from cpp/src/aztec/crypto/blake2s/blake2-impl.hpp rename to cpp/src/barretenberg/crypto/blake2s/blake2-impl.hpp diff --git a/cpp/src/aztec/crypto/blake2s/blake2s.cpp b/cpp/src/barretenberg/crypto/blake2s/blake2s.cpp similarity index 100% rename from cpp/src/aztec/crypto/blake2s/blake2s.cpp rename to cpp/src/barretenberg/crypto/blake2s/blake2s.cpp diff --git a/cpp/src/aztec/crypto/blake2s/blake2s.hpp b/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp similarity index 100% rename from cpp/src/aztec/crypto/blake2s/blake2s.hpp rename to cpp/src/barretenberg/crypto/blake2s/blake2s.hpp diff --git a/cpp/src/aztec/crypto/blake2s/blake2s.test.cpp b/cpp/src/barretenberg/crypto/blake2s/blake2s.test.cpp similarity index 100% rename from cpp/src/aztec/crypto/blake2s/blake2s.test.cpp rename to cpp/src/barretenberg/crypto/blake2s/blake2s.test.cpp diff --git a/cpp/src/aztec/crypto/blake2s/c_bind.cpp b/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp similarity index 89% rename from cpp/src/aztec/crypto/blake2s/c_bind.cpp rename to cpp/src/barretenberg/crypto/blake2s/c_bind.cpp index 41491c6934..9186f7ee4f 100644 --- a/cpp/src/aztec/crypto/blake2s/c_bind.cpp +++ b/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp @@ -1,5 +1,5 @@ #include "blake2s.hpp" -#include +#include #define WASM_EXPORT __attribute__((visibility("default"))) @@ -12,4 +12,4 @@ WASM_EXPORT void blake2s_to_field(uint8_t const* data, size_t length, uint8_t* r auto result = barretenberg::fr::serialize_from_buffer(output.data()); barretenberg::fr::serialize_to_buffer(result, r); } -} \ No newline at end of file +} diff --git a/cpp/src/aztec/crypto/blake2s/c_bind.hpp b/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp similarity index 100% rename from cpp/src/aztec/crypto/blake2s/c_bind.hpp rename to cpp/src/barretenberg/crypto/blake2s/c_bind.hpp diff --git a/cpp/src/aztec/crypto/blake3s/CMakeLists.txt b/cpp/src/barretenberg/crypto/blake3s/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/crypto/blake3s/CMakeLists.txt rename to cpp/src/barretenberg/crypto/blake3s/CMakeLists.txt diff --git a/cpp/src/aztec/crypto/blake3s/blake3-impl.hpp b/cpp/src/barretenberg/crypto/blake3s/blake3-impl.hpp similarity index 100% rename from cpp/src/aztec/crypto/blake3s/blake3-impl.hpp rename to cpp/src/barretenberg/crypto/blake3s/blake3-impl.hpp diff --git a/cpp/src/aztec/crypto/blake3s/blake3s.cpp b/cpp/src/barretenberg/crypto/blake3s/blake3s.cpp similarity index 100% rename from cpp/src/aztec/crypto/blake3s/blake3s.cpp rename to cpp/src/barretenberg/crypto/blake3s/blake3s.cpp diff --git a/cpp/src/aztec/crypto/blake3s/blake3s.hpp b/cpp/src/barretenberg/crypto/blake3s/blake3s.hpp similarity index 100% rename from cpp/src/aztec/crypto/blake3s/blake3s.hpp rename to cpp/src/barretenberg/crypto/blake3s/blake3s.hpp diff --git a/cpp/src/aztec/crypto/blake3s/blake3s.test.cpp b/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp similarity index 100% rename from cpp/src/aztec/crypto/blake3s/blake3s.test.cpp rename to cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp diff --git a/cpp/src/aztec/crypto/blake3s/c_bind.cpp b/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp similarity index 89% rename from cpp/src/aztec/crypto/blake3s/c_bind.cpp rename to cpp/src/barretenberg/crypto/blake3s/c_bind.cpp index 727fae4271..31d21a574a 100644 --- a/cpp/src/aztec/crypto/blake3s/c_bind.cpp +++ b/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp @@ -1,5 +1,5 @@ #include "blake3s.hpp" -#include +#include #define WASM_EXPORT __attribute__((visibility("default"))) @@ -12,4 +12,4 @@ WASM_EXPORT void blake3s_to_field(uint8_t const* data, size_t length, uint8_t* r auto result = barretenberg::fr::serialize_from_buffer(output.data()); barretenberg::fr::serialize_to_buffer(result, r); } -} \ No newline at end of file +} diff --git a/cpp/src/aztec/crypto/blake3s_full/CMakeLists.txt b/cpp/src/barretenberg/crypto/blake3s_full/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/crypto/blake3s_full/CMakeLists.txt rename to cpp/src/barretenberg/crypto/blake3s_full/CMakeLists.txt diff --git a/cpp/src/aztec/crypto/blake3s_full/blake3-impl.hpp b/cpp/src/barretenberg/crypto/blake3s_full/blake3-impl.hpp similarity index 100% rename from cpp/src/aztec/crypto/blake3s_full/blake3-impl.hpp rename to cpp/src/barretenberg/crypto/blake3s_full/blake3-impl.hpp diff --git a/cpp/src/aztec/crypto/blake3s_full/blake3s.cpp b/cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp similarity index 100% rename from cpp/src/aztec/crypto/blake3s_full/blake3s.cpp rename to cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp diff --git a/cpp/src/aztec/crypto/blake3s_full/blake3s.hpp b/cpp/src/barretenberg/crypto/blake3s_full/blake3s.hpp similarity index 100% rename from cpp/src/aztec/crypto/blake3s_full/blake3s.hpp rename to cpp/src/barretenberg/crypto/blake3s_full/blake3s.hpp diff --git a/cpp/src/aztec/crypto/blake3s_full/blake3s.test.cpp b/cpp/src/barretenberg/crypto/blake3s_full/blake3s.test.cpp similarity index 100% rename from cpp/src/aztec/crypto/blake3s_full/blake3s.test.cpp rename to cpp/src/barretenberg/crypto/blake3s_full/blake3s.test.cpp diff --git a/cpp/src/aztec/crypto/ecdsa/CMakeLists.txt b/cpp/src/barretenberg/crypto/ecdsa/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/crypto/ecdsa/CMakeLists.txt rename to cpp/src/barretenberg/crypto/ecdsa/CMakeLists.txt diff --git a/cpp/src/aztec/crypto/ecdsa/ecdsa.hpp b/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp similarity index 100% rename from cpp/src/aztec/crypto/ecdsa/ecdsa.hpp rename to cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp diff --git a/cpp/src/aztec/crypto/ecdsa/ecdsa.test.cpp b/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp similarity index 97% rename from cpp/src/aztec/crypto/ecdsa/ecdsa.test.cpp rename to cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp index 9af4f81257..829bcb3f07 100644 --- a/cpp/src/aztec/crypto/ecdsa/ecdsa.test.cpp +++ b/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp @@ -1,7 +1,7 @@ #include "ecdsa.hpp" -#include -#include -#include +#include +#include +#include #include using namespace barretenberg; @@ -141,4 +141,4 @@ TEST(ecdsa, verify_signature_secp256r1_sha256_NIST_1) bool result = crypto::ecdsa::verify_signature( message, public_key, sig); EXPECT_EQ(result, true); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/crypto/ecdsa/ecdsa_impl.hpp b/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp similarity index 94% rename from cpp/src/aztec/crypto/ecdsa/ecdsa_impl.hpp rename to cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp index 9be623aeef..a46e46598b 100644 --- a/cpp/src/aztec/crypto/ecdsa/ecdsa_impl.hpp +++ b/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include "../hmac/hmac.hpp" namespace crypto { @@ -71,4 +71,4 @@ bool verify_signature(const std::string& message, const typename G1::affine_elem return result == r; } } // namespace ecdsa -} // namespace crypto \ No newline at end of file +} // namespace crypto diff --git a/cpp/src/aztec/crypto/hashers/hashers.hpp b/cpp/src/barretenberg/crypto/hashers/hashers.hpp similarity index 100% rename from cpp/src/aztec/crypto/hashers/hashers.hpp rename to cpp/src/barretenberg/crypto/hashers/hashers.hpp diff --git a/cpp/src/aztec/crypto/hmac/CMakeLists.txt b/cpp/src/barretenberg/crypto/hmac/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/crypto/hmac/CMakeLists.txt rename to cpp/src/barretenberg/crypto/hmac/CMakeLists.txt diff --git a/cpp/src/aztec/crypto/hmac/hmac.hpp b/cpp/src/barretenberg/crypto/hmac/hmac.hpp similarity index 96% rename from cpp/src/aztec/crypto/hmac/hmac.hpp rename to cpp/src/barretenberg/crypto/hmac/hmac.hpp index 481d6345e6..a05bdc7a16 100644 --- a/cpp/src/aztec/crypto/hmac/hmac.hpp +++ b/cpp/src/barretenberg/crypto/hmac/hmac.hpp @@ -1,12 +1,12 @@ #pragma once -#include "common/serialize.hpp" +#include #include #include #include #include #include -#include +#include namespace crypto { /** @@ -93,8 +93,8 @@ std::array hmac(const MessageContainer& message, con * @return Fr output field element as uint512_t( H(10...0 || HMAC(k,m)) || H(00...0 || HMAC(k,m)) ) % r */ template -Fr get_unbiased_field_from_hmac(const MessageContainer& message, - const KeyContainer& key) requires(Hash::OUTPUT_SIZE == 32) +Fr get_unbiased_field_from_hmac(const MessageContainer& message, const KeyContainer& key) + requires(Hash::OUTPUT_SIZE == 32) { // Strong assumption that works for now with our suite of Hashers static_assert(Hash::BLOCK_SIZE > Hash::OUTPUT_SIZE); diff --git a/cpp/src/aztec/crypto/hmac/hmac.test.cpp b/cpp/src/barretenberg/crypto/hmac/hmac.test.cpp similarity index 100% rename from cpp/src/aztec/crypto/hmac/hmac.test.cpp rename to cpp/src/barretenberg/crypto/hmac/hmac.test.cpp diff --git a/cpp/src/aztec/crypto/keccak/CMakeLists.txt b/cpp/src/barretenberg/crypto/keccak/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/crypto/keccak/CMakeLists.txt rename to cpp/src/barretenberg/crypto/keccak/CMakeLists.txt diff --git a/cpp/src/aztec/crypto/keccak/hash_types.hpp b/cpp/src/barretenberg/crypto/keccak/hash_types.hpp similarity index 100% rename from cpp/src/aztec/crypto/keccak/hash_types.hpp rename to cpp/src/barretenberg/crypto/keccak/hash_types.hpp diff --git a/cpp/src/aztec/crypto/keccak/keccak.cpp b/cpp/src/barretenberg/crypto/keccak/keccak.cpp similarity index 100% rename from cpp/src/aztec/crypto/keccak/keccak.cpp rename to cpp/src/barretenberg/crypto/keccak/keccak.cpp diff --git a/cpp/src/aztec/crypto/keccak/keccak.hpp b/cpp/src/barretenberg/crypto/keccak/keccak.hpp similarity index 100% rename from cpp/src/aztec/crypto/keccak/keccak.hpp rename to cpp/src/barretenberg/crypto/keccak/keccak.hpp diff --git a/cpp/src/aztec/crypto/keccak/keccakf1600.cpp b/cpp/src/barretenberg/crypto/keccak/keccakf1600.cpp similarity index 100% rename from cpp/src/aztec/crypto/keccak/keccakf1600.cpp rename to cpp/src/barretenberg/crypto/keccak/keccakf1600.cpp diff --git a/cpp/src/aztec/crypto/pedersen/CMakeLists.txt b/cpp/src/barretenberg/crypto/pedersen/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/crypto/pedersen/CMakeLists.txt rename to cpp/src/barretenberg/crypto/pedersen/CMakeLists.txt diff --git a/cpp/src/aztec/crypto/pedersen/c_bind.cpp b/cpp/src/barretenberg/crypto/pedersen/c_bind.cpp similarity index 93% rename from cpp/src/aztec/crypto/pedersen/c_bind.cpp rename to cpp/src/barretenberg/crypto/pedersen/c_bind.cpp index f46e6193e1..09eacc50e4 100644 --- a/cpp/src/aztec/crypto/pedersen/c_bind.cpp +++ b/cpp/src/barretenberg/crypto/pedersen/c_bind.cpp @@ -1,9 +1,9 @@ #include "c_bind.hpp" #include "pedersen.hpp" -#include -#include -#include -#include +#include +#include +#include +#include #define WASM_EXPORT __attribute__((visibility("default"))) extern "C" { diff --git a/cpp/src/aztec/crypto/pedersen/c_bind.hpp b/cpp/src/barretenberg/crypto/pedersen/c_bind.hpp similarity index 84% rename from cpp/src/aztec/crypto/pedersen/c_bind.hpp rename to cpp/src/barretenberg/crypto/pedersen/c_bind.hpp index 0c7828b2f8..8e61135b9d 100644 --- a/cpp/src/aztec/crypto/pedersen/c_bind.hpp +++ b/cpp/src/barretenberg/crypto/pedersen/c_bind.hpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "barretenberg/common/serialize.hpp" +#include "barretenberg/common/timer.hpp" +#include "barretenberg/common/mem.hpp" +#include "barretenberg/common/streams.hpp" #define WASM_EXPORT __attribute__((visibility("default"))) extern "C" { diff --git a/cpp/src/aztec/crypto/pedersen/convert_buffer_to_field.hpp b/cpp/src/barretenberg/crypto/pedersen/convert_buffer_to_field.hpp similarity index 93% rename from cpp/src/aztec/crypto/pedersen/convert_buffer_to_field.hpp rename to cpp/src/barretenberg/crypto/pedersen/convert_buffer_to_field.hpp index e6dc4d3212..bc2b27c773 100644 --- a/cpp/src/aztec/crypto/pedersen/convert_buffer_to_field.hpp +++ b/cpp/src/barretenberg/crypto/pedersen/convert_buffer_to_field.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace crypto { namespace pedersen { @@ -34,4 +34,4 @@ inline std::vector convert_buffer_to_field(const std::vector +#include namespace crypto { namespace pedersen { diff --git a/cpp/src/aztec/crypto/pedersen/generator_data.cpp b/cpp/src/barretenberg/crypto/pedersen/generator_data.cpp similarity index 100% rename from cpp/src/aztec/crypto/pedersen/generator_data.cpp rename to cpp/src/barretenberg/crypto/pedersen/generator_data.cpp diff --git a/cpp/src/aztec/crypto/pedersen/generator_data.hpp b/cpp/src/barretenberg/crypto/pedersen/generator_data.hpp similarity index 97% rename from cpp/src/aztec/crypto/pedersen/generator_data.hpp rename to cpp/src/barretenberg/crypto/pedersen/generator_data.hpp index ed917d6a90..6d2cbe1282 100644 --- a/cpp/src/aztec/crypto/pedersen/generator_data.hpp +++ b/cpp/src/barretenberg/crypto/pedersen/generator_data.hpp @@ -1,7 +1,7 @@ #pragma once #include #include -#include +#include namespace crypto { namespace pedersen { diff --git a/cpp/src/aztec/crypto/pedersen/pedersen.cpp b/cpp/src/barretenberg/crypto/pedersen/pedersen.cpp similarity index 97% rename from cpp/src/aztec/crypto/pedersen/pedersen.cpp rename to cpp/src/barretenberg/crypto/pedersen/pedersen.cpp index 92aa4f6c13..b9ece656e2 100644 --- a/cpp/src/aztec/crypto/pedersen/pedersen.cpp +++ b/cpp/src/barretenberg/crypto/pedersen/pedersen.cpp @@ -1,6 +1,6 @@ #include "./pedersen.hpp" #include "./convert_buffer_to_field.hpp" -#include +#include #include #ifndef NO_MULTITHREADING #include @@ -90,4 +90,4 @@ grumpkin::fq compress_native(const std::vector& input) } } // namespace pedersen -} // namespace crypto \ No newline at end of file +} // namespace crypto diff --git a/cpp/src/aztec/crypto/pedersen/pedersen.hpp b/cpp/src/barretenberg/crypto/pedersen/pedersen.hpp similarity index 93% rename from cpp/src/aztec/crypto/pedersen/pedersen.hpp rename to cpp/src/barretenberg/crypto/pedersen/pedersen.hpp index 38df6eca46..779407b5d4 100644 --- a/cpp/src/aztec/crypto/pedersen/pedersen.hpp +++ b/cpp/src/barretenberg/crypto/pedersen/pedersen.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include +#include #include "./generator_data.hpp" #include "./fixed_base_scalar_mul.hpp" diff --git a/cpp/src/aztec/crypto/pedersen/pedersen.test.cpp b/cpp/src/barretenberg/crypto/pedersen/pedersen.test.cpp similarity index 98% rename from cpp/src/aztec/crypto/pedersen/pedersen.test.cpp rename to cpp/src/barretenberg/crypto/pedersen/pedersen.test.cpp index 32c85175d5..3ceb85a332 100644 --- a/cpp/src/aztec/crypto/pedersen/pedersen.test.cpp +++ b/cpp/src/barretenberg/crypto/pedersen/pedersen.test.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include "./pedersen.hpp" using namespace crypto::pedersen; diff --git a/cpp/src/aztec/crypto/pedersen/pedersen_lookup.cpp b/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.cpp similarity index 98% rename from cpp/src/aztec/crypto/pedersen/pedersen_lookup.cpp rename to cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.cpp index 5fd8dbff62..748af45e6b 100644 --- a/cpp/src/aztec/crypto/pedersen/pedersen_lookup.cpp +++ b/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.cpp @@ -1,7 +1,7 @@ #include "./pedersen_lookup.hpp" #include "./convert_buffer_to_field.hpp" -#include +#include namespace crypto { namespace pedersen { @@ -208,4 +208,4 @@ std::vector compress_native(const std::vector& input) } } // namespace lookup } // namespace pedersen -} // namespace crypto \ No newline at end of file +} // namespace crypto diff --git a/cpp/src/aztec/crypto/pedersen/pedersen_lookup.hpp b/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.hpp similarity index 96% rename from cpp/src/aztec/crypto/pedersen/pedersen_lookup.hpp rename to cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.hpp index ac63e9b19e..a1381d9c05 100644 --- a/cpp/src/aztec/crypto/pedersen/pedersen_lookup.hpp +++ b/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include namespace crypto { namespace pedersen { @@ -46,4 +46,4 @@ grumpkin::g1::affine_element commit_native(const std::vector& inpu } // namespace lookup } // namespace pedersen -} // namespace crypto \ No newline at end of file +} // namespace crypto diff --git a/cpp/src/aztec/crypto/pedersen/pedersen_lookup.test.cpp b/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.test.cpp similarity index 97% rename from cpp/src/aztec/crypto/pedersen/pedersen_lookup.test.cpp rename to cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.test.cpp index 974dd1ba29..a6de88c15a 100644 --- a/cpp/src/aztec/crypto/pedersen/pedersen_lookup.test.cpp +++ b/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.test.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include "./pedersen_lookup.hpp" diff --git a/cpp/src/aztec/crypto/pedersen/sidon_set/sidon_set.hpp b/cpp/src/barretenberg/crypto/pedersen/sidon_set/sidon_set.hpp similarity index 97% rename from cpp/src/aztec/crypto/pedersen/sidon_set/sidon_set.hpp rename to cpp/src/barretenberg/crypto/pedersen/sidon_set/sidon_set.hpp index 8240f2f7a1..1fa6f29414 100644 --- a/cpp/src/aztec/crypto/pedersen/sidon_set/sidon_set.hpp +++ b/cpp/src/barretenberg/crypto/pedersen/sidon_set/sidon_set.hpp @@ -3,9 +3,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace crypto { @@ -223,4 +223,4 @@ template inline std::vector compute_sidon_set() } } // namespace sidon } // namespace pedersen -} // namespace crypto \ No newline at end of file +} // namespace crypto diff --git a/cpp/src/aztec/crypto/pedersen/sidon_set/sidon_set.test.cpp b/cpp/src/barretenberg/crypto/pedersen/sidon_set/sidon_set.test.cpp similarity index 95% rename from cpp/src/aztec/crypto/pedersen/sidon_set/sidon_set.test.cpp rename to cpp/src/barretenberg/crypto/pedersen/sidon_set/sidon_set.test.cpp index a3b4fbc428..ccf828fdc0 100644 --- a/cpp/src/aztec/crypto/pedersen/sidon_set/sidon_set.test.cpp +++ b/cpp/src/barretenberg/crypto/pedersen/sidon_set/sidon_set.test.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include +#include #include "./sidon_set.hpp" @@ -78,4 +78,4 @@ TEST(sidon, compute_sidon_set) for (size_t i = 1; i < sums.size(); ++i) { EXPECT_EQ(sums[i] != sums[i - 1], true); } -} \ No newline at end of file +} diff --git a/cpp/src/aztec/crypto/schnorr/CMakeLists.txt b/cpp/src/barretenberg/crypto/schnorr/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/crypto/schnorr/CMakeLists.txt rename to cpp/src/barretenberg/crypto/schnorr/CMakeLists.txt diff --git a/cpp/src/aztec/crypto/schnorr/c_bind.cpp b/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp similarity index 99% rename from cpp/src/aztec/crypto/schnorr/c_bind.cpp rename to cpp/src/barretenberg/crypto/schnorr/c_bind.cpp index 1a7a62c57c..4d585d2833 100644 --- a/cpp/src/aztec/crypto/schnorr/c_bind.cpp +++ b/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp @@ -1,7 +1,7 @@ #include "schnorr.hpp" #include "multisig.hpp" -#include +#include #define WASM_EXPORT __attribute__((visibility("default"))) diff --git a/cpp/src/aztec/crypto/schnorr/c_bind.hpp b/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp similarity index 97% rename from cpp/src/aztec/crypto/schnorr/c_bind.hpp rename to cpp/src/barretenberg/crypto/schnorr/c_bind.hpp index 9006123740..47c0ae5c08 100644 --- a/cpp/src/aztec/crypto/schnorr/c_bind.hpp +++ b/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp @@ -1,4 +1,4 @@ -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #define WASM_EXPORT __attribute__((visibility("default"))) diff --git a/cpp/src/aztec/crypto/schnorr/multisig.hpp b/cpp/src/barretenberg/crypto/schnorr/multisig.hpp similarity index 100% rename from cpp/src/aztec/crypto/schnorr/multisig.hpp rename to cpp/src/barretenberg/crypto/schnorr/multisig.hpp diff --git a/cpp/src/aztec/crypto/schnorr/multisig.test.cpp b/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp similarity index 98% rename from cpp/src/aztec/crypto/schnorr/multisig.test.cpp rename to cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp index 19d628c2ca..02cf242b37 100644 --- a/cpp/src/aztec/crypto/schnorr/multisig.test.cpp +++ b/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "./multisig.hpp" diff --git a/cpp/src/aztec/crypto/schnorr/proof_of_possession.hpp b/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp similarity index 98% rename from cpp/src/aztec/crypto/schnorr/proof_of_possession.hpp rename to cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp index 4e27c6472b..4df6854c1b 100644 --- a/cpp/src/aztec/crypto/schnorr/proof_of_possession.hpp +++ b/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp @@ -2,7 +2,7 @@ #include -#include "common/serialize.hpp" +#include #include "schnorr.hpp" namespace crypto::schnorr { @@ -134,4 +134,4 @@ inline void write(B& buf, ProofOfPossession const& proof_of_possession write(buf, proof_of_possession.response); } -} // namespace crypto::schnorr \ No newline at end of file +} // namespace crypto::schnorr diff --git a/cpp/src/aztec/crypto/schnorr/proof_of_possession.test.cpp b/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp similarity index 98% rename from cpp/src/aztec/crypto/schnorr/proof_of_possession.test.cpp rename to cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp index c40645930a..98b4a30dd9 100644 --- a/cpp/src/aztec/crypto/schnorr/proof_of_possession.test.cpp +++ b/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp @@ -1,5 +1,5 @@ -#include +#include #include #include "proof_of_possession.hpp" @@ -99,4 +99,4 @@ TYPED_TEST(ProofOfPossessionTest, serialize) EXPECT_EQ(proof.challenge, proof2.challenge); EXPECT_TRUE(proof2.verify(account.public_key)); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/crypto/schnorr/schnorr.hpp b/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp similarity index 91% rename from cpp/src/aztec/crypto/schnorr/schnorr.hpp rename to cpp/src/barretenberg/crypto/schnorr/schnorr.hpp index a105a4cb4a..0e1f6d4531 100644 --- a/cpp/src/aztec/crypto/schnorr/schnorr.hpp +++ b/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp @@ -4,12 +4,12 @@ #include #include -#include +#include -#include +#include -#include -#include +#include +#include namespace crypto { namespace schnorr { @@ -75,4 +75,4 @@ template inline void write(B& buf, key_pair -#include +#include +#include #include "schnorr.hpp" @@ -153,4 +153,4 @@ bool verify_signature(const std::string& message, const typename G1::affine_elem return std::equal(sig.e.begin(), sig.e.end(), target_e.begin(), target_e.end()); } } // namespace schnorr -} // namespace crypto \ No newline at end of file +} // namespace crypto diff --git a/cpp/src/aztec/crypto/schnorr/schnorr.test.cpp b/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp similarity index 99% rename from cpp/src/aztec/crypto/schnorr/schnorr.test.cpp rename to cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp index f3a6bde1e3..6fc742513a 100644 --- a/cpp/src/aztec/crypto/schnorr/schnorr.test.cpp +++ b/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp @@ -1,5 +1,5 @@ #include "schnorr.hpp" -#include +#include #include using namespace barretenberg; @@ -136,4 +136,4 @@ TEST(schnorr, hmac_signature_consistency) res = verify_signature( message_b, account_b.public_key, signature_h); EXPECT_EQ(res, true); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/crypto/sha256/CMakeLists.txt b/cpp/src/barretenberg/crypto/sha256/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/crypto/sha256/CMakeLists.txt rename to cpp/src/barretenberg/crypto/sha256/CMakeLists.txt diff --git a/cpp/src/aztec/crypto/sha256/c_bind.cpp b/cpp/src/barretenberg/crypto/sha256/c_bind.cpp similarity index 100% rename from cpp/src/aztec/crypto/sha256/c_bind.cpp rename to cpp/src/barretenberg/crypto/sha256/c_bind.cpp diff --git a/cpp/src/aztec/crypto/sha256/sha256.cpp b/cpp/src/barretenberg/crypto/sha256/sha256.cpp similarity index 98% rename from cpp/src/aztec/crypto/sha256/sha256.cpp rename to cpp/src/barretenberg/crypto/sha256/sha256.cpp index 300e6ed0aa..d5942e0b62 100644 --- a/cpp/src/aztec/crypto/sha256/sha256.cpp +++ b/cpp/src/barretenberg/crypto/sha256/sha256.cpp @@ -1,7 +1,7 @@ #include "./sha256.hpp" #include -#include -#include +#include +#include #include namespace sha256 { @@ -181,4 +181,4 @@ template hash sha256>(const std::vector& input); template hash sha256>(const std::array& input); template hash sha256(const std::string& input); -} // namespace sha256 \ No newline at end of file +} // namespace sha256 diff --git a/cpp/src/aztec/crypto/sha256/sha256.hpp b/cpp/src/barretenberg/crypto/sha256/sha256.hpp similarity index 95% rename from cpp/src/aztec/crypto/sha256/sha256.hpp rename to cpp/src/barretenberg/crypto/sha256/sha256.hpp index e2d0dd238c..3d0e73e5fc 100644 --- a/cpp/src/aztec/crypto/sha256/sha256.hpp +++ b/cpp/src/barretenberg/crypto/sha256/sha256.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include namespace sha256 { @@ -48,4 +48,4 @@ inline std::ostream& operator<<(std::ostream& os, sha256::hash const& arr) os.flags(f); return os; } -} // namespace std \ No newline at end of file +} // namespace std diff --git a/cpp/src/aztec/crypto/sha256/sha256.test.cpp b/cpp/src/barretenberg/crypto/sha256/sha256.test.cpp similarity index 100% rename from cpp/src/aztec/crypto/sha256/sha256.test.cpp rename to cpp/src/barretenberg/crypto/sha256/sha256.test.cpp diff --git a/cpp/src/aztec/dsl/CMakeLists.txt b/cpp/src/barretenberg/dsl/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/dsl/CMakeLists.txt rename to cpp/src/barretenberg/dsl/CMakeLists.txt diff --git a/cpp/src/aztec/dsl/acir_format/CMakeLists.txt b/cpp/src/barretenberg/dsl/acir_format/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/dsl/acir_format/CMakeLists.txt rename to cpp/src/barretenberg/dsl/acir_format/CMakeLists.txt diff --git a/cpp/src/aztec/dsl/acir_format/acir_format.cpp b/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp similarity index 100% rename from cpp/src/aztec/dsl/acir_format/acir_format.cpp rename to cpp/src/barretenberg/dsl/acir_format/acir_format.cpp diff --git a/cpp/src/aztec/dsl/acir_format/acir_format.hpp b/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp similarity index 100% rename from cpp/src/aztec/dsl/acir_format/acir_format.hpp rename to cpp/src/barretenberg/dsl/acir_format/acir_format.hpp diff --git a/cpp/src/aztec/dsl/acir_format/blake2s_constraint.cpp b/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp similarity index 96% rename from cpp/src/aztec/dsl/acir_format/blake2s_constraint.cpp rename to cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp index 3cf5540b40..38876d0a5b 100644 --- a/cpp/src/aztec/dsl/acir_format/blake2s_constraint.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp @@ -1,6 +1,6 @@ #include "blake2s_constraint.hpp" #include "round.hpp" -#include "stdlib/types/types.hpp" +#include "barretenberg/stdlib/types/types.hpp" using namespace plonk::stdlib::types; diff --git a/cpp/src/aztec/dsl/acir_format/blake2s_constraint.hpp b/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp similarity index 95% rename from cpp/src/aztec/dsl/acir_format/blake2s_constraint.hpp rename to cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp index e6bcf11da0..e4ce915b5a 100644 --- a/cpp/src/aztec/dsl/acir_format/blake2s_constraint.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp @@ -1,7 +1,7 @@ #pragma once #include #include -#include "plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" namespace acir_format { diff --git a/cpp/src/aztec/dsl/acir_format/ecdsa_secp256k1.cpp b/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp similarity index 96% rename from cpp/src/aztec/dsl/acir_format/ecdsa_secp256k1.cpp rename to cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp index 94b9b0478a..5d495775d7 100644 --- a/cpp/src/aztec/dsl/acir_format/ecdsa_secp256k1.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp @@ -1,7 +1,7 @@ #include "ecdsa_secp256k1.hpp" -#include "crypto/ecdsa/ecdsa.hpp" -#include "stdlib/encryption/ecdsa/ecdsa.hpp" -#include "stdlib/types/types.hpp" +#include "barretenberg/crypto/ecdsa/ecdsa.hpp" +#include "barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp" +#include "barretenberg/stdlib/types/types.hpp" using namespace plonk::stdlib::types; diff --git a/cpp/src/aztec/dsl/acir_format/ecdsa_secp256k1.hpp b/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp similarity index 96% rename from cpp/src/aztec/dsl/acir_format/ecdsa_secp256k1.hpp rename to cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp index 20b053697b..816d4bda73 100644 --- a/cpp/src/aztec/dsl/acir_format/ecdsa_secp256k1.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include "plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" namespace acir_format { diff --git a/cpp/src/aztec/dsl/acir_format/fixed_base_scalar_mul.cpp b/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp similarity index 92% rename from cpp/src/aztec/dsl/acir_format/fixed_base_scalar_mul.cpp rename to cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp index 033fea2f63..db5383927c 100644 --- a/cpp/src/aztec/dsl/acir_format/fixed_base_scalar_mul.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp @@ -1,5 +1,5 @@ #include "fixed_base_scalar_mul.hpp" -#include "stdlib/types/types.hpp" +#include "barretenberg/stdlib/types/types.hpp" using namespace plonk::stdlib::types; diff --git a/cpp/src/aztec/dsl/acir_format/fixed_base_scalar_mul.hpp b/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.hpp similarity index 93% rename from cpp/src/aztec/dsl/acir_format/fixed_base_scalar_mul.hpp rename to cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.hpp index 33e9021541..672978bac6 100644 --- a/cpp/src/aztec/dsl/acir_format/fixed_base_scalar_mul.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include "plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" namespace acir_format { diff --git a/cpp/src/aztec/dsl/acir_format/hash_to_field.cpp b/cpp/src/barretenberg/dsl/acir_format/hash_to_field.cpp similarity index 96% rename from cpp/src/aztec/dsl/acir_format/hash_to_field.cpp rename to cpp/src/barretenberg/dsl/acir_format/hash_to_field.cpp index 11fc656835..577c3b6bac 100644 --- a/cpp/src/aztec/dsl/acir_format/hash_to_field.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/hash_to_field.cpp @@ -1,6 +1,6 @@ #include "hash_to_field.hpp" #include "round.hpp" -#include "stdlib/types/types.hpp" +#include "barretenberg/stdlib/types/types.hpp" using namespace plonk::stdlib::types; diff --git a/cpp/src/aztec/dsl/acir_format/hash_to_field.hpp b/cpp/src/barretenberg/dsl/acir_format/hash_to_field.hpp similarity index 95% rename from cpp/src/aztec/dsl/acir_format/hash_to_field.hpp rename to cpp/src/barretenberg/dsl/acir_format/hash_to_field.hpp index 1953ba90ef..6f8b901b57 100644 --- a/cpp/src/aztec/dsl/acir_format/hash_to_field.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/hash_to_field.hpp @@ -1,7 +1,7 @@ #pragma once #include #include -#include "plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" namespace acir_format { diff --git a/cpp/src/aztec/dsl/acir_format/logic_constraint.cpp b/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp similarity index 100% rename from cpp/src/aztec/dsl/acir_format/logic_constraint.cpp rename to cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp diff --git a/cpp/src/aztec/dsl/acir_format/logic_constraint.hpp b/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp similarity index 95% rename from cpp/src/aztec/dsl/acir_format/logic_constraint.hpp rename to cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp index bb71507df6..51dfb73db5 100644 --- a/cpp/src/aztec/dsl/acir_format/logic_constraint.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include "plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" namespace acir_format { diff --git a/cpp/src/aztec/dsl/acir_format/merkle_membership_constraint.cpp b/cpp/src/barretenberg/dsl/acir_format/merkle_membership_constraint.cpp similarity index 94% rename from cpp/src/aztec/dsl/acir_format/merkle_membership_constraint.cpp rename to cpp/src/barretenberg/dsl/acir_format/merkle_membership_constraint.cpp index a2caaaf4ea..65b746abcf 100644 --- a/cpp/src/aztec/dsl/acir_format/merkle_membership_constraint.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/merkle_membership_constraint.cpp @@ -1,6 +1,6 @@ #include "merkle_membership_constraint.hpp" -#include "stdlib/merkle_tree/membership.hpp" -#include "stdlib/types/types.hpp" +#include "barretenberg/stdlib/merkle_tree/membership.hpp" +#include "barretenberg/stdlib/types/types.hpp" using namespace plonk::stdlib::types; using namespace plonk::stdlib::merkle_tree; diff --git a/cpp/src/aztec/dsl/acir_format/merkle_membership_constraint.hpp b/cpp/src/barretenberg/dsl/acir_format/merkle_membership_constraint.hpp similarity index 95% rename from cpp/src/aztec/dsl/acir_format/merkle_membership_constraint.hpp rename to cpp/src/barretenberg/dsl/acir_format/merkle_membership_constraint.hpp index f54ce979fc..6cf9a78dd6 100644 --- a/cpp/src/aztec/dsl/acir_format/merkle_membership_constraint.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/merkle_membership_constraint.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include "plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" namespace acir_format { diff --git a/cpp/src/aztec/dsl/acir_format/pedersen.cpp b/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp similarity index 93% rename from cpp/src/aztec/dsl/acir_format/pedersen.cpp rename to cpp/src/barretenberg/dsl/acir_format/pedersen.cpp index b8243ccd12..6bb7b9de9b 100644 --- a/cpp/src/aztec/dsl/acir_format/pedersen.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp @@ -1,5 +1,5 @@ #include "pedersen.hpp" -#include "stdlib/types/types.hpp" +#include "barretenberg/stdlib/types/types.hpp" using namespace plonk::stdlib::types; diff --git a/cpp/src/aztec/dsl/acir_format/pedersen.hpp b/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp similarity index 93% rename from cpp/src/aztec/dsl/acir_format/pedersen.hpp rename to cpp/src/barretenberg/dsl/acir_format/pedersen.hpp index 142bdce861..e53c51fef0 100644 --- a/cpp/src/aztec/dsl/acir_format/pedersen.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include "plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" namespace acir_format { diff --git a/cpp/src/aztec/dsl/acir_format/range_constraint.hpp b/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp similarity index 93% rename from cpp/src/aztec/dsl/acir_format/range_constraint.hpp rename to cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp index 636653f219..7f5a512ce6 100644 --- a/cpp/src/aztec/dsl/acir_format/range_constraint.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include "common/serialize.hpp" +#include "barretenberg/common/serialize.hpp" namespace acir_format { diff --git a/cpp/src/aztec/dsl/acir_format/round.cpp b/cpp/src/barretenberg/dsl/acir_format/round.cpp similarity index 100% rename from cpp/src/aztec/dsl/acir_format/round.cpp rename to cpp/src/barretenberg/dsl/acir_format/round.cpp diff --git a/cpp/src/aztec/dsl/acir_format/round.hpp b/cpp/src/barretenberg/dsl/acir_format/round.hpp similarity index 100% rename from cpp/src/aztec/dsl/acir_format/round.hpp rename to cpp/src/barretenberg/dsl/acir_format/round.hpp diff --git a/cpp/src/aztec/dsl/acir_format/schnorr_verify.cpp b/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp similarity index 96% rename from cpp/src/aztec/dsl/acir_format/schnorr_verify.cpp rename to cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp index edbc041fee..497bda7f9a 100644 --- a/cpp/src/aztec/dsl/acir_format/schnorr_verify.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp @@ -1,6 +1,6 @@ #include "schnorr_verify.hpp" -#include "crypto/schnorr/schnorr.hpp" -#include "stdlib/types/types.hpp" +#include "barretenberg/crypto/schnorr/schnorr.hpp" +#include "barretenberg/stdlib/types/types.hpp" using namespace plonk::stdlib::types; diff --git a/cpp/src/aztec/dsl/acir_format/schnorr_verify.hpp b/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp similarity index 96% rename from cpp/src/aztec/dsl/acir_format/schnorr_verify.hpp rename to cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp index 3f208954d1..8f0eec2222 100644 --- a/cpp/src/aztec/dsl/acir_format/schnorr_verify.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include "plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" namespace acir_format { diff --git a/cpp/src/aztec/dsl/acir_format/sha256_constraint.cpp b/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp similarity index 93% rename from cpp/src/aztec/dsl/acir_format/sha256_constraint.cpp rename to cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp index da4fc98a3e..b1c2fbe2a8 100644 --- a/cpp/src/aztec/dsl/acir_format/sha256_constraint.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp @@ -1,7 +1,7 @@ #include "sha256_constraint.hpp" #include "round.hpp" -#include "stdlib/hash/sha256/sha256.hpp" -#include "stdlib/types/types.hpp" +#include "barretenberg/stdlib/hash/sha256/sha256.hpp" +#include "barretenberg/stdlib/types/types.hpp" using namespace plonk::stdlib::types; diff --git a/cpp/src/aztec/dsl/acir_format/sha256_constraint.hpp b/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp similarity index 96% rename from cpp/src/aztec/dsl/acir_format/sha256_constraint.hpp rename to cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp index 7f83c4c9e1..08b60e0bd1 100644 --- a/cpp/src/aztec/dsl/acir_format/sha256_constraint.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp @@ -1,7 +1,7 @@ #pragma once #include #include -#include "plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" namespace acir_format { diff --git a/cpp/src/aztec/dsl/turbo_proofs/CMakeLists.txt b/cpp/src/barretenberg/dsl/turbo_proofs/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/dsl/turbo_proofs/CMakeLists.txt rename to cpp/src/barretenberg/dsl/turbo_proofs/CMakeLists.txt diff --git a/cpp/src/aztec/dsl/turbo_proofs/c_bind.cpp b/cpp/src/barretenberg/dsl/turbo_proofs/c_bind.cpp similarity index 100% rename from cpp/src/aztec/dsl/turbo_proofs/c_bind.cpp rename to cpp/src/barretenberg/dsl/turbo_proofs/c_bind.cpp diff --git a/cpp/src/aztec/dsl/turbo_proofs/c_bind.hpp b/cpp/src/barretenberg/dsl/turbo_proofs/c_bind.hpp similarity index 100% rename from cpp/src/aztec/dsl/turbo_proofs/c_bind.hpp rename to cpp/src/barretenberg/dsl/turbo_proofs/c_bind.hpp diff --git a/cpp/src/aztec/dsl/turbo_proofs/turbo_proofs.cpp b/cpp/src/barretenberg/dsl/turbo_proofs/turbo_proofs.cpp similarity index 95% rename from cpp/src/aztec/dsl/turbo_proofs/turbo_proofs.cpp rename to cpp/src/barretenberg/dsl/turbo_proofs/turbo_proofs.cpp index fefecbc4c2..233170dee8 100644 --- a/cpp/src/aztec/dsl/turbo_proofs/turbo_proofs.cpp +++ b/cpp/src/barretenberg/dsl/turbo_proofs/turbo_proofs.cpp @@ -1,9 +1,9 @@ #include "turbo_proofs.hpp" -#include "proof_system/proving_key/serialize.hpp" -#include "dsl/acir_format/acir_format.hpp" -#include "stdlib/types/types.hpp" -#include "srs/reference_string/pippenger_reference_string.hpp" +#include "barretenberg/proof_system/proving_key/serialize.hpp" +#include "barretenberg/dsl/acir_format/acir_format.hpp" +#include "barretenberg/stdlib/types/types.hpp" +#include "barretenberg/srs/reference_string/pippenger_reference_string.hpp" using namespace plonk::stdlib::types; @@ -27,7 +27,7 @@ size_t turbo_init_proving_key(uint8_t const* constraint_system_buf, uint8_t cons auto crs_factory = std::make_unique(); auto composer = create_circuit(constraint_system, std::move(crs_factory)); auto proving_key = composer.compute_proving_key(); - + auto buffer = to_buffer(*proving_key); auto raw_buf = (uint8_t*)malloc(buffer.size()); memcpy(raw_buf, (void*)buffer.data(), buffer.size()); diff --git a/cpp/src/aztec/dsl/turbo_proofs/turbo_proofs.hpp b/cpp/src/barretenberg/dsl/turbo_proofs/turbo_proofs.hpp similarity index 100% rename from cpp/src/aztec/dsl/turbo_proofs/turbo_proofs.hpp rename to cpp/src/barretenberg/dsl/turbo_proofs/turbo_proofs.hpp diff --git a/cpp/src/aztec/ecc/CMakeLists.txt b/cpp/src/barretenberg/ecc/CMakeLists.txt similarity index 80% rename from cpp/src/aztec/ecc/CMakeLists.txt rename to cpp/src/barretenberg/ecc/CMakeLists.txt index 6b632ba320..588d8e2c2e 100644 --- a/cpp/src/aztec/ecc/CMakeLists.txt +++ b/cpp/src/barretenberg/ecc/CMakeLists.txt @@ -9,10 +9,10 @@ target_precompile_headers( ecc PUBLIC "$<$:>" - $<$:"numeric/uint256/uint256.hpp"> - $<$:"numeric/uint256/uint256_impl.hpp"> + $<$:"barretenberg/numeric/uint256/uint256.hpp"> + $<$:"barretenberg/numeric/uint256/uint256_impl.hpp"> $<$:"${CMAKE_CURRENT_SOURCE_DIR}/fields/asm_macros.hpp"> $<$:"${CMAKE_CURRENT_SOURCE_DIR}/fields/field.hpp"> $<$:"${CMAKE_CURRENT_SOURCE_DIR}/fields/field_impl_generic.hpp"> $<$:"${CMAKE_CURRENT_SOURCE_DIR}/fields/field_impl_x64.hpp"> -) \ No newline at end of file +) diff --git a/cpp/src/aztec/ecc/curves/bn254/fq.hpp b/cpp/src/barretenberg/ecc/curves/bn254/fq.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/fq.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/fq.hpp diff --git a/cpp/src/aztec/ecc/curves/bn254/fq.test.cpp b/cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/fq.test.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp diff --git a/cpp/src/aztec/ecc/curves/bn254/fq12.hpp b/cpp/src/barretenberg/ecc/curves/bn254/fq12.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/fq12.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/fq12.hpp diff --git a/cpp/src/aztec/ecc/curves/bn254/fq12.test.cpp b/cpp/src/barretenberg/ecc/curves/bn254/fq12.test.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/fq12.test.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/fq12.test.cpp diff --git a/cpp/src/aztec/ecc/curves/bn254/fq2.hpp b/cpp/src/barretenberg/ecc/curves/bn254/fq2.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/fq2.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/fq2.hpp diff --git a/cpp/src/aztec/ecc/curves/bn254/fq2.test.cpp b/cpp/src/barretenberg/ecc/curves/bn254/fq2.test.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/fq2.test.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/fq2.test.cpp diff --git a/cpp/src/aztec/ecc/curves/bn254/fq6.hpp b/cpp/src/barretenberg/ecc/curves/bn254/fq6.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/fq6.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/fq6.hpp diff --git a/cpp/src/aztec/ecc/curves/bn254/fq6.test.cpp b/cpp/src/barretenberg/ecc/curves/bn254/fq6.test.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/fq6.test.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/fq6.test.cpp diff --git a/cpp/src/aztec/ecc/curves/bn254/fr.bench.cpp b/cpp/src/barretenberg/ecc/curves/bn254/fr.bench.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/fr.bench.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/fr.bench.cpp diff --git a/cpp/src/aztec/ecc/curves/bn254/fr.hpp b/cpp/src/barretenberg/ecc/curves/bn254/fr.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/fr.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/fr.hpp diff --git a/cpp/src/aztec/ecc/curves/bn254/fr.test.cpp b/cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/fr.test.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp diff --git a/cpp/src/aztec/ecc/curves/bn254/g1.hpp b/cpp/src/barretenberg/ecc/curves/bn254/g1.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/g1.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/g1.hpp diff --git a/cpp/src/aztec/ecc/curves/bn254/g1.test.cpp b/cpp/src/barretenberg/ecc/curves/bn254/g1.test.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/g1.test.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/g1.test.cpp diff --git a/cpp/src/aztec/ecc/curves/bn254/g2.hpp b/cpp/src/barretenberg/ecc/curves/bn254/g2.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/g2.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/g2.hpp diff --git a/cpp/src/aztec/ecc/curves/bn254/g2.test.cpp b/cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/g2.test.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp diff --git a/cpp/src/aztec/ecc/curves/bn254/pairing.hpp b/cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/pairing.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp diff --git a/cpp/src/aztec/ecc/curves/bn254/pairing.test.cpp b/cpp/src/barretenberg/ecc/curves/bn254/pairing.test.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/pairing.test.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/pairing.test.cpp diff --git a/cpp/src/aztec/ecc/curves/bn254/pairing_impl.hpp b/cpp/src/barretenberg/ecc/curves/bn254/pairing_impl.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/pairing_impl.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/pairing_impl.hpp diff --git a/cpp/src/aztec/ecc/curves/bn254/pseudorandom.hpp b/cpp/src/barretenberg/ecc/curves/bn254/pseudorandom.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/pseudorandom.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/pseudorandom.hpp diff --git a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/c_bind.cpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/c_bind.cpp similarity index 97% rename from cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/c_bind.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/c_bind.cpp index c117b870b7..0df88035f4 100644 --- a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/c_bind.cpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/c_bind.cpp @@ -1,5 +1,5 @@ #include "pippenger.hpp" -#include "common/mem.hpp" +#include "barretenberg/common/mem.hpp" using namespace barretenberg; diff --git a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/c_bind.hpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/c_bind.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/c_bind.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/c_bind.hpp diff --git a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/pippenger.cpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.cpp similarity index 95% rename from cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/pippenger.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.cpp index 571197a1f4..e566c85d81 100644 --- a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/pippenger.cpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.cpp @@ -1,5 +1,5 @@ #include "pippenger.hpp" -#include +#include namespace barretenberg { namespace scalar_multiplication { @@ -41,4 +41,4 @@ Pippenger::~Pippenger() } } // namespace scalar_multiplication -} // namespace barretenberg \ No newline at end of file +} // namespace barretenberg diff --git a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/pippenger.hpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.hpp similarity index 93% rename from cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/pippenger.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.hpp index 6c2fc0044f..c873cd3771 100644 --- a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/pippenger.hpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.hpp @@ -1,7 +1,7 @@ #pragma once #include "./scalar_multiplication.hpp" -#include -#include +#include +#include #ifndef NO_MULTITHREADING #include @@ -59,4 +59,4 @@ class Pippenger { }; } // namespace scalar_multiplication -} // namespace barretenberg \ No newline at end of file +} // namespace barretenberg diff --git a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/process_buckets.cpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/process_buckets.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/process_buckets.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/process_buckets.cpp diff --git a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/process_buckets.hpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/process_buckets.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/process_buckets.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/process_buckets.hpp diff --git a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/runtime_states.cpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/runtime_states.cpp similarity index 97% rename from cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/runtime_states.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/runtime_states.cpp index 8229f984e4..a6e567b8e9 100644 --- a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/runtime_states.cpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/runtime_states.cpp @@ -1,8 +1,8 @@ #include "runtime_states.hpp" -#include -#include -#include +#include +#include +#include #ifndef NO_MULTITHREADING #include @@ -209,4 +209,4 @@ pippenger_runtime_state::~pippenger_runtime_state() } } } // namespace scalar_multiplication -} // namespace barretenberg \ No newline at end of file +} // namespace barretenberg diff --git a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/runtime_states.hpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/runtime_states.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/runtime_states.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/runtime_states.hpp diff --git a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.cpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.cpp similarity index 99% rename from cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.cpp index 6e9fb9dde6..71f973c4b4 100644 --- a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.cpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.cpp @@ -1,9 +1,9 @@ #include "./scalar_multiplication.hpp" -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -943,4 +943,4 @@ g1::element pippenger_without_endomorphism_basis_points(fr* scalars, return pippenger(scalars, &G_mod[0], num_initial_points, state, false); } } // namespace scalar_multiplication -} // namespace barretenberg \ No newline at end of file +} // namespace barretenberg diff --git a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp rename to cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp diff --git a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.test.cpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.test.cpp similarity index 99% rename from cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.test.cpp rename to cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.test.cpp index a715d52c45..3788ee24c4 100644 --- a/cpp/src/aztec/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.test.cpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.test.cpp @@ -1,13 +1,13 @@ #include "pippenger.hpp" #include "scalar_multiplication.hpp" #include -#include -#include +#include +#include #include -#include +#include -#include +#include #define BARRETENBERG_SRS_PATH "../srs_db/ignition" diff --git a/cpp/src/aztec/ecc/curves/grumpkin/c_bind.cpp b/cpp/src/barretenberg/ecc/curves/grumpkin/c_bind.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/grumpkin/c_bind.cpp rename to cpp/src/barretenberg/ecc/curves/grumpkin/c_bind.cpp diff --git a/cpp/src/aztec/ecc/curves/grumpkin/grumpkin.cpp b/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/grumpkin/grumpkin.cpp rename to cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.cpp diff --git a/cpp/src/aztec/ecc/curves/grumpkin/grumpkin.hpp b/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/grumpkin/grumpkin.hpp rename to cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.hpp diff --git a/cpp/src/aztec/ecc/curves/grumpkin/grumpkin.test.cpp b/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/grumpkin/grumpkin.test.cpp rename to cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp diff --git a/cpp/src/aztec/ecc/curves/secp256k1/secp256k1.cpp b/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/secp256k1/secp256k1.cpp rename to cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.cpp diff --git a/cpp/src/aztec/ecc/curves/secp256k1/secp256k1.hpp b/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp similarity index 97% rename from cpp/src/aztec/ecc/curves/secp256k1/secp256k1.hpp rename to cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp index 1d9051faf0..36881f9806 100644 --- a/cpp/src/aztec/ecc/curves/secp256k1/secp256k1.hpp +++ b/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include "../../fields/field.hpp" #include "../../groups/group.hpp" @@ -146,4 +146,4 @@ typedef barretenberg:: group, barretenberg::field, Secp256k1G1Params> g1; g1::affine_element get_generator(const size_t generator_index); -} // namespace secp256k1 \ No newline at end of file +} // namespace secp256k1 diff --git a/cpp/src/aztec/ecc/curves/secp256k1/secp256k1.test.cpp b/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp similarity index 99% rename from cpp/src/aztec/ecc/curves/secp256k1/secp256k1.test.cpp rename to cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp index 5b5186019f..79898c7503 100644 --- a/cpp/src/aztec/ecc/curves/secp256k1/secp256k1.test.cpp +++ b/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp @@ -1,6 +1,6 @@ #include "secp256k1.hpp" #include -#include +#include namespace test_secp256k1 { @@ -589,4 +589,4 @@ TEST(secp256k1, montgomery_mul_big_bug) EXPECT_EQ((a_sqr == expected), true); } -} // namespace test_secp256k1 \ No newline at end of file +} // namespace test_secp256k1 diff --git a/cpp/src/aztec/ecc/curves/secp256k1/secp256k1_endo_notes.hpp b/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp similarity index 98% rename from cpp/src/aztec/ecc/curves/secp256k1/secp256k1_endo_notes.hpp rename to cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp index 61a2a6ab91..abfb494945 100644 --- a/cpp/src/aztec/ecc/curves/secp256k1/secp256k1_endo_notes.hpp +++ b/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "secp256k1.hpp" namespace secp256k1_params { @@ -161,4 +161,4 @@ static std::pair get_endomorphism_scalars() std::cerr << "could not find endomorphism scalars???" << std::endl; return { secp256k1::fq(0), secp256k1::fr(0) }; } -}; // namespace secp256k1_params \ No newline at end of file +}; // namespace secp256k1_params diff --git a/cpp/src/aztec/ecc/curves/secp256r1/secp256r1.cpp b/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.cpp similarity index 100% rename from cpp/src/aztec/ecc/curves/secp256r1/secp256r1.cpp rename to cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.cpp diff --git a/cpp/src/aztec/ecc/curves/secp256r1/secp256r1.hpp b/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp similarity index 97% rename from cpp/src/aztec/ecc/curves/secp256r1/secp256r1.hpp rename to cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp index 461aecb029..681dccd3b8 100644 --- a/cpp/src/aztec/ecc/curves/secp256r1/secp256r1.hpp +++ b/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include "../../fields/field.hpp" #include "../../groups/group.hpp" @@ -133,4 +133,4 @@ typedef barretenberg:: group, barretenberg::field, Secp256r1G1Params> g1; g1::affine_element get_generator(const size_t generator_index); -} // namespace secp256r1 \ No newline at end of file +} // namespace secp256r1 diff --git a/cpp/src/aztec/ecc/curves/secp256r1/secp256r1.test.cpp b/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp similarity index 99% rename from cpp/src/aztec/ecc/curves/secp256r1/secp256r1.test.cpp rename to cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp index 17f5f3f89d..fe9276c05e 100644 --- a/cpp/src/aztec/ecc/curves/secp256r1/secp256r1.test.cpp +++ b/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp @@ -1,6 +1,6 @@ #include "secp256r1.hpp" #include -#include +#include namespace test_secp256r1 { @@ -480,4 +480,4 @@ TEST(secp256r1, montgomery_mul_big_bug) EXPECT_EQ((a_sqr == expected), true); } -} // namespace test_secp256r1 \ No newline at end of file +} // namespace test_secp256r1 diff --git a/cpp/src/aztec/ecc/curves/types.hpp b/cpp/src/barretenberg/ecc/curves/types.hpp similarity index 100% rename from cpp/src/aztec/ecc/curves/types.hpp rename to cpp/src/barretenberg/ecc/curves/types.hpp diff --git a/cpp/src/aztec/ecc/fields/asm_macros.hpp b/cpp/src/barretenberg/ecc/fields/asm_macros.hpp similarity index 100% rename from cpp/src/aztec/ecc/fields/asm_macros.hpp rename to cpp/src/barretenberg/ecc/fields/asm_macros.hpp diff --git a/cpp/src/aztec/ecc/fields/extra_flag_solver.py b/cpp/src/barretenberg/ecc/fields/extra_flag_solver.py similarity index 100% rename from cpp/src/aztec/ecc/fields/extra_flag_solver.py rename to cpp/src/barretenberg/ecc/fields/extra_flag_solver.py diff --git a/cpp/src/aztec/ecc/fields/field.hpp b/cpp/src/barretenberg/ecc/fields/field.hpp similarity index 98% rename from cpp/src/aztec/ecc/fields/field.hpp rename to cpp/src/barretenberg/ecc/fields/field.hpp index 42da28cef0..8e4effcdd4 100644 --- a/cpp/src/aztec/ecc/fields/field.hpp +++ b/cpp/src/barretenberg/ecc/fields/field.hpp @@ -1,13 +1,13 @@ #pragma once #include -#include -#include -#include +#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/src/aztec/ecc/fields/field12.hpp b/cpp/src/barretenberg/ecc/fields/field12.hpp similarity index 99% rename from cpp/src/aztec/ecc/fields/field12.hpp rename to cpp/src/barretenberg/ecc/fields/field12.hpp index 5b3b2ff2f6..5673bc69f9 100644 --- a/cpp/src/aztec/ecc/fields/field12.hpp +++ b/cpp/src/barretenberg/ecc/fields/field12.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace barretenberg { template class field12 { diff --git a/cpp/src/aztec/ecc/fields/field2.hpp b/cpp/src/barretenberg/ecc/fields/field2.hpp similarity index 98% rename from cpp/src/aztec/ecc/fields/field2.hpp rename to cpp/src/barretenberg/ecc/fields/field2.hpp index dc5a8ead27..e1440e5bbb 100644 --- a/cpp/src/aztec/ecc/fields/field2.hpp +++ b/cpp/src/barretenberg/ecc/fields/field2.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace barretenberg { template struct alignas(32) field2 { @@ -128,4 +128,4 @@ template struct alignas(32) field2 { } // namespace barretenberg -#include "field2_impl.hpp" \ No newline at end of file +#include "field2_impl.hpp" diff --git a/cpp/src/aztec/ecc/fields/field2_impl.hpp b/cpp/src/barretenberg/ecc/fields/field2_impl.hpp similarity index 100% rename from cpp/src/aztec/ecc/fields/field2_impl.hpp rename to cpp/src/barretenberg/ecc/fields/field2_impl.hpp diff --git a/cpp/src/aztec/ecc/fields/field6.hpp b/cpp/src/barretenberg/ecc/fields/field6.hpp similarity index 99% rename from cpp/src/aztec/ecc/fields/field6.hpp rename to cpp/src/barretenberg/ecc/fields/field6.hpp index 5cce798605..ee08b299a8 100644 --- a/cpp/src/aztec/ecc/fields/field6.hpp +++ b/cpp/src/barretenberg/ecc/fields/field6.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace barretenberg { template class field6 { diff --git a/cpp/src/aztec/ecc/fields/field_impl.hpp b/cpp/src/barretenberg/ecc/fields/field_impl.hpp similarity index 99% rename from cpp/src/aztec/ecc/fields/field_impl.hpp rename to cpp/src/barretenberg/ecc/fields/field_impl.hpp index 482418da33..1bb4c8f2f9 100644 --- a/cpp/src/aztec/ecc/fields/field_impl.hpp +++ b/cpp/src/barretenberg/ecc/fields/field_impl.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include #include @@ -595,4 +595,4 @@ template constexpr field field::multiplicative_generator() noexc return target; } -} // namespace barretenberg \ No newline at end of file +} // namespace barretenberg diff --git a/cpp/src/aztec/ecc/fields/field_impl_generic.hpp b/cpp/src/barretenberg/ecc/fields/field_impl_generic.hpp similarity index 100% rename from cpp/src/aztec/ecc/fields/field_impl_generic.hpp rename to cpp/src/barretenberg/ecc/fields/field_impl_generic.hpp diff --git a/cpp/src/aztec/ecc/fields/field_impl_x64.hpp b/cpp/src/barretenberg/ecc/fields/field_impl_x64.hpp similarity index 83% rename from cpp/src/aztec/ecc/fields/field_impl_x64.hpp rename to cpp/src/barretenberg/ecc/fields/field_impl_x64.hpp index 2664f12345..0f59db209c 100644 --- a/cpp/src/aztec/ecc/fields/field_impl_x64.hpp +++ b/cpp/src/barretenberg/ecc/fields/field_impl_x64.hpp @@ -87,12 +87,12 @@ template field field::asm_mul_with_coarse_reduction(const field& : "%r"(&a), "%r"(&b), "r"(&r), - [ modulus_0 ] "m"(modulus_0), - [ modulus_1 ] "m"(modulus_1), - [ modulus_2 ] "m"(modulus_2), - [ modulus_3 ] "m"(modulus_3), - [ r_inv ] "m"(r_inv), - [ zero_reference ] "m"(zero_ref) + [modulus_0] "m"(modulus_0), + [modulus_1] "m"(modulus_1), + [modulus_2] "m"(modulus_2), + [modulus_3] "m"(modulus_3), + [r_inv] "m"(r_inv), + [zero_reference] "m"(zero_ref) : "%rdx", "%rdi", "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "cc", "memory"); return r; } @@ -119,12 +119,12 @@ template void field::asm_self_mul_with_coarse_reduction(const field : : "r"(&a), "r"(&b), - [ modulus_0 ] "m"(modulus_0), - [ modulus_1 ] "m"(modulus_1), - [ modulus_2 ] "m"(modulus_2), - [ modulus_3 ] "m"(modulus_3), - [ r_inv ] "m"(r_inv), - [ zero_reference ] "m"(zero_ref) + [modulus_0] "m"(modulus_0), + [modulus_1] "m"(modulus_1), + [modulus_2] "m"(modulus_2), + [modulus_3] "m"(modulus_3), + [r_inv] "m"(r_inv), + [zero_reference] "m"(zero_ref) : "%rdx", "%rdi", "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "cc", "memory"); } @@ -157,12 +157,12 @@ template field field::asm_sqr_with_coarse_reduction(const field& : "%r"(&a), "%r"(&a), "r"(&r), - [ modulus_0 ] "m"(modulus_0), - [ modulus_1 ] "m"(modulus_1), - [ modulus_2 ] "m"(modulus_2), - [ modulus_3 ] "m"(modulus_3), - [ r_inv ] "m"(r_inv), - [ zero_reference ] "m"(zero_ref) + [modulus_0] "m"(modulus_0), + [modulus_1] "m"(modulus_1), + [modulus_2] "m"(modulus_2), + [modulus_3] "m"(modulus_3), + [r_inv] "m"(r_inv), + [zero_reference] "m"(zero_ref) : "%rdx", "%rdi", "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "cc", "memory"); #else @@ -181,12 +181,12 @@ template field field::asm_sqr_with_coarse_reduction(const field& : : "r"(&a), "r"(&r), - [ zero_reference ] "m"(zero_ref), - [ modulus_0 ] "m"(modulus_0), - [ modulus_1 ] "m"(modulus_1), - [ modulus_2 ] "m"(modulus_2), - [ modulus_3 ] "m"(modulus_3), - [ r_inv ] "m"(r_inv) + [zero_reference] "m"(zero_ref), + [modulus_0] "m"(modulus_0), + [modulus_1] "m"(modulus_1), + [modulus_2] "m"(modulus_2), + [modulus_3] "m"(modulus_3), + [r_inv] "m"(r_inv) : "%rcx", "%rdx", "%rdi", "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "cc", "memory"); #endif return r; @@ -219,12 +219,12 @@ template void field::asm_self_sqr_with_coarse_reduction(const field : : "r"(&a), "r"(&a), - [ modulus_0 ] "m"(modulus_0), - [ modulus_1 ] "m"(modulus_1), - [ modulus_2 ] "m"(modulus_2), - [ modulus_3 ] "m"(modulus_3), - [ r_inv ] "m"(r_inv), - [ zero_reference ] "m"(zero_ref) + [modulus_0] "m"(modulus_0), + [modulus_1] "m"(modulus_1), + [modulus_2] "m"(modulus_2), + [modulus_3] "m"(modulus_3), + [r_inv] "m"(r_inv), + [zero_reference] "m"(zero_ref) : "%rdx", "%rdi", "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "cc", "memory"); #else @@ -241,12 +241,12 @@ template void field::asm_self_sqr_with_coarse_reduction(const field STORE_FIELD_ELEMENT("%0", "%%r12", "%%r13", "%%r14", "%%r15") : : "r"(&a), - [ zero_reference ] "m"(zero_ref), - [ modulus_0 ] "m"(modulus_0), - [ modulus_1 ] "m"(modulus_1), - [ modulus_2 ] "m"(modulus_2), - [ modulus_3 ] "m"(modulus_3), - [ r_inv ] "m"(r_inv) + [zero_reference] "m"(zero_ref), + [modulus_0] "m"(modulus_0), + [modulus_1] "m"(modulus_1), + [modulus_2] "m"(modulus_2), + [modulus_3] "m"(modulus_3), + [r_inv] "m"(r_inv) : "%rcx", "%rdx", "%rdi", "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "cc", "memory"); #endif } @@ -270,10 +270,10 @@ template field field::asm_add_with_coarse_reduction(const field& : "%r"(&a), "%r"(&b), "r"(&r), - [ twice_not_modulus_0 ] "m"(twice_not_modulus_0), - [ twice_not_modulus_1 ] "m"(twice_not_modulus_1), - [ twice_not_modulus_2 ] "m"(twice_not_modulus_2), - [ twice_not_modulus_3 ] "m"(twice_not_modulus_3) + [twice_not_modulus_0] "m"(twice_not_modulus_0), + [twice_not_modulus_1] "m"(twice_not_modulus_1), + [twice_not_modulus_2] "m"(twice_not_modulus_2), + [twice_not_modulus_3] "m"(twice_not_modulus_3) : "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "cc", "memory"); return r; } @@ -294,10 +294,10 @@ template void field::asm_self_add_with_coarse_reduction(const field : : "r"(&a), "r"(&b), - [ twice_not_modulus_0 ] "m"(twice_not_modulus_0), - [ twice_not_modulus_1 ] "m"(twice_not_modulus_1), - [ twice_not_modulus_2 ] "m"(twice_not_modulus_2), - [ twice_not_modulus_3 ] "m"(twice_not_modulus_3) + [twice_not_modulus_0] "m"(twice_not_modulus_0), + [twice_not_modulus_1] "m"(twice_not_modulus_1), + [twice_not_modulus_2] "m"(twice_not_modulus_2), + [twice_not_modulus_3] "m"(twice_not_modulus_3) : "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "cc", "memory"); } @@ -318,10 +318,10 @@ template field field::asm_sub_with_coarse_reduction(const field& : "r"(&a), "r"(&b), "r"(&r), - [ twice_modulus_0 ] "m"(twice_modulus_0), - [ twice_modulus_1 ] "m"(twice_modulus_1), - [ twice_modulus_2 ] "m"(twice_modulus_2), - [ twice_modulus_3 ] "m"(twice_modulus_3) + [twice_modulus_0] "m"(twice_modulus_0), + [twice_modulus_1] "m"(twice_modulus_1), + [twice_modulus_2] "m"(twice_modulus_2), + [twice_modulus_3] "m"(twice_modulus_3) : "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "cc", "memory"); return r; } @@ -340,10 +340,10 @@ template void field::asm_self_sub_with_coarse_reduction(const field : : "r"(&a), "r"(&b), - [ twice_modulus_0 ] "m"(twice_modulus_0), - [ twice_modulus_1 ] "m"(twice_modulus_1), - [ twice_modulus_2 ] "m"(twice_modulus_2), - [ twice_modulus_3 ] "m"(twice_modulus_3) + [twice_modulus_0] "m"(twice_modulus_0), + [twice_modulus_1] "m"(twice_modulus_1), + [twice_modulus_2] "m"(twice_modulus_2), + [twice_modulus_3] "m"(twice_modulus_3) : "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "cc", "memory"); } @@ -372,10 +372,10 @@ template void field::asm_conditional_negate(field& r, const uint64_ : : "r"(predicate), "r"(&r), - [ twice_modulus_0 ] "i"(twice_modulus_0), - [ twice_modulus_1 ] "i"(twice_modulus_1), - [ twice_modulus_2 ] "i"(twice_modulus_2), - [ twice_modulus_3 ] "i"(twice_modulus_3) + [twice_modulus_0] "i"(twice_modulus_0), + [twice_modulus_1] "i"(twice_modulus_1), + [twice_modulus_2] "i"(twice_modulus_2), + [twice_modulus_3] "i"(twice_modulus_3) : "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "cc", "memory"); } @@ -394,10 +394,10 @@ template field field::asm_reduce_once(const field& a) noexcept : : "r"(&a), "r"(&r), - [ not_modulus_0 ] "m"(not_modulus_0), - [ not_modulus_1 ] "m"(not_modulus_1), - [ not_modulus_2 ] "m"(not_modulus_2), - [ not_modulus_3 ] "m"(not_modulus_3) + [not_modulus_0] "m"(not_modulus_0), + [not_modulus_1] "m"(not_modulus_1), + [not_modulus_2] "m"(not_modulus_2), + [not_modulus_3] "m"(not_modulus_3) : "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "cc", "memory"); return r; } @@ -414,10 +414,10 @@ template void field::asm_self_reduce_once(const field& a) noexcept STORE_FIELD_ELEMENT("%0", "%%r12", "%%r13", "%%r14", "%%r15") : : "r"(&a), - [ not_modulus_0 ] "m"(not_modulus_0), - [ not_modulus_1 ] "m"(not_modulus_1), - [ not_modulus_2 ] "m"(not_modulus_2), - [ not_modulus_3 ] "m"(not_modulus_3) + [not_modulus_0] "m"(not_modulus_0), + [not_modulus_1] "m"(not_modulus_1), + [not_modulus_2] "m"(not_modulus_2), + [not_modulus_3] "m"(not_modulus_3) : "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "cc", "memory"); } } // namespace barretenberg diff --git a/cpp/src/aztec/ecc/fields/macro_scrapbook.hpp b/cpp/src/barretenberg/ecc/fields/macro_scrapbook.hpp similarity index 100% rename from cpp/src/aztec/ecc/fields/macro_scrapbook.hpp rename to cpp/src/barretenberg/ecc/fields/macro_scrapbook.hpp diff --git a/cpp/src/aztec/ecc/groups/affine_element.hpp b/cpp/src/barretenberg/ecc/groups/affine_element.hpp similarity index 97% rename from cpp/src/aztec/ecc/groups/affine_element.hpp rename to cpp/src/barretenberg/ecc/groups/affine_element.hpp index 2b597ab23e..7f82f6a92c 100644 --- a/cpp/src/aztec/ecc/groups/affine_element.hpp +++ b/cpp/src/barretenberg/ecc/groups/affine_element.hpp @@ -1,8 +1,8 @@ #pragma once -#include +#include #include #include -#include +#include namespace barretenberg { namespace group_elements { @@ -171,4 +171,4 @@ void write(B& buf, affine_element const& value) } // namespace group_elements } // namespace barretenberg -#include "./affine_element_impl.hpp" \ No newline at end of file +#include "./affine_element_impl.hpp" diff --git a/cpp/src/aztec/ecc/groups/affine_element.test.cpp b/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp similarity index 89% rename from cpp/src/aztec/ecc/groups/affine_element.test.cpp rename to cpp/src/barretenberg/ecc/groups/affine_element.test.cpp index fbeb22a85b..21cc436d35 100644 --- a/cpp/src/aztec/ecc/groups/affine_element.test.cpp +++ b/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp @@ -1,10 +1,10 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include namespace test_affine_element { template class test_affine_element : public testing::Test { @@ -100,4 +100,4 @@ TEST(affine_element, infinity_ordering_regression) P.self_set_infinity(); EXPECT_NE(P < Q, Q < P); } -} // namespace test_affine_element \ No newline at end of file +} // namespace test_affine_element diff --git a/cpp/src/aztec/ecc/groups/affine_element_impl.hpp b/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp similarity index 99% rename from cpp/src/aztec/ecc/groups/affine_element_impl.hpp rename to cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp index bfde853c22..fd982768ea 100644 --- a/cpp/src/aztec/ecc/groups/affine_element_impl.hpp +++ b/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace barretenberg { namespace group_elements { diff --git a/cpp/src/aztec/ecc/groups/element.hpp b/cpp/src/barretenberg/ecc/groups/element.hpp similarity index 97% rename from cpp/src/aztec/ecc/groups/element.hpp rename to cpp/src/barretenberg/ecc/groups/element.hpp index 5898b11bab..46e73a4244 100644 --- a/cpp/src/aztec/ecc/groups/element.hpp +++ b/cpp/src/barretenberg/ecc/groups/element.hpp @@ -3,10 +3,10 @@ #include "affine_element.hpp" #include "wnaf.hpp" #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -161,4 +161,4 @@ barretenberg::group_elements::affine_element operator*( const barretenberg::group_elements::element& base, const Fr& exponent) noexcept { return (barretenberg::group_elements::element(base) * exponent); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/ecc/groups/element_impl.hpp b/cpp/src/barretenberg/ecc/groups/element_impl.hpp similarity index 100% rename from cpp/src/aztec/ecc/groups/element_impl.hpp rename to cpp/src/barretenberg/ecc/groups/element_impl.hpp diff --git a/cpp/src/aztec/ecc/groups/group.hpp b/cpp/src/barretenberg/ecc/groups/group.hpp similarity index 100% rename from cpp/src/aztec/ecc/groups/group.hpp rename to cpp/src/barretenberg/ecc/groups/group.hpp diff --git a/cpp/src/aztec/ecc/groups/group_impl_asm.tcc b/cpp/src/barretenberg/ecc/groups/group_impl_asm.tcc similarity index 94% rename from cpp/src/aztec/ecc/groups/group_impl_asm.tcc rename to cpp/src/barretenberg/ecc/groups/group_impl_asm.tcc index 73a6374b95..17d714b487 100644 --- a/cpp/src/aztec/ecc/groups/group_impl_asm.tcc +++ b/cpp/src/barretenberg/ecc/groups/group_impl_asm.tcc @@ -98,10 +98,10 @@ inline void group::conditional_ne : "r"(src), "r"(dest), "r"(predicate), - [ modulus_0 ] "i"(twice_modulus_0), - [ modulus_1 ] "i"(twice_modulus_1), - [ modulus_2 ] "i"(twice_modulus_2), - [ modulus_3 ] "i"(twice_modulus_3) + [modulus_0] "i"(twice_modulus_0), + [modulus_1] "i"(twice_modulus_1), + [modulus_2] "i"(twice_modulus_2), + [modulus_3] "i"(twice_modulus_3) : "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "%ymm0", "memory", "cc"); #else __asm__ __volatile__("xorq %%r8, %%r8 \n\t" @@ -138,10 +138,10 @@ inline void group::conditional_ne : "r"(src), "r"(dest), "r"(predicate), - [ modulus_0 ] "i"(twice_modulus_0), - [ modulus_1 ] "i"(twice_modulus_1), - [ modulus_2 ] "i"(twice_modulus_2), - [ modulus_3 ] "i"(twice_modulus_3) + [modulus_0] "i"(twice_modulus_0), + [modulus_1] "i"(twice_modulus_1), + [modulus_2] "i"(twice_modulus_2), + [modulus_3] "i"(twice_modulus_3) : "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15", "memory", "cc"); #endif } else { diff --git a/cpp/src/aztec/ecc/groups/group_impl_int128.tcc b/cpp/src/barretenberg/ecc/groups/group_impl_int128.tcc similarity index 100% rename from cpp/src/aztec/ecc/groups/group_impl_int128.tcc rename to cpp/src/barretenberg/ecc/groups/group_impl_int128.tcc diff --git a/cpp/src/aztec/ecc/groups/wnaf.hpp b/cpp/src/barretenberg/ecc/groups/wnaf.hpp similarity index 99% rename from cpp/src/aztec/ecc/groups/wnaf.hpp rename to cpp/src/barretenberg/ecc/groups/wnaf.hpp index 6acdd95809..d8b678287d 100644 --- a/cpp/src/aztec/ecc/groups/wnaf.hpp +++ b/cpp/src/barretenberg/ecc/groups/wnaf.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include +#include #include namespace barretenberg { diff --git a/cpp/src/aztec/ecc/groups/wnaf.test.cpp b/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp similarity index 99% rename from cpp/src/aztec/ecc/groups/wnaf.test.cpp rename to cpp/src/barretenberg/ecc/groups/wnaf.test.cpp index a58583845b..ab99f38ef7 100644 --- a/cpp/src/aztec/ecc/groups/wnaf.test.cpp +++ b/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp @@ -1,7 +1,7 @@ #include "../curves/bn254/fr.hpp" #include "wnaf.hpp" #include -#include +#include using namespace barretenberg; @@ -168,4 +168,4 @@ TEST(wnaf, wnaf_fixed_with_endo_split) result = k1_recovered - result; EXPECT_EQ(result, k); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/ecc/pippenger.md b/cpp/src/barretenberg/ecc/pippenger.md similarity index 100% rename from cpp/src/aztec/ecc/pippenger.md rename to cpp/src/barretenberg/ecc/pippenger.md diff --git a/cpp/src/aztec/env/CMakeLists.txt b/cpp/src/barretenberg/env/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/env/CMakeLists.txt rename to cpp/src/barretenberg/env/CMakeLists.txt diff --git a/cpp/src/aztec/env/data_store.hpp b/cpp/src/barretenberg/env/data_store.hpp similarity index 100% rename from cpp/src/aztec/env/data_store.hpp rename to cpp/src/barretenberg/env/data_store.hpp diff --git a/cpp/src/aztec/env/logstr.cpp b/cpp/src/barretenberg/env/logstr.cpp similarity index 100% rename from cpp/src/aztec/env/logstr.cpp rename to cpp/src/barretenberg/env/logstr.cpp diff --git a/cpp/src/aztec/env/logstr.hpp b/cpp/src/barretenberg/env/logstr.hpp similarity index 100% rename from cpp/src/aztec/env/logstr.hpp rename to cpp/src/barretenberg/env/logstr.hpp diff --git a/cpp/src/aztec/honk/CMakeLists.txt b/cpp/src/barretenberg/honk/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/honk/CMakeLists.txt rename to cpp/src/barretenberg/honk/CMakeLists.txt diff --git a/cpp/src/aztec/honk/circuit_constructors/circuit_constructor_base.cpp b/cpp/src/barretenberg/honk/circuit_constructors/circuit_constructor_base.cpp similarity index 100% rename from cpp/src/aztec/honk/circuit_constructors/circuit_constructor_base.cpp rename to cpp/src/barretenberg/honk/circuit_constructors/circuit_constructor_base.cpp diff --git a/cpp/src/aztec/honk/circuit_constructors/circuit_constructor_base.hpp b/cpp/src/barretenberg/honk/circuit_constructors/circuit_constructor_base.hpp similarity index 99% rename from cpp/src/aztec/honk/circuit_constructors/circuit_constructor_base.hpp rename to cpp/src/barretenberg/honk/circuit_constructors/circuit_constructor_base.hpp index 603a177fe0..fb2e496698 100644 --- a/cpp/src/aztec/honk/circuit_constructors/circuit_constructor_base.hpp +++ b/cpp/src/barretenberg/honk/circuit_constructors/circuit_constructor_base.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include #include using namespace bonk; @@ -514,4 +514,4 @@ template class CircuitConstructorBase { * ], * ]; * - */ \ No newline at end of file + */ diff --git a/cpp/src/aztec/honk/circuit_constructors/standard_circuit_constructor.cpp b/cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.cpp similarity index 100% rename from cpp/src/aztec/honk/circuit_constructors/standard_circuit_constructor.cpp rename to cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.cpp diff --git a/cpp/src/aztec/honk/circuit_constructors/standard_circuit_constructor.hpp b/cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.hpp similarity index 97% rename from cpp/src/aztec/honk/circuit_constructors/standard_circuit_constructor.hpp rename to cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.hpp index d41d8e3158..27c3cb1054 100644 --- a/cpp/src/aztec/honk/circuit_constructors/standard_circuit_constructor.hpp +++ b/cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.hpp @@ -1,7 +1,7 @@ #pragma once #include "circuit_constructor_base.hpp" -#include -#include +#include +#include namespace bonk { enum StandardSelectors { QM, Q1, Q2, Q3, QC, NUM }; diff --git a/cpp/src/aztec/honk/circuit_constructors/standard_circuit_constructor.test.cpp b/cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.test.cpp similarity index 99% rename from cpp/src/aztec/honk/circuit_constructors/standard_circuit_constructor.test.cpp rename to cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.test.cpp index ae9d4528b6..79e669594b 100644 --- a/cpp/src/aztec/honk/circuit_constructors/standard_circuit_constructor.test.cpp +++ b/cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.test.cpp @@ -1,7 +1,7 @@ #include "standard_circuit_constructor.hpp" #include -#include -#include +#include +#include using namespace barretenberg; using namespace bonk; @@ -585,4 +585,4 @@ TEST(standard_circuit_constructor, test_fixed_group_add_gate) EXPECT_EQ(result, true); } -} // namespace standard_circuit_constructor_tests \ No newline at end of file +} // namespace standard_circuit_constructor_tests diff --git a/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.cpp b/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.cpp new file mode 100644 index 0000000000..a65ffa0fc9 --- /dev/null +++ b/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.cpp @@ -0,0 +1,188 @@ +#include "standard_honk_composer_helper.hpp" +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" +#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" + +#include +#include +#include + +namespace honk { + +/** + * Compute proving key base. + * + * 1. Load crs. + * 2. Initialize this.circuit_proving_key. + * 3. Create constraint selector polynomials from each of this composer's `selectors` vectors and add them to the + * proving key. + * + * @param minimum_circuit_size Used as the total number of gates when larger than n + count of public inputs. + * @param num_reserved_gates The number of reserved gates. + * @return Pointer to the initialized proving key updated with selector polynomials. + * */ +template +std::shared_ptr StandardHonkComposerHelper::compute_proving_key_base( + const CircuitConstructor& constructor, const size_t minimum_circuit_size, const size_t num_randomized_gates) +{ + // Initialize circuit_proving_key + // TODO: replace composer types. + circuit_proving_key = initialize_proving_key(constructor, + crs_factory_.get(), + minimum_circuit_size, + num_randomized_gates, + plonk::ComposerType::STANDARD_HONK); + // Compute lagrange selectors + construct_lagrange_selector_forms(constructor, circuit_proving_key.get()); + + return circuit_proving_key; +} + +/** + * @brief Computes the verification key by computing the: + * (1) commitments to the selector, permutation, and lagrange (first/last) polynomials, + * (2) sets the polynomial manifest using the data from proving key. + */ + +template +std::shared_ptr StandardHonkComposerHelper::compute_verification_key_base( + std::shared_ptr const& proving_key, std::shared_ptr const& vrs) +{ + auto key = std::make_shared( + proving_key->circuit_size, proving_key->num_public_inputs, vrs, proving_key->composer_type); + // TODO(kesha): Dirty hack for now. Need to actually make commitment-agnositc + auto commitment_key = pcs::kzg::CommitmentKey(proving_key->circuit_size, "../srs_db/ignition"); + + // Compute and store commitments to all precomputed polynomials + key->commitments["Q_M"] = commitment_key.commit(proving_key->polynomial_cache.get("q_m_lagrange")); + key->commitments["Q_1"] = commitment_key.commit(proving_key->polynomial_cache.get("q_1_lagrange")); + key->commitments["Q_2"] = commitment_key.commit(proving_key->polynomial_cache.get("q_2_lagrange")); + key->commitments["Q_3"] = commitment_key.commit(proving_key->polynomial_cache.get("q_3_lagrange")); + key->commitments["Q_C"] = commitment_key.commit(proving_key->polynomial_cache.get("q_c_lagrange")); + key->commitments["SIGMA_1"] = commitment_key.commit(proving_key->polynomial_cache.get("sigma_1_lagrange")); + key->commitments["SIGMA_2"] = commitment_key.commit(proving_key->polynomial_cache.get("sigma_2_lagrange")); + key->commitments["SIGMA_3"] = commitment_key.commit(proving_key->polynomial_cache.get("sigma_3_lagrange")); + key->commitments["ID_1"] = commitment_key.commit(proving_key->polynomial_cache.get("id_1_lagrange")); + key->commitments["ID_2"] = commitment_key.commit(proving_key->polynomial_cache.get("id_2_lagrange")); + key->commitments["ID_3"] = commitment_key.commit(proving_key->polynomial_cache.get("id_3_lagrange")); + key->commitments["LAGRANGE_FIRST"] = commitment_key.commit(proving_key->polynomial_cache.get("L_first_lagrange")); + key->commitments["LAGRANGE_LAST"] = commitment_key.commit(proving_key->polynomial_cache.get("L_last_lagrange")); + + return key; +} + +/** + * Compute witness polynomials (w_1, w_2, w_3, w_4). + * + * @details Fills 3 or 4 witness polynomials w_1, w_2, w_3, w_4 with the values of in-circuit variables. The beginning + * of w_1, w_2 polynomials is filled with public_input values. + * @return Witness with computed witness polynomials. + * + * @tparam Program settings needed to establish if w_4 is being used. + * */ +template +void StandardHonkComposerHelper::compute_witness(const CircuitConstructor& circuit_constructor, + const size_t minimum_circuit_size) +{ + if (computed_witness) { + return; + } + wire_polynomials = compute_witness_base(circuit_constructor, minimum_circuit_size, NUM_RANDOMIZED_GATES); + + computed_witness = true; +} + +/** + * Compute proving key. + * Compute the polynomials q_l, q_r, etc. and sigma polynomial. + * + * @return Proving key with saved computed polynomials. + * */ + +template +std::shared_ptr StandardHonkComposerHelper::compute_proving_key( + const CircuitConstructor& circuit_constructor) +{ + if (circuit_proving_key) { + return circuit_proving_key; + } + // Compute q_l, q_r, q_o, etc polynomials + StandardHonkComposerHelper::compute_proving_key_base(circuit_constructor, plonk::ComposerType::STANDARD_HONK); + + // Compute sigma polynomials (we should update that late) + compute_standard_honk_sigma_permutations(circuit_constructor, + circuit_proving_key.get()); + compute_standard_honk_id_polynomials(circuit_proving_key.get()); + + compute_first_and_last_lagrange_polynomials(circuit_proving_key.get()); + + return circuit_proving_key; +} + +/** + * Compute verification key consisting of selector precommitments. + * + * @return Pointer to created circuit verification key. + * */ +template +std::shared_ptr StandardHonkComposerHelper::compute_verification_key( + const CircuitConstructor& circuit_constructor) +{ + if (circuit_verification_key) { + return circuit_verification_key; + } + if (!circuit_proving_key) { + compute_proving_key(circuit_constructor); + } + + circuit_verification_key = StandardHonkComposerHelper::compute_verification_key_base( + circuit_proving_key, crs_factory_->get_verifier_crs()); + circuit_verification_key->composer_type = circuit_proving_key->composer_type; + + return circuit_verification_key; +} + +template +StandardVerifier StandardHonkComposerHelper::create_verifier( + const CircuitConstructor& circuit_constructor) +{ + compute_verification_key(circuit_constructor); + StandardVerifier output_state( + circuit_verification_key, + honk::StandardHonk::create_manifest(circuit_constructor.public_inputs.size(), + numeric::get_msb(circuit_verification_key->circuit_size))); + + // TODO(Cody): This should be more generic + auto kate_verification_key = std::make_unique("../srs_db/ignition"); + + output_state.kate_verification_key = std::move(kate_verification_key); + + return output_state; +} + +template +template +// TODO(Cody): this file should be generic with regard to flavor/arithmetization/whatever. +StandardProver StandardHonkComposerHelper::create_prover( + const CircuitConstructor& circuit_constructor) +{ + compute_proving_key(circuit_constructor); + compute_witness(circuit_constructor); + + size_t num_sumcheck_rounds(circuit_proving_key->log_circuit_size); + auto manifest = Flavor::create_manifest(circuit_constructor.public_inputs.size(), num_sumcheck_rounds); + StandardProver output_state(std::move(wire_polynomials), circuit_proving_key, manifest); + + // TODO(Cody): This should be more generic + std::unique_ptr kate_commitment_key = + std::make_unique(circuit_proving_key->circuit_size, "../srs_db/ignition"); + + output_state.commitment_key = std::move(kate_commitment_key); + + return output_state; +} +template class StandardHonkComposerHelper; +template StandardProver StandardHonkComposerHelper::create_prover( + const StandardCircuitConstructor& circuit_constructor); +} // namespace honk diff --git a/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.hpp b/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.hpp new file mode 100644 index 0000000000..012f4d6946 --- /dev/null +++ b/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.hpp @@ -0,0 +1,74 @@ +#pragma once + +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/srs/reference_string/file_reference_string.hpp" +#include "barretenberg/proof_system/proving_key/proving_key.hpp" +#include "barretenberg/honk/proof_system/prover.hpp" +#include "barretenberg/honk/proof_system/verifier.hpp" +#include "barretenberg/honk/circuit_constructors/standard_circuit_constructor.hpp" +#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/proof_system/verification_key/verification_key.hpp" +#include "barretenberg/plonk/proof_system/verifier/verifier.hpp" +#include "barretenberg/proof_system/composer/composer_base.hpp" +#include "composer_helper_lib.hpp" +#include "permutation_helper.hpp" + +#include + +namespace honk { +// TODO(Kesha): change initializations to specify this parameter +// Cody: What does this mean? +template class StandardHonkComposerHelper { + public: + static constexpr size_t NUM_RANDOMIZED_GATES = 2; // equal to the number of multilinear evaluations leaked + static constexpr size_t program_width = CircuitConstructor::program_width; + std::shared_ptr circuit_proving_key; + std::vector wire_polynomials; + std::shared_ptr circuit_verification_key; + // TODO(kesha): we need to put this into the commitment key, so that the composer doesn't have to handle srs at all + std::shared_ptr crs_factory_; + bool computed_witness = false; + StandardHonkComposerHelper() + : StandardHonkComposerHelper( + std::shared_ptr(new bonk::FileReferenceStringFactory("../srs_db/ignition"))) + {} + StandardHonkComposerHelper(std::shared_ptr crs_factory) + : crs_factory_(std::move(crs_factory)) + {} + + StandardHonkComposerHelper(std::unique_ptr&& crs_factory) + : crs_factory_(std::move(crs_factory)) + {} + StandardHonkComposerHelper(std::shared_ptr p_key, std::shared_ptr v_key) + : circuit_proving_key(std::move(p_key)) + , circuit_verification_key(std::move(v_key)) + {} + StandardHonkComposerHelper(StandardHonkComposerHelper&& other) noexcept = default; + StandardHonkComposerHelper(const StandardHonkComposerHelper& other) = delete; + StandardHonkComposerHelper& operator=(StandardHonkComposerHelper&& other) noexcept = default; + StandardHonkComposerHelper& operator=(const StandardHonkComposerHelper& other) = delete; + ~StandardHonkComposerHelper() = default; + + std::shared_ptr compute_proving_key(const CircuitConstructor& circuit_constructor); + std::shared_ptr compute_verification_key(const CircuitConstructor& circuit_constructor); + + StandardVerifier create_verifier(const CircuitConstructor& circuit_constructor); + + template StandardProver create_prover(const CircuitConstructor& circuit_constructor); + + // TODO(Adrian): Seems error prone to provide the number of randomized gates + // Cody: Where should this go? In the flavor (or whatever that becomes)? + std::shared_ptr compute_proving_key_base( + const CircuitConstructor& circuit_constructor, + const size_t minimum_ciricut_size = 0, + const size_t num_randomized_gates = NUM_RANDOMIZED_GATES); + // This needs to be static as it may be used only to compute the selector commitments. + + static std::shared_ptr compute_verification_key_base( + std::shared_ptr const& proving_key, + std::shared_ptr const& vrs); + + void compute_witness(const CircuitConstructor& circuit_constructor, const size_t minimum_circuit_size = 0); +}; + +} // namespace honk diff --git a/cpp/src/aztec/honk/composer/composer_helper/composer_helper_lib.cpp b/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper_lib.cpp similarity index 98% rename from cpp/src/aztec/honk/composer/composer_helper/composer_helper_lib.cpp rename to cpp/src/barretenberg/honk/composer/composer_helper/composer_helper_lib.cpp index cdff9da883..3470ca3d8f 100644 --- a/cpp/src/aztec/honk/composer/composer_helper/composer_helper_lib.cpp +++ b/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper_lib.cpp @@ -5,8 +5,8 @@ * */ #include "composer_helper_lib.hpp" -#include -#include +#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/honk/circuit_constructors/standard_circuit_constructor.hpp" namespace bonk { /** @@ -213,4 +213,4 @@ template void construct_lagrange_selector_forms(cons template std::vector compute_witness_base( const StandardCircuitConstructor&, const size_t, const size_t); -} // namespace bonk \ No newline at end of file +} // namespace bonk diff --git a/cpp/src/aztec/honk/composer/composer_helper/composer_helper_lib.hpp b/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper_lib.hpp similarity index 92% rename from cpp/src/aztec/honk/composer/composer_helper/composer_helper_lib.hpp rename to cpp/src/barretenberg/honk/composer/composer_helper/composer_helper_lib.hpp index 6e56903491..096b62588e 100644 --- a/cpp/src/aztec/honk/composer/composer_helper/composer_helper_lib.hpp +++ b/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper_lib.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include -#include +#include "barretenberg/proof_system/proving_key/proving_key.hpp" +#include "barretenberg/proof_system/verification_key/verification_key.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/polynomials/polynomial.hpp" namespace bonk { struct SelectorProperties { std::string name; @@ -68,4 +68,4 @@ std::vector compute_witness_base(const CircuitConstruc std::shared_ptr compute_verification_key_base_common( std::shared_ptr const& proving_key, std::shared_ptr const& vrs); -} // namespace bonk \ No newline at end of file +} // namespace bonk diff --git a/cpp/src/aztec/honk/composer/composer_helper/permutation_helper.hpp b/cpp/src/barretenberg/honk/composer/composer_helper/permutation_helper.hpp similarity index 99% rename from cpp/src/aztec/honk/composer/composer_helper/permutation_helper.hpp rename to cpp/src/barretenberg/honk/composer/composer_helper/permutation_helper.hpp index 1f8c710449..46c34b18c3 100644 --- a/cpp/src/aztec/honk/composer/composer_helper/permutation_helper.hpp +++ b/cpp/src/barretenberg/honk/composer/composer_helper/permutation_helper.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/src/aztec/honk/composer/composer_helper/standard_honk_composer_helper.cpp b/cpp/src/barretenberg/honk/composer/composer_helper/standard_honk_composer_helper.cpp similarity index 97% rename from cpp/src/aztec/honk/composer/composer_helper/standard_honk_composer_helper.cpp rename to cpp/src/barretenberg/honk/composer/composer_helper/standard_honk_composer_helper.cpp index d47b272308..a65ffa0fc9 100644 --- a/cpp/src/aztec/honk/composer/composer_helper/standard_honk_composer_helper.cpp +++ b/cpp/src/barretenberg/honk/composer/composer_helper/standard_honk_composer_helper.cpp @@ -1,9 +1,8 @@ - #include "standard_honk_composer_helper.hpp" -#include -#include -#include -#include +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" +#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" #include #include diff --git a/cpp/src/aztec/honk/composer/composer_helper/standard_honk_composer_helper.hpp b/cpp/src/barretenberg/honk/composer/composer_helper/standard_honk_composer_helper.hpp similarity index 83% rename from cpp/src/aztec/honk/composer/composer_helper/standard_honk_composer_helper.hpp rename to cpp/src/barretenberg/honk/composer/composer_helper/standard_honk_composer_helper.hpp index 43f13850ef..012f4d6946 100644 --- a/cpp/src/aztec/honk/composer/composer_helper/standard_honk_composer_helper.hpp +++ b/cpp/src/barretenberg/honk/composer/composer_helper/standard_honk_composer_helper.hpp @@ -1,15 +1,15 @@ #pragma once -#include "polynomials/polynomial.hpp" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/srs/reference_string/file_reference_string.hpp" +#include "barretenberg/proof_system/proving_key/proving_key.hpp" +#include "barretenberg/honk/proof_system/prover.hpp" +#include "barretenberg/honk/proof_system/verifier.hpp" +#include "barretenberg/honk/circuit_constructors/standard_circuit_constructor.hpp" +#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/proof_system/verification_key/verification_key.hpp" +#include "barretenberg/plonk/proof_system/verifier/verifier.hpp" +#include "barretenberg/proof_system/composer/composer_base.hpp" #include "composer_helper_lib.hpp" #include "permutation_helper.hpp" @@ -71,4 +71,4 @@ template class StandardHonkComposerHelper { void compute_witness(const CircuitConstructor& circuit_constructor, const size_t minimum_circuit_size = 0); }; -} // namespace honk \ No newline at end of file +} // namespace honk diff --git a/cpp/src/aztec/honk/composer/composer_helper/standard_plonk_composer_helper.cpp b/cpp/src/barretenberg/honk/composer/composer_helper/standard_plonk_composer_helper.cpp similarity index 94% rename from cpp/src/aztec/honk/composer/composer_helper/standard_plonk_composer_helper.cpp rename to cpp/src/barretenberg/honk/composer/composer_helper/standard_plonk_composer_helper.cpp index 1e6e2cf447..6b905de42d 100644 --- a/cpp/src/aztec/honk/composer/composer_helper/standard_plonk_composer_helper.cpp +++ b/cpp/src/barretenberg/honk/composer/composer_helper/standard_plonk_composer_helper.cpp @@ -1,11 +1,11 @@ #include "standard_plonk_composer_helper.hpp" -#include -#include -#include -#include -#include -#include -#include +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" +#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp" +#include "barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" #include #include diff --git a/cpp/src/aztec/honk/composer/composer_helper/standard_plonk_composer_helper.hpp b/cpp/src/barretenberg/honk/composer/composer_helper/standard_plonk_composer_helper.hpp similarity index 92% rename from cpp/src/aztec/honk/composer/composer_helper/standard_plonk_composer_helper.hpp rename to cpp/src/barretenberg/honk/composer/composer_helper/standard_plonk_composer_helper.hpp index 3ead8289b3..3011df06d4 100644 --- a/cpp/src/aztec/honk/composer/composer_helper/standard_plonk_composer_helper.hpp +++ b/cpp/src/barretenberg/honk/composer/composer_helper/standard_plonk_composer_helper.hpp @@ -1,14 +1,14 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "barretenberg/srs/reference_string/file_reference_string.hpp" +#include "barretenberg/proof_system/proving_key/proving_key.hpp" +#include "barretenberg/plonk/proof_system/prover/prover.hpp" +#include "barretenberg/plonk/proof_system/verifier/verifier.hpp" +#include "barretenberg/honk/circuit_constructors/standard_circuit_constructor.hpp" +#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/proof_system/verification_key/verification_key.hpp" +#include "barretenberg/plonk/proof_system/verifier/verifier.hpp" +#include "barretenberg/proof_system/composer/composer_base.hpp" #include "composer_helper_lib.hpp" #include "permutation_helper.hpp" @@ -110,7 +110,7 @@ template class StandardPlonkComposerHelper { // Round 0 transcript::Manifest::RoundManifest( - { + { { .name = "circuit_size", .num_bytes = 4, .derived_by_verifier = true }, { .name = "public_input_size", .num_bytes = 4, .derived_by_verifier = true } }, @@ -119,8 +119,8 @@ template class StandardPlonkComposerHelper { // Round 1 transcript::Manifest::RoundManifest( - {}, - /* challenge_name = */ "eta", + {}, + /* challenge_name = */ "eta", /* num_challenges_in = */ 0), // Round 2 @@ -136,7 +136,7 @@ template class StandardPlonkComposerHelper { // Round 3 transcript::Manifest::RoundManifest( - { { .name = "Z_PERM", .num_bytes = g1_size, .derived_by_verifier = false } }, + { { .name = "Z_PERM", .num_bytes = g1_size, .derived_by_verifier = false } }, /* challenge_name = */ "alpha", /* num_challenges_in = */ 1), @@ -183,4 +183,4 @@ template class StandardPlonkComposerHelper { } }; -} // namespace honk \ No newline at end of file +} // namespace honk diff --git a/cpp/src/aztec/honk/composer/standard_honk_composer.hpp b/cpp/src/barretenberg/honk/composer/standard_honk_composer.hpp similarity index 96% rename from cpp/src/aztec/honk/composer/standard_honk_composer.hpp rename to cpp/src/barretenberg/honk/composer/standard_honk_composer.hpp index e44800ae83..b26bd2f98f 100644 --- a/cpp/src/aztec/honk/composer/standard_honk_composer.hpp +++ b/cpp/src/barretenberg/honk/composer/standard_honk_composer.hpp @@ -1,10 +1,10 @@ #pragma once #include "composer_helper/standard_honk_composer_helper.hpp" -#include -#include -#include -#include +#include "barretenberg/honk/circuit_constructors/standard_circuit_constructor.hpp" +#include "barretenberg/srs/reference_string/file_reference_string.hpp" +#include "barretenberg/transcript/manifest.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" namespace honk { /** @@ -197,4 +197,4 @@ class StandardHonkComposer { const std::string& err() const { return circuit_constructor.err(); }; void failure(std::string msg) { circuit_constructor.failure(msg); } }; -} // namespace honk \ No newline at end of file +} // namespace honk diff --git a/cpp/src/aztec/honk/composer/standard_honk_composer.test.cpp b/cpp/src/barretenberg/honk/composer/standard_honk_composer.test.cpp similarity index 97% rename from cpp/src/aztec/honk/composer/standard_honk_composer.test.cpp rename to cpp/src/barretenberg/honk/composer/standard_honk_composer.test.cpp index 4fb256ca9a..e80502b285 100644 --- a/cpp/src/aztec/honk/composer/standard_honk_composer.test.cpp +++ b/cpp/src/barretenberg/honk/composer/standard_honk_composer.test.cpp @@ -1,13 +1,13 @@ #include "standard_honk_composer.hpp" -#include "honk/sumcheck/relations/relation.hpp" -#include "numeric/uint256/uint256.hpp" -#include "proof_system/flavor/flavor.hpp" +#include "barretenberg/honk/sumcheck/relations/relation.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/cpp/src/aztec/honk/composer/standard_plonk_composer.hpp b/cpp/src/barretenberg/honk/composer/standard_plonk_composer.hpp similarity index 97% rename from cpp/src/aztec/honk/composer/standard_plonk_composer.hpp rename to cpp/src/barretenberg/honk/composer/standard_plonk_composer.hpp index 654ec36af0..5c753adbb4 100644 --- a/cpp/src/aztec/honk/composer/standard_plonk_composer.hpp +++ b/cpp/src/barretenberg/honk/composer/standard_plonk_composer.hpp @@ -1,10 +1,10 @@ #pragma once #include "composer_helper/standard_plonk_composer_helper.hpp" -#include -#include -#include -#include +#include "barretenberg/honk/circuit_constructors/standard_circuit_constructor.hpp" +#include "barretenberg/srs/reference_string/file_reference_string.hpp" +#include "barretenberg/transcript/manifest.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" namespace plonk { /** @@ -214,4 +214,4 @@ class StandardPlonkComposer { const std::string& err() const { return circuit_constructor.err(); }; void failure(std::string msg) { circuit_constructor.failure(msg); } }; -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/honk/composer/standard_plonk_composer.test.cpp b/cpp/src/barretenberg/honk/composer/standard_plonk_composer.test.cpp similarity index 99% rename from cpp/src/aztec/honk/composer/standard_plonk_composer.test.cpp rename to cpp/src/barretenberg/honk/composer/standard_plonk_composer.test.cpp index 26ff823c38..d0053283d6 100644 --- a/cpp/src/aztec/honk/composer/standard_plonk_composer.test.cpp +++ b/cpp/src/barretenberg/honk/composer/standard_plonk_composer.test.cpp @@ -1,8 +1,8 @@ #include "standard_plonk_composer.hpp" #include -#include -#include -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/crypto/pedersen/generator_data.hpp" +#include "barretenberg/proof_system/proving_key/serialize.hpp" using namespace barretenberg; using namespace bonk; @@ -673,4 +673,4 @@ TEST(standard_composer, test_fixed_group_add_gate) bool result = verifier.verify_proof(proof); EXPECT_EQ(result, true); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/honk/oracle/oracle.hpp b/cpp/src/barretenberg/honk/oracle/oracle.hpp similarity index 100% rename from cpp/src/aztec/honk/oracle/oracle.hpp rename to cpp/src/barretenberg/honk/oracle/oracle.hpp diff --git a/cpp/src/aztec/honk/pcs/claim.hpp b/cpp/src/barretenberg/honk/pcs/claim.hpp similarity index 97% rename from cpp/src/aztec/honk/pcs/claim.hpp rename to cpp/src/barretenberg/honk/pcs/claim.hpp index eb162fbe07..10d98d7645 100644 --- a/cpp/src/aztec/honk/pcs/claim.hpp +++ b/cpp/src/barretenberg/honk/pcs/claim.hpp @@ -1,6 +1,6 @@ #pragma once -#include "polynomials/polynomial.hpp" +#include namespace honk::pcs { /** @@ -98,4 +98,4 @@ template struct MLEOpeningClaim { // v↺ = g(u) = a₁⋅L₀(u) + … + aₙ₋₁⋅Lₙ₋₂(u) Fr evaluation; }; -} // namespace honk::pcs \ No newline at end of file +} // namespace honk::pcs diff --git a/cpp/src/aztec/honk/pcs/commitment_key.hpp b/cpp/src/barretenberg/honk/pcs/commitment_key.hpp similarity index 93% rename from cpp/src/aztec/honk/pcs/commitment_key.hpp rename to cpp/src/barretenberg/honk/pcs/commitment_key.hpp index b47488952f..913a189e90 100644 --- a/cpp/src/aztec/honk/pcs/commitment_key.hpp +++ b/cpp/src/barretenberg/honk/pcs/commitment_key.hpp @@ -5,12 +5,12 @@ * */ -#include "polynomials/polynomial_arithmetic.hpp" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -194,4 +194,4 @@ template struct Params { using VK = VerificationKey; }; } // namespace fake -} // namespace honk::pcs \ No newline at end of file +} // namespace honk::pcs diff --git a/cpp/src/aztec/honk/pcs/commitment_key.test.hpp b/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp similarity index 97% rename from cpp/src/aztec/honk/pcs/commitment_key.test.hpp rename to cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp index e662ce402a..d4128b6ba9 100644 --- a/cpp/src/aztec/honk/pcs/commitment_key.test.hpp +++ b/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp @@ -8,9 +8,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "../oracle/oracle.hpp" #include "../../transcript/transcript_wrappers.hpp" @@ -191,4 +191,4 @@ using CommitmentSchemeParams = ::testing::Types; // using CommitmentSchemeParams = // ::testing::Types, fake::Params, kzg::Params>; -} // namespace honk::pcs \ No newline at end of file +} // namespace honk::pcs diff --git a/cpp/src/aztec/honk/pcs/gemini/gemini.hpp b/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp similarity index 98% rename from cpp/src/aztec/honk/pcs/gemini/gemini.hpp rename to cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp index 2b7fe30924..1ac6962a04 100644 --- a/cpp/src/aztec/honk/pcs/gemini/gemini.hpp +++ b/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp @@ -1,11 +1,11 @@ #pragma once #include "../claim.hpp" -#include "common/log.hpp" -#include "honk/pcs/commitment_key.hpp" -#include "polynomials/polynomial.hpp" +#include "barretenberg/common/log.hpp" +#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/polynomials/polynomial.hpp" -#include +#include #include #include @@ -399,4 +399,4 @@ template class MultilinearReductionScheme { return { C0_r_pos, C0_r_neg }; }; }; -} // namespace honk::pcs::gemini \ No newline at end of file +} // namespace honk::pcs::gemini diff --git a/cpp/src/aztec/honk/pcs/gemini/gemini.test.cpp b/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp similarity index 99% rename from cpp/src/aztec/honk/pcs/gemini/gemini.test.cpp rename to cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp index 7d04b7afe5..20db926a5a 100644 --- a/cpp/src/aztec/honk/pcs/gemini/gemini.test.cpp +++ b/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp @@ -1,7 +1,7 @@ #include "gemini.hpp" #include "../commitment_key.test.hpp" -#include "polynomials/polynomial.hpp" +#include #include #include #include @@ -228,4 +228,4 @@ TYPED_TEST(GeminiTest, DoubleWithShift) multilinear_commitments_to_be_shifted); } -} // namespace honk::pcs::gemini \ No newline at end of file +} // namespace honk::pcs::gemini diff --git a/cpp/src/aztec/honk/pcs/ipa/ipa.hpp b/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp similarity index 98% rename from cpp/src/aztec/honk/pcs/ipa/ipa.hpp rename to cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp index 0aed2ce14f..b37ef7edc4 100644 --- a/cpp/src/aztec/honk/pcs/ipa/ipa.hpp +++ b/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include -#include "stdlib/primitives/curves/bn254.hpp" +#include +#include // Suggested by Zac: Future optimisations // 1: write a program that generates a large set of generator points (2^23?) and writes to a file on disk @@ -269,4 +269,4 @@ template class InnerProductArgument { right_hand_side += aux_generator * a_zero_b_zero; return (C_zero.normalize() == right_hand_side.normalize()); } -}; \ No newline at end of file +}; diff --git a/cpp/src/aztec/honk/pcs/ipa/ipa.test.cpp b/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp similarity index 92% rename from cpp/src/aztec/honk/pcs/ipa/ipa.test.cpp rename to cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp index ae433d012e..a536cc2940 100644 --- a/cpp/src/aztec/honk/pcs/ipa/ipa.test.cpp +++ b/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp @@ -1,9 +1,9 @@ #include "ipa.hpp" -#include +#include #include -#include "./polynomials/polynomial_arithmetic.hpp" -#include "./polynomials/polynomial.hpp" -#include +#include +#include +#include using namespace barretenberg; TEST(honk_commitment_scheme, ipa_commit) diff --git a/cpp/src/aztec/honk/pcs/kzg/kzg.hpp b/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp similarity index 97% rename from cpp/src/aztec/honk/pcs/kzg/kzg.hpp rename to cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp index 3915c1a93b..e66fc5cbb0 100644 --- a/cpp/src/aztec/honk/pcs/kzg/kzg.hpp +++ b/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp @@ -1,7 +1,7 @@ #pragma once #include "../claim.hpp" -#include "polynomials/polynomial.hpp" +#include #include #include @@ -90,4 +90,4 @@ template class UnivariateOpeningScheme { return Accumulator(claim, proof); }; }; -} // namespace honk::pcs::kzg \ No newline at end of file +} // namespace honk::pcs::kzg diff --git a/cpp/src/aztec/honk/pcs/kzg/kzg.test.cpp b/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp similarity index 96% rename from cpp/src/aztec/honk/pcs/kzg/kzg.test.cpp rename to cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp index f927562a61..679a87f95a 100644 --- a/cpp/src/aztec/honk/pcs/kzg/kzg.test.cpp +++ b/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp @@ -4,11 +4,11 @@ #include "../gemini/gemini.hpp" #include "../commitment_key.test.hpp" -#include "honk/pcs/claim.hpp" -#include "honk/pcs/commitment_key.hpp" -#include "polynomials/polynomial.hpp" +#include +#include +#include -#include +#include #include #include @@ -173,4 +173,4 @@ TYPED_TEST(BilinearAccumulationTest, GeminiShplonkKzgWithShift) EXPECT_EQ(verified, true); } -} // namespace honk::pcs::kzg \ No newline at end of file +} // namespace honk::pcs::kzg diff --git a/cpp/src/aztec/honk/pcs/shplonk/shplonk.hpp b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp similarity index 94% rename from cpp/src/aztec/honk/pcs/shplonk/shplonk.hpp rename to cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp index c40d684a1f..74120990fc 100644 --- a/cpp/src/aztec/honk/pcs/shplonk/shplonk.hpp +++ b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp @@ -1,7 +1,7 @@ #pragma once #include "../claim.hpp" -#include "polynomials/polynomial.hpp" +#include /** * @brief Reduces multiple claims about commitments opened at multiple points @@ -43,4 +43,4 @@ template struct ProverOutput { OutputWitness witness; // single polynomial G(X) }; -} // namespace honk::pcs::shplonk \ No newline at end of file +} // namespace honk::pcs::shplonk diff --git a/cpp/src/aztec/honk/pcs/shplonk/shplonk.test.cpp b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp similarity index 96% rename from cpp/src/aztec/honk/pcs/shplonk/shplonk.test.cpp rename to cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp index 842cdcb070..2d2f3030e8 100644 --- a/cpp/src/aztec/honk/pcs/shplonk/shplonk.test.cpp +++ b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp @@ -7,8 +7,8 @@ #include #include "../commitment_key.test.hpp" -#include "honk/pcs/claim.hpp" -#include "polynomials/polynomial.hpp" +#include +#include namespace honk::pcs::shplonk { template class ShplonkTest : public CommitmentTest {}; @@ -79,4 +79,4 @@ TYPED_TEST(ShplonkTest, GeminiShplonk) this->verify_opening_claim(verifier_claim, shplonk_prover_witness); } -} // namespace honk::pcs::shplonk \ No newline at end of file +} // namespace honk::pcs::shplonk diff --git a/cpp/src/aztec/honk/pcs/shplonk/shplonk_single.hpp b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk_single.hpp similarity index 98% rename from cpp/src/aztec/honk/pcs/shplonk/shplonk_single.hpp rename to cpp/src/barretenberg/honk/pcs/shplonk/shplonk_single.hpp index 2f387d551d..05730508c6 100644 --- a/cpp/src/aztec/honk/pcs/shplonk/shplonk_single.hpp +++ b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk_single.hpp @@ -1,7 +1,7 @@ #pragma once -#include "honk/pcs/claim.hpp" +#include #include "shplonk.hpp" -#include "honk/pcs/commitment_key.hpp" +#include namespace honk::pcs::shplonk { diff --git a/cpp/src/aztec/honk/pcs/wrapper.hpp b/cpp/src/barretenberg/honk/pcs/wrapper.hpp similarity index 79% rename from cpp/src/aztec/honk/pcs/wrapper.hpp rename to cpp/src/barretenberg/honk/pcs/wrapper.hpp index 3fc43933a5..ce0fad8026 100644 --- a/cpp/src/aztec/honk/pcs/wrapper.hpp +++ b/cpp/src/barretenberg/honk/pcs/wrapper.hpp @@ -2,7 +2,7 @@ #include "commitment_key.hpp" #include "gemini/gemini.hpp" -#include +#include namespace honk { @@ -12,4 +12,4 @@ struct OpeningProof { barretenberg::g1::affine_element kzg; }; -} // namespace honk \ No newline at end of file +} // namespace honk diff --git a/cpp/src/aztec/honk/proof_system/program_settings.hpp b/cpp/src/barretenberg/honk/proof_system/program_settings.hpp similarity index 90% rename from cpp/src/aztec/honk/proof_system/program_settings.hpp rename to cpp/src/barretenberg/honk/proof_system/program_settings.hpp index 2e1eaa7c4f..f8d59747f6 100644 --- a/cpp/src/aztec/honk/proof_system/program_settings.hpp +++ b/cpp/src/barretenberg/honk/proof_system/program_settings.hpp @@ -4,7 +4,7 @@ #include "../../transcript/transcript_wrappers.hpp" #include "../../plonk/proof_system/types/prover_settings.hpp" -#include +#include namespace honk { @@ -19,4 +19,4 @@ class standard_verifier_settings : public plonk::standard_settings { static constexpr size_t num_polys = bonk::StandardArithmetization::NUM_POLYNOMIALS; }; -} // namespace honk \ No newline at end of file +} // namespace honk diff --git a/cpp/src/aztec/honk/proof_system/prover.cpp b/cpp/src/barretenberg/honk/proof_system/prover.cpp similarity index 95% rename from cpp/src/aztec/honk/proof_system/prover.cpp rename to cpp/src/barretenberg/honk/proof_system/prover.cpp index c47d8c54dc..7c5808aaf8 100644 --- a/cpp/src/aztec/honk/proof_system/prover.cpp +++ b/cpp/src/barretenberg/honk/proof_system/prover.cpp @@ -1,25 +1,25 @@ #include "prover.hpp" #include #include -#include // will need +#include // will need #include -#include // will go away -#include -#include +#include // will go away +#include +#include #include #include #include #include -#include "ecc/curves/bn254/fr.hpp" -#include "ecc/curves/bn254/g1.hpp" -#include -#include -#include -#include "polynomials/polynomial.hpp" -#include "proof_system/flavor/flavor.hpp" -#include "transcript/transcript_wrappers.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include namespace honk { diff --git a/cpp/src/aztec/honk/proof_system/prover.hpp b/cpp/src/barretenberg/honk/proof_system/prover.hpp similarity index 82% rename from cpp/src/aztec/honk/proof_system/prover.hpp rename to cpp/src/barretenberg/honk/proof_system/prover.hpp index 9f83676aac..16fbca8a04 100644 --- a/cpp/src/aztec/honk/proof_system/prover.hpp +++ b/cpp/src/barretenberg/honk/proof_system/prover.hpp @@ -1,16 +1,16 @@ #pragma once -#include "ecc/curves/bn254/fr.hpp" -#include "honk/pcs/shplonk/shplonk.hpp" -#include "polynomials/polynomial.hpp" -#include "proof_system/flavor/flavor.hpp" +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -19,7 +19,7 @@ #include #include #include -#include +#include namespace honk { diff --git a/cpp/src/aztec/honk/proof_system/prover.test.cpp b/cpp/src/barretenberg/honk/proof_system/prover.test.cpp similarity index 97% rename from cpp/src/aztec/honk/proof_system/prover.test.cpp rename to cpp/src/barretenberg/honk/proof_system/prover.test.cpp index 5ebaa91ce7..c1fd3f2f1d 100644 --- a/cpp/src/aztec/honk/proof_system/prover.test.cpp +++ b/cpp/src/barretenberg/honk/proof_system/prover.test.cpp @@ -1,8 +1,8 @@ #include "prover.hpp" -#include "honk/composer/standard_honk_composer.hpp" -#include "polynomials/polynomial.hpp" +#include +#include -#include +#include #include #include #include @@ -158,4 +158,4 @@ TYPED_TEST(ProverTests, grand_product_construction) TestFixture::test_grand_product_construction(); } -} // namespace honk_prover_tests \ No newline at end of file +} // namespace honk_prover_tests diff --git a/cpp/src/aztec/honk/proof_system/verifier.cpp b/cpp/src/barretenberg/honk/proof_system/verifier.cpp similarity index 87% rename from cpp/src/aztec/honk/proof_system/verifier.cpp rename to cpp/src/barretenberg/honk/proof_system/verifier.cpp index 11e5a30be2..d71c6a1fd3 100644 --- a/cpp/src/aztec/honk/proof_system/verifier.cpp +++ b/cpp/src/barretenberg/honk/proof_system/verifier.cpp @@ -1,27 +1,27 @@ #include -#include +#include #include #include -#include +#include #include "./verifier.hpp" -#include "../../plonk/proof_system/public_inputs/public_inputs.hpp" -#include "ecc/curves/bn254/fr.hpp" -#include "honk/pcs/commitment_key.hpp" -#include "honk/pcs/gemini/gemini.hpp" -#include "honk/pcs/kzg/kzg.hpp" -#include "numeric/bitop/get_msb.hpp" -#include "proof_system/flavor/flavor.hpp" -#include "proof_system/polynomial_cache/polynomial_cache.hpp" -#include -#include -#include -#include -#include +#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/honk/pcs/gemini/gemini.hpp" +#include "barretenberg/honk/pcs/kzg/kzg.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" +#include "barretenberg/proof_system/polynomial_cache/polynomial_cache.hpp" +#include +#include +#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include using namespace barretenberg; using namespace honk::sumcheck; @@ -212,4 +212,4 @@ template bool Verifier::verify_pro template class Verifier; -} // namespace honk \ No newline at end of file +} // namespace honk diff --git a/cpp/src/aztec/honk/proof_system/verifier.hpp b/cpp/src/barretenberg/honk/proof_system/verifier.hpp similarity index 72% rename from cpp/src/aztec/honk/proof_system/verifier.hpp rename to cpp/src/barretenberg/honk/proof_system/verifier.hpp index 3cf8e3a092..a78b99ce42 100644 --- a/cpp/src/aztec/honk/proof_system/verifier.hpp +++ b/cpp/src/barretenberg/honk/proof_system/verifier.hpp @@ -1,16 +1,16 @@ #pragma once -#include "../../plonk/proof_system/types/proof.hpp" +#include #include "./program_settings.hpp" -#include "../../proof_system/verification_key/verification_key.hpp" -#include -#include +#include +#include +#include #include "../sumcheck/sumcheck.hpp" #include "../sumcheck/relations/arithmetic_relation.hpp" -#include "honk/pcs/commitment_key.hpp" -#include "proof_system/flavor/flavor.hpp" -#include -#include -#include +#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" +#include +#include +#include namespace honk { template class Verifier { @@ -41,4 +41,4 @@ extern template class Verifier; typedef Verifier StandardVerifier; -} // namespace honk \ No newline at end of file +} // namespace honk diff --git a/cpp/src/aztec/honk/proof_system/verifier.test.cpp b/cpp/src/barretenberg/honk/proof_system/verifier.test.cpp similarity index 93% rename from cpp/src/aztec/honk/proof_system/verifier.test.cpp rename to cpp/src/barretenberg/honk/proof_system/verifier.test.cpp index 8855e32589..36ded9c317 100644 --- a/cpp/src/aztec/honk/proof_system/verifier.test.cpp +++ b/cpp/src/barretenberg/honk/proof_system/verifier.test.cpp @@ -1,17 +1,17 @@ -#include "numeric/bitop/get_msb.hpp" -#include "plonk/proof_system/constants.hpp" -#include "polynomials/polynomial.hpp" -#include "proof_system/flavor/flavor.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/plonk/proof_system/constants.hpp" +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" #include "prover.hpp" -#include "proof_system/proving_key/proving_key.hpp" -#include "transcript/transcript.hpp" +#include "barretenberg/proof_system/proving_key/proving_key.hpp" +#include "barretenberg/transcript/transcript.hpp" #include "verifier.hpp" -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include using namespace barretenberg; @@ -231,4 +231,4 @@ TYPED_TEST(VerifierTests, VerifyArithmeticProofSmall) EXPECT_EQ(result, true); } -} // namespace test_honk_verifier \ No newline at end of file +} // namespace test_honk_verifier diff --git a/cpp/src/aztec/honk/sumcheck/polynomials/barycentric_data.hpp b/cpp/src/barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp similarity index 100% rename from cpp/src/aztec/honk/sumcheck/polynomials/barycentric_data.hpp rename to cpp/src/barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp diff --git a/cpp/src/aztec/honk/sumcheck/polynomials/barycentric_data.test.cpp b/cpp/src/barretenberg/honk/sumcheck/polynomials/barycentric_data.test.cpp similarity index 95% rename from cpp/src/aztec/honk/sumcheck/polynomials/barycentric_data.test.cpp rename to cpp/src/barretenberg/honk/sumcheck/polynomials/barycentric_data.test.cpp index c8c89c0a00..c4f8211660 100644 --- a/cpp/src/aztec/honk/sumcheck/polynomials/barycentric_data.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/polynomials/barycentric_data.test.cpp @@ -1,8 +1,8 @@ #include "barycentric_data.hpp" -#include +#include #include -#include +#include using namespace honk::sumcheck; namespace test_sumcheck_polynomials { @@ -83,4 +83,4 @@ TYPED_TEST(BarycentricDataTests, BarycentricData5to6) EXPECT_EQ(ext1, expected); } -} // namespace test_sumcheck_polynomials \ No newline at end of file +} // namespace test_sumcheck_polynomials diff --git a/cpp/src/aztec/honk/sumcheck/polynomials/multivariates.test.cpp b/cpp/src/barretenberg/honk/sumcheck/polynomials/multivariates.test.cpp similarity index 98% rename from cpp/src/aztec/honk/sumcheck/polynomials/multivariates.test.cpp rename to cpp/src/barretenberg/honk/sumcheck/polynomials/multivariates.test.cpp index d4da84d4b3..b990184200 100644 --- a/cpp/src/aztec/honk/sumcheck/polynomials/multivariates.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/polynomials/multivariates.test.cpp @@ -1,9 +1,9 @@ -#include -#include "honk/sumcheck/relations/arithmetic_relation.hpp" -#include "honk/sumcheck/sumcheck.hpp" +#include +#include "barretenberg/honk/sumcheck/relations/arithmetic_relation.hpp" +#include "barretenberg/honk/sumcheck/sumcheck.hpp" #include -#include +#include using namespace honk::sumcheck; namespace test_sumcheck_polynomials { @@ -306,4 +306,4 @@ TYPED_TEST(MultivariatesTests, FoldThreeRoundsGenericMultiplePolys) } } -} // namespace test_sumcheck_polynomials \ No newline at end of file +} // namespace test_sumcheck_polynomials diff --git a/cpp/src/aztec/honk/sumcheck/polynomials/pow.hpp b/cpp/src/barretenberg/honk/sumcheck/polynomials/pow.hpp similarity index 100% rename from cpp/src/aztec/honk/sumcheck/polynomials/pow.hpp rename to cpp/src/barretenberg/honk/sumcheck/polynomials/pow.hpp diff --git a/cpp/src/aztec/honk/sumcheck/polynomials/pow.test.cpp b/cpp/src/barretenberg/honk/sumcheck/polynomials/pow.test.cpp similarity index 80% rename from cpp/src/aztec/honk/sumcheck/polynomials/pow.test.cpp rename to cpp/src/barretenberg/honk/sumcheck/polynomials/pow.test.cpp index b7bd1490fd..5e1a6c16f6 100644 --- a/cpp/src/aztec/honk/sumcheck/polynomials/pow.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/polynomials/pow.test.cpp @@ -1,6 +1,6 @@ #include "pow.hpp" -#include "honk/utils/power_polynomial.hpp" -#include +#include "barretenberg/honk/utils/power_polynomial.hpp" +#include #include namespace honk::sumcheck::pow_test { @@ -23,4 +23,4 @@ TEST(SumcheckPow, FullPowConsistency) FF expected_eval = honk::power_polynomial::evaluate(zeta, variables); EXPECT_EQ(pow_univariate.partial_evaluation_constant, expected_eval); } -} // namespace honk::sumcheck::pow_test \ No newline at end of file +} // namespace honk::sumcheck::pow_test diff --git a/cpp/src/aztec/honk/sumcheck/polynomials/univariate.hpp b/cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.hpp similarity index 99% rename from cpp/src/aztec/honk/sumcheck/polynomials/univariate.hpp rename to cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.hpp index 961b20803b..8363bbfd00 100644 --- a/cpp/src/aztec/honk/sumcheck/polynomials/univariate.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.hpp @@ -3,8 +3,8 @@ #include #include #include -#include -#include +#include +#include namespace honk::sumcheck { diff --git a/cpp/src/aztec/honk/sumcheck/polynomials/univariate.test.cpp b/cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.test.cpp similarity index 98% rename from cpp/src/aztec/honk/sumcheck/polynomials/univariate.test.cpp rename to cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.test.cpp index 1895de3e65..2262d055d7 100644 --- a/cpp/src/aztec/honk/sumcheck/polynomials/univariate.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.test.cpp @@ -1,9 +1,9 @@ #include "univariate.hpp" #include "barycentric_data.hpp" -#include +#include #include -#include +#include using namespace honk::sumcheck; namespace test_univariate { diff --git a/cpp/src/aztec/honk/sumcheck/relations/arithmetic_relation.hpp b/cpp/src/barretenberg/honk/sumcheck/relations/arithmetic_relation.hpp similarity index 98% rename from cpp/src/aztec/honk/sumcheck/relations/arithmetic_relation.hpp rename to cpp/src/barretenberg/honk/sumcheck/relations/arithmetic_relation.hpp index f79794979a..c0d5c9db1c 100644 --- a/cpp/src/aztec/honk/sumcheck/relations/arithmetic_relation.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/relations/arithmetic_relation.hpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include "../polynomials/univariate.hpp" #include "relation.hpp" diff --git a/cpp/src/aztec/honk/sumcheck/relations/grand_product_computation_relation.hpp b/cpp/src/barretenberg/honk/sumcheck/relations/grand_product_computation_relation.hpp similarity index 94% rename from cpp/src/aztec/honk/sumcheck/relations/grand_product_computation_relation.hpp rename to cpp/src/barretenberg/honk/sumcheck/relations/grand_product_computation_relation.hpp index bded8f7570..4137176c99 100644 --- a/cpp/src/aztec/honk/sumcheck/relations/grand_product_computation_relation.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/relations/grand_product_computation_relation.hpp @@ -1,6 +1,6 @@ #pragma once #include "relation.hpp" -#include +#include #include "../polynomials/univariate.hpp" namespace honk::sumcheck { @@ -18,10 +18,8 @@ template class GrandProductComputationRelation : public Relation class GrandProductComputationRelation : public Relation +#include #include "../polynomials/univariate.hpp" namespace honk::sumcheck { diff --git a/cpp/src/aztec/honk/sumcheck/relations/relation.hpp b/cpp/src/barretenberg/honk/sumcheck/relations/relation.hpp similarity index 100% rename from cpp/src/aztec/honk/sumcheck/relations/relation.hpp rename to cpp/src/barretenberg/honk/sumcheck/relations/relation.hpp diff --git a/cpp/src/aztec/honk/sumcheck/relations/relation.test.cpp b/cpp/src/barretenberg/honk/sumcheck/relations/relation.test.cpp similarity index 98% rename from cpp/src/aztec/honk/sumcheck/relations/relation.test.cpp rename to cpp/src/barretenberg/honk/sumcheck/relations/relation.test.cpp index 68b9f48105..2bf4314efb 100644 --- a/cpp/src/aztec/honk/sumcheck/relations/relation.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/relations/relation.test.cpp @@ -1,13 +1,13 @@ #include "relation.hpp" -#include +#include #include "arithmetic_relation.hpp" #include "grand_product_initialization_relation.hpp" #include "grand_product_computation_relation.hpp" #include "../polynomials/univariate.hpp" #include "../polynomials/barycentric_data.hpp" -#include -#include +#include +#include #include using namespace honk::sumcheck; @@ -314,4 +314,4 @@ TYPED_TEST(SumcheckRelation, GrandProductInitializationRelation) run_test(/* is_random_input=*/false); }; -} // namespace honk_relation_tests \ No newline at end of file +} // namespace honk_relation_tests diff --git a/cpp/src/aztec/honk/sumcheck/sumcheck.hpp b/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp similarity index 97% rename from cpp/src/aztec/honk/sumcheck/sumcheck.hpp rename to cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp index b3772e94fd..227e3a2cbb 100644 --- a/cpp/src/aztec/honk/sumcheck/sumcheck.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp @@ -1,17 +1,17 @@ #pragma once -#include "common/serialize.hpp" +#include "barretenberg/common/serialize.hpp" #include -#include -#include "common/throw_or_abort.hpp" +#include +#include "barretenberg/common/throw_or_abort.hpp" #include "sumcheck_round.hpp" #include "polynomials/univariate.hpp" -#include +#include #include #include #include #include #include -#include +#include namespace honk::sumcheck { template class... Relations> class Sumcheck { diff --git a/cpp/src/aztec/honk/sumcheck/sumcheck.test.cpp b/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp similarity index 98% rename from cpp/src/aztec/honk/sumcheck/sumcheck.test.cpp rename to cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp index d15e9d9f38..13083db7cb 100644 --- a/cpp/src/aztec/honk/sumcheck/sumcheck.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp @@ -1,16 +1,16 @@ #include "sumcheck.hpp" -#include "proof_system/flavor/flavor.hpp" -#include "transcript/transcript_wrappers.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" +#include "barretenberg/transcript/transcript_wrappers.hpp" #include "relations/arithmetic_relation.hpp" #include "relations/grand_product_computation_relation.hpp" #include "relations/grand_product_initialization_relation.hpp" -#include "transcript/manifest.hpp" +#include "barretenberg/transcript/manifest.hpp" #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/cpp/src/aztec/honk/sumcheck/sumcheck_round.hpp b/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp similarity index 99% rename from cpp/src/aztec/honk/sumcheck/sumcheck_round.hpp rename to cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp index a63178c4e0..06b59e43af 100644 --- a/cpp/src/aztec/honk/sumcheck/sumcheck_round.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include #include #include @@ -289,7 +289,7 @@ template class... Relation // S^{l}(0) = ( (1−0) + 0⋅ζ^{ 2^l } ) ⋅ T^{l}(0) = T^{l}(0) // S^{l}(1) = ( (1−1) + 1⋅ζ^{ 2^l } ) ⋅ T^{l}(1) = ζ^{ 2^l } ⋅ T^{l}(1) FF total_sum = univariate.value_at(0) + (pow_univariate.zeta_pow * univariate.value_at(1)); - // target_total_sum = sigma_{l} = + // target_total_sum = sigma_{l} = bool sumcheck_round_failed = (target_total_sum != total_sum); round_failed = round_failed || sumcheck_round_failed; return !sumcheck_round_failed; diff --git a/cpp/src/aztec/honk/sumcheck/sumcheck_round.test.cpp b/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp similarity index 99% rename from cpp/src/aztec/honk/sumcheck/sumcheck_round.test.cpp rename to cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp index aa796564f6..2153eb251e 100644 --- a/cpp/src/aztec/honk/sumcheck/sumcheck_round.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp @@ -1,15 +1,15 @@ -#include +#include #include "sumcheck_round.hpp" #include "relations/arithmetic_relation.hpp" #include "relations/grand_product_computation_relation.hpp" #include "relations/grand_product_initialization_relation.hpp" #include "polynomials/univariate.hpp" -#include -#include +#include +#include #include -#include +#include #include /** * We want to test if the univariate (S_l in the thesis) computed by the prover in a particular round is correct. We diff --git a/cpp/src/aztec/honk/utils/power_polynomial.hpp b/cpp/src/barretenberg/honk/utils/power_polynomial.hpp similarity index 96% rename from cpp/src/aztec/honk/utils/power_polynomial.hpp rename to cpp/src/barretenberg/honk/utils/power_polynomial.hpp index 5cdaba6161..700d702672 100644 --- a/cpp/src/aztec/honk/utils/power_polynomial.hpp +++ b/cpp/src/barretenberg/honk/utils/power_polynomial.hpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #ifndef NO_MULTITHREADING diff --git a/cpp/src/aztec/honk/utils/power_polynomial.test.cpp b/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp similarity index 96% rename from cpp/src/aztec/honk/utils/power_polynomial.test.cpp rename to cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp index d36f815be0..4da22599ac 100644 --- a/cpp/src/aztec/honk/utils/power_polynomial.test.cpp +++ b/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp @@ -1,5 +1,5 @@ #include "power_polynomial.hpp" -#include +#include #include TEST(power_polynomial, test_full_polynomial_correctness) @@ -32,4 +32,4 @@ TEST(power_polynomial, test_evaluation_correctness) } EXPECT_EQ(zeta.pow(static_cast(random_index)), honk::power_polynomial::evaluate(zeta, variables)); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/honk/utils/public_inputs.hpp b/cpp/src/barretenberg/honk/utils/public_inputs.hpp similarity index 100% rename from cpp/src/aztec/honk/utils/public_inputs.hpp rename to cpp/src/barretenberg/honk/utils/public_inputs.hpp diff --git a/cpp/src/aztec/join_split_example/CMakeLists.txt b/cpp/src/barretenberg/join_split_example/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/join_split_example/CMakeLists.txt rename to cpp/src/barretenberg/join_split_example/CMakeLists.txt diff --git a/cpp/src/aztec/join_split_example/constants.hpp b/cpp/src/barretenberg/join_split_example/constants.hpp similarity index 84% rename from cpp/src/aztec/join_split_example/constants.hpp rename to cpp/src/barretenberg/join_split_example/constants.hpp index 5b8bb79f5b..c47671774c 100644 --- a/cpp/src/aztec/join_split_example/constants.hpp +++ b/cpp/src/barretenberg/join_split_example/constants.hpp @@ -1,8 +1,8 @@ #pragma once #include #include -#include -#include +#include +#include namespace join_split_example { @@ -23,4 +23,4 @@ namespace ProofIds { enum { PADDING = 0, DEPOSIT = 1, WITHDRAW = 2, SEND = 3, ACCOUNT = 4, DEFI_DEPOSIT = 5, DEFI_CLAIM = 6 }; }; -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/fixtures/user_context.hpp b/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp similarity index 88% rename from cpp/src/aztec/join_split_example/fixtures/user_context.hpp rename to cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp index 7bfc98e006..0d40bd485a 100644 --- a/cpp/src/aztec/join_split_example/fixtures/user_context.hpp +++ b/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace join_split_example { namespace fixtures { @@ -39,4 +39,4 @@ inline user_context create_user_context(numeric::random::Engine* engine = nullpt } } // namespace fixtures -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/CMakeLists.txt b/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/CMakeLists.txt rename to cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt diff --git a/cpp/src/aztec/join_split_example/proofs/compute_circuit_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp similarity index 99% rename from cpp/src/aztec/join_split_example/proofs/compute_circuit_data.hpp rename to cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp index e9fed596b3..2aa57344fa 100644 --- a/cpp/src/aztec/join_split_example/proofs/compute_circuit_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp @@ -4,8 +4,8 @@ #include "../constants.hpp" #include #include -#include -#include +#include +#include #ifndef __wasm__ #include diff --git a/cpp/src/aztec/join_split_example/proofs/inner_proof_data/CMakeLists.txt b/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/inner_proof_data/CMakeLists.txt rename to cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt diff --git a/cpp/src/aztec/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp b/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp rename to cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp diff --git a/cpp/src/aztec/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp similarity index 93% rename from cpp/src/aztec/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp rename to cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp index 326de62ee1..519c10632c 100644 --- a/cpp/src/aztec/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include namespace join_split_example { diff --git a/cpp/src/aztec/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp b/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp rename to cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/CMakeLists.txt b/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/join_split/CMakeLists.txt rename to cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/c_bind.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp similarity index 91% rename from cpp/src/aztec/join_split_example/proofs/join_split/c_bind.cpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp index 4b58ed7bd5..72b0733641 100644 --- a/cpp/src/aztec/join_split_example/proofs/join_split/c_bind.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp @@ -2,13 +2,13 @@ #include "join_split.hpp" #include "compute_signing_data.hpp" #include "../mock/mock_circuit.hpp" -#include -#include -#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include using namespace barretenberg; diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/c_bind.h b/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.h similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/join_split/c_bind.h rename to cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.h diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/compute_circuit_data.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp similarity index 96% rename from cpp/src/aztec/join_split_example/proofs/join_split/compute_circuit_data.cpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp index b50afe70e3..061ecc34e4 100644 --- a/cpp/src/aztec/join_split_example/proofs/join_split/compute_circuit_data.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp @@ -2,7 +2,7 @@ #include "join_split_circuit.hpp" #include "sign_join_split_tx.hpp" #include "../notes/native/index.hpp" -#include +#include namespace join_split_example { namespace proofs { @@ -73,4 +73,4 @@ circuit_data get_circuit_data(std::shared_ptr cons } // namespace join_split } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/compute_circuit_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/join_split/compute_circuit_data.hpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/compute_signing_data.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp similarity index 95% rename from cpp/src/aztec/join_split_example/proofs/join_split/compute_signing_data.cpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp index c33e5ffc0b..6a3974955b 100644 --- a/cpp/src/aztec/join_split_example/proofs/join_split/compute_signing_data.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp @@ -1,6 +1,6 @@ #include "compute_signing_data.hpp" #include "../notes/native/index.hpp" -#include +#include namespace join_split_example { namespace proofs { @@ -39,4 +39,4 @@ barretenberg::fr compute_signing_data(join_split_tx const& tx) } // namespace join_split } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/compute_signing_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/join_split/compute_signing_data.hpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/create_proof.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/join_split/create_proof.hpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/index.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/join_split/index.hpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/join_split.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp similarity index 97% rename from cpp/src/aztec/join_split_example/proofs/join_split/join_split.cpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp index 8cab72ce2e..89d7f5ec35 100644 --- a/cpp/src/aztec/join_split_example/proofs/join_split/join_split.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp @@ -1,7 +1,7 @@ #include "join_split.hpp" #include "join_split_circuit.hpp" #include "compute_circuit_data.hpp" -#include +#include namespace join_split_example { namespace proofs { diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/join_split.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp similarity index 89% rename from cpp/src/aztec/join_split_example/proofs/join_split/join_split.hpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp index 50b0ddf25c..02e1ac18f7 100644 --- a/cpp/src/aztec/join_split_example/proofs/join_split/join_split.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp @@ -1,7 +1,7 @@ #pragma once #include "join_split_tx.hpp" -#include -#include +#include +#include namespace join_split_example { namespace proofs { diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/join_split.test.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp similarity index 99% rename from cpp/src/aztec/join_split_example/proofs/join_split/join_split.test.cpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp index cc012a6bdb..fd4d6ff345 100644 --- a/cpp/src/aztec/join_split_example/proofs/join_split/join_split.test.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp @@ -2,12 +2,12 @@ #include "../inner_proof_data/inner_proof_data.hpp" #include "index.hpp" #include "../notes/native/index.hpp" -#include "join_split_example/proofs/join_split/join_split_circuit.hpp" -#include -#include +#include "join_split_circuit.hpp" +#include +#include #include -#include -#include +#include +#include namespace join_split_example::proofs::join_split { @@ -2620,4 +2620,4 @@ TEST_F(join_split_tests, serialzed_proving_key_size) EXPECT_LE(len, 2 * 170 * 1024 * 1024); } -} // namespace join_split_example::proofs::join_split \ No newline at end of file +} // namespace join_split_example::proofs::join_split diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/join_split_circuit.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp similarity index 99% rename from cpp/src/aztec/join_split_example/proofs/join_split/join_split_circuit.cpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp index 2ee65bf453..1e57d5fca2 100644 --- a/cpp/src/aztec/join_split_example/proofs/join_split/join_split_circuit.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp @@ -5,7 +5,7 @@ #include "../notes/circuit/account/account_note.hpp" #include "../notes/circuit/claim/claim_note.hpp" #include "verify_signature.hpp" -#include +#include namespace join_split_example { namespace proofs { diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/join_split_circuit.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp similarity index 94% rename from cpp/src/aztec/join_split_example/proofs/join_split/join_split_circuit.hpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp index 64174584a0..e3fc083d5c 100644 --- a/cpp/src/aztec/join_split_example/proofs/join_split/join_split_circuit.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp @@ -2,8 +2,8 @@ #include "join_split_tx.hpp" #include "../notes/circuit/value/witness_data.hpp" #include "../notes/circuit/claim/witness_data.hpp" -#include -#include +#include +#include namespace join_split_example { namespace proofs { diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/join_split_js_parity.test.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp similarity index 95% rename from cpp/src/aztec/join_split_example/proofs/join_split/join_split_js_parity.test.cpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp index c15eceb147..ddad02d0bd 100644 --- a/cpp/src/aztec/join_split_example/proofs/join_split/join_split_js_parity.test.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp @@ -2,11 +2,11 @@ #include "../inner_proof_data/inner_proof_data.hpp" #include "index.hpp" #include "../notes/native/index.hpp" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace join_split_example { namespace proofs { @@ -164,4 +164,4 @@ TEST_F(join_split_js_parity_tests, test_full_proof) } // namespace join_split } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/join_split_tx.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp similarity index 98% rename from cpp/src/aztec/join_split_example/proofs/join_split/join_split_tx.cpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp index 2967293a85..37fa840243 100644 --- a/cpp/src/aztec/join_split_example/proofs/join_split/join_split_tx.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp @@ -1,5 +1,5 @@ #include "join_split_tx.hpp" -#include +#include namespace join_split_example { namespace proofs { diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/join_split_tx.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp similarity index 90% rename from cpp/src/aztec/join_split_example/proofs/join_split/join_split_tx.hpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp index 76502cca60..0c6589fdaf 100644 --- a/cpp/src/aztec/join_split_example/proofs/join_split/join_split_tx.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp @@ -1,9 +1,9 @@ #pragma once #include "../notes/native/claim/claim_note_tx_data.hpp" #include "../notes/native/value/value_note.hpp" -#include -#include -#include +#include +#include +#include namespace join_split_example { namespace proofs { diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/join_split_tx.test.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp similarity index 90% rename from cpp/src/aztec/join_split_example/proofs/join_split/join_split_tx.test.cpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp index 612ee2f1e9..d2923b42d8 100644 --- a/cpp/src/aztec/join_split_example/proofs/join_split/join_split_tx.test.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp @@ -2,11 +2,11 @@ #include "join_split.hpp" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/sign_join_split_tx.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp similarity index 88% rename from cpp/src/aztec/join_split_example/proofs/join_split/sign_join_split_tx.cpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp index a4c44c3269..b421af6f98 100644 --- a/cpp/src/aztec/join_split_example/proofs/join_split/sign_join_split_tx.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp @@ -1,6 +1,6 @@ #include "sign_join_split_tx.hpp" #include "compute_signing_data.hpp" -#include +#include namespace join_split_example { namespace proofs { @@ -21,4 +21,4 @@ signature sign_join_split_tx(join_split_tx const& tx, key_pair +#include #include "../notes/native/value/value_note.hpp" #include "join_split_tx.hpp" @@ -14,4 +14,4 @@ signature sign_join_split_tx(proofs::join_split::join_split_tx const& tx, } // namespace join_split } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/join_split/verify_signature.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp similarity index 88% rename from cpp/src/aztec/join_split_example/proofs/join_split/verify_signature.hpp rename to cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp index fca85e828b..873655b1f7 100644 --- a/cpp/src/aztec/join_split_example/proofs/join_split/verify_signature.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include namespace join_split_example { namespace proofs { @@ -29,4 +29,4 @@ inline void verify_signature(field_ct const& public_value, } // namespace join_split } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/mock/CMakeLists.txt b/cpp/src/barretenberg/join_split_example/proofs/mock/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/mock/CMakeLists.txt rename to cpp/src/barretenberg/join_split_example/proofs/mock/CMakeLists.txt diff --git a/cpp/src/aztec/join_split_example/proofs/mock/mock_circuit.hpp b/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp similarity index 74% rename from cpp/src/aztec/join_split_example/proofs/mock/mock_circuit.hpp rename to cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp index 626533573a..26a7c13887 100644 --- a/cpp/src/aztec/join_split_example/proofs/mock/mock_circuit.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace join_split_example { namespace proofs { @@ -20,4 +20,4 @@ template void mock_circuit(Composer& composer, std::vector -#include +#include +#include using namespace plonk::stdlib::types; @@ -35,4 +35,4 @@ TEST(mock_circuit_tests, test_simple_circuit) } // namespace mock } // namespace proofs -} // namespace rollup \ No newline at end of file +} // namespace rollup diff --git a/cpp/src/aztec/join_split_example/proofs/notes/CMakeLists.txt b/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/notes/CMakeLists.txt rename to cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/account/account_note.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp similarity index 91% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/account/account_note.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp index 0bba11d902..460d865780 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/account/account_note.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "commit.hpp" namespace join_split_example { @@ -32,4 +32,4 @@ struct account_note { } // namespace circuit } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/account/commit.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp similarity index 88% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/account/commit.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp index 609212459f..c770b655c2 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/account/commit.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -27,4 +27,4 @@ inline auto commit(field_ct const& account_alias_hash, } // namespace circuit } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/account/index.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/account/index.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/asset_id.cpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp similarity index 90% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/asset_id.cpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp index 49255b1e25..f1727a120f 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/asset_id.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp @@ -1,4 +1,4 @@ -#include +#include #include "../constants.hpp" namespace join_split_example::proofs::notes::circuit { @@ -28,4 +28,4 @@ bool_ct get_asset_id_flag(suint_ct const& asset_id) return is_virtual; } -} // namespace join_split_example::proofs::notes::circuit \ No newline at end of file +} // namespace join_split_example::proofs::notes::circuit diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/asset_id.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp similarity index 69% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/asset_id.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp index ec7bdeefca..71ae56874e 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/asset_id.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace join_split_example::proofs::notes::circuit { @@ -9,4 +9,4 @@ std::pair deflag_asset_id(suint_ct const& asset_id); bool_ct get_asset_id_flag(suint_ct const& asset_id); -} // namespace join_split_example::proofs::notes::circuit \ No newline at end of file +} // namespace join_split_example::proofs::notes::circuit diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/bridge_call_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp similarity index 99% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/bridge_call_data.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp index cef7f9229d..4c742b7ca9 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/bridge_call_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "../native/bridge_call_data.hpp" #include "./asset_id.hpp" #include "../constants.hpp" @@ -219,4 +219,4 @@ inline std::ostream& operator<<(std::ostream& os, bridge_call_data const& bridge } // namespace circuit } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/claim_note.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp similarity index 96% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/claim_note.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp index ff00402198..d6a4794e4b 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/claim_note.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "../bridge_call_data.hpp" #include "witness_data.hpp" #include "../value/create_partial_commitment.hpp" @@ -65,4 +65,4 @@ struct claim_note { } // namespace circuit } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp similarity index 88% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp index 4cc10d7011..5e89d4fd76 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -22,4 +22,4 @@ inline auto complete_partial_commitment(field_ct const& partial_commitment, } // namespace circuit } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp similarity index 88% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp index c4c4141d32..eb571a09dc 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -28,4 +28,4 @@ inline field_ct compute_nullifier(field_ct const& note_commitment) } // namespace circuit } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp similarity index 84% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp index ae7aeef8f8..4787174347 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -24,4 +24,4 @@ inline auto create_partial_commitment(field_ct const& deposit_value, } // namespace circuit } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/index.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/index.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/witness_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp similarity index 97% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/witness_data.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp index f2d3129a45..2b3b1c9fbc 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/claim/witness_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "../../native/claim/claim_note.hpp" #include "../../native/claim/claim_note_tx_data.hpp" #include "../../constants.hpp" @@ -69,4 +69,4 @@ inline std::ostream& operator<<(std::ostream& os, partial_claim_note_witness_dat } // namespace circuit } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/index.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/index.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/commit.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/value/commit.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp similarity index 84% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp index b3a13d9eda..a59734883e 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -24,4 +24,4 @@ inline auto complete_partial_commitment(field_ct const& value_note_partial_commi } // namespace circuit } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp similarity index 96% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp index 3532fb3a67..ca7e27c1b3 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp @@ -1,6 +1,6 @@ #include "compute_nullifier.hpp" #include "../../constants.hpp" -#include +#include namespace join_split_example { namespace proofs { @@ -49,4 +49,4 @@ field_ct compute_nullifier(field_ct const& note_commitment, } // namespace circuit } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp similarity index 83% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp index 2e8b0e8c7a..088858d44e 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace join_split_example { namespace proofs { @@ -16,4 +16,4 @@ field_ct compute_nullifier(field_ct const& note_commitment, } // namespace circuit } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp similarity index 96% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp index f151b01741..a7b2a3d7df 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp @@ -4,7 +4,7 @@ #include "./value_note.hpp" #include "../../native/value/compute_nullifier.hpp" #include "../../native/value/value_note.hpp" -#include +#include using namespace join_split_example::proofs::notes; using namespace plonk::stdlib::types; @@ -26,4 +26,4 @@ TEST(compute_nullifier_circuit, native_consistency) circuit_input_note.commitment, field_ct(witness_ct(&composer, priv_key)), bool_ct(witness_ct(&composer, true))); EXPECT_EQ(circuit_nullifier.get_value(), native_nullifier); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp similarity index 83% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp index efa98988b2..461a28e054 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -24,4 +24,4 @@ inline auto create_partial_commitment(field_ct const& secret, } // namespace circuit } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/index.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/value/index.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/value_note.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp similarity index 92% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/value/value_note.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp index d9c807f6a4..09bcf5c9c7 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/value_note.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "witness_data.hpp" #include "commit.hpp" @@ -39,4 +39,4 @@ struct value_note { } // namespace circuit } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/value_note.test.cpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/value/value_note.test.cpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp diff --git a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/witness_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp similarity index 93% rename from cpp/src/aztec/join_split_example/proofs/notes/circuit/value/witness_data.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp index 71a20eaccf..78ecd32eaa 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/circuit/value/witness_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "../../native/value/value_note.hpp" #include "../../constants.hpp" @@ -37,4 +37,4 @@ struct witness_data { } // namespace circuit } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/constants.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp similarity index 94% rename from cpp/src/aztec/join_split_example/proofs/notes/constants.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp index acc81e71c0..d94d4479df 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/constants.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -42,4 +42,4 @@ constexpr uint32_t DEFI_BRIDGE_AUX_DATA = 64; } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/account/account_note.cpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp similarity index 90% rename from cpp/src/aztec/join_split_example/proofs/notes/native/account/account_note.cpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp index 8794066d47..4bc993740f 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/account/account_note.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp @@ -1,5 +1,5 @@ #include "account_note.hpp" -#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -25,4 +25,4 @@ grumpkin::fq account_note::commit() const } // namespace native } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/account/account_note.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp similarity index 81% rename from cpp/src/aztec/join_split_example/proofs/notes/native/account/account_note.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp index 58edab1344..cbec284b73 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/account/account_note.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -25,4 +25,4 @@ struct account_note { } // namespace native } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp similarity index 86% rename from cpp/src/aztec/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp index 02570ca49b..57613349d4 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp @@ -1,6 +1,6 @@ #pragma once #include "account_note.hpp" -#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -21,4 +21,4 @@ inline fr compute_account_alias_hash_nullifier(fr const& alias_hash) } // namespace native } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp similarity index 92% rename from cpp/src/aztec/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp index de16c589ad..66089a275c 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp @@ -1,6 +1,6 @@ #pragma once #include "account_note.hpp" -#include +#include #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/account/index.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/notes/native/account/index.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/asset_id.cpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/notes/native/asset_id.cpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/asset_id.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/notes/native/asset_id.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/bridge_call_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp similarity index 97% rename from cpp/src/aztec/join_split_example/proofs/notes/native/bridge_call_data.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp index e13bb50d06..a33b25b502 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/bridge_call_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp @@ -1,9 +1,9 @@ #pragma once -#include +#include #include "../constants.hpp" -#include -#include -#include +#include +#include +#include namespace join_split_example { namespace proofs { @@ -182,4 +182,4 @@ inline std::ostream& operator<<(std::ostream& os, bridge_call_data const& bridge } // namespace native } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/claim/claim_note.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp similarity index 92% rename from cpp/src/aztec/join_split_example/proofs/notes/native/claim/claim_note.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp index 283918b463..e3c3963cf6 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/claim/claim_note.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include +#include +#include #include "create_partial_commitment.hpp" #include "complete_partial_commitment.hpp" #include "../bridge_call_data.hpp" @@ -72,4 +72,4 @@ inline std::ostream& operator<<(std::ostream& os, claim_note const& note) } // namespace native } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp similarity index 87% rename from cpp/src/aztec/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp index d6868eba99..2e3bc87438 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include +#include +#include #include "../bridge_call_data.hpp" namespace join_split_example { @@ -47,4 +47,4 @@ inline void write(std::vector& buf, partial_claim_note_data const& note } // namespace native } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp similarity index 77% rename from cpp/src/aztec/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp index 3473e3e843..930571249b 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include +#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -22,4 +22,4 @@ inline auto complete_partial_commitment(grumpkin::fq const& claim_note_partial_c } // namespace native } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp similarity index 70% rename from cpp/src/aztec/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp index d5fa5d1a75..4ad580891f 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include +#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -21,4 +21,4 @@ inline auto compute_nullifier(grumpkin::fq const& note_commitment) } // namespace native } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp similarity index 89% rename from cpp/src/aztec/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp index 70035f637d..15e6cc1a12 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp @@ -1,6 +1,6 @@ #pragma once #include "claim_note.hpp" -#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -23,4 +23,4 @@ inline auto create_partial_commitment(uint256_t const& deposit_value, } // namespace native } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/claim/index.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/notes/native/claim/index.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/index.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/notes/native/index.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp similarity index 89% rename from cpp/src/aztec/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp index e30654cff1..7c1f550215 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -21,4 +21,4 @@ inline auto complete_partial_commitment(grumpkin::fq const& partial_commitment, } // namespace native } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/value/compute_nullifier.cpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp similarity index 87% rename from cpp/src/aztec/join_split_example/proofs/notes/native/value/compute_nullifier.cpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp index c9b0e163a0..678d18665e 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/value/compute_nullifier.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp @@ -1,7 +1,7 @@ #include "compute_nullifier.hpp" #include "../../constants.hpp" -#include -#include +#include +#include namespace join_split_example { namespace proofs { @@ -35,4 +35,4 @@ fr compute_nullifier(grumpkin::fq const& note_commitment, } // namespace native } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/value/compute_nullifier.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp similarity index 80% rename from cpp/src/aztec/join_split_example/proofs/notes/native/value/compute_nullifier.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp index 19c03c9f84..1a2bad04fc 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/value/compute_nullifier.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace join_split_example { namespace proofs { @@ -13,4 +13,4 @@ barretenberg::fr compute_nullifier(grumpkin::fq const& note_commitment, } // namespace native } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp similarity index 79% rename from cpp/src/aztec/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp index 5cb0e238a7..b69150e646 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include +#include +#include #include "../../constants.hpp" namespace join_split_example { @@ -23,4 +23,4 @@ inline auto create_partial_commitment(barretenberg::fr const& secret, } // namespace native } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/value/index.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp similarity index 100% rename from cpp/src/aztec/join_split_example/proofs/notes/native/value/index.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp diff --git a/cpp/src/aztec/join_split_example/proofs/notes/native/value/value_note.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp similarity index 90% rename from cpp/src/aztec/join_split_example/proofs/notes/native/value/value_note.hpp rename to cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp index a92799dc54..f8d8ad5267 100644 --- a/cpp/src/aztec/join_split_example/proofs/notes/native/value/value_note.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include +#include +#include #include "create_partial_commitment.hpp" #include "complete_partial_commitment.hpp" @@ -67,4 +67,4 @@ inline void write(std::vector& buf, value_note const& note) } // namespace native } // namespace notes } // namespace proofs -} // namespace join_split_example \ No newline at end of file +} // namespace join_split_example diff --git a/cpp/src/aztec/join_split_example/proofs/verify.hpp b/cpp/src/barretenberg/join_split_example/proofs/verify.hpp similarity index 97% rename from cpp/src/aztec/join_split_example/proofs/verify.hpp rename to cpp/src/barretenberg/join_split_example/proofs/verify.hpp index f05e2f4982..0679983302 100644 --- a/cpp/src/aztec/join_split_example/proofs/verify.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/verify.hpp @@ -1,8 +1,8 @@ #pragma once #include "./mock/mock_circuit.hpp" -#include -#include -#include +#include +#include +#include namespace join_split_example { namespace proofs { diff --git a/cpp/src/aztec/numeric/CMakeLists.txt b/cpp/src/barretenberg/numeric/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/numeric/CMakeLists.txt rename to cpp/src/barretenberg/numeric/CMakeLists.txt diff --git a/cpp/src/aztec/numeric/bitop/bitop.bench.cpp b/cpp/src/barretenberg/numeric/bitop/bitop.bench.cpp similarity index 100% rename from cpp/src/aztec/numeric/bitop/bitop.bench.cpp rename to cpp/src/barretenberg/numeric/bitop/bitop.bench.cpp diff --git a/cpp/src/aztec/numeric/bitop/count_leading_zeros.hpp b/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.hpp similarity index 100% rename from cpp/src/aztec/numeric/bitop/count_leading_zeros.hpp rename to cpp/src/barretenberg/numeric/bitop/count_leading_zeros.hpp diff --git a/cpp/src/aztec/numeric/bitop/count_leading_zeros.test.cpp b/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.test.cpp similarity index 100% rename from cpp/src/aztec/numeric/bitop/count_leading_zeros.test.cpp rename to cpp/src/barretenberg/numeric/bitop/count_leading_zeros.test.cpp diff --git a/cpp/src/aztec/numeric/bitop/get_msb.hpp b/cpp/src/barretenberg/numeric/bitop/get_msb.hpp similarity index 100% rename from cpp/src/aztec/numeric/bitop/get_msb.hpp rename to cpp/src/barretenberg/numeric/bitop/get_msb.hpp diff --git a/cpp/src/aztec/numeric/bitop/get_msb.test.cpp b/cpp/src/barretenberg/numeric/bitop/get_msb.test.cpp similarity index 100% rename from cpp/src/aztec/numeric/bitop/get_msb.test.cpp rename to cpp/src/barretenberg/numeric/bitop/get_msb.test.cpp diff --git a/cpp/src/aztec/numeric/bitop/keep_n_lsb.hpp b/cpp/src/barretenberg/numeric/bitop/keep_n_lsb.hpp similarity index 100% rename from cpp/src/aztec/numeric/bitop/keep_n_lsb.hpp rename to cpp/src/barretenberg/numeric/bitop/keep_n_lsb.hpp diff --git a/cpp/src/aztec/numeric/bitop/pow.hpp b/cpp/src/barretenberg/numeric/bitop/pow.hpp similarity index 100% rename from cpp/src/aztec/numeric/bitop/pow.hpp rename to cpp/src/barretenberg/numeric/bitop/pow.hpp diff --git a/cpp/src/aztec/numeric/bitop/rotate.hpp b/cpp/src/barretenberg/numeric/bitop/rotate.hpp similarity index 100% rename from cpp/src/aztec/numeric/bitop/rotate.hpp rename to cpp/src/barretenberg/numeric/bitop/rotate.hpp diff --git a/cpp/src/aztec/numeric/bitop/sparse_form.hpp b/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp similarity index 98% rename from cpp/src/aztec/numeric/bitop/sparse_form.hpp rename to cpp/src/barretenberg/numeric/bitop/sparse_form.hpp index f026ea4275..fe159849a9 100644 --- a/cpp/src/aztec/numeric/bitop/sparse_form.hpp +++ b/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include #include "../uint256/uint256.hpp" @@ -153,4 +153,4 @@ template class sparse_int { uint64_t sparse_value; }; -} // namespace numeric \ No newline at end of file +} // namespace numeric diff --git a/cpp/src/aztec/numeric/random/engine.cpp b/cpp/src/barretenberg/numeric/random/engine.cpp similarity index 98% rename from cpp/src/aztec/numeric/random/engine.cpp rename to cpp/src/barretenberg/numeric/random/engine.cpp index 1f16aabeda..20fe3d8179 100644 --- a/cpp/src/aztec/numeric/random/engine.cpp +++ b/cpp/src/barretenberg/numeric/random/engine.cpp @@ -1,6 +1,6 @@ #include "engine.hpp" #include -#include +#include #include #include @@ -133,4 +133,4 @@ Engine& get_engine() } } // namespace random -} // namespace numeric \ No newline at end of file +} // namespace numeric diff --git a/cpp/src/aztec/numeric/random/engine.hpp b/cpp/src/barretenberg/numeric/random/engine.hpp similarity index 100% rename from cpp/src/aztec/numeric/random/engine.hpp rename to cpp/src/barretenberg/numeric/random/engine.hpp diff --git a/cpp/src/aztec/numeric/random/engine.test.cpp b/cpp/src/barretenberg/numeric/random/engine.test.cpp similarity index 95% rename from cpp/src/aztec/numeric/random/engine.test.cpp rename to cpp/src/barretenberg/numeric/random/engine.test.cpp index 96ce7cfaa7..e5634cca01 100644 --- a/cpp/src/aztec/numeric/random/engine.test.cpp +++ b/cpp/src/barretenberg/numeric/random/engine.test.cpp @@ -1,7 +1,7 @@ #include "engine.hpp" #include -#include -#include +#include +#include TEST(engine, get_random_uint64) { @@ -46,4 +46,4 @@ TEST(engine, get_expected_debug_value) 0x66, 0x83, 0x68, 0x48, 0x20, 0xff, 0x40, 0x79, 0x5b, 0x8d, 0x9f, 0x1b, 0xe2, 0x22, 0x0c, 0xba, }); EXPECT_EQ(a, expected); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/numeric/uint128/uint128.hpp b/cpp/src/barretenberg/numeric/uint128/uint128.hpp similarity index 99% rename from cpp/src/aztec/numeric/uint128/uint128.hpp rename to cpp/src/barretenberg/numeric/uint128/uint128.hpp index a771ce6473..3ae84b45d8 100644 --- a/cpp/src/aztec/numeric/uint128/uint128.hpp +++ b/cpp/src/barretenberg/numeric/uint128/uint128.hpp @@ -4,7 +4,7 @@ #ifdef __i386__ #include -#include +#include namespace numeric { @@ -201,4 +201,4 @@ inline std::ostream& operator<<(std::ostream& os, uint128_t const& a) return os; } } // namespace std -#endif \ No newline at end of file +#endif diff --git a/cpp/src/aztec/numeric/uint128/uint128.test.cpp b/cpp/src/barretenberg/numeric/uint128/uint128.test.cpp similarity index 100% rename from cpp/src/aztec/numeric/uint128/uint128.test.cpp rename to cpp/src/barretenberg/numeric/uint128/uint128.test.cpp diff --git a/cpp/src/aztec/numeric/uint128/uint128_impl.hpp b/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp similarity index 99% rename from cpp/src/aztec/numeric/uint128/uint128_impl.hpp rename to cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp index 17e74648db..d2a1d02f01 100644 --- a/cpp/src/aztec/numeric/uint128/uint128_impl.hpp +++ b/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp @@ -1,7 +1,7 @@ #ifdef __i386__ #pragma once #include "../bitop/get_msb.hpp" -#include +#include namespace numeric { @@ -412,4 +412,4 @@ constexpr uint128_t uint128_t::operator<<(const uint128_t& other) const } } // namespace numeric -#endif \ No newline at end of file +#endif diff --git a/cpp/src/aztec/numeric/uint256/uint256.hpp b/cpp/src/barretenberg/numeric/uint256/uint256.hpp similarity index 98% rename from cpp/src/aztec/numeric/uint256/uint256.hpp rename to cpp/src/barretenberg/numeric/uint256/uint256.hpp index 9c144ec422..fe817cc784 100644 --- a/cpp/src/aztec/numeric/uint256/uint256.hpp +++ b/cpp/src/barretenberg/numeric/uint256/uint256.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include "../uint128/uint128.hpp" namespace numeric { @@ -209,4 +209,4 @@ template inline void write(B& it, uint256_t const& value) #include "./uint256_impl.hpp" -using numeric::uint256_t; \ No newline at end of file +using numeric::uint256_t; diff --git a/cpp/src/aztec/numeric/uint256/uint256.test.cpp b/cpp/src/barretenberg/numeric/uint256/uint256.test.cpp similarity index 100% rename from cpp/src/aztec/numeric/uint256/uint256.test.cpp rename to cpp/src/barretenberg/numeric/uint256/uint256.test.cpp diff --git a/cpp/src/aztec/numeric/uint256/uint256_impl.hpp b/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp similarity index 99% rename from cpp/src/aztec/numeric/uint256/uint256_impl.hpp rename to cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp index 40537f7e8b..661a34a520 100644 --- a/cpp/src/aztec/numeric/uint256/uint256_impl.hpp +++ b/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp @@ -1,6 +1,6 @@ #pragma once #include "../bitop/get_msb.hpp" -#include +#include namespace numeric { @@ -410,4 +410,4 @@ constexpr uint256_t uint256_t::operator<<(const uint256_t& other) const return result; } -} // namespace numeric \ No newline at end of file +} // namespace numeric diff --git a/cpp/src/aztec/numeric/uintx/uintx.hpp b/cpp/src/barretenberg/numeric/uintx/uintx.hpp similarity index 97% rename from cpp/src/aztec/numeric/uintx/uintx.hpp rename to cpp/src/barretenberg/numeric/uintx/uintx.hpp index 2b5f02c23e..94b04cd505 100644 --- a/cpp/src/aztec/numeric/uintx/uintx.hpp +++ b/cpp/src/barretenberg/numeric/uintx/uintx.hpp @@ -14,8 +14,8 @@ #include #include #include -#include -#include +#include +#include #include "../uint256/uint256.hpp" namespace numeric { @@ -188,4 +188,4 @@ typedef uintx uint1024_t; } // namespace numeric using numeric::uint1024_t; -using numeric::uint512_t; \ No newline at end of file +using numeric::uint512_t; diff --git a/cpp/src/aztec/numeric/uintx/uintx.test.cpp b/cpp/src/barretenberg/numeric/uintx/uintx.test.cpp similarity index 100% rename from cpp/src/aztec/numeric/uintx/uintx.test.cpp rename to cpp/src/barretenberg/numeric/uintx/uintx.test.cpp diff --git a/cpp/src/aztec/numeric/uintx/uintx_impl.hpp b/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp similarity index 99% rename from cpp/src/aztec/numeric/uintx/uintx_impl.hpp rename to cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp index c1b2fd9402..d426525580 100644 --- a/cpp/src/aztec/numeric/uintx/uintx_impl.hpp +++ b/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include template constexpr std::pair, uintx> uintx::divmod(const uintx& b) const @@ -330,4 +330,4 @@ template constexpr uintx uintx::operator result.hi = shifted_limbs[0]; } return result; -} \ No newline at end of file +} diff --git a/cpp/src/aztec/plonk/CMakeLists.txt b/cpp/src/barretenberg/plonk/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/plonk/CMakeLists.txt rename to cpp/src/barretenberg/plonk/CMakeLists.txt diff --git a/cpp/src/aztec/plonk/composer/composer_base.cpp b/cpp/src/barretenberg/plonk/composer/composer_base.cpp similarity index 98% rename from cpp/src/aztec/plonk/composer/composer_base.cpp rename to cpp/src/barretenberg/plonk/composer/composer_base.cpp index a9acf02141..f3a5bd3180 100644 --- a/cpp/src/aztec/plonk/composer/composer_base.cpp +++ b/cpp/src/barretenberg/plonk/composer/composer_base.cpp @@ -1,6 +1,6 @@ #include "composer_base.hpp" -#include -#include +#include +#include namespace plonk { @@ -245,7 +245,7 @@ std::shared_ptr ComposerBase::compute_proving_key_base(const Compos // Thus, to commit to t_{high}, we need the crs size to be (n + 1) for standard plonk. // // For more explanation about the degree of t(X), see - // ./src/aztec/plonk/proof_system/prover/prover.cpp/ProverBase::compute_quotient_commitments + // ./src/barretenberg/plonk/proof_system/prover/prover.cpp/ProverBase::compute_quotient_commitments // auto crs = crs_factory_->get_prover_crs(subgroup_size + 1); diff --git a/cpp/src/aztec/plonk/composer/composer_base.hpp b/cpp/src/barretenberg/plonk/composer/composer_base.hpp similarity index 98% rename from cpp/src/aztec/plonk/composer/composer_base.hpp rename to cpp/src/barretenberg/plonk/composer/composer_base.hpp index b762732c8a..a5b6b424ee 100644 --- a/cpp/src/aztec/plonk/composer/composer_base.hpp +++ b/cpp/src/barretenberg/plonk/composer/composer_base.hpp @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace plonk { static constexpr uint32_t DUMMY_TAG = 0; @@ -626,4 +626,4 @@ extern template void ComposerBase::compute_sigma_permutations<4, true>(proving_k * ], * ]; * - */ \ No newline at end of file + */ diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/aes128.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/aes128.hpp similarity index 96% rename from cpp/src/aztec/plonk/composer/plookup_tables/aes128.hpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/aes128.hpp index 5345991ec5..ee42e57452 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/aes128.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/aes128.hpp @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include "types.hpp" #include "sparse.hpp" @@ -174,4 +174,4 @@ inline MultiTable get_aes_sbox_table(const MultiTableId id = AES_SBOX) return table; } } // namespace aes128_tables -} // namespace plookup \ No newline at end of file +} // namespace plookup diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/blake2s.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/blake2s.hpp similarity index 99% rename from cpp/src/aztec/plonk/composer/plookup_tables/blake2s.hpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/blake2s.hpp index 69062fb032..45d4a30a39 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/blake2s.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/blake2s.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "types.hpp" #include "sparse.hpp" diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_chi.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_chi.hpp similarity index 98% rename from cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_chi.hpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_chi.hpp index e7245a665d..148c5f6bf1 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_chi.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_chi.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include "../types.hpp" namespace plookup { @@ -250,4 +250,4 @@ class Chi { } }; } // namespace keccak_tables -} // namespace plookup \ No newline at end of file +} // namespace plookup diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_input.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_input.hpp similarity index 96% rename from cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_input.hpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_input.hpp index 5da5c79074..c9cb274b2c 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_input.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_input.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #include "../types.hpp" namespace plookup { @@ -141,4 +141,4 @@ class KeccakInput { }; } // namespace keccak_tables -} // namespace plookup \ No newline at end of file +} // namespace plookup diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_output.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_output.hpp similarity index 97% rename from cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_output.hpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_output.hpp index 4f5fcdd0f7..7efed91fad 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_output.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_output.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #include "../types.hpp" #include "../sparse.hpp" @@ -172,4 +172,4 @@ class KeccakOutput { }; } // namespace keccak_tables -} // namespace plookup \ No newline at end of file +} // namespace plookup diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_rho.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_rho.hpp similarity index 99% rename from cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_rho.hpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_rho.hpp index e7bd5ad223..4542b52e65 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_rho.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_rho.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include "../types.hpp" namespace plookup { @@ -293,4 +293,4 @@ template class Rho { }; } // namespace keccak_tables -} // namespace plookup \ No newline at end of file +} // namespace plookup diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_theta.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_theta.hpp similarity index 98% rename from cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_theta.hpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_theta.hpp index 4a621c4d3c..bb69dc6d56 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/keccak/keccak_theta.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_theta.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include "../types.hpp" namespace plookup { @@ -252,4 +252,4 @@ class Theta { } }; } // namespace keccak_tables -} // namespace plookup \ No newline at end of file +} // namespace plookup diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/non_native_group_generator.cpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/non_native_group_generator.cpp similarity index 100% rename from cpp/src/aztec/plonk/composer/plookup_tables/non_native_group_generator.cpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/non_native_group_generator.cpp diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/non_native_group_generator.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/non_native_group_generator.hpp similarity index 95% rename from cpp/src/aztec/plonk/composer/plookup_tables/non_native_group_generator.hpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/non_native_group_generator.hpp index 3192a4c656..0e23835518 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/non_native_group_generator.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/non_native_group_generator.hpp @@ -2,9 +2,9 @@ #include "./types.hpp" #include -#include -#include -#include +#include +#include +#include namespace plookup { namespace ecc_generator_tables { @@ -60,4 +60,4 @@ extern template class ecc_generator_table; extern template class ecc_generator_table; } // namespace ecc_generator_tables -} // namespace plookup \ No newline at end of file +} // namespace plookup diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/pedersen.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/pedersen.hpp similarity index 97% rename from cpp/src/aztec/plonk/composer/plookup_tables/pedersen.hpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/pedersen.hpp index 26c7a74b1a..71cb707b23 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/pedersen.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/pedersen.hpp @@ -2,10 +2,10 @@ #include "./types.hpp" -#include -#include -#include -#include +#include +#include +#include +#include namespace plookup { namespace pedersen_tables { @@ -190,4 +190,4 @@ inline MultiTable get_pedersen_right_hi_table(const MultiTableId id = PEDERSEN_R } } // namespace basic } // namespace pedersen_tables -} // namespace plookup \ No newline at end of file +} // namespace plookup diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/plookup_tables.cpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/plookup_tables.cpp similarity index 99% rename from cpp/src/aztec/plonk/composer/plookup_tables/plookup_tables.cpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/plookup_tables.cpp index 299bc8966f..409566f119 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/plookup_tables.cpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/plookup_tables.cpp @@ -1,5 +1,5 @@ #include "plookup_tables.hpp" -#include +#include namespace plookup { @@ -201,4 +201,4 @@ ReadData get_lookup_accumulators(const MultiTableId id, return lookup; } -} // namespace plookup \ No newline at end of file +} // namespace plookup diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/plookup_tables.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp similarity index 99% rename from cpp/src/aztec/plonk/composer/plookup_tables/plookup_tables.hpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp index e1e30bcb44..cc3c0bc80d 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/plookup_tables.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "types.hpp" #include "sha256.hpp" @@ -284,4 +284,4 @@ inline BasicTable create_basic_table(const BasicTableId id, const size_t index) } } } -} // namespace plookup \ No newline at end of file +} // namespace plookup diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/sha256.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/sha256.hpp similarity index 98% rename from cpp/src/aztec/plonk/composer/plookup_tables/sha256.hpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/sha256.hpp index 4ce3a709e7..0d32d0d910 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/sha256.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/sha256.hpp @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include #include "types.hpp" #include "sparse.hpp" @@ -424,4 +424,4 @@ inline MultiTable get_majority_input_table(const MultiTableId id = SHA256_MAJ_IN } } // namespace sha256_tables -} // namespace plookup \ No newline at end of file +} // namespace plookup diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/sparse.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/sparse.hpp similarity index 94% rename from cpp/src/aztec/plonk/composer/plookup_tables/sparse.hpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/sparse.hpp index 8d135516ec..02a1d61a40 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/sparse.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/sparse.hpp @@ -2,10 +2,10 @@ #include "./types.hpp" -#include -#include -#include -#include +#include +#include +#include +#include namespace plookup { namespace sparse_tables { @@ -116,4 +116,4 @@ inline BasicTable generate_sparse_normalization_table(BasicTableId id, const siz return table; } } // namespace sparse_tables -} // namespace plookup \ No newline at end of file +} // namespace plookup diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/types.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/types.hpp similarity index 99% rename from cpp/src/aztec/plonk/composer/plookup_tables/types.hpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/types.hpp index 142b948d6b..6db42b685a 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/types.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/types.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include namespace plookup { @@ -346,4 +346,4 @@ template class ReadData { std::array, 3> columns; }; -} // namespace plookup \ No newline at end of file +} // namespace plookup diff --git a/cpp/src/aztec/plonk/composer/plookup_tables/uint.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/uint.hpp similarity index 97% rename from cpp/src/aztec/plonk/composer/plookup_tables/uint.hpp rename to cpp/src/barretenberg/plonk/composer/plookup_tables/uint.hpp index 5efc4c9009..4d368773be 100644 --- a/cpp/src/aztec/plonk/composer/plookup_tables/uint.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/uint.hpp @@ -2,7 +2,7 @@ #include "./types.hpp" -#include +#include namespace plookup { namespace uint_tables { @@ -104,4 +104,4 @@ inline MultiTable get_uint32_and_table(const MultiTableId id = UINT32_AND) } } // namespace uint_tables -} // namespace plookup \ No newline at end of file +} // namespace plookup diff --git a/cpp/src/aztec/plonk/composer/standard_composer.cpp b/cpp/src/barretenberg/plonk/composer/standard_composer.cpp similarity index 98% rename from cpp/src/aztec/plonk/composer/standard_composer.cpp rename to cpp/src/barretenberg/plonk/composer/standard_composer.cpp index 328c520b45..e237084da8 100644 --- a/cpp/src/aztec/plonk/composer/standard_composer.cpp +++ b/cpp/src/barretenberg/plonk/composer/standard_composer.cpp @@ -1,10 +1,10 @@ #include "standard_composer.hpp" -#include "plonk/proof_system/types/prover_settings.hpp" -#include -#include -#include -#include -#include +#include "barretenberg/plonk/proof_system/types/prover_settings.hpp" +#include +#include +#include +#include +#include #include #include @@ -856,4 +856,4 @@ bool StandardComposer::check_circuit() } return true; } -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/plonk/composer/standard_composer.hpp b/cpp/src/barretenberg/plonk/composer/standard_composer.hpp similarity index 97% rename from cpp/src/aztec/plonk/composer/standard_composer.hpp rename to cpp/src/barretenberg/plonk/composer/standard_composer.hpp index e144664180..69decf3d2b 100644 --- a/cpp/src/aztec/plonk/composer/standard_composer.hpp +++ b/cpp/src/barretenberg/plonk/composer/standard_composer.hpp @@ -1,7 +1,7 @@ #pragma once #include "composer_base.hpp" -#include -#include +#include +#include using namespace bonk; namespace plonk { @@ -159,7 +159,7 @@ class StandardComposer : public ComposerBase { // Round 0 transcript::Manifest::RoundManifest( - { + { { .name = "circuit_size", .num_bytes = 4, .derived_by_verifier = true }, { .name = "public_input_size", .num_bytes = 4, .derived_by_verifier = true } }, @@ -168,8 +168,8 @@ class StandardComposer : public ComposerBase { // Round 1 transcript::Manifest::RoundManifest( - {}, - /* challenge_name = */ "eta", + {}, + /* challenge_name = */ "eta", /* num_challenges_in = */ 0), // Round 2 @@ -185,7 +185,7 @@ class StandardComposer : public ComposerBase { // Round 3 transcript::Manifest::RoundManifest( - { { .name = "Z_PERM", .num_bytes = g1_size, .derived_by_verifier = false } }, + { { .name = "Z_PERM", .num_bytes = g1_size, .derived_by_verifier = false } }, /* challenge_name = */ "alpha", /* num_challenges_in = */ 1), diff --git a/cpp/src/aztec/plonk/composer/standard_composer.test.cpp b/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp similarity index 99% rename from cpp/src/aztec/plonk/composer/standard_composer.test.cpp rename to cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp index 9a904e3ed5..795ae0bc96 100644 --- a/cpp/src/aztec/plonk/composer/standard_composer.test.cpp +++ b/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp @@ -1,8 +1,8 @@ #include "standard_composer.hpp" #include -#include -#include -#include +#include +#include +#include using namespace barretenberg; using namespace bonk; @@ -719,4 +719,4 @@ TEST(standard_composer, test_fixed_group_add_gate) EXPECT_EQ(result, true); } -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/plonk/composer/turbo_composer.cpp b/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp similarity index 98% rename from cpp/src/aztec/plonk/composer/turbo_composer.cpp rename to cpp/src/barretenberg/plonk/composer/turbo_composer.cpp index dbdf6d2c1b..8bc4b4f2a6 100644 --- a/cpp/src/aztec/plonk/composer/turbo_composer.cpp +++ b/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp @@ -1,15 +1,15 @@ #include "turbo_composer.hpp" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "../proof_system/widgets/transition_widgets/transition_widget.hpp" #include "../proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp" -#include +#include using namespace barretenberg; using namespace bonk; diff --git a/cpp/src/aztec/plonk/composer/turbo_composer.hpp b/cpp/src/barretenberg/plonk/composer/turbo_composer.hpp similarity index 100% rename from cpp/src/aztec/plonk/composer/turbo_composer.hpp rename to cpp/src/barretenberg/plonk/composer/turbo_composer.hpp diff --git a/cpp/src/aztec/plonk/composer/turbo_composer.test.cpp b/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp similarity index 99% rename from cpp/src/aztec/plonk/composer/turbo_composer.test.cpp rename to cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp index 855d795661..af06dd5d34 100644 --- a/cpp/src/aztec/plonk/composer/turbo_composer.test.cpp +++ b/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp @@ -1,7 +1,7 @@ #include "turbo_composer.hpp" -#include +#include #include -#include +#include using namespace barretenberg; using namespace bonk; diff --git a/cpp/src/aztec/plonk/composer/ultra_composer.cpp b/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp similarity index 99% rename from cpp/src/aztec/plonk/composer/ultra_composer.cpp rename to cpp/src/barretenberg/plonk/composer/ultra_composer.cpp index df6aa5b10c..1d9cf8822a 100644 --- a/cpp/src/aztec/plonk/composer/ultra_composer.cpp +++ b/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp @@ -1,18 +1,18 @@ #include "ultra_composer.hpp" -#include -#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "plookup_tables/types.hpp" #include "plookup_tables/plookup_tables.hpp" diff --git a/cpp/src/aztec/plonk/composer/ultra_composer.hpp b/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp similarity index 100% rename from cpp/src/aztec/plonk/composer/ultra_composer.hpp rename to cpp/src/barretenberg/plonk/composer/ultra_composer.hpp diff --git a/cpp/src/aztec/plonk/composer/ultra_composer.test.cpp b/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp similarity index 99% rename from cpp/src/aztec/plonk/composer/ultra_composer.test.cpp rename to cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp index 9cb3eb6f80..0fe77f17ef 100644 --- a/cpp/src/aztec/plonk/composer/ultra_composer.test.cpp +++ b/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp @@ -1,9 +1,9 @@ -#include +#include #include "ultra_composer.hpp" -#include +#include #include -#include -#include +#include +#include #include "../proof_system/widgets/random_widgets/plookup_widget.hpp" #include "./plookup_tables/sha256.hpp" @@ -855,4 +855,4 @@ TEST(ultra_composer, ram) bool result = verifier.verify_proof(proof); EXPECT_EQ(result, true); } -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/plonk/proof_system/commitment_scheme/commitment_scheme.hpp b/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/commitment_scheme/commitment_scheme.hpp rename to cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp diff --git a/cpp/src/aztec/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp b/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp similarity index 94% rename from cpp/src/aztec/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp rename to cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp index be51faf113..7040ab6648 100644 --- a/cpp/src/aztec/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp @@ -2,17 +2,17 @@ #include "commitment_scheme.hpp" #include "kate_commitment_scheme.hpp" -#include +#include #include -#include "./polynomials/polynomial_arithmetic.hpp" -#include "./polynomials/polynomial.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/polynomials/polynomial.hpp" #include "../../../proof_system/work_queue/work_queue.hpp" #include "../types/program_settings.hpp" #include "../../composer/composer_base.hpp" -#include +#include -#include -#include +#include +#include using namespace barretenberg; using namespace plonk; diff --git a/cpp/src/aztec/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp b/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp similarity index 99% rename from cpp/src/aztec/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp rename to cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp index 0a92e2eb57..9671f1fe79 100644 --- a/cpp/src/aztec/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp @@ -1,4 +1,4 @@ -#include +#include #include "kate_commitment_scheme.hpp" #include "../../../polynomials/polynomial_arithmetic.hpp" diff --git a/cpp/src/aztec/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp b/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp rename to cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp diff --git a/cpp/src/aztec/plonk/proof_system/constants.hpp b/cpp/src/barretenberg/plonk/proof_system/constants.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/constants.hpp rename to cpp/src/barretenberg/plonk/proof_system/constants.hpp diff --git a/cpp/src/aztec/plonk/proof_system/prover/c_bind.cpp b/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp similarity index 98% rename from cpp/src/aztec/plonk/proof_system/prover/c_bind.cpp rename to cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp index 1c2d56e93d..7a1de38c39 100644 --- a/cpp/src/aztec/plonk/proof_system/prover/c_bind.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp @@ -1,5 +1,5 @@ #include "prover.hpp" -#include +#include #define WASM_EXPORT __attribute__((visibility("default"))) diff --git a/cpp/src/aztec/plonk/proof_system/prover/c_bind_unrolled.cpp b/cpp/src/barretenberg/plonk/proof_system/prover/c_bind_unrolled.cpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/prover/c_bind_unrolled.cpp rename to cpp/src/barretenberg/plonk/proof_system/prover/c_bind_unrolled.cpp diff --git a/cpp/src/aztec/plonk/proof_system/prover/prover.cpp b/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp similarity index 98% rename from cpp/src/aztec/plonk/proof_system/prover/prover.cpp rename to cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp index 10bcdf8939..1465af971e 100644 --- a/cpp/src/aztec/plonk/proof_system/prover/prover.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp @@ -1,10 +1,10 @@ #include "prover.hpp" #include "../public_inputs/public_inputs.hpp" -#include "polynomials/polynomial.hpp" +#include "barretenberg/polynomials/polynomial.hpp" #include -#include -#include -#include +#include +#include +#include using namespace barretenberg; @@ -111,7 +111,7 @@ template void ProverBase::compute_quotient_commitm // = n * program_width - program_width - 1 + k // // Since we must cut at least 4 roots from the vanishing polynomial - // (refer to ./src/aztec/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp/L247), + // (refer to ./src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp/L247), // k = 4 => deg(t) = n * program_width - program_width + 3 // // For standard plonk, program_width = 3 and thus, deg(t) = 3n. This implies that there would be diff --git a/cpp/src/aztec/plonk/proof_system/prover/prover.hpp b/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/prover/prover.hpp rename to cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp diff --git a/cpp/src/aztec/plonk/proof_system/prover/prover.test.cpp b/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp similarity index 98% rename from cpp/src/aztec/plonk/proof_system/prover/prover.test.cpp rename to cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp index 87eae43ea5..a3ad20f12f 100644 --- a/cpp/src/aztec/plonk/proof_system/prover/prover.test.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp @@ -4,9 +4,9 @@ #include "prover.hpp" #include -#include -#include -#include +#include +#include +#include /* ``` diff --git a/cpp/src/aztec/plonk/proof_system/public_inputs/public_inputs.hpp b/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp similarity index 79% rename from cpp/src/aztec/plonk/proof_system/public_inputs/public_inputs.hpp rename to cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp index 98a16212db..6f80ffd347 100644 --- a/cpp/src/aztec/plonk/proof_system/public_inputs/public_inputs.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include namespace plonk { @@ -10,4 +10,4 @@ Field compute_public_input_delta(const std::vector& inputs, const Field& subgroup_generator); } -#include "public_inputs_impl.hpp" \ No newline at end of file +#include "public_inputs_impl.hpp" diff --git a/cpp/src/aztec/plonk/proof_system/public_inputs/public_inputs.test.cpp b/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp similarity index 98% rename from cpp/src/aztec/plonk/proof_system/public_inputs/public_inputs.test.cpp rename to cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp index 77f7921099..ede5532479 100644 --- a/cpp/src/aztec/plonk/proof_system/public_inputs/public_inputs.test.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp @@ -1,6 +1,6 @@ #include "public_inputs.hpp" #include -#include +#include using namespace barretenberg; @@ -149,4 +149,4 @@ TEST(test_public_inputs, compute_delta) // T2 += T0; // T3 += T0; -} // namespace \ No newline at end of file +} // namespace diff --git a/cpp/src/aztec/plonk/proof_system/public_inputs/public_inputs_impl.hpp b/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/public_inputs/public_inputs_impl.hpp rename to cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp diff --git a/cpp/src/aztec/plonk/proof_system/types/commitment_open_proof.hpp b/cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/types/commitment_open_proof.hpp rename to cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp diff --git a/cpp/src/aztec/plonk/proof_system/types/program_settings.hpp b/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/types/program_settings.hpp rename to cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp diff --git a/cpp/src/aztec/plonk/proof_system/types/proof.hpp b/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/types/proof.hpp rename to cpp/src/barretenberg/plonk/proof_system/types/proof.hpp diff --git a/cpp/src/aztec/plonk/proof_system/types/prover_settings.hpp b/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp similarity index 97% rename from cpp/src/aztec/plonk/proof_system/types/prover_settings.hpp rename to cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp index 9ef112a26e..b9bab846bb 100644 --- a/cpp/src/aztec/plonk/proof_system/types/prover_settings.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp @@ -1,5 +1,5 @@ #pragma once -#include "../../../transcript/transcript.hpp" +#include "barretenberg/transcript/transcript.hpp" namespace plonk { class settings_base { public: @@ -55,4 +55,4 @@ class ultra_to_standard_settings : public ultra_settings { static constexpr transcript::HashType hash_type = transcript::HashType::PedersenBlake3s; }; -} // namespace waffle +} // namespace plonk diff --git a/cpp/src/aztec/plonk/proof_system/utils/generalized_permutation.hpp b/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp similarity index 95% rename from cpp/src/aztec/plonk/proof_system/utils/generalized_permutation.hpp rename to cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp index d6ceb3a9f1..b5a7387b15 100644 --- a/cpp/src/aztec/plonk/proof_system/utils/generalized_permutation.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include +#include +#include namespace plonk { template diff --git a/cpp/src/aztec/plonk/proof_system/utils/kate_verification.hpp b/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/utils/kate_verification.hpp rename to cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp diff --git a/cpp/src/aztec/plonk/proof_system/utils/permutation.hpp b/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp similarity index 96% rename from cpp/src/aztec/plonk/proof_system/utils/permutation.hpp rename to cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp index 307b344c1f..a782ac69a8 100644 --- a/cpp/src/aztec/plonk/proof_system/utils/permutation.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp @@ -1,8 +1,8 @@ #pragma once -#include "common/throw_or_abort.hpp" -#include -#include -#include +#include "barretenberg/common/throw_or_abort.hpp" +#include +#include +#include namespace plonk { diff --git a/cpp/src/aztec/plonk/proof_system/verifier/verifier.cpp b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp similarity index 97% rename from cpp/src/aztec/plonk/proof_system/verifier/verifier.cpp rename to cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp index 5c47069f55..f9a7558648 100644 --- a/cpp/src/aztec/plonk/proof_system/verifier/verifier.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp @@ -1,12 +1,12 @@ -#include -#include +#include +#include #include "./verifier.hpp" #include "../public_inputs/public_inputs.hpp" #include "../utils/kate_verification.hpp" -#include -#include -#include -#include +#include +#include +#include +#include using namespace barretenberg; diff --git a/cpp/src/aztec/plonk/proof_system/verifier/verifier.hpp b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp similarity index 90% rename from cpp/src/aztec/plonk/proof_system/verifier/verifier.hpp rename to cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp index d056e4d341..c7e0f811c5 100644 --- a/cpp/src/aztec/plonk/proof_system/verifier/verifier.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp @@ -2,8 +2,8 @@ #include "../types/proof.hpp" #include "../types/program_settings.hpp" #include "../widgets/random_widgets/random_widget.hpp" -#include -#include +#include +#include namespace plonk { template class VerifierBase { @@ -38,4 +38,4 @@ typedef VerifierBase TurboVerifier; typedef VerifierBase UltraVerifier; typedef VerifierBase UltraToStandardVerifier; -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/plonk/proof_system/verifier/verifier.test.cpp b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp similarity index 97% rename from cpp/src/aztec/plonk/proof_system/verifier/verifier.test.cpp rename to cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp index df213684a4..bc0c94eafe 100644 --- a/cpp/src/aztec/plonk/proof_system/verifier/verifier.test.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp @@ -3,13 +3,13 @@ #include "../utils/permutation.hpp" #include "../widgets/transition_widgets/arithmetic_widget.hpp" #include "../../../transcript/transcript.hpp" -#include "plonk/composer/standard_composer.hpp" +#include "barretenberg/plonk/composer/standard_composer.hpp" #include "verifier.hpp" -#include +#include #include -#include -#include -#include +#include +#include +#include namespace verifier_helpers { @@ -290,4 +290,4 @@ TEST(verifier, verify_damaged_proof) // verify proof EXPECT_ANY_THROW(verifier.verify_proof(proof)); } -#endif \ No newline at end of file +#endif diff --git a/cpp/src/aztec/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp diff --git a/cpp/src/aztec/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp similarity index 98% rename from cpp/src/aztec/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp index e388d8e601..2d6c64c66b 100644 --- a/cpp/src/aztec/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace plonk { @@ -229,7 +229,7 @@ void ProverPermutationWidget; -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp diff --git a/cpp/src/aztec/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp similarity index 98% rename from cpp/src/aztec/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp index 0b5ab89e35..22439b740d 100644 --- a/cpp/src/aztec/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace plonk { @@ -751,4 +751,4 @@ template class VerifierPlookupWidget; -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/plonk/proof_system/widgets/random_widgets/random_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp similarity index 96% rename from cpp/src/aztec/plonk/proof_system/widgets/random_widgets/random_widget.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp index 16c72b23fb..ba376d4334 100644 --- a/cpp/src/aztec/plonk/proof_system/widgets/random_widgets/random_widget.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp @@ -1,7 +1,7 @@ #pragma once #include "../../../../transcript/transcript.hpp" #include "../../../../proof_system/work_queue/work_queue.hpp" -#include +#include #include namespace transcript { diff --git a/cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp diff --git a/cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp diff --git a/cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp diff --git a/cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp diff --git a/cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp diff --git a/cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp diff --git a/cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp similarity index 99% rename from cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp index dca1beece2..3fa0581a5c 100644 --- a/cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include "../../types/prover_settings.hpp" #include "../../../../proof_system/proving_key/proving_key.hpp" #include "../../../../proof_system/work_queue/work_queue.hpp" @@ -386,4 +386,4 @@ class GenericVerifierWidget { } }; } // namespace widget -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp diff --git a/cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp diff --git a/cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp similarity index 100% rename from cpp/src/aztec/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp rename to cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp diff --git a/cpp/src/aztec/polynomials/CMakeLists.txt b/cpp/src/barretenberg/polynomials/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/polynomials/CMakeLists.txt rename to cpp/src/barretenberg/polynomials/CMakeLists.txt diff --git a/cpp/src/aztec/polynomials/evaluation_domain.cpp b/cpp/src/barretenberg/polynomials/evaluation_domain.cpp similarity index 96% rename from cpp/src/aztec/polynomials/evaluation_domain.cpp rename to cpp/src/barretenberg/polynomials/evaluation_domain.cpp index ae8a19ba75..abed11cdda 100644 --- a/cpp/src/aztec/polynomials/evaluation_domain.cpp +++ b/cpp/src/barretenberg/polynomials/evaluation_domain.cpp @@ -1,11 +1,11 @@ #include "evaluation_domain.hpp" -#include -#include -#include +#include +#include +#include #include #include -#include -#include +#include +#include #ifndef NO_MULTITHREADING #include "omp.h" @@ -186,4 +186,4 @@ template void EvaluationDomain::compute_lookup_table() template class EvaluationDomain; template class EvaluationDomain; -} // namespace barretenberg \ No newline at end of file +} // namespace barretenberg diff --git a/cpp/src/aztec/polynomials/evaluation_domain.hpp b/cpp/src/barretenberg/polynomials/evaluation_domain.hpp similarity index 95% rename from cpp/src/aztec/polynomials/evaluation_domain.hpp rename to cpp/src/barretenberg/polynomials/evaluation_domain.hpp index c034f6749f..904b4ecdf6 100644 --- a/cpp/src/aztec/polynomials/evaluation_domain.hpp +++ b/cpp/src/barretenberg/polynomials/evaluation_domain.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include #include namespace barretenberg { diff --git a/cpp/src/aztec/polynomials/iterate_over_domain.hpp b/cpp/src/barretenberg/polynomials/iterate_over_domain.hpp similarity index 100% rename from cpp/src/aztec/polynomials/iterate_over_domain.hpp rename to cpp/src/barretenberg/polynomials/iterate_over_domain.hpp diff --git a/cpp/src/aztec/polynomials/polynomial.cpp b/cpp/src/barretenberg/polynomials/polynomial.cpp similarity index 98% rename from cpp/src/aztec/polynomials/polynomial.cpp rename to cpp/src/barretenberg/polynomials/polynomial.cpp index 3b65a50500..13771ea420 100644 --- a/cpp/src/aztec/polynomials/polynomial.cpp +++ b/cpp/src/barretenberg/polynomials/polynomial.cpp @@ -1,8 +1,8 @@ #include "polynomial.hpp" #include "polynomial_arithmetic.hpp" -#include -#include -#include +#include +#include +#include #include #include #include @@ -371,4 +371,4 @@ template Fr Polynomial::evaluate_mle(std::span evalu template class Polynomial; template class Polynomial; -} // namespace barretenberg \ No newline at end of file +} // namespace barretenberg diff --git a/cpp/src/aztec/polynomials/polynomial.hpp b/cpp/src/barretenberg/polynomials/polynomial.hpp similarity index 98% rename from cpp/src/aztec/polynomials/polynomial.hpp rename to cpp/src/barretenberg/polynomials/polynomial.hpp index 73477ac7cf..f29df90fa6 100644 --- a/cpp/src/aztec/polynomials/polynomial.hpp +++ b/cpp/src/barretenberg/polynomials/polynomial.hpp @@ -1,9 +1,9 @@ #pragma once #include "evaluation_domain.hpp" #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/cpp/src/aztec/polynomials/polynomial_arithmetic.cpp b/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp similarity index 99% rename from cpp/src/aztec/polynomials/polynomial_arithmetic.cpp rename to cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp index 590152519e..6ed868925b 100644 --- a/cpp/src/aztec/polynomials/polynomial_arithmetic.cpp +++ b/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp @@ -1,11 +1,11 @@ #include "polynomial_arithmetic.hpp" #include "iterate_over_domain.hpp" -#include -#include +#include +#include #include #include -#include -#include +#include +#include namespace barretenberg::polynomial_arithmetic { diff --git a/cpp/src/aztec/polynomials/polynomial_arithmetic.hpp b/cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp similarity index 100% rename from cpp/src/aztec/polynomials/polynomial_arithmetic.hpp rename to cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp diff --git a/cpp/src/aztec/polynomials/polynomial_arithmetic.test.cpp b/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp similarity index 99% rename from cpp/src/aztec/polynomials/polynomial_arithmetic.test.cpp rename to cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp index 2cf7313bc1..d9f119dcc5 100644 --- a/cpp/src/aztec/polynomials/polynomial_arithmetic.test.cpp +++ b/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp @@ -1,11 +1,11 @@ #include "polynomial_arithmetic.hpp" #include -#include +#include #include #include #include -#include "numeric/bitop/get_msb.hpp" -#include "numeric/random/engine.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/numeric/random/engine.hpp" #include "polynomial.hpp" using namespace barretenberg; @@ -1193,4 +1193,4 @@ TEST(polynomials, default_construct_then_assign) EXPECT_EQ(poly[i], interesting_poly[i]); } EXPECT_EQ(poly.size(), interesting_poly.size()); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/polynomials/polynomials.bench.cpp b/cpp/src/barretenberg/polynomials/polynomials.bench.cpp similarity index 95% rename from cpp/src/aztec/polynomials/polynomials.bench.cpp rename to cpp/src/barretenberg/polynomials/polynomials.bench.cpp index 74e528145c..a3f473bccc 100644 --- a/cpp/src/aztec/polynomials/polynomials.bench.cpp +++ b/cpp/src/barretenberg/polynomials/polynomials.bench.cpp @@ -1,15 +1,15 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace benchmark; using namespace barretenberg; diff --git a/cpp/src/aztec/polynomials/serialize.hpp b/cpp/src/barretenberg/polynomials/serialize.hpp similarity index 100% rename from cpp/src/aztec/polynomials/serialize.hpp rename to cpp/src/barretenberg/polynomials/serialize.hpp diff --git a/cpp/src/aztec/proof_system/CMakeLists.txt b/cpp/src/barretenberg/proof_system/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/proof_system/CMakeLists.txt rename to cpp/src/barretenberg/proof_system/CMakeLists.txt diff --git a/cpp/src/aztec/proof_system/composer/composer_base.hpp b/cpp/src/barretenberg/proof_system/composer/composer_base.hpp similarity index 95% rename from cpp/src/aztec/proof_system/composer/composer_base.hpp rename to cpp/src/barretenberg/proof_system/composer/composer_base.hpp index 67791f9adc..87df0c4795 100644 --- a/cpp/src/aztec/proof_system/composer/composer_base.hpp +++ b/cpp/src/barretenberg/proof_system/composer/composer_base.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include -#include +#include +#include namespace bonk { struct add_triple { @@ -121,4 +121,4 @@ struct ecc_add_gate { barretenberg::fr endomorphism_coefficient; barretenberg::fr sign_coefficient; }; -} // namespace bonk \ No newline at end of file +} // namespace bonk diff --git a/cpp/src/aztec/proof_system/flavor/flavor.hpp b/cpp/src/barretenberg/proof_system/flavor/flavor.hpp similarity index 97% rename from cpp/src/aztec/proof_system/flavor/flavor.hpp rename to cpp/src/barretenberg/proof_system/flavor/flavor.hpp index 486ba528da..fee040ee9c 100644 --- a/cpp/src/aztec/proof_system/flavor/flavor.hpp +++ b/cpp/src/barretenberg/proof_system/flavor/flavor.hpp @@ -1,8 +1,8 @@ #pragma once #include #include -#include -#include +#include +#include #define STANDARD_HONK_WIDTH 3 // TODO(Cody): "bonk" is short for "both plonk and honk". Just need a short and non-vague temporary name. @@ -88,13 +88,13 @@ struct StandardHonk { // Round 0 manifest_rounds.emplace_back(transcript::Manifest::RoundManifest( - { + { { .name = "circuit_size", .num_bytes = 4, .derived_by_verifier = true }, - { .name = "public_input_size", .num_bytes = 4, .derived_by_verifier = true } + { .name = "public_input_size", .num_bytes = 4, .derived_by_verifier = true } }, /* challenge_name = */ "init", /* num_challenges_in = */ 1)); - + // Round 1 manifest_rounds.emplace_back(transcript::Manifest::RoundManifest( { /* this is a noop */ }, @@ -118,22 +118,22 @@ struct StandardHonk { { { .name = "Z_PERM", .num_bytes = g1_size, .derived_by_verifier = false } }, /* challenge_name = */ "alpha", /* num_challenges_in = */ 2) - ); + ); // Rounds 4, ... 4 + num_sumcheck_rounds-1 for (size_t i = 0; i < num_sumcheck_rounds; i++) { auto label = std::to_string(i); manifest_rounds.emplace_back( transcript::Manifest::RoundManifest( - { - { .name = "univariate_" + label, .num_bytes = fr_size * honk::StandardHonk::MAX_RELATION_LENGTH, .derived_by_verifier = false } + { + { .name = "univariate_" + label, .num_bytes = fr_size * honk::StandardHonk::MAX_RELATION_LENGTH, .derived_by_verifier = false } }, /* challenge_name = */ "u_" + label, /* num_challenges_in = */ 1)); } // Round 5 + num_sumcheck_rounds - manifest_rounds.emplace_back(transcript::Manifest::RoundManifest( + manifest_rounds.emplace_back(transcript::Manifest::RoundManifest( { { .name = "multivariate_evaluations", .num_bytes = fr_size * bonk::StandardArithmetization::NUM_POLYNOMIALS, .derived_by_verifier = false, .challenge_map_index = 0 }, }, @@ -165,8 +165,8 @@ struct StandardHonk { // Round 7 + 3 * num_sumcheck_rounds manifest_rounds.emplace_back( transcript::Manifest::RoundManifest( - { - { .name = "Q", .num_bytes = g1_size, .derived_by_verifier = false } + { + { .name = "Q", .num_bytes = g1_size, .derived_by_verifier = false } }, /* challenge_name = */ "z", /* num_challenges_in */ 1)); @@ -174,7 +174,7 @@ struct StandardHonk { // Round 8 + 3 * num_sumcheck_rounds manifest_rounds.emplace_back( transcript::Manifest::RoundManifest( - { + { { .name = "W", .num_bytes = g1_size, .derived_by_verifier = false } }, /* challenge_name = */ "separator", @@ -186,4 +186,4 @@ struct StandardHonk { return output; } }; -} // namespace honk \ No newline at end of file +} // namespace honk diff --git a/cpp/src/aztec/proof_system/flavor/flavor.test.cpp b/cpp/src/barretenberg/proof_system/flavor/flavor.test.cpp similarity index 100% rename from cpp/src/aztec/proof_system/flavor/flavor.test.cpp rename to cpp/src/barretenberg/proof_system/flavor/flavor.test.cpp diff --git a/cpp/src/aztec/proof_system/polynomial_cache/polynomial_cache.cpp b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.cpp similarity index 97% rename from cpp/src/aztec/proof_system/polynomial_cache/polynomial_cache.cpp rename to cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.cpp index b3dda8a2b2..209b5890ec 100644 --- a/cpp/src/aztec/proof_system/polynomial_cache/polynomial_cache.cpp +++ b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.cpp @@ -1,6 +1,6 @@ #include "polynomial_cache.hpp" -#include "polynomials/polynomial.hpp" -#include +#include "barretenberg/polynomials/polynomial.hpp" +#include namespace bonk { @@ -144,4 +144,4 @@ size_t get_cache_capacity(size_t num_gates, plonk::ComposerType composer_type) return min_required_capacity; } -} // namespace bonk \ No newline at end of file +} // namespace bonk diff --git a/cpp/src/aztec/proof_system/polynomial_cache/polynomial_cache.hpp b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.hpp similarity index 100% rename from cpp/src/aztec/proof_system/polynomial_cache/polynomial_cache.hpp rename to cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.hpp diff --git a/cpp/src/aztec/proof_system/polynomial_cache/polynomial_cache.test.cpp b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.test.cpp similarity index 97% rename from cpp/src/aztec/proof_system/polynomial_cache/polynomial_cache.test.cpp rename to cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.test.cpp index 52f7ba379f..9fafdde151 100644 --- a/cpp/src/aztec/proof_system/polynomial_cache/polynomial_cache.test.cpp +++ b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.test.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include "polynomial_cache.hpp" @@ -130,4 +130,4 @@ TEST(polynomial_cache, no_store) EXPECT_EQ(got.size(), 1024); } -} // namespace bonk \ No newline at end of file +} // namespace bonk diff --git a/cpp/src/aztec/proof_system/polynomial_cache/polynomial_store.hpp b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store.hpp similarity index 100% rename from cpp/src/aztec/proof_system/polynomial_cache/polynomial_store.hpp rename to cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store.hpp diff --git a/cpp/src/aztec/proof_system/polynomial_cache/polynomial_store.test.cpp b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store.test.cpp similarity index 90% rename from cpp/src/aztec/proof_system/polynomial_cache/polynomial_store.test.cpp rename to cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store.test.cpp index c535f85ba4..bd7a13af68 100644 --- a/cpp/src/aztec/proof_system/polynomial_cache/polynomial_store.test.cpp +++ b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store.test.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include "polynomial_store.hpp" @@ -38,4 +38,4 @@ TEST(polynomial_store, get_polynomial) EXPECT_EQ(store.get_stats()["id"].second, 1); } -} // namespace bonk \ No newline at end of file +} // namespace bonk diff --git a/cpp/src/aztec/proof_system/polynomial_cache/polynomial_store_mem.cpp b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store_mem.cpp similarity index 91% rename from cpp/src/aztec/proof_system/polynomial_cache/polynomial_store_mem.cpp rename to cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store_mem.cpp index bdf56c1dee..f4e15f8cbc 100644 --- a/cpp/src/aztec/proof_system/polynomial_cache/polynomial_store_mem.cpp +++ b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store_mem.cpp @@ -1,5 +1,5 @@ #include "polynomial_store.hpp" -#include "polynomials/polynomial.hpp" +#include "barretenberg/polynomials/polynomial.hpp" namespace bonk { @@ -36,4 +36,4 @@ polynomial PolynomialStoreMem::get(std::string const& key) const return polynomial(); } -} // namespace bonk \ No newline at end of file +} // namespace bonk diff --git a/cpp/src/aztec/proof_system/polynomial_cache/polynomial_store_wasm.cpp b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store_wasm.cpp similarity index 91% rename from cpp/src/aztec/proof_system/polynomial_cache/polynomial_store_wasm.cpp rename to cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store_wasm.cpp index feaab774d6..250ff283ad 100644 --- a/cpp/src/aztec/proof_system/polynomial_cache/polynomial_store_wasm.cpp +++ b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store_wasm.cpp @@ -1,5 +1,5 @@ #include "polynomial_store.hpp" -#include +#include namespace bonk { @@ -27,4 +27,4 @@ polynomial PolynomialStoreWasm::get(std::string const& key) const return length_out ? polynomial((fr*)buf, length_out / sizeof(fr)) : polynomial(); } -} // namespace bonk \ No newline at end of file +} // namespace bonk diff --git a/cpp/src/aztec/proof_system/proving_key/proving_key.cpp b/cpp/src/barretenberg/proof_system/proving_key/proving_key.cpp similarity index 93% rename from cpp/src/aztec/proof_system/proving_key/proving_key.cpp rename to cpp/src/barretenberg/proof_system/proving_key/proving_key.cpp index 70fdf7373e..4774e558a0 100644 --- a/cpp/src/aztec/proof_system/proving_key/proving_key.cpp +++ b/cpp/src/barretenberg/proof_system/proving_key/proving_key.cpp @@ -1,12 +1,12 @@ #include "proving_key.hpp" -#include -#include -#include +#include +#include +#include namespace bonk { // In all the constructors below, the pippenger_runtime_state takes (n + 1) as the input // as the degree of t_{high}(X) is (n + 1) for standard plonk. Refer to -// ./src/aztec/plonk/proof_system/prover/prover.cpp/ProverBase::compute_quotient_commitments +// ./src/barretenberg/plonk/proof_system/prover/prover.cpp/ProverBase::compute_quotient_commitments // for more details on this. // // NOTE: If the number of roots cut out of the vanishing polynomial is increased beyond 4, diff --git a/cpp/src/aztec/proof_system/proving_key/proving_key.hpp b/cpp/src/barretenberg/proof_system/proving_key/proving_key.hpp similarity index 86% rename from cpp/src/aztec/proof_system/proving_key/proving_key.hpp rename to cpp/src/barretenberg/proof_system/proving_key/proving_key.hpp index cebd05c15f..7b3d2d087d 100644 --- a/cpp/src/aztec/proof_system/proving_key/proving_key.hpp +++ b/cpp/src/barretenberg/proof_system/proving_key/proving_key.hpp @@ -1,12 +1,12 @@ #pragma once -#include +#include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #include #include "../polynomial_cache/polynomial_cache.hpp" diff --git a/cpp/src/aztec/proof_system/proving_key/proving_key.test.cpp b/cpp/src/barretenberg/proof_system/proving_key/proving_key.test.cpp similarity index 95% rename from cpp/src/aztec/proof_system/proving_key/proving_key.test.cpp rename to cpp/src/barretenberg/proof_system/proving_key/proving_key.test.cpp index 871d5a8597..929cd71e47 100644 --- a/cpp/src/aztec/proof_system/proving_key/proving_key.test.cpp +++ b/cpp/src/barretenberg/proof_system/proving_key/proving_key.test.cpp @@ -1,8 +1,8 @@ -#include -#include +#include +#include #include "proving_key.hpp" #include "serialize.hpp" -#include "plonk/composer/standard_composer.hpp" +#include "barretenberg/plonk/composer/standard_composer.hpp" #ifndef __wasm__ #include @@ -57,7 +57,7 @@ TEST(proving_key, proving_key_from_mmaped_key) // Write each precomputed polynomial in the proving key to // its own file using write_mmap - std::string pk_dir = "../src/aztec/proof_system/proving_key/fixtures"; + std::string pk_dir = "../src/barretenberg/proof_system/proving_key/fixtures"; std::filesystem::create_directories(pk_dir); std::string pk_path = pk_dir + "/proving_key"; std::ofstream os(pk_path); @@ -113,4 +113,4 @@ TEST(proving_key, proving_key_from_mmaped_key) EXPECT_EQ(p_key.num_public_inputs, pk_data.num_public_inputs); EXPECT_EQ(p_key.contains_recursive_proof, pk_data.contains_recursive_proof); } -#endif \ No newline at end of file +#endif diff --git a/cpp/src/aztec/proof_system/proving_key/serialize.hpp b/cpp/src/barretenberg/proof_system/proving_key/serialize.hpp similarity index 96% rename from cpp/src/aztec/proof_system/proving_key/serialize.hpp rename to cpp/src/barretenberg/proof_system/proving_key/serialize.hpp index 09118cf3e9..0653d55fd6 100644 --- a/cpp/src/aztec/proof_system/proving_key/serialize.hpp +++ b/cpp/src/barretenberg/proof_system/proving_key/serialize.hpp @@ -1,8 +1,8 @@ #pragma once #include "proving_key.hpp" -#include -#include -#include +#include +#include +#include namespace bonk { diff --git a/cpp/src/aztec/proof_system/types/polynomial_manifest.hpp b/cpp/src/barretenberg/proof_system/types/polynomial_manifest.hpp similarity index 99% rename from cpp/src/aztec/proof_system/types/polynomial_manifest.hpp rename to cpp/src/barretenberg/proof_system/types/polynomial_manifest.hpp index fd20d50c1e..e8467cd5ca 100644 --- a/cpp/src/aztec/proof_system/types/polynomial_manifest.hpp +++ b/cpp/src/barretenberg/proof_system/types/polynomial_manifest.hpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include // ToDo(Arijit): The below namespace should be plonk once all the honk related stuffs are moved out namespace bonk { @@ -252,4 +252,4 @@ class PrecomputedPolyList { std::string operator[](size_t index) const { return precomputed_poly_ids[index]; } }; -} // namespace bonk \ No newline at end of file +} // namespace bonk diff --git a/cpp/src/aztec/proof_system/verification_key/sol_gen.hpp b/cpp/src/barretenberg/proof_system/verification_key/sol_gen.hpp similarity index 100% rename from cpp/src/aztec/proof_system/verification_key/sol_gen.hpp rename to cpp/src/barretenberg/proof_system/verification_key/sol_gen.hpp diff --git a/cpp/src/aztec/proof_system/verification_key/verification_key.cpp b/cpp/src/barretenberg/proof_system/verification_key/verification_key.cpp similarity index 98% rename from cpp/src/aztec/proof_system/verification_key/verification_key.cpp rename to cpp/src/barretenberg/proof_system/verification_key/verification_key.cpp index 299f6b71cb..b17098a6ad 100644 --- a/cpp/src/aztec/proof_system/verification_key/verification_key.cpp +++ b/cpp/src/barretenberg/proof_system/verification_key/verification_key.cpp @@ -1,4 +1,4 @@ -#include +#include #include "verification_key.hpp" #include "../../plonk/proof_system/constants.hpp" @@ -87,4 +87,4 @@ sha256::hash verification_key::sha256_hash() return sha256::sha256(to_buffer(vk_data)); } -} // namespace bonk \ No newline at end of file +} // namespace bonk diff --git a/cpp/src/aztec/proof_system/verification_key/verification_key.hpp b/cpp/src/barretenberg/proof_system/verification_key/verification_key.hpp similarity index 94% rename from cpp/src/aztec/proof_system/verification_key/verification_key.hpp rename to cpp/src/barretenberg/proof_system/verification_key/verification_key.hpp index 3587ae955f..978bf5d2d8 100644 --- a/cpp/src/aztec/proof_system/verification_key/verification_key.hpp +++ b/cpp/src/barretenberg/proof_system/verification_key/verification_key.hpp @@ -1,8 +1,8 @@ #pragma once #include -#include -#include -#include +#include +#include +#include #include "../../proof_system/types/polynomial_manifest.hpp" namespace bonk { @@ -91,4 +91,4 @@ template inline void write(B& buf, verification_key const& key) write(buf, key.recursive_proof_public_input_indices); } -} // namespace bonk \ No newline at end of file +} // namespace bonk diff --git a/cpp/src/aztec/proof_system/verification_key/verification_key.test.cpp b/cpp/src/barretenberg/proof_system/verification_key/verification_key.test.cpp similarity index 93% rename from cpp/src/aztec/proof_system/verification_key/verification_key.test.cpp rename to cpp/src/barretenberg/proof_system/verification_key/verification_key.test.cpp index 629d830769..075960d696 100644 --- a/cpp/src/aztec/proof_system/verification_key/verification_key.test.cpp +++ b/cpp/src/barretenberg/proof_system/verification_key/verification_key.test.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include "verification_key.hpp" using namespace barretenberg; @@ -40,4 +40,4 @@ TEST(verification_key, stream_serialization) read(static_cast(s), result); EXPECT_EQ(key, result); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/proof_system/work_queue/work_queue.cpp b/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp similarity index 98% rename from cpp/src/aztec/proof_system/work_queue/work_queue.cpp rename to cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp index 835b550b1b..8997046a6a 100644 --- a/cpp/src/aztec/proof_system/work_queue/work_queue.cpp +++ b/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp @@ -1,7 +1,7 @@ #include "work_queue.hpp" -#include -#include +#include +#include namespace bonk { @@ -295,4 +295,4 @@ std::vector work_queue::get_queue() const return work_item_queue; } -} // namespace bonk \ No newline at end of file +} // namespace bonk diff --git a/cpp/src/aztec/proof_system/work_queue/work_queue.hpp b/cpp/src/barretenberg/proof_system/work_queue/work_queue.hpp similarity index 100% rename from cpp/src/aztec/proof_system/work_queue/work_queue.hpp rename to cpp/src/barretenberg/proof_system/work_queue/work_queue.hpp diff --git a/cpp/src/aztec/srs/CMakeLists.txt b/cpp/src/barretenberg/srs/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/srs/CMakeLists.txt rename to cpp/src/barretenberg/srs/CMakeLists.txt diff --git a/cpp/src/aztec/srs/io.cpp b/cpp/src/barretenberg/srs/io.cpp similarity index 98% rename from cpp/src/aztec/srs/io.cpp rename to cpp/src/barretenberg/srs/io.cpp index 135b3f4f8a..c3f24ecdb8 100644 --- a/cpp/src/aztec/srs/io.cpp +++ b/cpp/src/barretenberg/srs/io.cpp @@ -1,7 +1,7 @@ #include "io.hpp" -#include -#include -#include +#include +#include +#include #include #include @@ -331,4 +331,4 @@ void write_transcript(g1::affine_element const* g1_x, } } // namespace io -} // namespace barretenberg \ No newline at end of file +} // namespace barretenberg diff --git a/cpp/src/aztec/srs/io.hpp b/cpp/src/barretenberg/srs/io.hpp similarity index 100% rename from cpp/src/aztec/srs/io.hpp rename to cpp/src/barretenberg/srs/io.hpp diff --git a/cpp/src/aztec/srs/io.test.cpp b/cpp/src/barretenberg/srs/io.test.cpp similarity index 85% rename from cpp/src/aztec/srs/io.test.cpp rename to cpp/src/barretenberg/srs/io.test.cpp index e0c7169553..33d00f8853 100644 --- a/cpp/src/aztec/srs/io.test.cpp +++ b/cpp/src/barretenberg/srs/io.test.cpp @@ -1,7 +1,7 @@ -#include -#include +#include +#include #include "io.hpp" -#include +#include #include using namespace barretenberg; @@ -29,4 +29,4 @@ TEST(io, read_transcript_loads_well_formed_srs) EXPECT_EQ(monomials[i].on_curve(), true); } aligned_free(monomials); -} \ No newline at end of file +} diff --git a/cpp/src/barretenberg/srs/lagrange_base_transformation/lagrange_base.hpp b/cpp/src/barretenberg/srs/lagrange_base_transformation/lagrange_base.hpp new file mode 100644 index 0000000000..031384ffc1 --- /dev/null +++ b/cpp/src/barretenberg/srs/lagrange_base_transformation/lagrange_base.hpp @@ -0,0 +1,11 @@ +#pragma once + +#include "../../ecc/curves/bn254/g1.hpp" +#include "../../polynomials/evaluation_domain.hpp" +#include "../../ecc/groups/element.hpp" + +namespace barretenberg { +namespace lagrange_base { +void transform_srs(g1::affine_element*, g1::affine_element*, const size_t); +} +} // namespace barretenberg \ No newline at end of file diff --git a/cpp/src/aztec/srs/reference_string/file_reference_string.cpp b/cpp/src/barretenberg/srs/reference_string/file_reference_string.cpp similarity index 92% rename from cpp/src/aztec/srs/reference_string/file_reference_string.cpp rename to cpp/src/barretenberg/srs/reference_string/file_reference_string.cpp index 37e3751d49..464be2f719 100644 --- a/cpp/src/aztec/srs/reference_string/file_reference_string.cpp +++ b/cpp/src/barretenberg/srs/reference_string/file_reference_string.cpp @@ -1,7 +1,7 @@ #include "file_reference_string.hpp" #include "../io.hpp" -#include +#include namespace bonk { diff --git a/cpp/src/aztec/srs/reference_string/file_reference_string.hpp b/cpp/src/barretenberg/srs/reference_string/file_reference_string.hpp similarity index 94% rename from cpp/src/aztec/srs/reference_string/file_reference_string.hpp rename to cpp/src/barretenberg/srs/reference_string/file_reference_string.hpp index 4094f84bf7..37b5767762 100644 --- a/cpp/src/aztec/srs/reference_string/file_reference_string.hpp +++ b/cpp/src/barretenberg/srs/reference_string/file_reference_string.hpp @@ -4,9 +4,9 @@ #pragma once #include "reference_string.hpp" -#include -#include -#include +#include +#include +#include #include #include diff --git a/cpp/src/aztec/srs/reference_string/mem_reference_string.cpp b/cpp/src/barretenberg/srs/reference_string/mem_reference_string.cpp similarity index 85% rename from cpp/src/aztec/srs/reference_string/mem_reference_string.cpp rename to cpp/src/barretenberg/srs/reference_string/mem_reference_string.cpp index df51a4ed6a..915d700110 100644 --- a/cpp/src/aztec/srs/reference_string/mem_reference_string.cpp +++ b/cpp/src/barretenberg/srs/reference_string/mem_reference_string.cpp @@ -1,8 +1,8 @@ #include "mem_reference_string.hpp" #include "../io.hpp" -#include -#include +#include +#include #include @@ -23,4 +23,4 @@ VerifierMemReferenceString::~VerifierMemReferenceString() aligned_free(precomputed_g2_lines); } -} // namespace bonk \ No newline at end of file +} // namespace bonk diff --git a/cpp/src/aztec/srs/reference_string/mem_reference_string.hpp b/cpp/src/barretenberg/srs/reference_string/mem_reference_string.hpp similarity index 90% rename from cpp/src/aztec/srs/reference_string/mem_reference_string.hpp rename to cpp/src/barretenberg/srs/reference_string/mem_reference_string.hpp index 307c6089e7..4144859308 100644 --- a/cpp/src/aztec/srs/reference_string/mem_reference_string.hpp +++ b/cpp/src/barretenberg/srs/reference_string/mem_reference_string.hpp @@ -5,7 +5,7 @@ #include "reference_string.hpp" -#include +#include namespace barretenberg::pairing { struct miller_lines; diff --git a/cpp/src/aztec/srs/reference_string/mem_reference_string.test.cpp b/cpp/src/barretenberg/srs/reference_string/mem_reference_string.test.cpp similarity index 95% rename from cpp/src/aztec/srs/reference_string/mem_reference_string.test.cpp rename to cpp/src/barretenberg/srs/reference_string/mem_reference_string.test.cpp index cfda7bd9bc..51d80de52b 100644 --- a/cpp/src/aztec/srs/reference_string/mem_reference_string.test.cpp +++ b/cpp/src/barretenberg/srs/reference_string/mem_reference_string.test.cpp @@ -1,7 +1,7 @@ #include "file_reference_string.hpp" #include "mem_reference_string.hpp" -#include +#include #include @@ -30,4 +30,4 @@ TEST(reference_string, mem_file_consistency) file_verifier->get_precomputed_g2_lines(), sizeof(barretenberg::pairing::miller_lines) * 2), 0); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/srs/reference_string/pippenger_reference_string.hpp b/cpp/src/barretenberg/srs/reference_string/pippenger_reference_string.hpp similarity index 100% rename from cpp/src/aztec/srs/reference_string/pippenger_reference_string.hpp rename to cpp/src/barretenberg/srs/reference_string/pippenger_reference_string.hpp diff --git a/cpp/src/aztec/srs/reference_string/reference_string.hpp b/cpp/src/barretenberg/srs/reference_string/reference_string.hpp similarity index 88% rename from cpp/src/aztec/srs/reference_string/reference_string.hpp rename to cpp/src/barretenberg/srs/reference_string/reference_string.hpp index c1684d24f2..c1273e4c4f 100644 --- a/cpp/src/aztec/srs/reference_string/reference_string.hpp +++ b/cpp/src/barretenberg/srs/reference_string/reference_string.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include +#include +#include #include diff --git a/cpp/src/aztec/stdlib/CMakeLists.txt b/cpp/src/barretenberg/stdlib/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/stdlib/CMakeLists.txt rename to cpp/src/barretenberg/stdlib/CMakeLists.txt diff --git a/cpp/src/aztec/stdlib/encryption/CMakeLists.txt b/cpp/src/barretenberg/stdlib/encryption/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/stdlib/encryption/CMakeLists.txt rename to cpp/src/barretenberg/stdlib/encryption/CMakeLists.txt diff --git a/cpp/src/aztec/stdlib/encryption/aes128/CMakeLists.txt b/cpp/src/barretenberg/stdlib/encryption/aes128/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/stdlib/encryption/aes128/CMakeLists.txt rename to cpp/src/barretenberg/stdlib/encryption/aes128/CMakeLists.txt diff --git a/cpp/src/aztec/stdlib/encryption/aes128/aes128.cpp b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp similarity index 97% rename from cpp/src/aztec/stdlib/encryption/aes128/aes128.cpp rename to cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp index 737de3fa38..f7abf534a4 100644 --- a/cpp/src/aztec/stdlib/encryption/aes128/aes128.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp @@ -1,12 +1,12 @@ #include "./aes128.hpp" -#include +#include -#include -#include -#include +#include +#include +#include -#include +#include using namespace crypto::aes128; using namespace barretenberg; diff --git a/cpp/src/aztec/stdlib/encryption/aes128/aes128.hpp b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp similarity index 100% rename from cpp/src/aztec/stdlib/encryption/aes128/aes128.hpp rename to cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp diff --git a/cpp/src/aztec/stdlib/encryption/aes128/aes128.test.cpp b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp similarity index 96% rename from cpp/src/aztec/stdlib/encryption/aes128/aes128.test.cpp rename to cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp index cb84d99a8a..a0e5f8f19b 100644 --- a/cpp/src/aztec/stdlib/encryption/aes128/aes128.test.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp @@ -1,8 +1,8 @@ #include "aes128.hpp" -#include +#include -#include +#include #include @@ -63,4 +63,4 @@ TEST(stdlib_aes128, encrypt_64_bytes) plonk::proof proof = prover.construct_proof(); bool proof_result = verifier.verify_proof(proof); EXPECT_EQ(proof_result, true); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/stdlib/encryption/ecdsa/CMakeLists.txt b/cpp/src/barretenberg/stdlib/encryption/ecdsa/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/stdlib/encryption/ecdsa/CMakeLists.txt rename to cpp/src/barretenberg/stdlib/encryption/ecdsa/CMakeLists.txt diff --git a/cpp/src/aztec/stdlib/encryption/ecdsa/ecdsa.hpp b/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp similarity index 100% rename from cpp/src/aztec/stdlib/encryption/ecdsa/ecdsa.hpp rename to cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp diff --git a/cpp/src/aztec/stdlib/encryption/ecdsa/ecdsa.test.cpp b/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp similarity index 94% rename from cpp/src/aztec/stdlib/encryption/ecdsa/ecdsa.test.cpp rename to cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp index 82236b5794..401dc8af9e 100644 --- a/cpp/src/aztec/stdlib/encryption/ecdsa/ecdsa.test.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp @@ -3,8 +3,8 @@ #include "../../primitives/curves/secp256k1.hpp" #include "ecdsa.hpp" -#include -#include +#include +#include using namespace barretenberg; using namespace plonk; @@ -54,4 +54,4 @@ TEST(stdlib_ecdsa, verify_signature) bool proof_result = verifier.verify_proof(proof); EXPECT_EQ(proof_result, true); } -} // namespace test_stdlib_ecdsa \ No newline at end of file +} // namespace test_stdlib_ecdsa diff --git a/cpp/src/aztec/stdlib/encryption/ecdsa/ecdsa_impl.hpp b/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp similarity index 100% rename from cpp/src/aztec/stdlib/encryption/ecdsa/ecdsa_impl.hpp rename to cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp diff --git a/cpp/src/aztec/stdlib/encryption/schnorr/CMakeLists.txt b/cpp/src/barretenberg/stdlib/encryption/schnorr/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/stdlib/encryption/schnorr/CMakeLists.txt rename to cpp/src/barretenberg/stdlib/encryption/schnorr/CMakeLists.txt diff --git a/cpp/src/aztec/stdlib/encryption/schnorr/schnorr.cpp b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp similarity index 99% rename from cpp/src/aztec/stdlib/encryption/schnorr/schnorr.cpp rename to cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp index 97bf0f77f5..d96bbbf30c 100644 --- a/cpp/src/aztec/stdlib/encryption/schnorr/schnorr.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp @@ -1,8 +1,8 @@ #include "schnorr.hpp" #include -#include -#include -#include +#include +#include +#include #include "../../primitives/composers/composers.hpp" diff --git a/cpp/src/aztec/stdlib/encryption/schnorr/schnorr.hpp b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp similarity index 98% rename from cpp/src/aztec/stdlib/encryption/schnorr/schnorr.hpp rename to cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp index 1560099789..4af0c9a347 100644 --- a/cpp/src/aztec/stdlib/encryption/schnorr/schnorr.hpp +++ b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "../../primitives/field/field.hpp" #include "../../primitives/bool/bool.hpp" #include "../../primitives/witness/witness.hpp" diff --git a/cpp/src/aztec/stdlib/encryption/schnorr/schnorr.test.cpp b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp similarity index 98% rename from cpp/src/aztec/stdlib/encryption/schnorr/schnorr.test.cpp rename to cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp index e7ffb8b98b..e6c7b7eb10 100644 --- a/cpp/src/aztec/stdlib/encryption/schnorr/schnorr.test.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp @@ -1,8 +1,8 @@ #include "schnorr.hpp" -#include -#include +#include +#include #include -#include +#include namespace test_stdlib_schnorr { @@ -343,4 +343,4 @@ TEST(stdlib_schnorr, signature_verification_result_failure) EXPECT_EQ(verification_result, true); } -} // namespace test_stdlib_schnorr \ No newline at end of file +} // namespace test_stdlib_schnorr diff --git a/cpp/src/aztec/stdlib/hash/CMakeLists.txt b/cpp/src/barretenberg/stdlib/hash/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/stdlib/hash/CMakeLists.txt rename to cpp/src/barretenberg/stdlib/hash/CMakeLists.txt diff --git a/cpp/src/aztec/stdlib/hash/blake2s/CMakeLists.txt b/cpp/src/barretenberg/stdlib/hash/blake2s/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/stdlib/hash/blake2s/CMakeLists.txt rename to cpp/src/barretenberg/stdlib/hash/blake2s/CMakeLists.txt diff --git a/cpp/src/aztec/stdlib/hash/blake2s/blake2s.cpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp similarity index 94% rename from cpp/src/aztec/stdlib/hash/blake2s/blake2s.cpp rename to cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp index 4c436c0352..748cacc58e 100644 --- a/cpp/src/aztec/stdlib/hash/blake2s/blake2s.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp @@ -1,10 +1,10 @@ #include "blake2s.hpp" #include "blake2s_plookup.hpp" #include "blake_util.hpp" -#include -#include -#include -#include +#include +#include +#include +#include namespace plonk { namespace stdlib { diff --git a/cpp/src/aztec/stdlib/hash/blake2s/blake2s.hpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp similarity index 90% rename from cpp/src/aztec/stdlib/hash/blake2s/blake2s.hpp rename to cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp index 4bcb430616..91da1ba980 100644 --- a/cpp/src/aztec/stdlib/hash/blake2s/blake2s.hpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace plonk { class StandardComposer; diff --git a/cpp/src/aztec/stdlib/hash/blake2s/blake2s.test.cpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp similarity index 97% rename from cpp/src/aztec/stdlib/hash/blake2s/blake2s.test.cpp rename to cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp index be79844196..1f1bb19d92 100644 --- a/cpp/src/aztec/stdlib/hash/blake2s/blake2s.test.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp @@ -1,8 +1,8 @@ #include "blake2s.hpp" #include "blake2s_plookup.hpp" -#include +#include #include -#include +#include using namespace barretenberg; using namespace plonk; diff --git a/cpp/src/aztec/stdlib/hash/blake2s/blake2s_plookup.cpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp similarity index 93% rename from cpp/src/aztec/stdlib/hash/blake2s/blake2s_plookup.cpp rename to cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp index c3b8e31f7f..7fcd3cbf07 100644 --- a/cpp/src/aztec/stdlib/hash/blake2s/blake2s_plookup.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp @@ -1,13 +1,13 @@ #include "blake2s_plookup.hpp" #include "blake_util.hpp" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /** * Optimizations: diff --git a/cpp/src/aztec/stdlib/hash/blake2s/blake2s_plookup.hpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp similarity index 74% rename from cpp/src/aztec/stdlib/hash/blake2s/blake2s_plookup.hpp rename to cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp index 3683b68b35..8b49316747 100644 --- a/cpp/src/aztec/stdlib/hash/blake2s/blake2s_plookup.hpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp @@ -1,9 +1,9 @@ #pragma once #include -#include -#include +#include +#include -#include +#include #include "../../primitives/field/field.hpp" #include "../../primitives/composers/composers_fwd.hpp" diff --git a/cpp/src/aztec/stdlib/hash/blake2s/blake_util.hpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp similarity index 96% rename from cpp/src/aztec/stdlib/hash/blake2s/blake_util.hpp rename to cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp index 7dcda992c7..9a95e99d8d 100644 --- a/cpp/src/aztec/stdlib/hash/blake2s/blake_util.hpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace plonk { namespace stdlib { diff --git a/cpp/src/aztec/stdlib/hash/blake3s/CMakeLists.txt b/cpp/src/barretenberg/stdlib/hash/blake3s/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/stdlib/hash/blake3s/CMakeLists.txt rename to cpp/src/barretenberg/stdlib/hash/blake3s/CMakeLists.txt diff --git a/cpp/src/aztec/stdlib/hash/blake3s/blake3s.cpp b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp similarity index 98% rename from cpp/src/aztec/stdlib/hash/blake3s/blake3s.cpp rename to cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp index 56e83da1d8..5c6a724d73 100644 --- a/cpp/src/aztec/stdlib/hash/blake3s/blake3s.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp @@ -1,8 +1,8 @@ #include "blake3s.hpp" #include "blake3s_plookup.hpp" -#include -#include -#include +#include +#include +#include #include "../blake2s/blake_util.hpp" namespace plonk { diff --git a/cpp/src/aztec/stdlib/hash/blake3s/blake3s.hpp b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp similarity index 89% rename from cpp/src/aztec/stdlib/hash/blake3s/blake3s.hpp rename to cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp index 9a33039e9e..28571fbe0d 100644 --- a/cpp/src/aztec/stdlib/hash/blake3s/blake3s.hpp +++ b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace plonk { class TurboComposer; diff --git a/cpp/src/aztec/stdlib/hash/blake3s/blake3s.test.cpp b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp similarity index 95% rename from cpp/src/aztec/stdlib/hash/blake3s/blake3s.test.cpp rename to cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp index 89043f925f..5d0d18e0fc 100644 --- a/cpp/src/aztec/stdlib/hash/blake3s/blake3s.test.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp @@ -1,9 +1,9 @@ #include "blake3s.hpp" #include "blake3s_plookup.hpp" -#include +#include #include -#include -#include +#include +#include using namespace barretenberg; using namespace plonk; diff --git a/cpp/src/aztec/stdlib/hash/blake3s/blake3s_plookup.cpp b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp similarity index 96% rename from cpp/src/aztec/stdlib/hash/blake3s/blake3s_plookup.cpp rename to cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp index 517a1812f2..b2f5bf92a9 100644 --- a/cpp/src/aztec/stdlib/hash/blake3s/blake3s_plookup.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp @@ -1,12 +1,12 @@ #include "blake3s_plookup.hpp" #include "../blake2s/blake_util.hpp" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace plonk { namespace stdlib { diff --git a/cpp/src/aztec/stdlib/hash/blake3s/blake3s_plookup.hpp b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp similarity index 74% rename from cpp/src/aztec/stdlib/hash/blake3s/blake3s_plookup.hpp rename to cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp index 3db65263c8..3fcf4b371d 100644 --- a/cpp/src/aztec/stdlib/hash/blake3s/blake3s_plookup.hpp +++ b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp @@ -1,9 +1,9 @@ #pragma once #include -#include -#include +#include +#include -#include +#include #include "../../primitives/field/field.hpp" #include "../../primitives/composers/composers_fwd.hpp" diff --git a/cpp/src/aztec/stdlib/hash/keccak/CMakeLists.txt b/cpp/src/barretenberg/stdlib/hash/keccak/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/stdlib/hash/keccak/CMakeLists.txt rename to cpp/src/barretenberg/stdlib/hash/keccak/CMakeLists.txt diff --git a/cpp/src/aztec/stdlib/hash/keccak/keccak.cpp b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp similarity index 99% rename from cpp/src/aztec/stdlib/hash/keccak/keccak.cpp rename to cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp index 2a138a5a11..7f21ddbb15 100644 --- a/cpp/src/aztec/stdlib/hash/keccak/keccak.cpp +++ b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp @@ -1,8 +1,8 @@ #include "keccak.hpp" -#include -#include -#include -#include +#include +#include +#include +#include namespace plonk { namespace stdlib { @@ -617,4 +617,4 @@ template stdlib::byte_array keccak::hash template class keccak; } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/hash/keccak/keccak.hpp b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp similarity index 96% rename from cpp/src/aztec/stdlib/hash/keccak/keccak.hpp rename to cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp index c71612392d..30221b6c7f 100644 --- a/cpp/src/aztec/stdlib/hash/keccak/keccak.hpp +++ b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp @@ -1,8 +1,8 @@ #pragma once #include -#include -#include -#include +#include +#include +#include namespace plonk { class UltraComposer; diff --git a/cpp/src/aztec/stdlib/hash/keccak/keccak.test.cpp b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp similarity index 98% rename from cpp/src/aztec/stdlib/hash/keccak/keccak.test.cpp rename to cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp index 793ed5bdf1..6935a588d0 100644 --- a/cpp/src/aztec/stdlib/hash/keccak/keccak.test.cpp +++ b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp @@ -1,8 +1,8 @@ #include "keccak.hpp" -#include +#include #include -#include -#include +#include +#include #include "../../primitives/plookup/plookup.hpp" using namespace barretenberg; diff --git a/cpp/src/aztec/stdlib/hash/pedersen/CMakeLists.txt b/cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/stdlib/hash/pedersen/CMakeLists.txt rename to cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt diff --git a/cpp/src/aztec/stdlib/hash/pedersen/pedersen.bench.cpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.bench.cpp similarity index 94% rename from cpp/src/aztec/stdlib/hash/pedersen/pedersen.bench.cpp rename to cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.bench.cpp index 7bbb75360d..163868dcb9 100644 --- a/cpp/src/aztec/stdlib/hash/pedersen/pedersen.bench.cpp +++ b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.bench.cpp @@ -1,11 +1,11 @@ #include "pedersen.hpp" #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #define BARRETENBERG_SRS_PATH "../srs_db/ignition" diff --git a/cpp/src/aztec/stdlib/hash/pedersen/pedersen.cpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp similarity index 99% rename from cpp/src/aztec/stdlib/hash/pedersen/pedersen.cpp rename to cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp index 629694d237..197ea2064b 100644 --- a/cpp/src/aztec/stdlib/hash/pedersen/pedersen.cpp +++ b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp @@ -1,7 +1,7 @@ #include "pedersen.hpp" #include "pedersen_plookup.hpp" -#include -#include +#include +#include #include "../../primitives/composers/composers.hpp" #include "../../primitives/packed_byte_array/packed_byte_array.hpp" @@ -587,4 +587,4 @@ template class pedersen; template class pedersen; } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/hash/pedersen/pedersen.hpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp similarity index 96% rename from cpp/src/aztec/stdlib/hash/pedersen/pedersen.hpp rename to cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp index cc2626df20..1db698e62b 100644 --- a/cpp/src/aztec/stdlib/hash/pedersen/pedersen.hpp +++ b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "../../primitives/composers/composers_fwd.hpp" #include "../../primitives/field/field.hpp" #include "../../primitives/point/point.hpp" @@ -54,4 +54,4 @@ extern template class pedersen; extern template class pedersen; } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/hash/pedersen/pedersen.test.cpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp similarity index 98% rename from cpp/src/aztec/stdlib/hash/pedersen/pedersen.test.cpp rename to cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp index 3a78f2f7b9..7d1d324b92 100644 --- a/cpp/src/aztec/stdlib/hash/pedersen/pedersen.test.cpp +++ b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp @@ -1,11 +1,11 @@ #include "pedersen.hpp" #include "pedersen_plookup.hpp" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace test_stdlib_pedersen { using namespace barretenberg; diff --git a/cpp/src/aztec/stdlib/hash/pedersen/pedersen_plookup.cpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp similarity index 96% rename from cpp/src/aztec/stdlib/hash/pedersen/pedersen_plookup.cpp rename to cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp index d11be43153..d35b11fb22 100644 --- a/cpp/src/aztec/stdlib/hash/pedersen/pedersen_plookup.cpp +++ b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp @@ -1,8 +1,8 @@ #include "pedersen_plookup.hpp" -#include -#include +#include +#include -#include +#include #include "../../primitives/composers/composers.hpp" #include "../../primitives/plookup/plookup.hpp" @@ -168,4 +168,4 @@ field_t pedersen_plookup::compress(const std::vector& inputs, con template class pedersen_plookup; } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/hash/pedersen/pedersen_plookup.hpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp similarity index 100% rename from cpp/src/aztec/stdlib/hash/pedersen/pedersen_plookup.hpp rename to cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp diff --git a/cpp/src/aztec/stdlib/hash/sha256/CMakeLists.txt b/cpp/src/barretenberg/stdlib/hash/sha256/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/stdlib/hash/sha256/CMakeLists.txt rename to cpp/src/barretenberg/stdlib/hash/sha256/CMakeLists.txt diff --git a/cpp/src/aztec/stdlib/hash/sha256/sha256.bench.cpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.bench.cpp similarity index 94% rename from cpp/src/aztec/stdlib/hash/sha256/sha256.bench.cpp rename to cpp/src/barretenberg/stdlib/hash/sha256/sha256.bench.cpp index 25d0efc159..09c3301956 100644 --- a/cpp/src/aztec/stdlib/hash/sha256/sha256.bench.cpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.bench.cpp @@ -1,8 +1,8 @@ #include "sha256.hpp" #include -#include -#include -#include +#include +#include +#include using namespace benchmark; using namespace plonk::stdlib::types; @@ -84,4 +84,4 @@ void verify_proofs_bench(State& state) noexcept } BENCHMARK(verify_proofs_bench)->DenseRange(START_BYTES, MAX_BYTES, BYTES_PER_CHUNK); -BENCHMARK_MAIN(); \ No newline at end of file +BENCHMARK_MAIN(); diff --git a/cpp/src/aztec/stdlib/hash/sha256/sha256.cpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp similarity index 96% rename from cpp/src/aztec/stdlib/hash/sha256/sha256.cpp rename to cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp index c5e88a3b45..5611373bc4 100644 --- a/cpp/src/aztec/stdlib/hash/sha256/sha256.cpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp @@ -1,9 +1,9 @@ #include "sha256.hpp" #include "sha256_plookup.hpp" -#include -#include -#include -#include +#include +#include +#include +#include namespace plonk { namespace stdlib { diff --git a/cpp/src/aztec/stdlib/hash/sha256/sha256.hpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp similarity index 88% rename from cpp/src/aztec/stdlib/hash/sha256/sha256.hpp rename to cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp index 3f65a27a83..7fd17c35c3 100644 --- a/cpp/src/aztec/stdlib/hash/sha256/sha256.hpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp @@ -1,8 +1,8 @@ #pragma once #include -#include -#include -#include +#include +#include +#include #include "sha256_plookup.hpp" diff --git a/cpp/src/aztec/stdlib/hash/sha256/sha256.test.cpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp similarity index 97% rename from cpp/src/aztec/stdlib/hash/sha256/sha256.test.cpp rename to cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp index 94506859cb..6281777bbd 100644 --- a/cpp/src/aztec/stdlib/hash/sha256/sha256.test.cpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp @@ -1,13 +1,13 @@ #include "sha256.hpp" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include namespace { auto& engine = numeric::random::get_debug_engine(); @@ -496,4 +496,4 @@ TEST(stdlib_sha256, test_input_str_len_multiple) } } -} // namespace test_stdlib_sha256 \ No newline at end of file +} // namespace test_stdlib_sha256 diff --git a/cpp/src/aztec/stdlib/hash/sha256/sha256_plookup.cpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp similarity index 96% rename from cpp/src/aztec/stdlib/hash/sha256/sha256_plookup.cpp rename to cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp index 63a38824c9..b2b724e78e 100644 --- a/cpp/src/aztec/stdlib/hash/sha256/sha256_plookup.cpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp @@ -1,12 +1,12 @@ #include "sha256_plookup.hpp" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include using namespace barretenberg; diff --git a/cpp/src/aztec/stdlib/hash/sha256/sha256_plookup.hpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp similarity index 92% rename from cpp/src/aztec/stdlib/hash/sha256/sha256_plookup.hpp rename to cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp index 91fb27d3c2..21ce50268f 100644 --- a/cpp/src/aztec/stdlib/hash/sha256/sha256_plookup.hpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp @@ -1,10 +1,10 @@ #pragma once #include -#include -#include -#include +#include +#include +#include -#include +#include #include "../../primitives/field/field.hpp" #include "../../primitives/packed_byte_array/packed_byte_array.hpp" diff --git a/cpp/src/aztec/stdlib/merkle_tree/CMakeLists.txt b/cpp/src/barretenberg/stdlib/merkle_tree/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/stdlib/merkle_tree/CMakeLists.txt rename to cpp/src/barretenberg/stdlib/merkle_tree/CMakeLists.txt diff --git a/cpp/src/aztec/stdlib/merkle_tree/hash.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp similarity index 65% rename from cpp/src/aztec/stdlib/merkle_tree/hash.hpp rename to cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp index 8a1a3dc544..ec620b6052 100644 --- a/cpp/src/aztec/stdlib/merkle_tree/hash.hpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include namespace plonk { @@ -28,4 +28,4 @@ inline barretenberg::fr compress_native(barretenberg::fr const& lhs, barretenber } // namespace merkle_tree } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/merkle_tree/hash.test.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp similarity index 88% rename from cpp/src/aztec/stdlib/merkle_tree/hash.test.cpp rename to cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp index 0b2cb852ef..96906e58de 100644 --- a/cpp/src/aztec/stdlib/merkle_tree/hash.test.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp @@ -1,7 +1,7 @@ #include "hash.hpp" #include -#include -#include +#include +#include using namespace barretenberg; using namespace plonk::stdlib::types; @@ -24,4 +24,4 @@ TEST(stdlib_merkle_tree_hash, hash_value_native_vs_circuit) field_ct z = merkle_tree::hash_value(y); fr zz = merkle_tree::hash_value_native(x); EXPECT_EQ(z.get_value(), zz); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/stdlib/merkle_tree/hash_path.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp similarity index 97% rename from cpp/src/aztec/stdlib/merkle_tree/hash_path.hpp rename to cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp index b648076772..69663452e9 100644 --- a/cpp/src/aztec/stdlib/merkle_tree/hash_path.hpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp @@ -1,7 +1,7 @@ #pragma once #include "hash.hpp" #include -#include +#include #include namespace plonk { diff --git a/cpp/src/aztec/stdlib/merkle_tree/index.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/index.hpp similarity index 100% rename from cpp/src/aztec/stdlib/merkle_tree/index.hpp rename to cpp/src/barretenberg/stdlib/merkle_tree/index.hpp diff --git a/cpp/src/aztec/stdlib/merkle_tree/membership.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp similarity index 98% rename from cpp/src/aztec/stdlib/merkle_tree/membership.hpp rename to cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp index 55de69cbbe..29245c682d 100644 --- a/cpp/src/aztec/stdlib/merkle_tree/membership.hpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp @@ -1,8 +1,8 @@ #pragma once #include "hash_path.hpp" -#include -#include -#include +#include +#include +#include namespace plonk { namespace stdlib { diff --git a/cpp/src/aztec/stdlib/merkle_tree/membership.test.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp similarity index 99% rename from cpp/src/aztec/stdlib/merkle_tree/membership.test.cpp rename to cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp index d80f79343e..1ba283ce47 100644 --- a/cpp/src/aztec/stdlib/merkle_tree/membership.test.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp @@ -3,7 +3,7 @@ #include "memory_store.hpp" #include "memory_tree.hpp" #include -#include +#include using namespace barretenberg; using namespace plonk::stdlib::types; @@ -202,4 +202,4 @@ TEST(stdlib_merkle_tree, test_tree) bool result = verifier.verify_proof(proof); EXPECT_EQ(result, true); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/stdlib/merkle_tree/memory_store.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp similarity index 98% rename from cpp/src/aztec/stdlib/merkle_tree/memory_store.hpp rename to cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp index 63db4c8de7..e6eccdda64 100644 --- a/cpp/src/aztec/stdlib/merkle_tree/memory_store.hpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp @@ -1,6 +1,6 @@ #pragma once #include "hash_path.hpp" -#include +#include #include #include diff --git a/cpp/src/aztec/stdlib/merkle_tree/memory_tree.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp similarity index 100% rename from cpp/src/aztec/stdlib/merkle_tree/memory_tree.cpp rename to cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp diff --git a/cpp/src/aztec/stdlib/merkle_tree/memory_tree.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp similarity index 100% rename from cpp/src/aztec/stdlib/merkle_tree/memory_tree.hpp rename to cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp diff --git a/cpp/src/aztec/stdlib/merkle_tree/memory_tree.test.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp similarity index 95% rename from cpp/src/aztec/stdlib/merkle_tree/memory_tree.test.cpp rename to cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp index 5e82de2a05..7d99c6cc9b 100644 --- a/cpp/src/aztec/stdlib/merkle_tree/memory_tree.test.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp @@ -1,6 +1,6 @@ #include "memory_tree.hpp" #include -#include +#include using namespace barretenberg; using namespace plonk::stdlib::merkle_tree; @@ -42,4 +42,4 @@ TEST(stdlib_merkle_tree, test_memory_store) EXPECT_EQ(db.get_hash_path(2), expected); EXPECT_EQ(db.get_hash_path(3), expected); EXPECT_EQ(db.root(), root); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/stdlib/merkle_tree/merkle_tree.bench.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp similarity index 97% rename from cpp/src/aztec/stdlib/merkle_tree/merkle_tree.bench.cpp rename to cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp index ebf89bb03f..246de156fd 100644 --- a/cpp/src/aztec/stdlib/merkle_tree/merkle_tree.bench.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp @@ -2,7 +2,7 @@ #include "memory_store.hpp" #include "merkle_tree.hpp" #include -#include +#include using namespace benchmark; using namespace plonk::stdlib::merkle_tree; diff --git a/cpp/src/aztec/stdlib/merkle_tree/merkle_tree.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp similarity index 97% rename from cpp/src/aztec/stdlib/merkle_tree/merkle_tree.cpp rename to cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp index ce4db0b01d..4a196b66c4 100644 --- a/cpp/src/aztec/stdlib/merkle_tree/merkle_tree.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp @@ -1,11 +1,11 @@ #include "merkle_tree.hpp" #include "hash.hpp" #include "memory_store.hpp" -#include +#include #include -#include -#include -#include +#include +#include +#include #include namespace plonk { @@ -292,4 +292,4 @@ template class MerkleTree; } // namespace merkle_tree } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/merkle_tree/merkle_tree.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp similarity index 97% rename from cpp/src/aztec/stdlib/merkle_tree/merkle_tree.hpp rename to cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp index 5e97bd3efe..6b797e9c6c 100644 --- a/cpp/src/aztec/stdlib/merkle_tree/merkle_tree.hpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp @@ -1,6 +1,6 @@ #pragma once #include "hash_path.hpp" -#include +#include namespace plonk { namespace stdlib { @@ -99,4 +99,4 @@ extern template class MerkleTree; } // namespace merkle_tree } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/merkle_tree/merkle_tree.test.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp similarity index 94% rename from cpp/src/aztec/stdlib/merkle_tree/merkle_tree.test.cpp rename to cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp index 4f1aee66a1..bebbd47b86 100644 --- a/cpp/src/aztec/stdlib/merkle_tree/merkle_tree.test.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp @@ -1,10 +1,10 @@ #include "merkle_tree.hpp" #include "memory_store.hpp" #include "memory_tree.hpp" -#include -#include -#include -#include +#include +#include +#include +#include using namespace barretenberg; using namespace plonk::stdlib::merkle_tree; @@ -127,4 +127,4 @@ TEST(stdlib_merkle_tree, test_get_hash_path_layers) EXPECT_EQ(before[1], after[1]); EXPECT_NE(before[2], after[2]); } -} \ No newline at end of file +} diff --git a/cpp/src/aztec/stdlib/primitives/CMakeLists.txt b/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/stdlib/primitives/CMakeLists.txt rename to cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt diff --git a/cpp/src/aztec/stdlib/primitives/bigfield/bigfield.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/bigfield/bigfield.fuzzer.hpp rename to cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp index 426075e1c5..0eaa9de5c7 100644 --- a/cpp/src/aztec/stdlib/primitives/bigfield/bigfield.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp @@ -1,20 +1,20 @@ -#include -#include -#include -#include +#include +#include +#include +#include // This is a global variable, so that the execution handling class could alter it and signal to the input tester // that the input should fail bool circuit_should_fail = false; #define HAVOC_TESTING -//#define DISABLE_DIVISION 1 -#include +// #define DISABLE_DIVISION 1 +#include FastRandom VarianceRNG(0); -//#define DISABLE_DIVISION -// Enable this definition, when you want to find out the instructions that caused a failure -//#define SHOW_INFORMATION 1 +// #define DISABLE_DIVISION +// Enable this definition, when you want to find out the instructions that caused a failure +// #define SHOW_INFORMATION 1 #ifdef SHOW_INFORMATION #define PRINT_SINGLE_ARG_INSTRUCTION(first_index, vector, operation_name, preposition) \ @@ -234,7 +234,9 @@ template class BigFieldBase { * @param rng PRNG used * @return A random instruction */ - template inline static Instruction generateRandom(T& rng) requires SimpleRng + template + inline static Instruction generateRandom(T& rng) + requires SimpleRng { // Choose which instruction we are going to generate OPCODE instruction_opcode = static_cast(rng.next() % (OPCODE::_LAST)); @@ -360,7 +362,8 @@ template class BigFieldBase { * @return Mutated element */ template - inline static fq mutateFieldElement(fq e, T& rng, HavocSettings& havoc_config) requires SimpleRng + inline static fq mutateFieldElement(fq e, T& rng, HavocSettings& havoc_config) + requires SimpleRng { // With a certain probability, we apply changes to the Montgomery form, rather than the plain form. This // has merit, since the computation is performed in montgomery form and comparisons are often performed @@ -456,9 +459,8 @@ template class BigFieldBase { * @return Mutated instruction */ template - inline static Instruction mutateInstruction(Instruction instruction, - T& rng, - HavocSettings& havoc_config) requires SimpleRng + inline static Instruction mutateInstruction(Instruction instruction, T& rng, HavocSettings& havoc_config) + requires SimpleRng { #define PUT_RANDOM_BYTE_IF_LUCKY(variable) \ if (rng.next() & 1) { \ diff --git a/cpp/src/aztec/stdlib/primitives/bigfield/bigfield.hpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp similarity index 98% rename from cpp/src/aztec/stdlib/primitives/bigfield/bigfield.hpp rename to cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp index 1e03582c34..4f5979438c 100644 --- a/cpp/src/aztec/stdlib/primitives/bigfield/bigfield.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "../byte_array/byte_array.hpp" #include "../field/field.hpp" @@ -498,4 +498,4 @@ template inline std::ostream& operator<<(std::ostream& } // namespace stdlib } // namespace plonk -#include "bigfield_impl.hpp" \ No newline at end of file +#include "bigfield_impl.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/bigfield/bigfield.test.cpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp similarity index 98% rename from cpp/src/aztec/stdlib/primitives/bigfield/bigfield.test.cpp rename to cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp index 808eeaa3f1..36067e4816 100644 --- a/cpp/src/aztec/stdlib/primitives/bigfield/bigfield.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp @@ -1,24 +1,24 @@ #include -#include +#include -#include -#include +#include +#include #include "../bool/bool.hpp" #include "../byte_array/byte_array.hpp" #include "../field/field.hpp" #include "./bigfield.hpp" -#include "honk/composer/standard_honk_composer.hpp" -#include "honk/composer/standard_plonk_composer.hpp" +#include "barretenberg/honk/composer/standard_honk_composer.hpp" +#include "barretenberg/honk/composer/standard_plonk_composer.hpp" -#include -#include -#include +#include +#include +#include #include #include -#include +#include namespace test_stdlib_bigfield { using namespace barretenberg; @@ -1078,4 +1078,4 @@ TYPED_TEST(stdlib_bigfield, division_context) // bool proof_result = verifier.verify_proof(proof); // EXPECT_EQ(proof_result, true); // } -} // namespace test_stdlib_bigfield \ No newline at end of file +} // namespace test_stdlib_bigfield diff --git a/cpp/src/aztec/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp similarity index 69% rename from cpp/src/aztec/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp index c30767a22f..77ffcd4329 100644 --- a/cpp/src/aztec/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard | ComposerType::Turbo; #include "bigfield.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/bigfield/bigfield_impl.hpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/bigfield/bigfield_impl.hpp rename to cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp index 3d072775f6..194ba3502f 100644 --- a/cpp/src/aztec/stdlib/primitives/bigfield/bigfield_impl.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include #include "../composers/composers.hpp" @@ -2863,4 +2863,4 @@ std::pair bigfield::get_quotient_reduction_info(const std::v } } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp similarity index 64% rename from cpp/src/aztec/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp index 15b0119604..a8a42cd144 100644 --- a/cpp/src/aztec/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard; #include "bigfield.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp similarity index 64% rename from cpp/src/aztec/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp index 7183597306..dfde177a57 100644 --- a/cpp/src/aztec/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Turbo; #include "bigfield.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/biggroup/biggroup.hpp b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/biggroup/biggroup.hpp rename to cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp index 20fbf48ca5..f903d1d0e0 100644 --- a/cpp/src/aztec/stdlib/primitives/biggroup/biggroup.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp @@ -3,14 +3,14 @@ #include "../bigfield/bigfield.hpp" #include "../byte_array/byte_array.hpp" #include "../field/field.hpp" -#include +#include #include "../composers/composers_fwd.hpp" #include "../memory/rom_table.hpp" #include "../memory/twin_rom_table.hpp" -#include -#include -#include +#include +#include +#include #include "../composers/composers_fwd.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/biggroup/biggroup.test.cpp b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/biggroup/biggroup.test.cpp rename to cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp index dd788b1717..2ffe384cc6 100644 --- a/cpp/src/aztec/stdlib/primitives/biggroup/biggroup.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp @@ -1,18 +1,18 @@ -#include +#include #include #include "../bigfield/bigfield.hpp" #include "../biggroup/biggroup.hpp" #include "../bool/bool.hpp" #include "../field/field.hpp" -#include "honk/composer/standard_honk_composer.hpp" +#include "barretenberg/honk/composer/standard_honk_composer.hpp" -#include -#include -#include +#include +#include +#include #include -#include +#include namespace test_stdlib_biggroup { namespace { @@ -1001,4 +1001,4 @@ HEAVY_TYPED_TEST(stdlib_biggroup, ecdsa_mul_secp256k1) GTEST_SKIP(); } } -} // namespace test_stdlib_biggroup \ No newline at end of file +} // namespace test_stdlib_biggroup diff --git a/cpp/src/aztec/stdlib/primitives/biggroup/biggroup_batch_mul.hpp b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/biggroup/biggroup_batch_mul.hpp rename to cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp diff --git a/cpp/src/aztec/stdlib/primitives/biggroup/biggroup_bn254.hpp b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/biggroup/biggroup_bn254.hpp rename to cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp diff --git a/cpp/src/aztec/stdlib/primitives/biggroup/biggroup_impl.hpp b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/biggroup/biggroup_impl.hpp rename to cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp index 2a6e7be925..6ffcb3ccba 100644 --- a/cpp/src/aztec/stdlib/primitives/biggroup/biggroup_impl.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include +#include #include #include "../composers/composers.hpp" @@ -660,4 +660,4 @@ element element::operator*(const Fr& scalar) const return element(out_x, out_y) - element(offset_generators.second); } } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/primitives/biggroup/biggroup_nafs.hpp b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/biggroup/biggroup_nafs.hpp rename to cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp index b92f6750c5..344039f0eb 100644 --- a/cpp/src/aztec/stdlib/primitives/biggroup/biggroup_nafs.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include namespace plonk { namespace stdlib { @@ -548,4 +548,4 @@ std::vector> element::compute_naf(const Fr& scalar, cons return naf_entries; } } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/primitives/biggroup/biggroup_secp256k1.hpp b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/biggroup/biggroup_secp256k1.hpp rename to cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp diff --git a/cpp/src/aztec/stdlib/primitives/biggroup/biggroup_tables.hpp b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/biggroup/biggroup_tables.hpp rename to cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp diff --git a/cpp/src/aztec/stdlib/primitives/bit_array/bit_array.cpp b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/bit_array/bit_array.cpp rename to cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp diff --git a/cpp/src/aztec/stdlib/primitives/bit_array/bit_array.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp similarity index 98% rename from cpp/src/aztec/stdlib/primitives/bit_array/bit_array.fuzzer.hpp rename to cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp index 3f9aebdf13..cd300c0e4f 100644 --- a/cpp/src/aztec/stdlib/primitives/bit_array/bit_array.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include #define MAX_ARRAY_SIZE 128 @@ -9,11 +9,11 @@ bool circuit_should_fail = false; #define HAVOC_TESTING -#include +#include FastRandom VarianceRNG(0); // Enable this definition, when you want to find out the instructions that caused a failure -//#define SHOW_INFORMATION 1 +// #define SHOW_INFORMATION 1 #define OPERATION_TYPE_SIZE 1 @@ -168,7 +168,9 @@ template class BitArrayFuzzBase { * @param rng PRNG used * @return A random instruction */ - template inline static Instruction generateRandom(T& rng) requires SimpleRng + template + inline static Instruction generateRandom(T& rng) + requires SimpleRng { // Choose which instruction we are going to generate OPCODE instruction_opcode = static_cast(rng.next() % (OPCODE::_LAST)); @@ -227,9 +229,8 @@ template class BitArrayFuzzBase { * @return Mutated instruction */ template - inline static Instruction mutateInstruction(Instruction instruction, - T& rng, - HavocSettings& havoc_config) requires SimpleRng + inline static Instruction mutateInstruction(Instruction instruction, T& rng, HavocSettings& havoc_config) + requires SimpleRng { (void)rng; (void)havoc_config; diff --git a/cpp/src/aztec/stdlib/primitives/bit_array/bit_array.hpp b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/bit_array/bit_array.hpp rename to cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp index 2cd867ce7b..dde913c8b1 100644 --- a/cpp/src/aztec/stdlib/primitives/bit_array/bit_array.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp @@ -1,7 +1,7 @@ #pragma once #include "../composers/composers_fwd.hpp" #include "../uint/uint.hpp" -#include "honk/composer/standard_honk_composer.hpp" +#include "barretenberg/honk/composer/standard_honk_composer.hpp" #include namespace plonk { diff --git a/cpp/src/aztec/stdlib/primitives/bit_array/bit_array.test.cpp b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp similarity index 97% rename from cpp/src/aztec/stdlib/primitives/bit_array/bit_array.test.cpp rename to cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp index 9c7935cbce..bbdab25d2e 100644 --- a/cpp/src/aztec/stdlib/primitives/bit_array/bit_array.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp @@ -1,7 +1,7 @@ #include "bit_array.hpp" #include -#include -#include +#include +#include // #include namespace test_stdlib_bit_array { diff --git a/cpp/src/aztec/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp similarity index 69% rename from cpp/src/aztec/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp index 2eb5bedf72..c398c87bbb 100644 --- a/cpp/src/aztec/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard | ComposerType::Turbo; #include "bit_array.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp similarity index 65% rename from cpp/src/aztec/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp index c5ca2f4f9d..885f566eda 100644 --- a/cpp/src/aztec/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard; #include "bit_array.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp similarity index 64% rename from cpp/src/aztec/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp index 5e113398e2..45543d3147 100644 --- a/cpp/src/aztec/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Turbo; #include "bit_array.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/bool/bool.cpp b/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/bool/bool.cpp rename to cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp index 3564195918..46c29f632d 100644 --- a/cpp/src/aztec/stdlib/primitives/bool/bool.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp @@ -1,6 +1,6 @@ #include "bool.hpp" #include "../composers/composers.hpp" -#include "honk/composer/standard_honk_composer.hpp" +#include "barretenberg/honk/composer/standard_honk_composer.hpp" using namespace barretenberg; using namespace bonk; diff --git a/cpp/src/aztec/stdlib/primitives/bool/bool.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp similarity index 98% rename from cpp/src/aztec/stdlib/primitives/bool/bool.fuzzer.hpp rename to cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp index 81155da8c4..bfc81bf368 100644 --- a/cpp/src/aztec/stdlib/primitives/bool/bool.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include // This is a global variable, so that the execution handling class could alter it and signal to the input tester that // the input should fail @@ -7,11 +7,11 @@ bool circuit_should_fail = false; #define HAVOC_TESTING -#include +#include FastRandom VarianceRNG(0); // Enable this definition, when you want to find out the instructions that caused a failure -//#define SHOW_INFORMATION 1 +// #define SHOW_INFORMATION 1 #define OPERATION_TYPE_SIZE 1 @@ -71,7 +71,9 @@ template class BoolFuzzBase { * @param rng PRNG used * @return A random instruction */ - template inline static Instruction generateRandom(T& rng) requires SimpleRng + template + inline static Instruction generateRandom(T& rng) + requires SimpleRng { // Choose which instruction we are going to generate OPCODE instruction_opcode = static_cast(rng.next() % (OPCODE::_LAST)); @@ -128,9 +130,8 @@ template class BoolFuzzBase { * @return Mutated instruction */ template - inline static Instruction mutateInstruction(Instruction instruction, - T& rng, - HavocSettings& havoc_config) requires SimpleRng + inline static Instruction mutateInstruction(Instruction instruction, T& rng, HavocSettings& havoc_config) + requires SimpleRng { (void)rng; (void)havoc_config; diff --git a/cpp/src/aztec/stdlib/primitives/bool/bool.hpp b/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp similarity index 97% rename from cpp/src/aztec/stdlib/primitives/bool/bool.hpp rename to cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp index 03c9f757ca..87eec13232 100644 --- a/cpp/src/aztec/stdlib/primitives/bool/bool.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp @@ -1,7 +1,7 @@ #pragma once #include "../composers/composers_fwd.hpp" #include "../witness/witness.hpp" -#include "honk/composer/standard_honk_composer.hpp" +#include "barretenberg/honk/composer/standard_honk_composer.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/aztec/stdlib/primitives/bool/bool.test.cpp b/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp similarity index 98% rename from cpp/src/aztec/stdlib/primitives/bool/bool.test.cpp rename to cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp index 34a0882ffe..113777cdcc 100644 --- a/cpp/src/aztec/stdlib/primitives/bool/bool.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp @@ -1,8 +1,8 @@ #include "bool.hpp" -#include "plonk/proof_system/constants.hpp" +#include "barretenberg/plonk/proof_system/constants.hpp" #include // #include -#include +#include namespace test_stdlib_bool { using namespace barretenberg; @@ -422,4 +422,4 @@ TEST(stdlib_bool, normalize) bool result = verifier.verify_proof(proof); EXPECT_EQ(result, true); } -} // namespace test_stdlib_bool \ No newline at end of file +} // namespace test_stdlib_bool diff --git a/cpp/src/aztec/stdlib/primitives/bool/bool_all.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp similarity index 68% rename from cpp/src/aztec/stdlib/primitives/bool/bool_all.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp index 4537ef6af4..04b3f0379d 100644 --- a/cpp/src/aztec/stdlib/primitives/bool/bool_all.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard | ComposerType::Turbo; #include "bool.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/bool/bool_standard.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp similarity index 63% rename from cpp/src/aztec/stdlib/primitives/bool/bool_standard.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp index e3bce6ff7c..5e0e1c37cc 100644 --- a/cpp/src/aztec/stdlib/primitives/bool/bool_standard.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard; #include "bool.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/bool/bool_turbo.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp similarity index 63% rename from cpp/src/aztec/stdlib/primitives/bool/bool_turbo.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp index febcb3d2ad..015d1e2126 100644 --- a/cpp/src/aztec/stdlib/primitives/bool/bool_turbo.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Turbo; #include "bool.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/byte_array/byte_array.cpp b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/byte_array/byte_array.cpp rename to cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp diff --git a/cpp/src/aztec/stdlib/primitives/byte_array/byte_array.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp similarity index 98% rename from cpp/src/aztec/stdlib/primitives/byte_array/byte_array.fuzzer.hpp rename to cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp index 6ff1805bfa..c8040d554b 100644 --- a/cpp/src/aztec/stdlib/primitives/byte_array/byte_array.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #define MAX_ARRAY_SIZE 128 @@ -10,11 +10,11 @@ bool circuit_should_fail = false; #define HAVOC_TESTING -#include +#include FastRandom VarianceRNG(0); // Enable this definition, when you want to find out the instructions that caused a failure -//#define SHOW_INFORMATION 1 +// #define SHOW_INFORMATION 1 #define OPERATION_TYPE_SIZE 1 @@ -104,7 +104,9 @@ template class ByteArrayFuzzBase { * @param rng PRNG used * @return A random instruction */ - template inline static Instruction generateRandom(T& rng) requires SimpleRng + template + inline static Instruction generateRandom(T& rng) + requires SimpleRng { // Choose which instruction we are going to generate OPCODE instruction_opcode = static_cast(rng.next() % (OPCODE::_LAST)); @@ -174,9 +176,8 @@ template class ByteArrayFuzzBase { * @return Mutated instruction */ template - inline static Instruction mutateInstruction(Instruction instruction, - T& rng, - HavocSettings& havoc_config) requires SimpleRng + inline static Instruction mutateInstruction(Instruction instruction, T& rng, HavocSettings& havoc_config) + requires SimpleRng { (void)rng; (void)havoc_config; diff --git a/cpp/src/aztec/stdlib/primitives/byte_array/byte_array.hpp b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp similarity index 98% rename from cpp/src/aztec/stdlib/primitives/byte_array/byte_array.hpp rename to cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp index 0e80cfc0f5..2f0b8a676c 100644 --- a/cpp/src/aztec/stdlib/primitives/byte_array/byte_array.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp @@ -3,7 +3,7 @@ #include "../composers/composers_fwd.hpp" #include "../field/field.hpp" #include "../safe_uint/safe_uint.hpp" -#include "honk/composer/standard_honk_composer.hpp" +#include "barretenberg/honk/composer/standard_honk_composer.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/aztec/stdlib/primitives/byte_array/byte_array.test.cpp b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp similarity index 94% rename from cpp/src/aztec/stdlib/primitives/byte_array/byte_array.test.cpp rename to cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp index 87a7e7c48d..aa0a6a7660 100644 --- a/cpp/src/aztec/stdlib/primitives/byte_array/byte_array.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp @@ -1,8 +1,8 @@ #include "byte_array.hpp" #include -#include -#include -#include +#include +#include +#include // ULTRATODO: make these typed tests namespace test_stdlib_byte_array { @@ -126,4 +126,4 @@ TEST(stdlib_byte_array, set_bit) EXPECT_EQ(proof_result, true); } -} // namespace test_stdlib_byte_array \ No newline at end of file +} // namespace test_stdlib_byte_array diff --git a/cpp/src/aztec/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp similarity index 69% rename from cpp/src/aztec/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp index 74a4766c33..a2693247bc 100644 --- a/cpp/src/aztec/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard | ComposerType::Turbo; #include "byte_array.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp similarity index 65% rename from cpp/src/aztec/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp index 45ec5ff2bd..cce9c7b782 100644 --- a/cpp/src/aztec/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard; #include "byte_array.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp similarity index 64% rename from cpp/src/aztec/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp index aa936ca633..d124b62b8b 100644 --- a/cpp/src/aztec/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Turbo; #include "byte_array.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/composers/composers.hpp b/cpp/src/barretenberg/stdlib/primitives/composers/composers.hpp similarity index 88% rename from cpp/src/aztec/stdlib/primitives/composers/composers.hpp rename to cpp/src/barretenberg/stdlib/primitives/composers/composers.hpp index 7d59771715..7567d080f1 100644 --- a/cpp/src/aztec/stdlib/primitives/composers/composers.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/composers/composers.hpp @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include -#include +#include "barretenberg/honk/composer/standard_plonk_composer.hpp" +#include "barretenberg/honk/composer/standard_honk_composer.hpp" +#include "barretenberg/plonk/composer/standard_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" #define INSTANTIATE_STDLIB_TYPE(stdlib_type) \ template class stdlib_type; \ diff --git a/cpp/src/aztec/stdlib/primitives/composers/composers_fwd.hpp b/cpp/src/barretenberg/stdlib/primitives/composers/composers_fwd.hpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/composers/composers_fwd.hpp rename to cpp/src/barretenberg/stdlib/primitives/composers/composers_fwd.hpp diff --git a/cpp/src/aztec/stdlib/primitives/curves/bn254.hpp b/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp similarity index 93% rename from cpp/src/aztec/stdlib/primitives/curves/bn254.hpp rename to cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp index 94b15b8719..b8d3a9280f 100644 --- a/cpp/src/aztec/stdlib/primitives/curves/bn254.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include #include "../bigfield/bigfield.hpp" #include "../biggroup/biggroup.hpp" #include "../field/field.hpp" @@ -29,4 +29,4 @@ template struct bn254 { }; // namespace bn254 } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/primitives/curves/secp256k1.hpp b/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp similarity index 92% rename from cpp/src/aztec/stdlib/primitives/curves/secp256k1.hpp rename to cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp index d1166076fd..f970a9d6cf 100644 --- a/cpp/src/aztec/stdlib/primitives/curves/secp256k1.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp @@ -4,7 +4,7 @@ #include "../biggroup/biggroup.hpp" #include "../field/field.hpp" -#include +#include namespace plonk { namespace stdlib { @@ -30,4 +30,4 @@ template struct secp256k1 { typedef element g1_bigfr_ct; }; } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/primitives/curves/secp256r1.hpp b/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp similarity index 92% rename from cpp/src/aztec/stdlib/primitives/curves/secp256r1.hpp rename to cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp index 95d964782a..7211b56cdd 100644 --- a/cpp/src/aztec/stdlib/primitives/curves/secp256r1.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp @@ -4,7 +4,7 @@ #include "../biggroup/biggroup.hpp" #include "../field/field.hpp" -#include +#include namespace plonk { namespace stdlib { @@ -30,4 +30,4 @@ template struct secp256r1 { typedef element g1_bigfr_ct; }; } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/primitives/field/field.cpp b/cpp/src/barretenberg/stdlib/primitives/field/field.cpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/field/field.cpp rename to cpp/src/barretenberg/stdlib/primitives/field/field.cpp index db6f50d3ed..e977fc779b 100644 --- a/cpp/src/aztec/stdlib/primitives/field/field.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field.cpp @@ -2,7 +2,7 @@ #include #include "../bool/bool.hpp" #include "../composers/composers.hpp" -#include +#include using namespace bonk; diff --git a/cpp/src/aztec/stdlib/primitives/field/field.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/field/field.fuzzer.hpp rename to cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp index 8a60756431..ea21fbb45e 100644 --- a/cpp/src/aztec/stdlib/primitives/field/field.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp @@ -1,22 +1,22 @@ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include // This is a global variable, so that the execution handling class could alter it and signal to the input tester // that the input should fail bool circuit_should_fail = false; #define HAVOC_TESTING -//#define DISABLE_DIVISION 1 -#include +// #define DISABLE_DIVISION 1 +#include FastRandom VarianceRNG(0); -//#define DISABLE_DIVISION -// Enable this definition, when you want to find out the instructions that caused a failure -//#define SHOW_INFORMATION 1 +// #define DISABLE_DIVISION +// Enable this definition, when you want to find out the instructions that caused a failure +// #define SHOW_INFORMATION 1 #ifdef SHOW_INFORMATION #define PRINT_SINGLE_ARG_INSTRUCTION(first_index, vector, operation_name, preposition) \ @@ -234,7 +234,9 @@ template class FieldBase { * @param rng PRNG used * @return A random instruction */ - template inline static Instruction generateRandom(T& rng) requires SimpleRng + template + inline static Instruction generateRandom(T& rng) + requires SimpleRng { // Choose which instruction we are going to generate OPCODE instruction_opcode = static_cast(rng.next() % (OPCODE::_LAST)); @@ -333,7 +335,8 @@ template class FieldBase { * @return Mutated element */ template - inline static fr mutateFieldElement(fr e, T& rng, HavocSettings& havoc_config) requires SimpleRng + inline static fr mutateFieldElement(fr e, T& rng, HavocSettings& havoc_config) + requires SimpleRng { // With a certain probability, we apply changes to the Montgomery form, rather than the plain form. This // has merit, since the computation is performed in montgomery form and comparisons are often performed @@ -429,9 +432,8 @@ template class FieldBase { * @return Mutated instruction */ template - inline static Instruction mutateInstruction(Instruction instruction, - T& rng, - HavocSettings& havoc_config) requires SimpleRng + inline static Instruction mutateInstruction(Instruction instruction, T& rng, HavocSettings& havoc_config) + requires SimpleRng { #define PUT_RANDOM_BYTE_IF_LUCKY(variable) \ if (rng.next() & 1) { \ diff --git a/cpp/src/aztec/stdlib/primitives/field/field.hpp b/cpp/src/barretenberg/stdlib/primitives/field/field.hpp similarity index 98% rename from cpp/src/aztec/stdlib/primitives/field/field.hpp rename to cpp/src/barretenberg/stdlib/primitives/field/field.hpp index 8f963928c5..f5abc5b710 100644 --- a/cpp/src/aztec/stdlib/primitives/field/field.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field.hpp @@ -2,9 +2,9 @@ #include #include "../composers/composers_fwd.hpp" #include "../witness/witness.hpp" -#include "honk/composer/standard_honk_composer.hpp" -#include "honk/composer/standard_plonk_composer.hpp" -#include +#include "barretenberg/honk/composer/standard_honk_composer.hpp" +#include "barretenberg/honk/composer/standard_plonk_composer.hpp" +#include "barretenberg/common/assert.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/aztec/stdlib/primitives/field/field.test.cpp b/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp similarity index 98% rename from cpp/src/aztec/stdlib/primitives/field/field.test.cpp rename to cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp index 5c0ba6fc06..7c22288b71 100644 --- a/cpp/src/aztec/stdlib/primitives/field/field.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp @@ -1,12 +1,12 @@ #include "../bool/bool.hpp" #include "field.hpp" -#include "plonk/proof_system/constants.hpp" +#include "barretenberg/plonk/proof_system/constants.hpp" #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace bonk; @@ -1023,4 +1023,4 @@ TYPED_TEST(stdlib_field, test_pow_exponent_out_of_range) { TestFixture::test_pow_exponent_out_of_range(); } -} // namespace test_stdlib_field \ No newline at end of file +} // namespace test_stdlib_field diff --git a/cpp/src/aztec/stdlib/primitives/field/field_all.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp similarity index 68% rename from cpp/src/aztec/stdlib/primitives/field/field_all.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp index 04d927ce19..4a1767b898 100644 --- a/cpp/src/aztec/stdlib/primitives/field/field_all.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard | ComposerType::Turbo; #include "field.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/field/field_standard.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp similarity index 64% rename from cpp/src/aztec/stdlib/primitives/field/field_standard.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp index a14fa2d2f0..4eab251be6 100644 --- a/cpp/src/aztec/stdlib/primitives/field/field_standard.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard; #include "field.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/field/field_turbo.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp similarity index 63% rename from cpp/src/aztec/stdlib/primitives/field/field_turbo.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp index e4f76c786e..802a7df2ba 100644 --- a/cpp/src/aztec/stdlib/primitives/field/field_turbo.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Turbo; #include "field.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/group/group.hpp b/cpp/src/barretenberg/stdlib/primitives/group/group.hpp similarity index 98% rename from cpp/src/aztec/stdlib/primitives/group/group.hpp rename to cpp/src/barretenberg/stdlib/primitives/group/group.hpp index 186c43044c..07d376168a 100644 --- a/cpp/src/aztec/stdlib/primitives/group/group.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/group/group.hpp @@ -1,9 +1,9 @@ #pragma once #include "../field/field.hpp" -#include -#include -#include +#include +#include +#include #include "../../hash/pedersen/pedersen.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/group/group.test.cpp b/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp similarity index 92% rename from cpp/src/aztec/stdlib/primitives/group/group.test.cpp rename to cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp index 460245c1d8..4eda97d5bd 100644 --- a/cpp/src/aztec/stdlib/primitives/group/group.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp @@ -1,8 +1,8 @@ #include "../../types/types.hpp" -#include "honk/composer/standard_honk_composer.hpp" -#include "stdlib/primitives/witness/witness.hpp" -#include -#include +#include "barretenberg/honk/composer/standard_honk_composer.hpp" +#include "barretenberg/stdlib/primitives/witness/witness.hpp" +#include +#include using namespace barretenberg; // using namespace plonk::stdlib::types; @@ -93,4 +93,4 @@ TEST(stdlib_group, test_fixed_base_scalar_mul_with_two_limbs) bool proof_result = verifier.verify_proof(proof); EXPECT_EQ(proof_result, true); } -} // namespace stdlib_group_tests \ No newline at end of file +} // namespace stdlib_group_tests diff --git a/cpp/src/aztec/stdlib/primitives/memory/rom_table.cpp b/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/memory/rom_table.cpp rename to cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp diff --git a/cpp/src/aztec/stdlib/primitives/memory/rom_table.hpp b/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/memory/rom_table.hpp rename to cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp diff --git a/cpp/src/aztec/stdlib/primitives/memory/rom_table.test.cpp b/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp similarity index 93% rename from cpp/src/aztec/stdlib/primitives/memory/rom_table.test.cpp rename to cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp index 86f7d9fd9b..55a50d4ec5 100644 --- a/cpp/src/aztec/stdlib/primitives/memory/rom_table.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp @@ -2,9 +2,9 @@ #include -#include +#include -#include +#include namespace test_stdlib_rom_array { using namespace barretenberg; @@ -68,4 +68,4 @@ TEST(rom_table, rom_table_read_write_consistency) EXPECT_EQ(verified, true); } -} // namespace test_stdlib_rom_array \ No newline at end of file +} // namespace test_stdlib_rom_array diff --git a/cpp/src/aztec/stdlib/primitives/memory/twin_rom_table.cpp b/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/memory/twin_rom_table.cpp rename to cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp diff --git a/cpp/src/aztec/stdlib/primitives/memory/twin_rom_table.hpp b/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/memory/twin_rom_table.hpp rename to cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp diff --git a/cpp/src/aztec/stdlib/primitives/packed_byte_array/packed_byte_array.cpp b/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/packed_byte_array/packed_byte_array.cpp rename to cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp diff --git a/cpp/src/aztec/stdlib/primitives/packed_byte_array/packed_byte_array.hpp b/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp similarity index 96% rename from cpp/src/aztec/stdlib/primitives/packed_byte_array/packed_byte_array.hpp rename to cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp index 686607d46a..b1355e3a9d 100644 --- a/cpp/src/aztec/stdlib/primitives/packed_byte_array/packed_byte_array.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp @@ -3,7 +3,7 @@ #include "../field/field.hpp" #include "../bool/bool.hpp" #include "../byte_array/byte_array.hpp" -#include "honk/composer/standard_honk_composer.hpp" +#include "barretenberg/honk/composer/standard_honk_composer.hpp" namespace plonk { namespace stdlib { @@ -69,4 +69,4 @@ EXTERN_STDLIB_TYPE(packed_byte_array); extern template class packed_byte_array; } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp b/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp similarity index 97% rename from cpp/src/aztec/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp rename to cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp index bf8f755d7d..3eb993dee6 100644 --- a/cpp/src/aztec/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp @@ -3,12 +3,12 @@ #include // test currently doesn't construct or verify proof, but hey, why not. -#include +#include // #include // #include // #include -#include +#include namespace test_stdlib_packed_byte_array { using namespace barretenberg; @@ -181,4 +181,4 @@ TEST(packed_byte_array, check_append_uint32) } } -} // namespace test_stdlib_packed_byte_array \ No newline at end of file +} // namespace test_stdlib_packed_byte_array diff --git a/cpp/src/aztec/stdlib/primitives/plookup/plookup.cpp b/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp similarity index 95% rename from cpp/src/aztec/stdlib/primitives/plookup/plookup.cpp rename to cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp index 88bacb5d2e..c9551c5311 100644 --- a/cpp/src/aztec/stdlib/primitives/plookup/plookup.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp @@ -1,7 +1,7 @@ #include "./plookup.hpp" -#include -#include -#include +#include +#include +#include namespace plonk { class UltraComposer; diff --git a/cpp/src/aztec/stdlib/primitives/plookup/plookup.hpp b/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp similarity index 79% rename from cpp/src/aztec/stdlib/primitives/plookup/plookup.hpp rename to cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp index 57128fba4c..3964505a2d 100644 --- a/cpp/src/aztec/stdlib/primitives/plookup/plookup.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp @@ -1,10 +1,10 @@ #pragma once #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace plonk { namespace stdlib { diff --git a/cpp/src/aztec/stdlib/primitives/plookup/plookup.test.cpp b/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp similarity index 98% rename from cpp/src/aztec/stdlib/primitives/plookup/plookup.test.cpp rename to cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp index a546455366..9f9ca5b57f 100644 --- a/cpp/src/aztec/stdlib/primitives/plookup/plookup.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp @@ -1,14 +1,14 @@ #include "plookup.hpp" #include "../byte_array/byte_array.hpp" #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace test_stdlib_plookups { using namespace barretenberg; diff --git a/cpp/src/aztec/stdlib/primitives/point/point.hpp b/cpp/src/barretenberg/stdlib/primitives/point/point.hpp similarity index 96% rename from cpp/src/aztec/stdlib/primitives/point/point.hpp rename to cpp/src/barretenberg/stdlib/primitives/point/point.hpp index 27aa9f88ef..7e43aafb6a 100644 --- a/cpp/src/aztec/stdlib/primitives/point/point.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/point/point.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "../field/field.hpp" @@ -69,4 +69,4 @@ template std::ostream& operator<<(std::ostream& os, point +#include namespace plonk { namespace stdlib { diff --git a/cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp rename to cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp index 4df06dadc0..6f37d60eb9 100644 --- a/cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include // This is a global variable, so that the execution handling class could alter it and signal to the input tester that // the input should fail @@ -9,11 +9,11 @@ bool circuit_should_fail = false; #define HAVOC_TESTING -#include +#include FastRandom VarianceRNG(0); // Enable this definition, when you want to find out the instructions that caused a failure -//#define SHOW_INFORMATION 1 +// #define SHOW_INFORMATION 1 #ifdef SHOW_INFORMATION #define PRINT_TWO_ARG_INSTRUCTION(first_index, second_index, vector, operation_name, preposition) \ @@ -186,7 +186,9 @@ template class SafeUintFuzzBase { * @param rng PRNG used * @return A random instruction */ - template inline static Instruction generateRandom(T& rng) requires SimpleRng + template + inline static Instruction generateRandom(T& rng) + requires SimpleRng { // Choose which instruction we are going to generate OPCODE instruction_opcode = static_cast(rng.next() % (OPCODE::_LAST)); @@ -281,7 +283,8 @@ template class SafeUintFuzzBase { * @return Mutated element */ template - inline static fr mutateFieldElement(fr e, T& rng, HavocSettings& havoc_config) requires SimpleRng + inline static fr mutateFieldElement(fr e, T& rng, HavocSettings& havoc_config) + requires SimpleRng { // With a certain probability, we apply changes to the Montgomery form, rather than the plain form. This has // merit, since the computation is performed in montgomery form and comparisons are often performed in it, @@ -374,9 +377,8 @@ template class SafeUintFuzzBase { * @return Mutated instruction */ template - inline static Instruction mutateInstruction(Instruction instruction, - T& rng, - HavocSettings& havoc_config) requires SimpleRng + inline static Instruction mutateInstruction(Instruction instruction, T& rng, HavocSettings& havoc_config) + requires SimpleRng { #define PUT_RANDOM_BYTE_IF_LUCKY(variable) \ if (rng.next() & 1) { \ diff --git a/cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint.hpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint.hpp rename to cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp index 8b7a6347c3..ef721f6dd5 100644 --- a/cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp @@ -3,9 +3,9 @@ #include "../composers/composers_fwd.hpp" #include "../witness/witness.hpp" #include "../bool/bool.hpp" -#include +#include #include "../field/field.hpp" -#include "honk/composer/standard_honk_composer.hpp" +#include "barretenberg/honk/composer/standard_honk_composer.hpp" // The purpose of this class is to enable positive integer operations without a risk of overflow. // Despite the name, it is *not* a "safe" version of the uint class - as operations are positive integer diff --git a/cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint.test.cpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp similarity index 98% rename from cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint.test.cpp rename to cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp index 7f1cf9530c..1f742a97a1 100644 --- a/cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp @@ -2,13 +2,13 @@ #include #include #include "safe_uint.hpp" -#include +#include #include "../byte_array/byte_array.hpp" -#include +#include // #include // #include // #include -#include +#include namespace { auto& engine = numeric::random::get_debug_engine(); @@ -587,4 +587,4 @@ TEST(stdlib_safeuint, test_byte_array_conversion) arr.write(static_cast(safe)); EXPECT_EQ(arr.get_string(), expected); } -} // namespace test_stdlib_safe_uint \ No newline at end of file +} // namespace test_stdlib_safe_uint diff --git a/cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp similarity index 69% rename from cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp index 7f5c5820e0..d663fd7bbc 100644 --- a/cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard | ComposerType::Turbo; #include "safe_uint.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp similarity index 65% rename from cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp index b441151a1e..f087605ea7 100644 --- a/cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard; #include "safe_uint.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp similarity index 64% rename from cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp index 81c7ee4282..842c1552eb 100644 --- a/cpp/src/aztec/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Turbo; #include "safe_uint.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/uint/arithmetic.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/uint/arithmetic.cpp rename to cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp diff --git a/cpp/src/aztec/stdlib/primitives/uint/comparison.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/uint/comparison.cpp rename to cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp diff --git a/cpp/src/aztec/stdlib/primitives/uint/logic.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/uint/logic.cpp rename to cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp index d4109a3105..17ec3cd566 100644 --- a/cpp/src/aztec/stdlib/primitives/uint/logic.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp @@ -1,5 +1,5 @@ #include "../composers/composers.hpp" -#include "honk/composer/standard_honk_composer.hpp" +#include "barretenberg/honk/composer/standard_honk_composer.hpp" #include "uint.hpp" using namespace barretenberg; @@ -545,4 +545,4 @@ template class uint; template class uint; } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/primitives/uint/plookup/arithmetic.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/uint/plookup/arithmetic.cpp rename to cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp diff --git a/cpp/src/aztec/stdlib/primitives/uint/plookup/comparison.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/uint/plookup/comparison.cpp rename to cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp diff --git a/cpp/src/aztec/stdlib/primitives/uint/plookup/logic.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/uint/plookup/logic.cpp rename to cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp diff --git a/cpp/src/aztec/stdlib/primitives/uint/plookup/uint.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/uint/plookup/uint.cpp rename to cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp diff --git a/cpp/src/aztec/stdlib/primitives/uint/plookup/uint.hpp b/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/uint/plookup/uint.hpp rename to cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp diff --git a/cpp/src/aztec/stdlib/primitives/uint/uint.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp similarity index 100% rename from cpp/src/aztec/stdlib/primitives/uint/uint.cpp rename to cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp diff --git a/cpp/src/aztec/stdlib/primitives/uint/uint.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/uint/uint.fuzzer.hpp rename to cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp index 6629f8ca2e..578584d5d1 100644 --- a/cpp/src/aztec/stdlib/primitives/uint/uint.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp @@ -1,19 +1,19 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // This is a global variable, so that the execution handling class could alter it and signal to the input tester that // the input should fail bool circuit_should_fail = false; #define HAVOC_TESTING -#include +#include FastRandom VarianceRNG(0); // Enable this definition, when you want to find out the instructions that caused a failure -//#define SHOW_INFORMATION 1 +// #define SHOW_INFORMATION 1 #define OPERATION_TYPE_SIZE 1 @@ -101,7 +101,9 @@ template class UintFuzzBase { * @param rng PRNG used * @return A random instruction */ - template inline static Instruction generateRandom(T& rng) requires SimpleRng + template + inline static Instruction generateRandom(T& rng) + requires SimpleRng { // Choose which instruction we are going to generate OPCODE instruction_opcode = static_cast(rng.next() % (OPCODE::_LAST)); @@ -161,9 +163,8 @@ template class UintFuzzBase { * @return Mutated instruction */ template - inline static Instruction mutateInstruction(Instruction instruction, - T& rng, - HavocSettings& havoc_config) requires SimpleRng + inline static Instruction mutateInstruction(Instruction instruction, T& rng, HavocSettings& havoc_config) + requires SimpleRng { (void)rng; (void)havoc_config; diff --git a/cpp/src/aztec/stdlib/primitives/uint/uint.hpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp similarity index 96% rename from cpp/src/aztec/stdlib/primitives/uint/uint.hpp rename to cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp index b02bcb799f..9794a6976c 100644 --- a/cpp/src/aztec/stdlib/primitives/uint/uint.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp @@ -7,10 +7,10 @@ #include "./plookup/uint.hpp" -#include -#include -#include -#include +#include +#include +#include +#include namespace plonk { namespace stdlib { @@ -216,4 +216,4 @@ EXTERN_STDLIB_BASIC_TYPE_VA(uint, uint32_t); EXTERN_STDLIB_BASIC_TYPE_VA(uint, uint64_t); } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/primitives/uint/uint.test.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp similarity index 99% rename from cpp/src/aztec/stdlib/primitives/uint/uint.test.cpp rename to cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp index 74070dbc9e..cfd80c087d 100644 --- a/cpp/src/aztec/stdlib/primitives/uint/uint.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp @@ -1,8 +1,8 @@ #include "uint.hpp" -#include "honk/composer/standard_honk_composer.hpp" +#include "barretenberg/honk/composer/standard_honk_composer.hpp" #include #include -#include +#include using namespace barretenberg; using namespace plonk; diff --git a/cpp/src/aztec/stdlib/primitives/uint/uint_all.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp similarity index 68% rename from cpp/src/aztec/stdlib/primitives/uint/uint_all.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp index 4c358d8dd3..f780949bc6 100644 --- a/cpp/src/aztec/stdlib/primitives/uint/uint_all.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard | ComposerType::Turbo; #include "uint.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/uint/uint_standard.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp similarity index 63% rename from cpp/src/aztec/stdlib/primitives/uint/uint_standard.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp index 0e7f0acd01..3b1c99873c 100644 --- a/cpp/src/aztec/stdlib/primitives/uint/uint_standard.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard; #include "uint.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/uint/uint_turbo.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp similarity index 63% rename from cpp/src/aztec/stdlib/primitives/uint/uint_turbo.fuzzer.cpp rename to cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp index 29d4bb0f71..b8282082d1 100644 --- a/cpp/src/aztec/stdlib/primitives/uint/uint_turbo.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include constexpr uint64_t FuzzerComposerTypes = ComposerType::Turbo; #include "uint.fuzzer.hpp" diff --git a/cpp/src/aztec/stdlib/primitives/witness/witness.hpp b/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp similarity index 95% rename from cpp/src/aztec/stdlib/primitives/witness/witness.hpp rename to cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp index 2a1e2eb0ff..aed81e5d41 100644 --- a/cpp/src/aztec/stdlib/primitives/witness/witness.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include +#include namespace plonk { namespace stdlib { @@ -84,4 +84,4 @@ template class public_witness_t : public witness_t -#include -#include -#include +#include +#include +#include +#include #include "../../primitives/curves/bn254.hpp" #include "../verification_key/verification_key.hpp" @@ -404,4 +404,4 @@ template class Transcript { }; } // namespace recursion } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/recursion/transcript/transcript.test.cpp b/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp similarity index 98% rename from cpp/src/aztec/stdlib/recursion/transcript/transcript.test.cpp rename to cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp index 15cdf06871..f7194d9530 100644 --- a/cpp/src/aztec/stdlib/recursion/transcript/transcript.test.cpp +++ b/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp @@ -1,10 +1,10 @@ #include "transcript.hpp" #include -#include -#include +#include +#include -#include +#include using namespace plonk; @@ -290,4 +290,4 @@ TEST(stdlib_transcript, validate_transcript) bool result = verifier.verify_proof(proof); EXPECT_EQ(result, true); -} \ No newline at end of file +} diff --git a/cpp/src/aztec/stdlib/recursion/verification_key/verification_key.hpp b/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp similarity index 94% rename from cpp/src/aztec/stdlib/recursion/verification_key/verification_key.hpp rename to cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp index 60c4193342..2fc5383f01 100644 --- a/cpp/src/aztec/stdlib/recursion/verification_key/verification_key.hpp +++ b/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp @@ -1,19 +1,19 @@ #pragma once #include -#include -#include +#include +#include -#include +#include -#include -#include +#include +#include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include "../../primitives/uint/uint.hpp" #include "../../primitives/memory/rom_table.hpp" @@ -277,4 +277,4 @@ template struct verification_key { } // namespace recursion } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/recursion/verifier/program_settings.hpp b/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp similarity index 99% rename from cpp/src/aztec/stdlib/recursion/verifier/program_settings.hpp rename to cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp index 452c4ef29e..57e6ca79a7 100644 --- a/cpp/src/aztec/stdlib/recursion/verifier/program_settings.hpp +++ b/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include #include "../transcript/transcript.hpp" diff --git a/cpp/src/aztec/stdlib/recursion/verifier/verifier.hpp b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp similarity index 97% rename from cpp/src/aztec/stdlib/recursion/verifier/verifier.hpp rename to cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp index 5658d5f273..fca6065432 100644 --- a/cpp/src/aztec/stdlib/recursion/verifier/verifier.hpp +++ b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp @@ -7,13 +7,13 @@ #include "../transcript/transcript.hpp" -#include -#include +#include +#include -#include +#include -#include -#include +#include +#include namespace plonk { namespace stdlib { @@ -189,8 +189,8 @@ lagrange_evaluations get_lagrange_evaluations( } /** - * Refer to src/aztec/plonk/proof_system/verifier/verifier.cpp verify_proof() for the native implementation, which - * includes detailed comments. + * Refer to src/barretenberg/plonk/proof_system/verifier/verifier.cpp verify_proof() for the native implementation, + * which includes detailed comments. */ template recursion_output verify_proof(typename Curve::Composer* context, @@ -424,4 +424,4 @@ recursion_output verify_proof(typename Curve::Composer* context, } // namespace recursion } // namespace stdlib -} // namespace plonk \ No newline at end of file +} // namespace plonk diff --git a/cpp/src/aztec/stdlib/recursion/verifier/verifier.test.cpp b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp similarity index 98% rename from cpp/src/aztec/stdlib/recursion/verifier/verifier.test.cpp rename to cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp index 0374674882..764b65f149 100644 --- a/cpp/src/aztec/stdlib/recursion/verifier/verifier.test.cpp +++ b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp @@ -1,10 +1,10 @@ #include "verifier.hpp" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "../../hash/blake3s/blake3s.hpp" #include "../../hash/pedersen/pedersen.hpp" #include "program_settings.hpp" @@ -115,9 +115,8 @@ template class stdlib_verifier : public testing::Test { constexpr bool is_ultra_to_ultra = std::is_same::value; typedef typename std::conditional::type ProverOfInnerCircuit; - typedef - typename std::conditional::type - VerifierOfInnerProof; + typedef typename std::conditional::type + VerifierOfInnerProof; typedef typename std::conditional::type RecursiveSettings; diff --git a/cpp/src/aztec/stdlib/recursion/verifier/verifier_turbo.test.cpp b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp similarity index 98% rename from cpp/src/aztec/stdlib/recursion/verifier/verifier_turbo.test.cpp rename to cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp index 98d2b23172..040629355d 100644 --- a/cpp/src/aztec/stdlib/recursion/verifier/verifier_turbo.test.cpp +++ b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp @@ -1,10 +1,10 @@ #include "verifier.hpp" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "../../hash/blake3s/blake3s.hpp" #include "../../hash/pedersen/pedersen.hpp" #include "program_settings.hpp" @@ -59,8 +59,7 @@ template class stdlib_verifier_turbo : public testing:: std::shared_ptr verification_key = verification_key_pt::from_witness(&outer_composer, verification_key_raw); plonk::proof recursive_proof = prover.construct_proof(); - transcript::Manifest recursive_manifest = - InnerComposer::create_manifest(prover.key->num_public_inputs); + transcript::Manifest recursive_manifest = InnerComposer::create_manifest(prover.key->num_public_inputs); stdlib::recursion::recursion_output output = stdlib::recursion::verify_proof( &outer_composer, verification_key, recursive_manifest, recursive_proof); diff --git a/cpp/src/aztec/stdlib/types/types.hpp b/cpp/src/barretenberg/stdlib/types/types.hpp similarity index 62% rename from cpp/src/aztec/stdlib/types/types.hpp rename to cpp/src/barretenberg/stdlib/types/types.hpp index cfb9fbccfc..10de01a47d 100644 --- a/cpp/src/aztec/stdlib/types/types.hpp +++ b/cpp/src/barretenberg/stdlib/types/types.hpp @@ -1,25 +1,25 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace plonk::stdlib::types { @@ -43,10 +43,9 @@ typedef std::conditional_t< std::conditional_t> Verifier; -typedef std::conditional_t< - SYSTEM_COMPOSER == plonk::STANDARD, - plonk::Prover, - std::conditional_t> +typedef std::conditional_t> Prover; typedef std::conditional_t< @@ -92,4 +91,4 @@ typedef std::conditional_t> recursive_inner_verifier_settings; -} // namespace plonk::stdlib::types \ No newline at end of file +} // namespace plonk::stdlib::types diff --git a/cpp/src/aztec/transcript/CMakeLists.txt b/cpp/src/barretenberg/transcript/CMakeLists.txt similarity index 100% rename from cpp/src/aztec/transcript/CMakeLists.txt rename to cpp/src/barretenberg/transcript/CMakeLists.txt diff --git a/cpp/src/aztec/transcript/manifest.hpp b/cpp/src/barretenberg/transcript/manifest.hpp similarity index 100% rename from cpp/src/aztec/transcript/manifest.hpp rename to cpp/src/barretenberg/transcript/manifest.hpp diff --git a/cpp/src/aztec/transcript/transcript.cpp b/cpp/src/barretenberg/transcript/transcript.cpp similarity index 97% rename from cpp/src/aztec/transcript/transcript.cpp rename to cpp/src/barretenberg/transcript/transcript.cpp index 42d2165140..5680d88857 100644 --- a/cpp/src/aztec/transcript/transcript.cpp +++ b/cpp/src/barretenberg/transcript/transcript.cpp @@ -1,13 +1,13 @@ #include "transcript.hpp" -#include "transcript/manifest.hpp" +#include "manifest.hpp" #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -447,4 +447,4 @@ std::vector Transcript::export_transcript() const return buffer; } -} // namespace transcript \ No newline at end of file +} // namespace transcript diff --git a/cpp/src/aztec/transcript/transcript.hpp b/cpp/src/barretenberg/transcript/transcript.hpp similarity index 100% rename from cpp/src/aztec/transcript/transcript.hpp rename to cpp/src/barretenberg/transcript/transcript.hpp diff --git a/cpp/src/aztec/transcript/transcript.test.cpp b/cpp/src/barretenberg/transcript/transcript.test.cpp similarity index 100% rename from cpp/src/aztec/transcript/transcript.test.cpp rename to cpp/src/barretenberg/transcript/transcript.test.cpp diff --git a/cpp/src/aztec/transcript/transcript_wrappers.cpp b/cpp/src/barretenberg/transcript/transcript_wrappers.cpp similarity index 96% rename from cpp/src/aztec/transcript/transcript_wrappers.cpp rename to cpp/src/barretenberg/transcript/transcript_wrappers.cpp index e47ae8313c..c698553344 100644 --- a/cpp/src/aztec/transcript/transcript_wrappers.cpp +++ b/cpp/src/barretenberg/transcript/transcript_wrappers.cpp @@ -1,5 +1,4 @@ #include "./transcript_wrappers.hpp" -#include "transcript/manifest.hpp" #include namespace transcript { @@ -34,4 +33,4 @@ barretenberg::fr StandardTranscript::get_challenge_field_element_from_map(const { return barretenberg::fr::serialize_from_buffer(&(get_challenge_from_map(challenge_name, challenge_map_name))[0]); } -} // namespace transcript \ No newline at end of file +} // namespace transcript diff --git a/cpp/src/aztec/transcript/transcript_wrappers.hpp b/cpp/src/barretenberg/transcript/transcript_wrappers.hpp similarity index 96% rename from cpp/src/aztec/transcript/transcript_wrappers.hpp rename to cpp/src/barretenberg/transcript/transcript_wrappers.hpp index 8459852d97..96cfbbe915 100644 --- a/cpp/src/aztec/transcript/transcript_wrappers.hpp +++ b/cpp/src/barretenberg/transcript/transcript_wrappers.hpp @@ -1,8 +1,8 @@ #pragma once #include "./transcript.hpp" -#include -#include +#include +#include #include namespace transcript { From 56803def8ec2f13bf6ef89b44542cbf400a62917 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Mon, 6 Mar 2023 13:37:10 -0600 Subject: [PATCH 02/10] chore: Use quote includes instead of angle brackets --- .../benchmark/decrypt_bench/main.cpp | 2 +- .../benchmark/honk_bench/honk.bench.cpp | 5 +-- .../benchmark/pippenger_bench/main.cpp | 8 ++-- .../benchmark/plonk_bench/plonk.bench.cpp | 12 +++--- cpp/src/barretenberg/common/fuzzer.hpp | 4 +- cpp/src/barretenberg/common/log.hpp | 2 +- cpp/src/barretenberg/common/max_threads.hpp | 2 +- cpp/src/barretenberg/common/serialize.hpp | 4 +- .../barretenberg/crypto/blake2s/c_bind.cpp | 2 +- .../barretenberg/crypto/blake3s/c_bind.cpp | 2 +- .../barretenberg/crypto/ecdsa/ecdsa.test.cpp | 6 +-- .../barretenberg/crypto/ecdsa/ecdsa_impl.hpp | 4 +- cpp/src/barretenberg/crypto/hmac/hmac.hpp | 4 +- .../barretenberg/crypto/pedersen/c_bind.cpp | 8 ++-- .../pedersen/convert_buffer_to_field.hpp | 2 +- .../crypto/pedersen/fixed_base_scalar_mul.hpp | 2 +- .../crypto/pedersen/generator_data.hpp | 2 +- .../barretenberg/crypto/pedersen/pedersen.cpp | 2 +- .../barretenberg/crypto/pedersen/pedersen.hpp | 2 +- .../crypto/pedersen/pedersen.test.cpp | 2 +- .../crypto/pedersen/pedersen_lookup.cpp | 2 +- .../crypto/pedersen/pedersen_lookup.hpp | 2 +- .../crypto/pedersen/pedersen_lookup.test.cpp | 4 +- .../crypto/pedersen/sidon_set/sidon_set.hpp | 6 +-- .../pedersen/sidon_set/sidon_set.test.cpp | 4 +- .../barretenberg/crypto/schnorr/c_bind.cpp | 2 +- .../crypto/schnorr/multisig.test.cpp | 2 +- .../crypto/schnorr/proof_of_possession.hpp | 2 +- .../schnorr/proof_of_possession.test.cpp | 2 +- .../barretenberg/crypto/schnorr/schnorr.hpp | 8 ++-- .../barretenberg/crypto/schnorr/schnorr.tcc | 4 +- .../crypto/schnorr/schnorr.test.cpp | 2 +- cpp/src/barretenberg/crypto/sha256/sha256.cpp | 4 +- cpp/src/barretenberg/crypto/sha256/sha256.hpp | 2 +- .../bn254/scalar_multiplication/c_bind.cpp | 1 + .../bn254/scalar_multiplication/pippenger.cpp | 2 +- .../bn254/scalar_multiplication/pippenger.hpp | 4 +- .../scalar_multiplication/runtime_states.cpp | 6 +-- .../scalar_multiplication.cpp | 8 ++-- .../scalar_multiplication.test.cpp | 8 ++-- .../ecc/curves/secp256k1/secp256k1.hpp | 4 +- .../ecc/curves/secp256k1/secp256k1.test.cpp | 2 +- .../curves/secp256k1/secp256k1_endo_notes.hpp | 2 +- .../ecc/curves/secp256r1/secp256r1.hpp | 4 +- .../ecc/curves/secp256r1/secp256r1.test.cpp | 2 +- cpp/src/barretenberg/ecc/fields/field.hpp | 12 +++--- cpp/src/barretenberg/ecc/fields/field12.hpp | 2 +- cpp/src/barretenberg/ecc/fields/field2.hpp | 2 +- cpp/src/barretenberg/ecc/fields/field6.hpp | 2 +- .../barretenberg/ecc/fields/field_impl.hpp | 6 +-- .../ecc/groups/affine_element.hpp | 4 +- .../ecc/groups/affine_element.test.cpp | 12 +++--- .../ecc/groups/affine_element_impl.hpp | 2 +- cpp/src/barretenberg/ecc/groups/element.hpp | 8 ++-- cpp/src/barretenberg/ecc/groups/wnaf.hpp | 2 +- cpp/src/barretenberg/ecc/groups/wnaf.test.cpp | 2 +- .../circuit_constructor_base.hpp | 4 +- .../standard_circuit_constructor.hpp | 4 +- .../standard_circuit_constructor.test.cpp | 4 +- .../composer_helper/permutation_helper.hpp | 6 +-- .../composer/standard_honk_composer.test.cpp | 10 ++--- cpp/src/barretenberg/honk/pcs/claim.hpp | 2 +- .../barretenberg/honk/pcs/commitment_key.hpp | 12 +++--- .../honk/pcs/commitment_key.test.hpp | 6 +-- .../barretenberg/honk/pcs/gemini/gemini.hpp | 2 +- .../honk/pcs/gemini/gemini.test.cpp | 2 +- cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp | 4 +- .../barretenberg/honk/pcs/ipa/ipa.test.cpp | 8 ++-- cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp | 2 +- .../barretenberg/honk/pcs/kzg/kzg.test.cpp | 8 ++-- .../barretenberg/honk/pcs/shplonk/shplonk.hpp | 2 +- .../honk/pcs/shplonk/shplonk.test.cpp | 4 +- .../honk/pcs/shplonk/shplonk_single.hpp | 4 +- cpp/src/barretenberg/honk/pcs/wrapper.hpp | 2 +- .../honk/proof_system/program_settings.hpp | 2 +- .../barretenberg/honk/proof_system/prover.cpp | 26 ++++++------ .../barretenberg/honk/proof_system/prover.hpp | 24 +++++------ .../honk/proof_system/prover.test.cpp | 6 +-- .../honk/proof_system/verifier.cpp | 22 +++++----- .../honk/proof_system/verifier.hpp | 14 +++---- .../honk/proof_system/verifier.test.cpp | 10 ++--- .../polynomials/barycentric_data.test.cpp | 4 +- .../polynomials/multivariates.test.cpp | 4 +- .../honk/sumcheck/polynomials/pow.test.cpp | 2 +- .../honk/sumcheck/polynomials/univariate.hpp | 4 +- .../sumcheck/polynomials/univariate.test.cpp | 4 +- .../relations/arithmetic_relation.hpp | 2 +- .../grand_product_computation_relation.hpp | 2 +- .../grand_product_initialization_relation.hpp | 2 +- .../honk/sumcheck/relations/relation.test.cpp | 6 +-- .../barretenberg/honk/sumcheck/sumcheck.hpp | 6 +-- .../honk/sumcheck/sumcheck.test.cpp | 4 +- .../honk/sumcheck/sumcheck_round.hpp | 2 +- .../honk/sumcheck/sumcheck_round.test.cpp | 8 ++-- .../honk/utils/power_polynomial.hpp | 4 +- .../honk/utils/power_polynomial.test.cpp | 2 +- .../join_split_example/constants.hpp | 4 +- .../fixtures/user_context.hpp | 6 +-- .../proofs/compute_circuit_data.hpp | 4 +- .../inner_proof_data/inner_proof_data.hpp | 8 ++-- .../proofs/join_split/c_bind.cpp | 12 +++--- .../join_split/compute_circuit_data.cpp | 2 +- .../join_split/compute_signing_data.cpp | 2 +- .../proofs/join_split/join_split.cpp | 2 +- .../proofs/join_split/join_split.hpp | 4 +- .../proofs/join_split/join_split.test.cpp | 8 ++-- .../proofs/join_split/join_split_circuit.cpp | 2 +- .../proofs/join_split/join_split_circuit.hpp | 4 +- .../join_split/join_split_js_parity.test.cpp | 10 ++--- .../proofs/join_split/join_split_tx.cpp | 2 +- .../proofs/join_split/join_split_tx.hpp | 6 +-- .../proofs/join_split/join_split_tx.test.cpp | 10 ++--- .../proofs/join_split/sign_join_split_tx.cpp | 2 +- .../proofs/join_split/sign_join_split_tx.hpp | 2 +- .../proofs/join_split/verify_signature.hpp | 4 +- .../proofs/mock/mock_circuit.hpp | 6 +-- .../proofs/mock/mock_circuit.test.cpp | 4 +- .../notes/circuit/account/account_note.hpp | 2 +- .../proofs/notes/circuit/account/commit.hpp | 2 +- .../proofs/notes/circuit/asset_id.cpp | 2 +- .../proofs/notes/circuit/asset_id.hpp | 2 +- .../proofs/notes/circuit/bridge_call_data.hpp | 2 +- .../proofs/notes/circuit/claim/claim_note.hpp | 2 +- .../claim/complete_partial_commitment.hpp | 2 +- .../notes/circuit/claim/compute_nullifier.hpp | 4 +- .../claim/create_partial_commitment.hpp | 4 +- .../notes/circuit/claim/witness_data.hpp | 2 +- .../value/complete_partial_commitment.hpp | 4 +- .../notes/circuit/value/compute_nullifier.cpp | 2 +- .../notes/circuit/value/compute_nullifier.hpp | 2 +- .../circuit/value/compute_nullifier.test.cpp | 2 +- .../value/create_partial_commitment.hpp | 4 +- .../proofs/notes/circuit/value/value_note.hpp | 2 +- .../notes/circuit/value/witness_data.hpp | 2 +- .../proofs/notes/constants.hpp | 2 +- .../notes/native/account/account_note.cpp | 2 +- .../notes/native/account/account_note.hpp | 4 +- .../compute_account_alias_hash_nullifier.hpp | 2 +- .../compute_account_public_key_nullifier.hpp | 2 +- .../proofs/notes/native/bridge_call_data.hpp | 8 ++-- .../proofs/notes/native/claim/claim_note.hpp | 6 +-- .../notes/native/claim/claim_note_tx_data.hpp | 6 +-- .../claim/complete_partial_commitment.hpp | 6 +-- .../notes/native/claim/compute_nullifier.hpp | 6 +-- .../claim/create_partial_commitment.hpp | 2 +- .../value/complete_partial_commitment.hpp | 2 +- .../notes/native/value/compute_nullifier.cpp | 4 +- .../notes/native/value/compute_nullifier.hpp | 2 +- .../value/create_partial_commitment.hpp | 6 +-- .../proofs/notes/native/value/value_note.hpp | 6 +-- .../join_split_example/proofs/verify.hpp | 6 +-- .../numeric/bitop/sparse_form.hpp | 2 +- .../barretenberg/numeric/random/engine.cpp | 2 +- .../numeric/random/engine.test.cpp | 4 +- .../barretenberg/numeric/uint128/uint128.hpp | 2 +- .../numeric/uint128/uint128_impl.hpp | 2 +- .../barretenberg/numeric/uint256/uint256.hpp | 2 +- .../numeric/uint256/uint256_impl.hpp | 2 +- cpp/src/barretenberg/numeric/uintx/uintx.hpp | 4 +- .../barretenberg/numeric/uintx/uintx_impl.hpp | 2 +- .../plonk/composer/composer_base.cpp | 4 +- .../plonk/composer/composer_base.hpp | 12 +++--- .../plonk/composer/plookup_tables/aes128.hpp | 8 ++-- .../plonk/composer/plookup_tables/blake2s.hpp | 2 +- .../plookup_tables/keccak/keccak_chi.hpp | 4 +- .../plookup_tables/keccak/keccak_input.hpp | 6 +-- .../plookup_tables/keccak/keccak_output.hpp | 6 +-- .../plookup_tables/keccak/keccak_rho.hpp | 4 +- .../plookup_tables/keccak/keccak_theta.hpp | 4 +- .../non_native_group_generator.hpp | 6 +-- .../composer/plookup_tables/pedersen.hpp | 8 ++-- .../plookup_tables/plookup_tables.cpp | 2 +- .../plookup_tables/plookup_tables.hpp | 2 +- .../plonk/composer/plookup_tables/sha256.hpp | 8 ++-- .../plonk/composer/plookup_tables/sparse.hpp | 8 ++-- .../plonk/composer/plookup_tables/types.hpp | 2 +- .../plonk/composer/plookup_tables/uint.hpp | 2 +- .../plonk/composer/standard_composer.cpp | 10 ++--- .../plonk/composer/standard_composer.hpp | 4 +- .../plonk/composer/standard_composer.test.cpp | 6 +-- .../plonk/composer/turbo_composer.cpp | 18 ++++---- .../plonk/composer/turbo_composer.test.cpp | 4 +- .../plonk/composer/ultra_composer.cpp | 22 +++++----- .../plonk/composer/ultra_composer.test.cpp | 8 ++-- .../commitment_scheme.test.cpp | 8 ++-- .../kate_commitment_scheme.cpp | 2 +- .../plonk/proof_system/prover/c_bind.cpp | 2 +- .../plonk/proof_system/prover/prover.cpp | 6 +-- .../plonk/proof_system/prover/prover.test.cpp | 6 +-- .../public_inputs/public_inputs.hpp | 2 +- .../public_inputs/public_inputs.test.cpp | 2 +- .../utils/generalized_permutation.hpp | 6 +-- .../plonk/proof_system/utils/permutation.hpp | 6 +-- .../plonk/proof_system/verifier/verifier.cpp | 12 +++--- .../plonk/proof_system/verifier/verifier.hpp | 4 +- .../proof_system/verifier/verifier.test.cpp | 8 ++-- .../permutation_widget_impl.hpp | 14 +++---- .../random_widgets/plookup_widget_impl.hpp | 12 +++--- .../widgets/random_widgets/random_widget.hpp | 2 +- .../transition_widgets/transition_widget.hpp | 2 +- .../polynomials/evaluation_domain.cpp | 10 ++--- .../polynomials/evaluation_domain.hpp | 4 +- .../barretenberg/polynomials/polynomial.cpp | 6 +-- .../barretenberg/polynomials/polynomial.hpp | 6 +-- .../polynomials/polynomial_arithmetic.cpp | 8 ++-- .../polynomial_arithmetic.test.cpp | 2 +- .../polynomials/polynomials.bench.cpp | 22 +++++----- .../proof_system/composer/composer_base.hpp | 4 +- .../proof_system/flavor/flavor.hpp | 4 +- .../polynomial_cache/polynomial_cache.cpp | 2 +- .../polynomial_cache.test.cpp | 4 +- .../polynomial_store.test.cpp | 4 +- .../polynomial_store_wasm.cpp | 2 +- .../proof_system/proving_key/proving_key.cpp | 6 +-- .../proof_system/proving_key/proving_key.hpp | 12 +++--- .../proving_key/proving_key.test.cpp | 4 +- .../proof_system/proving_key/serialize.hpp | 6 +-- .../types/polynomial_manifest.hpp | 2 +- .../verification_key/verification_key.cpp | 2 +- .../verification_key/verification_key.hpp | 6 +-- .../verification_key.test.cpp | 4 +- .../proof_system/work_queue/work_queue.cpp | 4 +- cpp/src/barretenberg/srs/io.cpp | 6 +-- cpp/src/barretenberg/srs/io.test.cpp | 6 +-- .../file_reference_string.cpp | 2 +- .../file_reference_string.hpp | 6 +-- .../reference_string/mem_reference_string.cpp | 4 +- .../reference_string/mem_reference_string.hpp | 2 +- .../mem_reference_string.test.cpp | 2 +- .../srs/reference_string/reference_string.hpp | 6 +-- .../stdlib/encryption/aes128/aes128.cpp | 10 ++--- .../stdlib/encryption/aes128/aes128.test.cpp | 4 +- .../stdlib/encryption/ecdsa/ecdsa.test.cpp | 4 +- .../stdlib/encryption/schnorr/schnorr.cpp | 6 +-- .../stdlib/encryption/schnorr/schnorr.hpp | 2 +- .../encryption/schnorr/schnorr.test.cpp | 6 +-- .../stdlib/hash/blake2s/blake2s.cpp | 8 ++-- .../stdlib/hash/blake2s/blake2s.hpp | 2 +- .../stdlib/hash/blake2s/blake2s.test.cpp | 4 +- .../stdlib/hash/blake2s/blake2s_plookup.cpp | 14 +++---- .../stdlib/hash/blake2s/blake2s_plookup.hpp | 6 +-- .../stdlib/hash/blake2s/blake_util.hpp | 12 +++--- .../stdlib/hash/blake3s/blake3s.cpp | 6 +-- .../stdlib/hash/blake3s/blake3s.hpp | 2 +- .../stdlib/hash/blake3s/blake3s.test.cpp | 6 +-- .../stdlib/hash/blake3s/blake3s_plookup.cpp | 12 +++--- .../stdlib/hash/blake3s/blake3s_plookup.hpp | 6 +-- .../stdlib/hash/keccak/keccak.cpp | 8 ++-- .../stdlib/hash/keccak/keccak.hpp | 6 +-- .../stdlib/hash/keccak/keccak.test.cpp | 6 +-- .../stdlib/hash/pedersen/pedersen.bench.cpp | 12 +++--- .../stdlib/hash/pedersen/pedersen.cpp | 4 +- .../stdlib/hash/pedersen/pedersen.hpp | 2 +- .../stdlib/hash/pedersen/pedersen.test.cpp | 12 +++--- .../stdlib/hash/pedersen/pedersen_plookup.cpp | 6 +-- .../stdlib/hash/sha256/sha256.bench.cpp | 6 +-- .../stdlib/hash/sha256/sha256.cpp | 8 ++-- .../stdlib/hash/sha256/sha256.hpp | 6 +-- .../stdlib/hash/sha256/sha256.test.cpp | 18 ++++---- .../stdlib/hash/sha256/sha256_plookup.cpp | 14 +++---- .../stdlib/hash/sha256/sha256_plookup.hpp | 8 ++-- .../barretenberg/stdlib/merkle_tree/hash.hpp | 12 +++--- .../stdlib/merkle_tree/hash.test.cpp | 4 +- .../stdlib/merkle_tree/hash_path.hpp | 2 +- .../stdlib/merkle_tree/membership.hpp | 6 +-- .../stdlib/merkle_tree/membership.test.cpp | 2 +- .../stdlib/merkle_tree/memory_store.hpp | 2 +- .../stdlib/merkle_tree/memory_tree.test.cpp | 2 +- .../stdlib/merkle_tree/merkle_tree.bench.cpp | 2 +- .../stdlib/merkle_tree/merkle_tree.cpp | 8 ++-- .../stdlib/merkle_tree/merkle_tree.hpp | 2 +- .../stdlib/merkle_tree/merkle_tree.test.cpp | 8 ++-- .../primitives/bigfield/bigfield.fuzzer.hpp | 10 ++--- .../stdlib/primitives/bigfield/bigfield.hpp | 10 ++--- .../primitives/bigfield/bigfield.test.cpp | 14 +++---- .../bigfield/bigfield_all.fuzzer.cpp | 2 +- .../primitives/bigfield/bigfield_impl.hpp | 4 +- .../bigfield/bigfield_standard.fuzzer.cpp | 2 +- .../bigfield/bigfield_turbo.fuzzer.cpp | 2 +- .../stdlib/primitives/biggroup/biggroup.hpp | 8 ++-- .../primitives/biggroup/biggroup.test.cpp | 10 ++--- .../primitives/biggroup/biggroup_impl.hpp | 4 +- .../primitives/biggroup/biggroup_nafs.hpp | 2 +- .../primitives/bit_array/bit_array.fuzzer.hpp | 6 +-- .../primitives/bit_array/bit_array.test.cpp | 4 +- .../bit_array/bit_array_all.fuzzer.cpp | 2 +- .../bit_array/bit_array_standard.fuzzer.cpp | 2 +- .../bit_array/bit_array_turbo.fuzzer.cpp | 2 +- .../stdlib/primitives/bool/bool.fuzzer.hpp | 6 +-- .../stdlib/primitives/bool/bool.test.cpp | 2 +- .../primitives/bool/bool_all.fuzzer.cpp | 2 +- .../primitives/bool/bool_standard.fuzzer.cpp | 2 +- .../primitives/bool/bool_turbo.fuzzer.cpp | 2 +- .../byte_array/byte_array.fuzzer.hpp | 8 ++-- .../primitives/byte_array/byte_array.test.cpp | 6 +-- .../byte_array/byte_array_all.fuzzer.cpp | 2 +- .../byte_array/byte_array_standard.fuzzer.cpp | 2 +- .../byte_array/byte_array_turbo.fuzzer.cpp | 2 +- .../stdlib/primitives/curves/bn254.hpp | 2 +- .../stdlib/primitives/curves/secp256k1.hpp | 2 +- .../stdlib/primitives/curves/secp256r1.hpp | 2 +- .../stdlib/primitives/field/field.cpp | 2 +- .../stdlib/primitives/field/field.fuzzer.hpp | 14 +++---- .../stdlib/primitives/field/field.test.cpp | 10 ++--- .../primitives/field/field_all.fuzzer.cpp | 2 +- .../field/field_standard.fuzzer.cpp | 2 +- .../primitives/field/field_turbo.fuzzer.cpp | 2 +- .../stdlib/primitives/group/group.hpp | 6 +-- .../stdlib/primitives/group/group.test.cpp | 4 +- .../primitives/memory/rom_table.test.cpp | 4 +- .../packed_byte_array.test.cpp | 4 +- .../stdlib/primitives/plookup/plookup.cpp | 6 +-- .../stdlib/primitives/plookup/plookup.hpp | 8 ++-- .../primitives/plookup/plookup.test.cpp | 16 +++---- .../stdlib/primitives/point/point.hpp | 2 +- .../stdlib/primitives/safe_uint/safe_uint.cpp | 2 +- .../primitives/safe_uint/safe_uint.fuzzer.hpp | 10 ++--- .../stdlib/primitives/safe_uint/safe_uint.hpp | 2 +- .../primitives/safe_uint/safe_uint.test.cpp | 6 +-- .../safe_uint/safe_uint_all.fuzzer.cpp | 2 +- .../safe_uint/safe_uint_standard.fuzzer.cpp | 2 +- .../safe_uint/safe_uint_turbo.fuzzer.cpp | 2 +- .../stdlib/primitives/uint/uint.fuzzer.hpp | 12 +++--- .../stdlib/primitives/uint/uint.hpp | 8 ++-- .../stdlib/primitives/uint/uint.test.cpp | 2 +- .../primitives/uint/uint_all.fuzzer.cpp | 2 +- .../primitives/uint/uint_standard.fuzzer.cpp | 2 +- .../primitives/uint/uint_turbo.fuzzer.cpp | 2 +- .../stdlib/primitives/witness/witness.hpp | 4 +- .../recursion/transcript/transcript.hpp | 8 ++-- .../recursion/transcript/transcript.test.cpp | 6 +-- .../verification_key/verification_key.hpp | 20 ++++----- .../recursion/verifier/program_settings.hpp | 2 +- .../stdlib/recursion/verifier/verifier.hpp | 10 ++--- .../recursion/verifier/verifier.test.cpp | 12 +++--- .../verifier/verifier_turbo.test.cpp | 12 +++--- cpp/src/barretenberg/stdlib/types/types.hpp | 42 +++++++++---------- .../barretenberg/transcript/transcript.cpp | 14 +++---- .../transcript/transcript_wrappers.hpp | 4 +- 339 files changed, 894 insertions(+), 894 deletions(-) diff --git a/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp b/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp index be87be56b8..265e2e2d7b 100644 --- a/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp +++ b/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp @@ -1,4 +1,4 @@ -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include int main(int, char**) diff --git a/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp b/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp index ed06bb552a..4b9a049dad 100644 --- a/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp +++ b/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp @@ -1,11 +1,10 @@ #include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/honk/proof_system/prover.hpp" -#include "barretenberg/honk/proof_system/prover.hpp" #include "barretenberg/honk/proof_system/verifier.hpp" #include #include -#include -#include +#include "barretenberg/honk/composer/standard_honk_composer.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" using namespace benchmark; diff --git a/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp b/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp index 582257db10..2208ce5228 100644 --- a/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp +++ b/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp @@ -1,9 +1,9 @@ #include -#include +#include "barretenberg/common/assert.hpp" #include -#include -#include -#include +#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 // CALLGRIND_START_INSTRUMENTATION; diff --git a/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp b/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp index 5032420ff8..38581ff231 100644 --- a/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp +++ b/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp @@ -1,10 +1,10 @@ #include -#include -#include -#include -#include -#include -#include +#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; diff --git a/cpp/src/barretenberg/common/fuzzer.hpp b/cpp/src/barretenberg/common/fuzzer.hpp index 76b3f41618..adf0aa5d1b 100644 --- a/cpp/src/barretenberg/common/fuzzer.hpp +++ b/cpp/src/barretenberg/common/fuzzer.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include "barretenberg/plonk/composer/standard_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" #include #define PARENS () diff --git a/cpp/src/barretenberg/common/log.hpp b/cpp/src/barretenberg/common/log.hpp index 8d133be845..729ffcb28c 100644 --- a/cpp/src/barretenberg/common/log.hpp +++ b/cpp/src/barretenberg/common/log.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/env/logstr.hpp" #include #include #include diff --git a/cpp/src/barretenberg/common/max_threads.hpp b/cpp/src/barretenberg/common/max_threads.hpp index 58ed8eddbf..92c9e01b06 100644 --- a/cpp/src/barretenberg/common/max_threads.hpp +++ b/cpp/src/barretenberg/common/max_threads.hpp @@ -4,7 +4,7 @@ #ifndef NO_MULTITHREADING #include #endif -#include +#include "barretenberg/numeric/bitop/get_msb.hpp" namespace max_threads { // diff --git a/cpp/src/barretenberg/common/serialize.hpp b/cpp/src/barretenberg/common/serialize.hpp index dbc3faa455..b196f68ab0 100644 --- a/cpp/src/barretenberg/common/serialize.hpp +++ b/cpp/src/barretenberg/common/serialize.hpp @@ -28,12 +28,12 @@ */ #pragma once #include -#include +#include "barretenberg/common/net.hpp" #include #include #include #include -#include +#include "barretenberg/common/log.hpp" #ifndef __i386__ __extension__ using uint128_t = unsigned __int128; diff --git a/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp b/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp index 9186f7ee4f..7c4b6d0d9b 100644 --- a/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp +++ b/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp @@ -1,5 +1,5 @@ #include "blake2s.hpp" -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" #define WASM_EXPORT __attribute__((visibility("default"))) diff --git a/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp b/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp index 31d21a574a..bb056e41b8 100644 --- a/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp +++ b/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp @@ -1,5 +1,5 @@ #include "blake3s.hpp" -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" #define WASM_EXPORT __attribute__((visibility("default"))) diff --git a/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp b/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp index 829bcb3f07..2c028e101a 100644 --- a/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp +++ b/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp @@ -1,7 +1,7 @@ #include "ecdsa.hpp" -#include -#include -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/ecc/curves/secp256r1/secp256r1.hpp" +#include "barretenberg/common/serialize.hpp" #include using namespace barretenberg; diff --git a/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp b/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp index a46e46598b..3ff27bceb2 100644 --- a/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp +++ b/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/common/serialize.hpp" #include "../hmac/hmac.hpp" namespace crypto { diff --git a/cpp/src/barretenberg/crypto/hmac/hmac.hpp b/cpp/src/barretenberg/crypto/hmac/hmac.hpp index a05bdc7a16..e78ef5206c 100644 --- a/cpp/src/barretenberg/crypto/hmac/hmac.hpp +++ b/cpp/src/barretenberg/crypto/hmac/hmac.hpp @@ -1,12 +1,12 @@ #pragma once -#include +#include "barretenberg/common/serialize.hpp" #include #include #include #include #include -#include +#include "barretenberg/numeric/uintx/uintx.hpp" namespace crypto { /** diff --git a/cpp/src/barretenberg/crypto/pedersen/c_bind.cpp b/cpp/src/barretenberg/crypto/pedersen/c_bind.cpp index 09eacc50e4..8f8a9e6a74 100644 --- a/cpp/src/barretenberg/crypto/pedersen/c_bind.cpp +++ b/cpp/src/barretenberg/crypto/pedersen/c_bind.cpp @@ -1,9 +1,9 @@ #include "c_bind.hpp" #include "pedersen.hpp" -#include -#include -#include -#include +#include "barretenberg/common/serialize.hpp" +#include "barretenberg/common/timer.hpp" +#include "barretenberg/common/mem.hpp" +#include "barretenberg/common/streams.hpp" #define WASM_EXPORT __attribute__((visibility("default"))) extern "C" { diff --git a/cpp/src/barretenberg/crypto/pedersen/convert_buffer_to_field.hpp b/cpp/src/barretenberg/crypto/pedersen/convert_buffer_to_field.hpp index bc2b27c773..cea45bd3bc 100644 --- a/cpp/src/barretenberg/crypto/pedersen/convert_buffer_to_field.hpp +++ b/cpp/src/barretenberg/crypto/pedersen/convert_buffer_to_field.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" namespace crypto { namespace pedersen { diff --git a/cpp/src/barretenberg/crypto/pedersen/fixed_base_scalar_mul.hpp b/cpp/src/barretenberg/crypto/pedersen/fixed_base_scalar_mul.hpp index 37a0fee597..abe08371c5 100644 --- a/cpp/src/barretenberg/crypto/pedersen/fixed_base_scalar_mul.hpp +++ b/cpp/src/barretenberg/crypto/pedersen/fixed_base_scalar_mul.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" namespace crypto { namespace pedersen { diff --git a/cpp/src/barretenberg/crypto/pedersen/generator_data.hpp b/cpp/src/barretenberg/crypto/pedersen/generator_data.hpp index 6d2cbe1282..1d6c07c9eb 100644 --- a/cpp/src/barretenberg/crypto/pedersen/generator_data.hpp +++ b/cpp/src/barretenberg/crypto/pedersen/generator_data.hpp @@ -1,7 +1,7 @@ #pragma once #include #include -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" namespace crypto { namespace pedersen { diff --git a/cpp/src/barretenberg/crypto/pedersen/pedersen.cpp b/cpp/src/barretenberg/crypto/pedersen/pedersen.cpp index b9ece656e2..4a2314ab35 100644 --- a/cpp/src/barretenberg/crypto/pedersen/pedersen.cpp +++ b/cpp/src/barretenberg/crypto/pedersen/pedersen.cpp @@ -1,6 +1,6 @@ #include "./pedersen.hpp" #include "./convert_buffer_to_field.hpp" -#include +#include "barretenberg/common/throw_or_abort.hpp" #include #ifndef NO_MULTITHREADING #include diff --git a/cpp/src/barretenberg/crypto/pedersen/pedersen.hpp b/cpp/src/barretenberg/crypto/pedersen/pedersen.hpp index 779407b5d4..675da3d7b7 100644 --- a/cpp/src/barretenberg/crypto/pedersen/pedersen.hpp +++ b/cpp/src/barretenberg/crypto/pedersen/pedersen.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "./generator_data.hpp" #include "./fixed_base_scalar_mul.hpp" diff --git a/cpp/src/barretenberg/crypto/pedersen/pedersen.test.cpp b/cpp/src/barretenberg/crypto/pedersen/pedersen.test.cpp index 3ceb85a332..90e6503f7c 100644 --- a/cpp/src/barretenberg/crypto/pedersen/pedersen.test.cpp +++ b/cpp/src/barretenberg/crypto/pedersen/pedersen.test.cpp @@ -1,5 +1,5 @@ #include -#include +#include "barretenberg/common/streams.hpp" #include "./pedersen.hpp" using namespace crypto::pedersen; diff --git a/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.cpp b/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.cpp index 748af45e6b..b43bb3594b 100644 --- a/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.cpp +++ b/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.cpp @@ -1,7 +1,7 @@ #include "./pedersen_lookup.hpp" #include "./convert_buffer_to_field.hpp" -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" namespace crypto { namespace pedersen { diff --git a/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.hpp b/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.hpp index a1381d9c05..adec023426 100644 --- a/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.hpp +++ b/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" namespace crypto { namespace pedersen { diff --git a/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.test.cpp b/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.test.cpp index a6de88c15a..e71c3a4150 100644 --- a/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.test.cpp +++ b/cpp/src/barretenberg/crypto/pedersen/pedersen_lookup.test.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/numeric/random/engine.hpp" #include "./pedersen_lookup.hpp" diff --git a/cpp/src/barretenberg/crypto/pedersen/sidon_set/sidon_set.hpp b/cpp/src/barretenberg/crypto/pedersen/sidon_set/sidon_set.hpp index 1fa6f29414..a1a6db817d 100644 --- a/cpp/src/barretenberg/crypto/pedersen/sidon_set/sidon_set.hpp +++ b/cpp/src/barretenberg/crypto/pedersen/sidon_set/sidon_set.hpp @@ -3,9 +3,9 @@ #include #include -#include -#include -#include +#include "barretenberg/numeric/uintx/uintx.hpp" +#include "barretenberg/ecc/fields/field.hpp" +#include "barretenberg/ecc/fields/field2.hpp" namespace crypto { diff --git a/cpp/src/barretenberg/crypto/pedersen/sidon_set/sidon_set.test.cpp b/cpp/src/barretenberg/crypto/pedersen/sidon_set/sidon_set.test.cpp index ccf828fdc0..615067414b 100644 --- a/cpp/src/barretenberg/crypto/pedersen/sidon_set/sidon_set.test.cpp +++ b/cpp/src/barretenberg/crypto/pedersen/sidon_set/sidon_set.test.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/numeric/random/engine.hpp" #include "./sidon_set.hpp" diff --git a/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp b/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp index 4d585d2833..a9cee246a6 100644 --- a/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp +++ b/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp @@ -1,7 +1,7 @@ #include "schnorr.hpp" #include "multisig.hpp" -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #define WASM_EXPORT __attribute__((visibility("default"))) diff --git a/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp b/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp index 02cf242b37..09372702df 100644 --- a/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp +++ b/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp @@ -1,4 +1,4 @@ -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include #include "./multisig.hpp" diff --git a/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp b/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp index 4df6854c1b..69efb5cb8c 100644 --- a/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp +++ b/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp @@ -2,7 +2,7 @@ #include -#include +#include "barretenberg/common/serialize.hpp" #include "schnorr.hpp" namespace crypto::schnorr { diff --git a/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp b/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp index 98b4a30dd9..e81cc7034f 100644 --- a/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp +++ b/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp @@ -1,5 +1,5 @@ -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include #include "proof_of_possession.hpp" diff --git a/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp b/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp index 0e1f6d4531..ccd88dceb7 100644 --- a/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp +++ b/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp @@ -4,12 +4,12 @@ #include #include -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include +#include "barretenberg/crypto/hashers/hashers.hpp" -#include -#include +#include "barretenberg/common/serialize.hpp" +#include "barretenberg/common/streams.hpp" namespace crypto { namespace schnorr { diff --git a/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc b/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc index 74239bbb7a..a9b04e8c51 100644 --- a/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc +++ b/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "barretenberg/crypto/hmac/hmac.hpp" +#include "barretenberg/crypto/pedersen/pedersen.hpp" #include "schnorr.hpp" diff --git a/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp b/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp index 6fc742513a..b485895235 100644 --- a/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp +++ b/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp @@ -1,5 +1,5 @@ #include "schnorr.hpp" -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include using namespace barretenberg; diff --git a/cpp/src/barretenberg/crypto/sha256/sha256.cpp b/cpp/src/barretenberg/crypto/sha256/sha256.cpp index d5942e0b62..0aa87213cc 100644 --- a/cpp/src/barretenberg/crypto/sha256/sha256.cpp +++ b/cpp/src/barretenberg/crypto/sha256/sha256.cpp @@ -1,7 +1,7 @@ #include "./sha256.hpp" #include -#include -#include +#include "barretenberg/common/assert.hpp" +#include "barretenberg/common/net.hpp" #include namespace sha256 { diff --git a/cpp/src/barretenberg/crypto/sha256/sha256.hpp b/cpp/src/barretenberg/crypto/sha256/sha256.hpp index 3d0e73e5fc..eda1c83810 100644 --- a/cpp/src/barretenberg/crypto/sha256/sha256.hpp +++ b/cpp/src/barretenberg/crypto/sha256/sha256.hpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" namespace sha256 { diff --git a/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/c_bind.cpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/c_bind.cpp index 0df88035f4..66803cb5d5 100644 --- a/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/c_bind.cpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/c_bind.cpp @@ -1,3 +1,4 @@ +#include "scalar_multiplication.hpp" #include "pippenger.hpp" #include "barretenberg/common/mem.hpp" diff --git a/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.cpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.cpp index e566c85d81..cb8f93a6c3 100644 --- a/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.cpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.cpp @@ -1,5 +1,5 @@ #include "pippenger.hpp" -#include +#include "barretenberg/srs/io.hpp" namespace barretenberg { namespace scalar_multiplication { diff --git a/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.hpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.hpp index c873cd3771..48a2c133f6 100644 --- a/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.hpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.hpp @@ -1,7 +1,7 @@ #pragma once #include "./scalar_multiplication.hpp" -#include -#include +#include "barretenberg/common/mem.hpp" +#include "barretenberg/common/max_threads.hpp" #ifndef NO_MULTITHREADING #include diff --git a/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/runtime_states.cpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/runtime_states.cpp index a6e567b8e9..6e8aa5ccd8 100644 --- a/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/runtime_states.cpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/runtime_states.cpp @@ -1,8 +1,8 @@ #include "runtime_states.hpp" -#include -#include -#include +#include "barretenberg/common/mem.hpp" +#include "barretenberg/common/max_threads.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" #ifndef NO_MULTITHREADING #include diff --git a/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.cpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.cpp index 71f973c4b4..8ff1782f1e 100644 --- a/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.cpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.cpp @@ -1,9 +1,9 @@ #include "./scalar_multiplication.hpp" -#include -#include -#include -#include +#include "barretenberg/common/throw_or_abort.hpp" +#include "barretenberg/common/mem.hpp" +#include "barretenberg/common/max_threads.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" #include #include diff --git a/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.test.cpp b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.test.cpp index 3788ee24c4..a09245c1e7 100644 --- a/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.test.cpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.test.cpp @@ -1,13 +1,13 @@ #include "pippenger.hpp" #include "scalar_multiplication.hpp" #include -#include -#include +#include "barretenberg/common/test.hpp" +#include "barretenberg/srs/io.hpp" #include -#include +#include "barretenberg/numeric/random/engine.hpp" -#include +#include "barretenberg/common/mem.hpp" #define BARRETENBERG_SRS_PATH "../srs_db/ignition" diff --git a/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp b/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp index 36881f9806..220cc9da30 100644 --- a/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp +++ b/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/numeric/uintx/uintx.hpp" #include "../../fields/field.hpp" #include "../../groups/group.hpp" diff --git a/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp b/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp index 79898c7503..dd24f367e8 100644 --- a/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp +++ b/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp @@ -1,6 +1,6 @@ #include "secp256k1.hpp" #include -#include +#include "barretenberg/numeric/random/engine.hpp" namespace test_secp256k1 { diff --git a/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp b/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp index abfb494945..0e2dcb2056 100644 --- a/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp +++ b/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "barretenberg/numeric/uintx/uintx.hpp" #include "secp256k1.hpp" namespace secp256k1_params { diff --git a/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp b/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp index 681dccd3b8..542d351231 100644 --- a/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp +++ b/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/numeric/uintx/uintx.hpp" #include "../../fields/field.hpp" #include "../../groups/group.hpp" diff --git a/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp b/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp index fe9276c05e..9705cc15ff 100644 --- a/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp +++ b/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp @@ -1,6 +1,6 @@ #include "secp256r1.hpp" #include -#include +#include "barretenberg/numeric/random/engine.hpp" namespace test_secp256r1 { diff --git a/cpp/src/barretenberg/ecc/fields/field.hpp b/cpp/src/barretenberg/ecc/fields/field.hpp index 8e4effcdd4..ae31b54e93 100644 --- a/cpp/src/barretenberg/ecc/fields/field.hpp +++ b/cpp/src/barretenberg/ecc/fields/field.hpp @@ -1,13 +1,13 @@ #pragma once #include -#include -#include -#include +#include "barretenberg/common/assert.hpp" +#include "barretenberg/common/inline.hpp" +#include "barretenberg/common/serialize.hpp" #include #include -#include -#include -#include +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/numeric/uint128/uint128.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" #include #include diff --git a/cpp/src/barretenberg/ecc/fields/field12.hpp b/cpp/src/barretenberg/ecc/fields/field12.hpp index 5673bc69f9..d799574fd7 100644 --- a/cpp/src/barretenberg/ecc/fields/field12.hpp +++ b/cpp/src/barretenberg/ecc/fields/field12.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/numeric/random/engine.hpp" namespace barretenberg { template class field12 { diff --git a/cpp/src/barretenberg/ecc/fields/field2.hpp b/cpp/src/barretenberg/ecc/fields/field2.hpp index e1440e5bbb..630b25c1b4 100644 --- a/cpp/src/barretenberg/ecc/fields/field2.hpp +++ b/cpp/src/barretenberg/ecc/fields/field2.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/numeric/random/engine.hpp" namespace barretenberg { template struct alignas(32) field2 { diff --git a/cpp/src/barretenberg/ecc/fields/field6.hpp b/cpp/src/barretenberg/ecc/fields/field6.hpp index ee08b299a8..3db01c3875 100644 --- a/cpp/src/barretenberg/ecc/fields/field6.hpp +++ b/cpp/src/barretenberg/ecc/fields/field6.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/numeric/random/engine.hpp" namespace barretenberg { template class field6 { diff --git a/cpp/src/barretenberg/ecc/fields/field_impl.hpp b/cpp/src/barretenberg/ecc/fields/field_impl.hpp index 1bb4c8f2f9..24e19026da 100644 --- a/cpp/src/barretenberg/ecc/fields/field_impl.hpp +++ b/cpp/src/barretenberg/ecc/fields/field_impl.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include "barretenberg/common/throw_or_abort.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/numeric/random/engine.hpp" #include #include #include diff --git a/cpp/src/barretenberg/ecc/groups/affine_element.hpp b/cpp/src/barretenberg/ecc/groups/affine_element.hpp index 7f82f6a92c..bc957a5b03 100644 --- a/cpp/src/barretenberg/ecc/groups/affine_element.hpp +++ b/cpp/src/barretenberg/ecc/groups/affine_element.hpp @@ -1,8 +1,8 @@ #pragma once -#include +#include "barretenberg/numeric/uint256/uint256.hpp" #include #include -#include +#include "barretenberg/ecc/curves/bn254/fq2.hpp" namespace barretenberg { namespace group_elements { diff --git a/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp b/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp index 21cc436d35..8fef38d0d3 100644 --- a/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp +++ b/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp @@ -1,10 +1,10 @@ -#include -#include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/ecc/curves/secp256k1/secp256k1.hpp" +#include "barretenberg/ecc/curves/secp256r1/secp256r1.hpp" +#include "barretenberg/common/test.hpp" #include -#include +#include "barretenberg/common/serialize.hpp" namespace test_affine_element { template class test_affine_element : public testing::Test { diff --git a/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp b/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp index fd982768ea..d1f4828688 100644 --- a/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp +++ b/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/crypto/keccak/keccak.hpp" namespace barretenberg { namespace group_elements { diff --git a/cpp/src/barretenberg/ecc/groups/element.hpp b/cpp/src/barretenberg/ecc/groups/element.hpp index 46e73a4244..67f4451ba5 100644 --- a/cpp/src/barretenberg/ecc/groups/element.hpp +++ b/cpp/src/barretenberg/ecc/groups/element.hpp @@ -3,10 +3,10 @@ #include "affine_element.hpp" #include "wnaf.hpp" #include -#include -#include -#include -#include +#include "barretenberg/common/inline.hpp" +#include "barretenberg/common/mem.hpp" +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" #include #include diff --git a/cpp/src/barretenberg/ecc/groups/wnaf.hpp b/cpp/src/barretenberg/ecc/groups/wnaf.hpp index d8b678287d..ba16a34c45 100644 --- a/cpp/src/barretenberg/ecc/groups/wnaf.hpp +++ b/cpp/src/barretenberg/ecc/groups/wnaf.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include +#include "barretenberg/numeric/bitop/get_msb.hpp" #include namespace barretenberg { diff --git a/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp b/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp index ab99f38ef7..56d80264bc 100644 --- a/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp +++ b/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp @@ -1,7 +1,7 @@ #include "../curves/bn254/fr.hpp" #include "wnaf.hpp" #include -#include +#include "barretenberg/numeric/random/engine.hpp" using namespace barretenberg; diff --git a/cpp/src/barretenberg/honk/circuit_constructors/circuit_constructor_base.hpp b/cpp/src/barretenberg/honk/circuit_constructors/circuit_constructor_base.hpp index fb2e496698..a7ad1d592f 100644 --- a/cpp/src/barretenberg/honk/circuit_constructors/circuit_constructor_base.hpp +++ b/cpp/src/barretenberg/honk/circuit_constructors/circuit_constructor_base.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include "barretenberg/proof_system/composer/composer_base.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" #include using namespace bonk; diff --git a/cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.hpp b/cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.hpp index 27c3cb1054..243d552189 100644 --- a/cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.hpp +++ b/cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.hpp @@ -1,7 +1,7 @@ #pragma once #include "circuit_constructor_base.hpp" -#include -#include +#include "barretenberg/plonk/proof_system/constants.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" namespace bonk { enum StandardSelectors { QM, Q1, Q2, Q3, QC, NUM }; diff --git a/cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.test.cpp b/cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.test.cpp index 79e669594b..e584c0c4df 100644 --- a/cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.test.cpp +++ b/cpp/src/barretenberg/honk/circuit_constructors/standard_circuit_constructor.test.cpp @@ -1,7 +1,7 @@ #include "standard_circuit_constructor.hpp" #include -#include -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/crypto/pedersen/generator_data.hpp" using namespace barretenberg; using namespace bonk; diff --git a/cpp/src/barretenberg/honk/composer/composer_helper/permutation_helper.hpp b/cpp/src/barretenberg/honk/composer/composer_helper/permutation_helper.hpp index 46c34b18c3..34736a8ed4 100644 --- a/cpp/src/barretenberg/honk/composer/composer_helper/permutation_helper.hpp +++ b/cpp/src/barretenberg/honk/composer/composer_helper/permutation_helper.hpp @@ -8,9 +8,9 @@ #pragma once -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/proof_system/proving_key/proving_key.hpp" #include #include diff --git a/cpp/src/barretenberg/honk/composer/standard_honk_composer.test.cpp b/cpp/src/barretenberg/honk/composer/standard_honk_composer.test.cpp index e80502b285..7ab8722048 100644 --- a/cpp/src/barretenberg/honk/composer/standard_honk_composer.test.cpp +++ b/cpp/src/barretenberg/honk/composer/standard_honk_composer.test.cpp @@ -3,11 +3,11 @@ #include "barretenberg/numeric/uint256/uint256.hpp" #include "barretenberg/proof_system/flavor/flavor.hpp" #include -#include -#include -#include -#include -#include +#include "barretenberg/honk/proof_system/prover.hpp" +#include "barretenberg/honk/sumcheck/sumcheck_round.hpp" +#include "barretenberg/honk/sumcheck/relations/grand_product_computation_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/grand_product_initialization_relation.hpp" +#include "barretenberg/honk/utils/public_inputs.hpp" #include diff --git a/cpp/src/barretenberg/honk/pcs/claim.hpp b/cpp/src/barretenberg/honk/pcs/claim.hpp index 10d98d7645..44b47a1d24 100644 --- a/cpp/src/barretenberg/honk/pcs/claim.hpp +++ b/cpp/src/barretenberg/honk/pcs/claim.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "barretenberg/polynomials/polynomial.hpp" namespace honk::pcs { /** diff --git a/cpp/src/barretenberg/honk/pcs/commitment_key.hpp b/cpp/src/barretenberg/honk/pcs/commitment_key.hpp index 913a189e90..d4ff71785c 100644 --- a/cpp/src/barretenberg/honk/pcs/commitment_key.hpp +++ b/cpp/src/barretenberg/honk/pcs/commitment_key.hpp @@ -5,12 +5,12 @@ * */ -#include -#include -#include -#include -#include -#include +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/srs/reference_string/file_reference_string.hpp" +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" +#include "barretenberg/numeric/bitop/pow.hpp" #include #include diff --git a/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp b/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp index d4128b6ba9..016f1b7067 100644 --- a/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp +++ b/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp @@ -8,9 +8,9 @@ #include #include -#include -#include -#include +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/srs/reference_string/file_reference_string.hpp" +#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "../oracle/oracle.hpp" #include "../../transcript/transcript_wrappers.hpp" diff --git a/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp b/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp index 1ac6962a04..898b0c70b7 100644 --- a/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp +++ b/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp @@ -5,7 +5,7 @@ #include "barretenberg/honk/pcs/commitment_key.hpp" #include "barretenberg/polynomials/polynomial.hpp" -#include +#include "barretenberg/common/assert.hpp" #include #include diff --git a/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp b/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp index 20db926a5a..619108737a 100644 --- a/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp +++ b/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp @@ -1,7 +1,7 @@ #include "gemini.hpp" #include "../commitment_key.test.hpp" -#include +#include "barretenberg/polynomials/polynomial.hpp" #include #include #include diff --git a/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp b/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp index b37ef7edc4..73fcd0ff6f 100644 --- a/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp +++ b/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include -#include +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/stdlib/primitives/curves/bn254.hpp" // Suggested by Zac: Future optimisations // 1: write a program that generates a large set of generator points (2^23?) and writes to a file on disk diff --git a/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp b/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp index a536cc2940..614e5225c8 100644 --- a/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp +++ b/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp @@ -1,9 +1,9 @@ #include "ipa.hpp" -#include +#include "barretenberg/common/mem.hpp" #include -#include -#include -#include +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/ecc/curves/bn254/fq12.hpp" using namespace barretenberg; TEST(honk_commitment_scheme, ipa_commit) diff --git a/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp b/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp index e66fc5cbb0..a538045f84 100644 --- a/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp +++ b/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp @@ -1,7 +1,7 @@ #pragma once #include "../claim.hpp" -#include +#include "barretenberg/polynomials/polynomial.hpp" #include #include diff --git a/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp b/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp index 679a87f95a..b5c79fbfed 100644 --- a/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp +++ b/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp @@ -4,11 +4,11 @@ #include "../gemini/gemini.hpp" #include "../commitment_key.test.hpp" -#include -#include -#include +#include "barretenberg/honk/pcs/claim.hpp" +#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/polynomials/polynomial.hpp" -#include +#include "barretenberg/ecc/curves/bn254/g1.hpp" #include #include diff --git a/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp index 74120990fc..e73105085b 100644 --- a/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp +++ b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp @@ -1,7 +1,7 @@ #pragma once #include "../claim.hpp" -#include +#include "barretenberg/polynomials/polynomial.hpp" /** * @brief Reduces multiple claims about commitments opened at multiple points diff --git a/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp index 2d2f3030e8..6fa06b5808 100644 --- a/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp +++ b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp @@ -7,8 +7,8 @@ #include #include "../commitment_key.test.hpp" -#include -#include +#include "barretenberg/honk/pcs/claim.hpp" +#include "barretenberg/polynomials/polynomial.hpp" namespace honk::pcs::shplonk { template class ShplonkTest : public CommitmentTest {}; diff --git a/cpp/src/barretenberg/honk/pcs/shplonk/shplonk_single.hpp b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk_single.hpp index 05730508c6..5826813806 100644 --- a/cpp/src/barretenberg/honk/pcs/shplonk/shplonk_single.hpp +++ b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk_single.hpp @@ -1,7 +1,7 @@ #pragma once -#include +#include "barretenberg/honk/pcs/claim.hpp" #include "shplonk.hpp" -#include +#include "barretenberg/honk/pcs/commitment_key.hpp" namespace honk::pcs::shplonk { diff --git a/cpp/src/barretenberg/honk/pcs/wrapper.hpp b/cpp/src/barretenberg/honk/pcs/wrapper.hpp index ce0fad8026..d5f60d8cd7 100644 --- a/cpp/src/barretenberg/honk/pcs/wrapper.hpp +++ b/cpp/src/barretenberg/honk/pcs/wrapper.hpp @@ -2,7 +2,7 @@ #include "commitment_key.hpp" #include "gemini/gemini.hpp" -#include +#include "barretenberg/ecc/curves/bn254/g1.hpp" namespace honk { diff --git a/cpp/src/barretenberg/honk/proof_system/program_settings.hpp b/cpp/src/barretenberg/honk/proof_system/program_settings.hpp index f8d59747f6..7ea749d8dc 100644 --- a/cpp/src/barretenberg/honk/proof_system/program_settings.hpp +++ b/cpp/src/barretenberg/honk/proof_system/program_settings.hpp @@ -4,7 +4,7 @@ #include "../../transcript/transcript_wrappers.hpp" #include "../../plonk/proof_system/types/prover_settings.hpp" -#include +#include "barretenberg/proof_system/flavor/flavor.hpp" namespace honk { diff --git a/cpp/src/barretenberg/honk/proof_system/prover.cpp b/cpp/src/barretenberg/honk/proof_system/prover.cpp index 7c5808aaf8..4b7f012cb2 100644 --- a/cpp/src/barretenberg/honk/proof_system/prover.cpp +++ b/cpp/src/barretenberg/honk/proof_system/prover.cpp @@ -1,25 +1,25 @@ #include "prover.hpp" #include #include -#include // will need +#include "barretenberg/honk/sumcheck/sumcheck.hpp" // will need #include -#include // will go away -#include -#include +#include "barretenberg/honk/sumcheck/polynomials/univariate.hpp" // will go away +#include "barretenberg/honk/utils/power_polynomial.hpp" +#include "barretenberg/honk/pcs/commitment_key.hpp" #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/honk/sumcheck/relations/arithmetic_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/grand_product_computation_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/grand_product_initialization_relation.hpp" +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" +#include "barretenberg/transcript/transcript_wrappers.hpp" #include -#include +#include "barretenberg/honk/pcs/claim.hpp" namespace honk { diff --git a/cpp/src/barretenberg/honk/proof_system/prover.hpp b/cpp/src/barretenberg/honk/proof_system/prover.hpp index 16fbca8a04..6b50caccfd 100644 --- a/cpp/src/barretenberg/honk/proof_system/prover.hpp +++ b/cpp/src/barretenberg/honk/proof_system/prover.hpp @@ -1,16 +1,16 @@ #pragma once -#include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/honk/pcs/shplonk/shplonk.hpp" +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" #include -#include -#include -#include -#include -#include -#include -#include +#include "barretenberg/proof_system/proving_key/proving_key.hpp" +#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/plonk/proof_system/types/proof.hpp" +#include "barretenberg/plonk/proof_system/types/program_settings.hpp" +#include "barretenberg/honk/pcs/gemini/gemini.hpp" +#include "barretenberg/honk/pcs/shplonk/shplonk_single.hpp" +#include "barretenberg/honk/pcs/kzg/kzg.hpp" #include #include #include @@ -19,7 +19,7 @@ #include #include #include -#include +#include "barretenberg/honk/pcs/claim.hpp" namespace honk { diff --git a/cpp/src/barretenberg/honk/proof_system/prover.test.cpp b/cpp/src/barretenberg/honk/proof_system/prover.test.cpp index c1fd3f2f1d..88cd7b56ed 100644 --- a/cpp/src/barretenberg/honk/proof_system/prover.test.cpp +++ b/cpp/src/barretenberg/honk/proof_system/prover.test.cpp @@ -1,8 +1,8 @@ #include "prover.hpp" -#include -#include +#include "barretenberg/honk/composer/standard_honk_composer.hpp" +#include "barretenberg/polynomials/polynomial.hpp" -#include +#include "barretenberg/srs/reference_string/file_reference_string.hpp" #include #include #include diff --git a/cpp/src/barretenberg/honk/proof_system/verifier.cpp b/cpp/src/barretenberg/honk/proof_system/verifier.cpp index d71c6a1fd3..57a747f8af 100644 --- a/cpp/src/barretenberg/honk/proof_system/verifier.cpp +++ b/cpp/src/barretenberg/honk/proof_system/verifier.cpp @@ -1,10 +1,10 @@ #include -#include +#include "barretenberg/common/throw_or_abort.hpp" #include #include -#include +#include "barretenberg/plonk/proof_system/constants.hpp" #include "./verifier.hpp" -#include +#include "barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp" #include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/honk/pcs/commitment_key.hpp" #include "barretenberg/honk/pcs/gemini/gemini.hpp" @@ -12,16 +12,16 @@ #include "barretenberg/numeric/bitop/get_msb.hpp" #include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/proof_system/polynomial_cache/polynomial_cache.hpp" -#include -#include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/fq12.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/honk/composer/composer_helper/permutation_helper.hpp" #include #include -#include -#include -#include +#include "barretenberg/honk/utils/power_polynomial.hpp" +#include "barretenberg/honk/sumcheck/relations/grand_product_computation_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/grand_product_initialization_relation.hpp" using namespace barretenberg; using namespace honk::sumcheck; diff --git a/cpp/src/barretenberg/honk/proof_system/verifier.hpp b/cpp/src/barretenberg/honk/proof_system/verifier.hpp index a78b99ce42..0f5e4b1a90 100644 --- a/cpp/src/barretenberg/honk/proof_system/verifier.hpp +++ b/cpp/src/barretenberg/honk/proof_system/verifier.hpp @@ -1,16 +1,16 @@ #pragma once -#include +#include "barretenberg/plonk/proof_system/types/proof.hpp" #include "./program_settings.hpp" -#include -#include -#include +#include "barretenberg/proof_system/verification_key/verification_key.hpp" +#include "barretenberg/transcript/manifest.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp" #include "../sumcheck/sumcheck.hpp" #include "../sumcheck/relations/arithmetic_relation.hpp" #include "barretenberg/honk/pcs/commitment_key.hpp" #include "barretenberg/proof_system/flavor/flavor.hpp" -#include -#include -#include +#include "barretenberg/honk/pcs/gemini/gemini.hpp" +#include "barretenberg/honk/pcs/shplonk/shplonk_single.hpp" +#include "barretenberg/honk/pcs/kzg/kzg.hpp" namespace honk { template class Verifier { diff --git a/cpp/src/barretenberg/honk/proof_system/verifier.test.cpp b/cpp/src/barretenberg/honk/proof_system/verifier.test.cpp index 36ded9c317..4135f33e14 100644 --- a/cpp/src/barretenberg/honk/proof_system/verifier.test.cpp +++ b/cpp/src/barretenberg/honk/proof_system/verifier.test.cpp @@ -6,12 +6,12 @@ #include "barretenberg/proof_system/proving_key/proving_key.hpp" #include "barretenberg/transcript/transcript.hpp" #include "verifier.hpp" -#include +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp" #include -#include -#include -#include -#include +#include "barretenberg/srs/reference_string/file_reference_string.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" +#include "barretenberg/honk/composer/composer_helper/permutation_helper.hpp" #include using namespace barretenberg; diff --git a/cpp/src/barretenberg/honk/sumcheck/polynomials/barycentric_data.test.cpp b/cpp/src/barretenberg/honk/sumcheck/polynomials/barycentric_data.test.cpp index c4f8211660..baee00800e 100644 --- a/cpp/src/barretenberg/honk/sumcheck/polynomials/barycentric_data.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/polynomials/barycentric_data.test.cpp @@ -1,8 +1,8 @@ #include "barycentric_data.hpp" -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" #include -#include +#include "barretenberg/numeric/random/engine.hpp" using namespace honk::sumcheck; namespace test_sumcheck_polynomials { diff --git a/cpp/src/barretenberg/honk/sumcheck/polynomials/multivariates.test.cpp b/cpp/src/barretenberg/honk/sumcheck/polynomials/multivariates.test.cpp index b990184200..aca89f9319 100644 --- a/cpp/src/barretenberg/honk/sumcheck/polynomials/multivariates.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/polynomials/multivariates.test.cpp @@ -1,9 +1,9 @@ -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/honk/sumcheck/relations/arithmetic_relation.hpp" #include "barretenberg/honk/sumcheck/sumcheck.hpp" #include -#include +#include "barretenberg/numeric/random/engine.hpp" using namespace honk::sumcheck; namespace test_sumcheck_polynomials { diff --git a/cpp/src/barretenberg/honk/sumcheck/polynomials/pow.test.cpp b/cpp/src/barretenberg/honk/sumcheck/polynomials/pow.test.cpp index 5e1a6c16f6..91bbad1a50 100644 --- a/cpp/src/barretenberg/honk/sumcheck/polynomials/pow.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/polynomials/pow.test.cpp @@ -1,6 +1,6 @@ #include "pow.hpp" #include "barretenberg/honk/utils/power_polynomial.hpp" -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" #include namespace honk::sumcheck::pow_test { diff --git a/cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.hpp b/cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.hpp index 8363bbfd00..38df06e29e 100644 --- a/cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.hpp @@ -3,8 +3,8 @@ #include #include #include -#include -#include +#include "barretenberg/common/serialize.hpp" +#include "barretenberg/common/assert.hpp" namespace honk::sumcheck { diff --git a/cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.test.cpp b/cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.test.cpp index 2262d055d7..e1e5477858 100644 --- a/cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.test.cpp @@ -1,9 +1,9 @@ #include "univariate.hpp" #include "barycentric_data.hpp" -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" #include -#include +#include "barretenberg/numeric/random/engine.hpp" using namespace honk::sumcheck; namespace test_univariate { diff --git a/cpp/src/barretenberg/honk/sumcheck/relations/arithmetic_relation.hpp b/cpp/src/barretenberg/honk/sumcheck/relations/arithmetic_relation.hpp index c0d5c9db1c..7a1af7f921 100644 --- a/cpp/src/barretenberg/honk/sumcheck/relations/arithmetic_relation.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/relations/arithmetic_relation.hpp @@ -2,7 +2,7 @@ #include #include -#include +#include "barretenberg/proof_system/flavor/flavor.hpp" #include "../polynomials/univariate.hpp" #include "relation.hpp" diff --git a/cpp/src/barretenberg/honk/sumcheck/relations/grand_product_computation_relation.hpp b/cpp/src/barretenberg/honk/sumcheck/relations/grand_product_computation_relation.hpp index 4137176c99..f9dddb55d3 100644 --- a/cpp/src/barretenberg/honk/sumcheck/relations/grand_product_computation_relation.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/relations/grand_product_computation_relation.hpp @@ -1,6 +1,6 @@ #pragma once #include "relation.hpp" -#include +#include "barretenberg/proof_system/flavor/flavor.hpp" #include "../polynomials/univariate.hpp" namespace honk::sumcheck { diff --git a/cpp/src/barretenberg/honk/sumcheck/relations/grand_product_initialization_relation.hpp b/cpp/src/barretenberg/honk/sumcheck/relations/grand_product_initialization_relation.hpp index 77a2c7ea09..e786046d88 100644 --- a/cpp/src/barretenberg/honk/sumcheck/relations/grand_product_initialization_relation.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/relations/grand_product_initialization_relation.hpp @@ -1,6 +1,6 @@ #pragma once #include "relation.hpp" -#include +#include "barretenberg/proof_system/flavor/flavor.hpp" #include "../polynomials/univariate.hpp" namespace honk::sumcheck { diff --git a/cpp/src/barretenberg/honk/sumcheck/relations/relation.test.cpp b/cpp/src/barretenberg/honk/sumcheck/relations/relation.test.cpp index 2bf4314efb..20cd5c8fcd 100644 --- a/cpp/src/barretenberg/honk/sumcheck/relations/relation.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/relations/relation.test.cpp @@ -1,13 +1,13 @@ #include "relation.hpp" -#include +#include "barretenberg/proof_system/flavor/flavor.hpp" #include "arithmetic_relation.hpp" #include "grand_product_initialization_relation.hpp" #include "grand_product_computation_relation.hpp" #include "../polynomials/univariate.hpp" #include "../polynomials/barycentric_data.hpp" -#include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/numeric/random/engine.hpp" #include using namespace honk::sumcheck; diff --git a/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp b/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp index 227e3a2cbb..17f45e8d20 100644 --- a/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp @@ -1,17 +1,17 @@ #pragma once #include "barretenberg/common/serialize.hpp" #include -#include +#include "barretenberg/honk/utils/public_inputs.hpp" #include "barretenberg/common/throw_or_abort.hpp" #include "sumcheck_round.hpp" #include "polynomials/univariate.hpp" -#include +#include "barretenberg/proof_system/flavor/flavor.hpp" #include #include #include #include #include -#include +#include "barretenberg/honk/proof_system/prover.hpp" namespace honk::sumcheck { template class... Relations> class Sumcheck { diff --git a/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp b/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp index 13083db7cb..bfdf6c3b45 100644 --- a/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp @@ -8,9 +8,9 @@ #include #include #include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" #include -#include +#include "barretenberg/numeric/random/engine.hpp" #include #include diff --git a/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp b/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp index 06b59e43af..8c2f56ac64 100644 --- a/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/common/log.hpp" #include #include #include diff --git a/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp b/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp index 2153eb251e..95f2677239 100644 --- a/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp @@ -1,15 +1,15 @@ -#include +#include "barretenberg/proof_system/flavor/flavor.hpp" #include "sumcheck_round.hpp" #include "relations/arithmetic_relation.hpp" #include "relations/grand_product_computation_relation.hpp" #include "relations/grand_product_initialization_relation.hpp" #include "polynomials/univariate.hpp" -#include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/numeric/random/engine.hpp" #include -#include +#include "barretenberg/common/mem.hpp" #include /** * We want to test if the univariate (S_l in the thesis) computed by the prover in a particular round is correct. We diff --git a/cpp/src/barretenberg/honk/utils/power_polynomial.hpp b/cpp/src/barretenberg/honk/utils/power_polynomial.hpp index 700d702672..3459679e37 100644 --- a/cpp/src/barretenberg/honk/utils/power_polynomial.hpp +++ b/cpp/src/barretenberg/honk/utils/power_polynomial.hpp @@ -1,5 +1,5 @@ -#include -#include +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/common/max_threads.hpp" #include #ifndef NO_MULTITHREADING diff --git a/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp b/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp index 4da22599ac..d62658e592 100644 --- a/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp +++ b/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp @@ -1,5 +1,5 @@ #include "power_polynomial.hpp" -#include +#include "barretenberg/numeric/random/engine.hpp" #include TEST(power_polynomial, test_full_polynomial_correctness) diff --git a/cpp/src/barretenberg/join_split_example/constants.hpp b/cpp/src/barretenberg/join_split_example/constants.hpp index c47671774c..03dd820cf7 100644 --- a/cpp/src/barretenberg/join_split_example/constants.hpp +++ b/cpp/src/barretenberg/join_split_example/constants.hpp @@ -1,8 +1,8 @@ #pragma once #include #include -#include -#include +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp b/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp index 0d40bd485a..1ac6ce1947 100644 --- a/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp +++ b/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/crypto/schnorr/schnorr.hpp" namespace join_split_example { namespace fixtures { diff --git a/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp index 2aa57344fa..f50bb31eba 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp @@ -4,8 +4,8 @@ #include "../constants.hpp" #include #include -#include -#include +#include "barretenberg/common/timer.hpp" +#include "barretenberg/proof_system/proving_key/serialize.hpp" #ifndef __wasm__ #include diff --git a/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp index 519c10632c..432a610188 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include -#include +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/numeric/uint128/uint128.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp index 72b0733641..67983ccd08 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp @@ -2,13 +2,13 @@ #include "join_split.hpp" #include "compute_signing_data.hpp" #include "../mock/mock_circuit.hpp" -#include -#include -#include +#include "barretenberg/common/streams.hpp" +#include "barretenberg/common/mem.hpp" +#include "barretenberg/common/container.hpp" #include -#include -#include -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/srs/reference_string/pippenger_reference_string.hpp" +#include "barretenberg/proof_system/proving_key/serialize.hpp" #include using namespace barretenberg; diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp index 061ecc34e4..700310f724 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp @@ -2,7 +2,7 @@ #include "join_split_circuit.hpp" #include "sign_join_split_tx.hpp" #include "../notes/native/index.hpp" -#include +#include "barretenberg/stdlib/merkle_tree/hash_path.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp index 6a3974955b..0a40dd74c8 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp @@ -1,6 +1,6 @@ #include "compute_signing_data.hpp" #include "../notes/native/index.hpp" -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp index 89d7f5ec35..64af4cbd25 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp @@ -1,7 +1,7 @@ #include "join_split.hpp" #include "join_split_circuit.hpp" #include "compute_circuit_data.hpp" -#include +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp index 02e1ac18f7..274983ec80 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp @@ -1,7 +1,7 @@ #pragma once #include "join_split_tx.hpp" -#include -#include +#include "barretenberg/srs/reference_string/mem_reference_string.hpp" +#include "barretenberg/stdlib/types/types.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp index fd4d6ff345..c023322bbe 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp @@ -3,11 +3,11 @@ #include "index.hpp" #include "../notes/native/index.hpp" #include "join_split_circuit.hpp" -#include -#include +#include "barretenberg/common/streams.hpp" +#include "barretenberg/common/test.hpp" #include -#include -#include +#include "barretenberg/proof_system/proving_key/serialize.hpp" +#include "barretenberg/stdlib/merkle_tree/index.hpp" namespace join_split_example::proofs::join_split { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp index 1e57d5fca2..0bc3b796b1 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp @@ -5,7 +5,7 @@ #include "../notes/circuit/account/account_note.hpp" #include "../notes/circuit/claim/claim_note.hpp" #include "verify_signature.hpp" -#include +#include "barretenberg/stdlib/merkle_tree/membership.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp index e3fc083d5c..5e28d1e161 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp @@ -2,8 +2,8 @@ #include "join_split_tx.hpp" #include "../notes/circuit/value/witness_data.hpp" #include "../notes/circuit/claim/witness_data.hpp" -#include -#include +#include "barretenberg/crypto/schnorr/schnorr.hpp" +#include "barretenberg/stdlib/types/types.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp index ddad02d0bd..e470b98f88 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp @@ -2,11 +2,11 @@ #include "../inner_proof_data/inner_proof_data.hpp" #include "index.hpp" #include "../notes/native/index.hpp" -#include -#include -#include -#include -#include +#include "barretenberg/common/streams.hpp" +#include "barretenberg/common/test.hpp" +#include "barretenberg/proof_system/proving_key/serialize.hpp" +#include "barretenberg/stdlib/merkle_tree/index.hpp" +#include "barretenberg/crypto/sha256/sha256.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp index 37fa840243..6bf3c1bfe1 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp @@ -1,5 +1,5 @@ #include "join_split_tx.hpp" -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp index 0c6589fdaf..38c9cc4624 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp @@ -1,9 +1,9 @@ #pragma once #include "../notes/native/claim/claim_note_tx_data.hpp" #include "../notes/native/value/value_note.hpp" -#include -#include -#include +#include "barretenberg/crypto/schnorr/schnorr.hpp" +#include "barretenberg/stdlib/merkle_tree/hash_path.hpp" +#include "barretenberg/stdlib/types/types.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp index d2923b42d8..60a83dcafd 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp @@ -2,11 +2,11 @@ #include "join_split.hpp" -#include -#include -#include -#include -#include +#include "barretenberg/common/streams.hpp" +#include "barretenberg/crypto/schnorr/schnorr.hpp" +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/srs/reference_string/pippenger_reference_string.hpp" +#include "barretenberg/srs/io.hpp" #include #include diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp index b421af6f98..f578541272 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp @@ -1,6 +1,6 @@ #include "sign_join_split_tx.hpp" #include "compute_signing_data.hpp" -#include +#include "barretenberg/crypto/schnorr/schnorr.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp index 1ffb2968e6..6f4319f927 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/crypto/schnorr/schnorr.hpp" #include "../notes/native/value/value_note.hpp" #include "join_split_tx.hpp" diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp index 873655b1f7..87347fe765 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp @@ -1,5 +1,5 @@ -#include -#include +#include "barretenberg/stdlib/encryption/schnorr/schnorr.hpp" +#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp b/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp index 26a7c13887..6f61e4e936 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include "barretenberg/common/map.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" +#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp b/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp index 9229a14852..dc4683353a 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp @@ -1,7 +1,7 @@ #include "mock_circuit.hpp" #include "../join_split/join_split_tx.hpp" -#include -#include +#include "barretenberg/common/test.hpp" +#include "barretenberg/stdlib/types/types.hpp" using namespace plonk::stdlib::types; diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp index 460d865780..7252072da9 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/stdlib/types/types.hpp" #include "commit.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp index c770b655c2..b1e6f3eadb 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/stdlib/types/types.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp index f1727a120f..b2c5d86c18 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp @@ -1,4 +1,4 @@ -#include +#include "barretenberg/stdlib/types/types.hpp" #include "../constants.hpp" namespace join_split_example::proofs::notes::circuit { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp index 71ae56874e..8a4b5a5520 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/stdlib/types/types.hpp" namespace join_split_example::proofs::notes::circuit { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp index 4c742b7ca9..40040322ee 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/stdlib/types/types.hpp" #include "../native/bridge_call_data.hpp" #include "./asset_id.hpp" #include "../constants.hpp" diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp index d6a4794e4b..f2f24a5a91 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/stdlib/types/types.hpp" #include "../bridge_call_data.hpp" #include "witness_data.hpp" #include "../value/create_partial_commitment.hpp" diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp index 5e89d4fd76..d92ded2135 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/stdlib/types/types.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp index eb571a09dc..27f7284ea5 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include "barretenberg/stdlib/types/types.hpp" +#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp index 4787174347..b5c6180b5e 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include "barretenberg/stdlib/types/types.hpp" +#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp index 2b3b1c9fbc..a5fd321a85 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/stdlib/types/types.hpp" #include "../../native/claim/claim_note.hpp" #include "../../native/claim/claim_note_tx_data.hpp" #include "../../constants.hpp" diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp index a59734883e..cb1c475283 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include "barretenberg/stdlib/types/types.hpp" +#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp index ca7e27c1b3..f501e2df2b 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp @@ -1,6 +1,6 @@ #include "compute_nullifier.hpp" #include "../../constants.hpp" -#include +#include "barretenberg/stdlib/types/types.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp index 088858d44e..7b78685348 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/stdlib/types/types.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp index a7b2a3d7df..c6c7f83861 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp @@ -4,7 +4,7 @@ #include "./value_note.hpp" #include "../../native/value/compute_nullifier.hpp" #include "../../native/value/value_note.hpp" -#include +#include "barretenberg/stdlib/types/types.hpp" using namespace join_split_example::proofs::notes; using namespace plonk::stdlib::types; diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp index 461a28e054..bedd3d0688 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include "barretenberg/stdlib/types/types.hpp" +#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp index 09bcf5c9c7..10ef82d110 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/stdlib/types/types.hpp" #include "witness_data.hpp" #include "commit.hpp" diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp index 78ecd32eaa..69e26fd9e2 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/stdlib/types/types.hpp" #include "../../native/value/value_note.hpp" #include "../../constants.hpp" diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp index d94d4479df..9cbdd32a10 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp @@ -1,6 +1,6 @@ #pragma once #include -#include +#include "barretenberg/numeric/uint256/uint256.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp index 4bc993740f..13b951ed20 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp @@ -1,5 +1,5 @@ #include "account_note.hpp" -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp index cbec284b73..3a5d3750b2 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/crypto/pedersen/pedersen.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp index 57613349d4..55d98889da 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp @@ -1,6 +1,6 @@ #pragma once #include "account_note.hpp" -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp index 66089a275c..68f7c6784b 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp @@ -1,6 +1,6 @@ #pragma once #include "account_note.hpp" -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp index a33b25b502..1c60a3ac4e 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp @@ -1,9 +1,9 @@ #pragma once -#include +#include "barretenberg/common/serialize.hpp" #include "../constants.hpp" -#include -#include -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/common/throw_or_abort.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp index e3c3963cf6..9c05253c6e 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include "barretenberg/common/serialize.hpp" +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "create_partial_commitment.hpp" #include "complete_partial_commitment.hpp" #include "../bridge_call_data.hpp" diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp index 2e3bc87438..72a572982c 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include "barretenberg/common/serialize.hpp" +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "../bridge_call_data.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp index 930571249b..aa945e1145 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include "barretenberg/common/serialize.hpp" +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp index 4ad580891f..f03fa0a4d7 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include "barretenberg/common/serialize.hpp" +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp index 15e6cc1a12..1743abc1e8 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp @@ -1,6 +1,6 @@ #pragma once #include "claim_note.hpp" -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp index 7c1f550215..0744a78619 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp index 678d18665e..2a7a89e92f 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp @@ -1,7 +1,7 @@ #include "compute_nullifier.hpp" #include "../../constants.hpp" -#include -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/crypto/blake2s/blake2s.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp index 1a2bad04fc..4d380e2992 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp index b69150e646..1f26ffde99 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include "barretenberg/common/serialize.hpp" +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "../../constants.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp index f8d8ad5267..83e201eec0 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include "barretenberg/common/serialize.hpp" +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "create_partial_commitment.hpp" #include "complete_partial_commitment.hpp" diff --git a/cpp/src/barretenberg/join_split_example/proofs/verify.hpp b/cpp/src/barretenberg/join_split_example/proofs/verify.hpp index 0679983302..140203f0c9 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/verify.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/verify.hpp @@ -1,8 +1,8 @@ #pragma once #include "./mock/mock_circuit.hpp" -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/fq12.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" +#include "barretenberg/stdlib/recursion/verifier/verifier.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp b/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp index fe159849a9..cb4028ab4e 100644 --- a/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp +++ b/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include "barretenberg/common/throw_or_abort.hpp" #include #include "../uint256/uint256.hpp" diff --git a/cpp/src/barretenberg/numeric/random/engine.cpp b/cpp/src/barretenberg/numeric/random/engine.cpp index 20fe3d8179..aeb5125070 100644 --- a/cpp/src/barretenberg/numeric/random/engine.cpp +++ b/cpp/src/barretenberg/numeric/random/engine.cpp @@ -1,6 +1,6 @@ #include "engine.hpp" #include -#include +#include "barretenberg/common/assert.hpp" #include #include diff --git a/cpp/src/barretenberg/numeric/random/engine.test.cpp b/cpp/src/barretenberg/numeric/random/engine.test.cpp index e5634cca01..f8db4e9582 100644 --- a/cpp/src/barretenberg/numeric/random/engine.test.cpp +++ b/cpp/src/barretenberg/numeric/random/engine.test.cpp @@ -1,7 +1,7 @@ #include "engine.hpp" #include -#include -#include +#include "barretenberg/common/log.hpp" +#include "barretenberg/common/streams.hpp" TEST(engine, get_random_uint64) { diff --git a/cpp/src/barretenberg/numeric/uint128/uint128.hpp b/cpp/src/barretenberg/numeric/uint128/uint128.hpp index 3ae84b45d8..884c73e9c6 100644 --- a/cpp/src/barretenberg/numeric/uint128/uint128.hpp +++ b/cpp/src/barretenberg/numeric/uint128/uint128.hpp @@ -4,7 +4,7 @@ #ifdef __i386__ #include -#include +#include "barretenberg/common/serialize.hpp" namespace numeric { diff --git a/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp b/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp index d2a1d02f01..eb6ca3295c 100644 --- a/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp +++ b/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp @@ -1,7 +1,7 @@ #ifdef __i386__ #pragma once #include "../bitop/get_msb.hpp" -#include +#include "barretenberg/common/assert.hpp" namespace numeric { diff --git a/cpp/src/barretenberg/numeric/uint256/uint256.hpp b/cpp/src/barretenberg/numeric/uint256/uint256.hpp index fe817cc784..52c6411e1c 100644 --- a/cpp/src/barretenberg/numeric/uint256/uint256.hpp +++ b/cpp/src/barretenberg/numeric/uint256/uint256.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include "barretenberg/common/serialize.hpp" #include "../uint128/uint128.hpp" namespace numeric { diff --git a/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp b/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp index 661a34a520..659f8e06f8 100644 --- a/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp +++ b/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp @@ -1,6 +1,6 @@ #pragma once #include "../bitop/get_msb.hpp" -#include +#include "barretenberg/common/assert.hpp" namespace numeric { diff --git a/cpp/src/barretenberg/numeric/uintx/uintx.hpp b/cpp/src/barretenberg/numeric/uintx/uintx.hpp index 94b04cd505..4299fca3b1 100644 --- a/cpp/src/barretenberg/numeric/uintx/uintx.hpp +++ b/cpp/src/barretenberg/numeric/uintx/uintx.hpp @@ -14,8 +14,8 @@ #include #include #include -#include -#include +#include "barretenberg/common/assert.hpp" +#include "barretenberg/common/throw_or_abort.hpp" #include "../uint256/uint256.hpp" namespace numeric { diff --git a/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp b/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp index d426525580..7a0a653e3b 100644 --- a/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp +++ b/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/common/assert.hpp" template constexpr std::pair, uintx> uintx::divmod(const uintx& b) const diff --git a/cpp/src/barretenberg/plonk/composer/composer_base.cpp b/cpp/src/barretenberg/plonk/composer/composer_base.cpp index f3a5bd3180..9ddf09cc46 100644 --- a/cpp/src/barretenberg/plonk/composer/composer_base.cpp +++ b/cpp/src/barretenberg/plonk/composer/composer_base.cpp @@ -1,6 +1,6 @@ #include "composer_base.hpp" -#include -#include +#include "barretenberg/proof_system/proving_key/proving_key.hpp" +#include "barretenberg/plonk/proof_system/utils/permutation.hpp" namespace plonk { diff --git a/cpp/src/barretenberg/plonk/composer/composer_base.hpp b/cpp/src/barretenberg/plonk/composer/composer_base.hpp index a5b6b424ee..cbee5892e3 100644 --- a/cpp/src/barretenberg/plonk/composer/composer_base.hpp +++ b/cpp/src/barretenberg/plonk/composer/composer_base.hpp @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/proof_system/composer/composer_base.hpp" +#include "barretenberg/plonk/proof_system/prover/prover.hpp" +#include "barretenberg/plonk/proof_system/verifier/verifier.hpp" +#include "barretenberg/plonk/proof_system/types/prover_settings.hpp" +#include "barretenberg/srs/reference_string/file_reference_string.hpp" namespace plonk { static constexpr uint32_t DUMMY_TAG = 0; diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/aes128.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/aes128.hpp index ee42e57452..3dfaff4f36 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/aes128.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/aes128.hpp @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "barretenberg/crypto/aes128/aes128.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/numeric/bitop/rotate.hpp" +#include "barretenberg/numeric/bitop/sparse_form.hpp" #include "types.hpp" #include "sparse.hpp" diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/blake2s.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/blake2s.hpp index 45d4a30a39..22ba606571 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/blake2s.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/blake2s.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "barretenberg/numeric/bitop/rotate.hpp" #include "types.hpp" #include "sparse.hpp" diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_chi.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_chi.hpp index 148c5f6bf1..fab70497ae 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_chi.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_chi.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "barretenberg/numeric/bitop/pow.hpp" +#include "barretenberg/common/constexpr_utils.hpp" #include "../types.hpp" namespace plookup { diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_input.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_input.hpp index c9cb274b2c..b6e8765158 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_input.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_input.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "barretenberg/numeric/bitop/pow.hpp" +#include "barretenberg/numeric/bitop/sparse_form.hpp" +#include "barretenberg/common/constexpr_utils.hpp" #include "../types.hpp" namespace plookup { diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_output.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_output.hpp index 7efed91fad..d6af17403e 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_output.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_output.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "barretenberg/numeric/bitop/pow.hpp" +#include "barretenberg/numeric/bitop/sparse_form.hpp" +#include "barretenberg/common/constexpr_utils.hpp" #include "../types.hpp" #include "../sparse.hpp" diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_rho.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_rho.hpp index 4542b52e65..c052c53d37 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_rho.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_rho.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "barretenberg/numeric/bitop/pow.hpp" +#include "barretenberg/common/constexpr_utils.hpp" #include "../types.hpp" namespace plookup { diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_theta.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_theta.hpp index bb69dc6d56..51422f829a 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_theta.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/keccak/keccak_theta.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "barretenberg/numeric/bitop/pow.hpp" +#include "barretenberg/common/constexpr_utils.hpp" #include "../types.hpp" namespace plookup { diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/non_native_group_generator.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/non_native_group_generator.hpp index 0e23835518..3fad0b85c9 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/non_native_group_generator.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/non_native_group_generator.hpp @@ -2,9 +2,9 @@ #include "./types.hpp" #include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/ecc/curves/secp256k1/secp256k1.hpp" namespace plookup { namespace ecc_generator_tables { diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/pedersen.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/pedersen.hpp index 71cb707b23..b9f5372516 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/pedersen.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/pedersen.hpp @@ -2,10 +2,10 @@ #include "./types.hpp" -#include -#include -#include -#include +#include "barretenberg/crypto/pedersen/pedersen_lookup.hpp" +#include "barretenberg/numeric/bitop/rotate.hpp" +#include "barretenberg/numeric/bitop/sparse_form.hpp" +#include "barretenberg/numeric/bitop/pow.hpp" namespace plookup { namespace pedersen_tables { diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/plookup_tables.cpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/plookup_tables.cpp index 409566f119..b0f2528224 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/plookup_tables.cpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/plookup_tables.cpp @@ -1,5 +1,5 @@ #include "plookup_tables.hpp" -#include +#include "barretenberg/common/constexpr_utils.hpp" namespace plookup { diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp index cc3c0bc80d..a6f46d3c49 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/common/throw_or_abort.hpp" #include "types.hpp" #include "sha256.hpp" diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/sha256.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/sha256.hpp index 0d32d0d910..ced149cbf3 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/sha256.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/sha256.hpp @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "barretenberg/crypto/aes128/aes128.hpp" +#include "barretenberg/numeric/bitop/rotate.hpp" +#include "barretenberg/numeric/bitop/sparse_form.hpp" +#include "barretenberg/numeric/bitop/pow.hpp" #include "types.hpp" #include "sparse.hpp" diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/sparse.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/sparse.hpp index 02a1d61a40..4d7397f67d 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/sparse.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/sparse.hpp @@ -2,10 +2,10 @@ #include "./types.hpp" -#include -#include -#include -#include +#include "barretenberg/crypto/aes128/aes128.hpp" +#include "barretenberg/numeric/bitop/rotate.hpp" +#include "barretenberg/numeric/bitop/sparse_form.hpp" +#include "barretenberg/numeric/bitop/pow.hpp" namespace plookup { namespace sparse_tables { diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/types.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/types.hpp index 6db42b685a..0939d777ba 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/types.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/types.hpp @@ -3,7 +3,7 @@ #include #include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" namespace plookup { diff --git a/cpp/src/barretenberg/plonk/composer/plookup_tables/uint.hpp b/cpp/src/barretenberg/plonk/composer/plookup_tables/uint.hpp index 4d368773be..41446d150b 100644 --- a/cpp/src/barretenberg/plonk/composer/plookup_tables/uint.hpp +++ b/cpp/src/barretenberg/plonk/composer/plookup_tables/uint.hpp @@ -2,7 +2,7 @@ #include "./types.hpp" -#include +#include "barretenberg/numeric/bitop/rotate.hpp" namespace plookup { namespace uint_tables { diff --git a/cpp/src/barretenberg/plonk/composer/standard_composer.cpp b/cpp/src/barretenberg/plonk/composer/standard_composer.cpp index e237084da8..56b2c28206 100644 --- a/cpp/src/barretenberg/plonk/composer/standard_composer.cpp +++ b/cpp/src/barretenberg/plonk/composer/standard_composer.cpp @@ -1,10 +1,10 @@ #include "standard_composer.hpp" #include "barretenberg/plonk/proof_system/types/prover_settings.hpp" -#include -#include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp" +#include "barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" #include #include diff --git a/cpp/src/barretenberg/plonk/composer/standard_composer.hpp b/cpp/src/barretenberg/plonk/composer/standard_composer.hpp index 69decf3d2b..a621f9840f 100644 --- a/cpp/src/barretenberg/plonk/composer/standard_composer.hpp +++ b/cpp/src/barretenberg/plonk/composer/standard_composer.hpp @@ -1,7 +1,7 @@ #pragma once #include "composer_base.hpp" -#include -#include +#include "barretenberg/transcript/manifest.hpp" +#include "barretenberg/srs/reference_string/file_reference_string.hpp" using namespace bonk; namespace plonk { diff --git a/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp b/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp index 795ae0bc96..f1894b941b 100644 --- a/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp +++ b/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp @@ -1,8 +1,8 @@ #include "standard_composer.hpp" #include -#include -#include -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/crypto/pedersen/generator_data.hpp" +#include "barretenberg/proof_system/proving_key/serialize.hpp" using namespace barretenberg; using namespace bonk; diff --git a/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp b/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp index 8bc4b4f2a6..cf599e26b6 100644 --- a/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp +++ b/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp @@ -1,15 +1,15 @@ #include "turbo_composer.hpp" -#include -#include -#include -#include -#include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp" +#include "barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp" +#include "barretenberg/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp" +#include "barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp" +#include "barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" #include "../proof_system/widgets/transition_widgets/transition_widget.hpp" #include "../proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp" -#include +#include "barretenberg/srs/reference_string/file_reference_string.hpp" using namespace barretenberg; using namespace bonk; diff --git a/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp b/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp index af06dd5d34..9ee74d9edd 100644 --- a/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp +++ b/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp @@ -1,7 +1,7 @@ #include "turbo_composer.hpp" -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" #include -#include +#include "barretenberg/proof_system/proving_key/serialize.hpp" using namespace barretenberg; using namespace bonk; diff --git a/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp b/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp index 1d9cf8822a..8783932780 100644 --- a/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp +++ b/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp @@ -1,18 +1,18 @@ #include "ultra_composer.hpp" -#include -#include +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp" +#include "barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp" +#include "barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp" +#include "barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp" +#include "barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp" +#include "barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp" +#include "barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" +#include "barretenberg/srs/reference_string/file_reference_string.hpp" #include "plookup_tables/types.hpp" #include "plookup_tables/plookup_tables.hpp" diff --git a/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp b/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp index 0fe77f17ef..9755d4bb20 100644 --- a/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp +++ b/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp @@ -1,9 +1,9 @@ -#include +#include "barretenberg/stdlib/primitives/plookup/plookup.hpp" #include "ultra_composer.hpp" -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" #include -#include -#include +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/numeric/uintx/uintx.hpp" #include "../proof_system/widgets/random_widgets/plookup_widget.hpp" #include "./plookup_tables/sha256.hpp" diff --git a/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp b/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp index 7040ab6648..200e44a281 100644 --- a/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp @@ -2,17 +2,17 @@ #include "commitment_scheme.hpp" #include "kate_commitment_scheme.hpp" -#include +#include "barretenberg/common/mem.hpp" #include #include "barretenberg/polynomials/polynomial_arithmetic.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "../../../proof_system/work_queue/work_queue.hpp" #include "../types/program_settings.hpp" #include "../../composer/composer_base.hpp" -#include +#include "barretenberg/srs/reference_string/file_reference_string.hpp" -#include -#include +#include "barretenberg/ecc/curves/bn254/fq12.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" using namespace barretenberg; using namespace plonk; diff --git a/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp b/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp index 9671f1fe79..864782dfab 100644 --- a/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp @@ -1,4 +1,4 @@ -#include +#include "barretenberg/common/throw_or_abort.hpp" #include "kate_commitment_scheme.hpp" #include "../../../polynomials/polynomial_arithmetic.hpp" diff --git a/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp b/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp index 7a1de38c39..682c2454f6 100644 --- a/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp @@ -1,5 +1,5 @@ #include "prover.hpp" -#include +#include "barretenberg/env/data_store.hpp" #define WASM_EXPORT __attribute__((visibility("default"))) diff --git a/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp b/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp index 1465af971e..dd470497d8 100644 --- a/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp @@ -2,9 +2,9 @@ #include "../public_inputs/public_inputs.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/polynomials/iterate_over_domain.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" using namespace barretenberg; diff --git a/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp b/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp index a3ad20f12f..33d7e22fb8 100644 --- a/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp @@ -4,9 +4,9 @@ #include "prover.hpp" #include -#include -#include -#include +#include "barretenberg/srs/reference_string/file_reference_string.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" /* ``` diff --git a/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp b/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp index 6f80ffd347..a137bca18c 100644 --- a/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" #include namespace plonk { diff --git a/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp b/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp index ede5532479..8730d41afe 100644 --- a/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp @@ -1,6 +1,6 @@ #include "public_inputs.hpp" #include -#include +#include "barretenberg/polynomials/evaluation_domain.hpp" using namespace barretenberg; diff --git a/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp b/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp index b5a7387b15..a85f9a6e3d 100644 --- a/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include -#include +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/polynomials/iterate_over_domain.hpp" +#include "barretenberg/polynomials/polynomial.hpp" namespace plonk { template diff --git a/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp b/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp index a782ac69a8..d33cf98d46 100644 --- a/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp @@ -1,8 +1,8 @@ #pragma once #include "barretenberg/common/throw_or_abort.hpp" -#include -#include -#include +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/polynomials/iterate_over_domain.hpp" +#include "barretenberg/polynomials/polynomial.hpp" namespace plonk { diff --git a/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp index f9a7558648..4986bec460 100644 --- a/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp @@ -1,12 +1,12 @@ -#include -#include +#include "barretenberg/common/throw_or_abort.hpp" +#include "barretenberg/plonk/proof_system/constants.hpp" #include "./verifier.hpp" #include "../public_inputs/public_inputs.hpp" #include "../utils/kate_verification.hpp" -#include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/fq12.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" using namespace barretenberg; diff --git a/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp index c7e0f811c5..32be98f126 100644 --- a/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp @@ -2,8 +2,8 @@ #include "../types/proof.hpp" #include "../types/program_settings.hpp" #include "../widgets/random_widgets/random_widget.hpp" -#include -#include +#include "barretenberg/transcript/manifest.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp" namespace plonk { template class VerifierBase { diff --git a/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp index bc0c94eafe..35ddf7e329 100644 --- a/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp @@ -5,11 +5,11 @@ #include "../../../transcript/transcript.hpp" #include "barretenberg/plonk/composer/standard_composer.hpp" #include "verifier.hpp" -#include +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp" #include -#include -#include -#include +#include "barretenberg/srs/reference_string/file_reference_string.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" namespace verifier_helpers { diff --git a/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp index 2d6c64c66b..00a8a78d3e 100644 --- a/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include +#include "barretenberg/common/mem.hpp" +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/proof_system/proving_key/proving_key.hpp" +#include "barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp" +#include "barretenberg/transcript/transcript.hpp" +#include "barretenberg/polynomials/iterate_over_domain.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" namespace plonk { diff --git a/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp index 22439b740d..6327d685c3 100644 --- a/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp @@ -1,11 +1,11 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "barretenberg/proof_system/proving_key/proving_key.hpp" +#include "barretenberg/transcript/transcript.hpp" +#include "barretenberg/polynomials/iterate_over_domain.hpp" +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/common/mem.hpp" namespace plonk { diff --git a/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp index ba376d4334..828897a495 100644 --- a/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp @@ -1,7 +1,7 @@ #pragma once #include "../../../../transcript/transcript.hpp" #include "../../../../proof_system/work_queue/work_queue.hpp" -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" #include namespace transcript { diff --git a/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp b/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp index 3fa0581a5c..4b88415417 100644 --- a/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp @@ -5,7 +5,7 @@ #include #include -#include +#include "barretenberg/polynomials/iterate_over_domain.hpp" #include "../../types/prover_settings.hpp" #include "../../../../proof_system/proving_key/proving_key.hpp" #include "../../../../proof_system/work_queue/work_queue.hpp" diff --git a/cpp/src/barretenberg/polynomials/evaluation_domain.cpp b/cpp/src/barretenberg/polynomials/evaluation_domain.cpp index abed11cdda..b4fb82d8e3 100644 --- a/cpp/src/barretenberg/polynomials/evaluation_domain.cpp +++ b/cpp/src/barretenberg/polynomials/evaluation_domain.cpp @@ -1,11 +1,11 @@ #include "evaluation_domain.hpp" -#include -#include -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/common/assert.hpp" +#include "barretenberg/common/mem.hpp" #include #include -#include -#include +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/common/max_threads.hpp" #ifndef NO_MULTITHREADING #include "omp.h" diff --git a/cpp/src/barretenberg/polynomials/evaluation_domain.hpp b/cpp/src/barretenberg/polynomials/evaluation_domain.hpp index 904b4ecdf6..4dd908ff7a 100644 --- a/cpp/src/barretenberg/polynomials/evaluation_domain.hpp +++ b/cpp/src/barretenberg/polynomials/evaluation_domain.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include namespace barretenberg { diff --git a/cpp/src/barretenberg/polynomials/polynomial.cpp b/cpp/src/barretenberg/polynomials/polynomial.cpp index 13771ea420..7897320b28 100644 --- a/cpp/src/barretenberg/polynomials/polynomial.cpp +++ b/cpp/src/barretenberg/polynomials/polynomial.cpp @@ -1,8 +1,8 @@ #include "polynomial.hpp" #include "polynomial_arithmetic.hpp" -#include -#include -#include +#include "barretenberg/common/assert.hpp" +#include "barretenberg/common/mem.hpp" +#include "barretenberg/common/throw_or_abort.hpp" #include #include #include diff --git a/cpp/src/barretenberg/polynomials/polynomial.hpp b/cpp/src/barretenberg/polynomials/polynomial.hpp index f29df90fa6..ebc6745bae 100644 --- a/cpp/src/barretenberg/polynomials/polynomial.hpp +++ b/cpp/src/barretenberg/polynomials/polynomial.hpp @@ -1,9 +1,9 @@ #pragma once #include "evaluation_domain.hpp" #include -#include -#include -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/common/mem.hpp" +#include "barretenberg/common/timer.hpp" #include #include #include diff --git a/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp b/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp index 6ed868925b..368693262e 100644 --- a/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp +++ b/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp @@ -1,11 +1,11 @@ #include "polynomial_arithmetic.hpp" #include "iterate_over_domain.hpp" -#include -#include +#include "barretenberg/common/assert.hpp" +#include "barretenberg/common/mem.hpp" #include #include -#include -#include +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/common/max_threads.hpp" namespace barretenberg::polynomial_arithmetic { diff --git a/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp b/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp index d9f119dcc5..62abdedff7 100644 --- a/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp +++ b/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp @@ -1,6 +1,6 @@ #include "polynomial_arithmetic.hpp" #include -#include +#include "barretenberg/common/mem.hpp" #include #include #include diff --git a/cpp/src/barretenberg/polynomials/polynomials.bench.cpp b/cpp/src/barretenberg/polynomials/polynomials.bench.cpp index a3f473bccc..93f70d79f3 100644 --- a/cpp/src/barretenberg/polynomials/polynomials.bench.cpp +++ b/cpp/src/barretenberg/polynomials/polynomials.bench.cpp @@ -1,15 +1,15 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "barretenberg/common/mem.hpp" +#include "barretenberg/ecc/curves/bn254/fq.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/ecc/curves/bn254/g2.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/ecc/groups/wnaf.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/srs/io.hpp" using namespace benchmark; using namespace barretenberg; diff --git a/cpp/src/barretenberg/proof_system/composer/composer_base.hpp b/cpp/src/barretenberg/proof_system/composer/composer_base.hpp index 87df0c4795..f62a121960 100644 --- a/cpp/src/barretenberg/proof_system/composer/composer_base.hpp +++ b/cpp/src/barretenberg/proof_system/composer/composer_base.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/common/serialize.hpp" namespace bonk { struct add_triple { diff --git a/cpp/src/barretenberg/proof_system/flavor/flavor.hpp b/cpp/src/barretenberg/proof_system/flavor/flavor.hpp index fee040ee9c..b929f9fb52 100644 --- a/cpp/src/barretenberg/proof_system/flavor/flavor.hpp +++ b/cpp/src/barretenberg/proof_system/flavor/flavor.hpp @@ -1,8 +1,8 @@ #pragma once #include #include -#include -#include +#include "barretenberg/common/log.hpp" +#include "barretenberg/transcript/manifest.hpp" #define STANDARD_HONK_WIDTH 3 // TODO(Cody): "bonk" is short for "both plonk and honk". Just need a short and non-vague temporary name. diff --git a/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.cpp b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.cpp index 209b5890ec..3c858dca4e 100644 --- a/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.cpp +++ b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.cpp @@ -1,6 +1,6 @@ #include "polynomial_cache.hpp" #include "barretenberg/polynomials/polynomial.hpp" -#include +#include "barretenberg/common/streams.hpp" namespace bonk { diff --git a/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.test.cpp b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.test.cpp index 9fafdde151..272cf15b14 100644 --- a/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.test.cpp +++ b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_cache.test.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "barretenberg/common/test.hpp" +#include "barretenberg/common/log.hpp" #include #include "polynomial_cache.hpp" diff --git a/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store.test.cpp b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store.test.cpp index bd7a13af68..8d8cfbc27b 100644 --- a/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store.test.cpp +++ b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store.test.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "barretenberg/common/test.hpp" +#include "barretenberg/common/log.hpp" #include #include "polynomial_store.hpp" diff --git a/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store_wasm.cpp b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store_wasm.cpp index 250ff283ad..c6ce4eab80 100644 --- a/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store_wasm.cpp +++ b/cpp/src/barretenberg/proof_system/polynomial_cache/polynomial_store_wasm.cpp @@ -1,5 +1,5 @@ #include "polynomial_store.hpp" -#include +#include "barretenberg/env/data_store.hpp" namespace bonk { diff --git a/cpp/src/barretenberg/proof_system/proving_key/proving_key.cpp b/cpp/src/barretenberg/proof_system/proving_key/proving_key.cpp index 4774e558a0..4ea6d668d6 100644 --- a/cpp/src/barretenberg/proof_system/proving_key/proving_key.cpp +++ b/cpp/src/barretenberg/proof_system/proving_key/proving_key.cpp @@ -1,7 +1,7 @@ #include "proving_key.hpp" -#include -#include -#include +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/common/throw_or_abort.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" namespace bonk { // In all the constructors below, the pippenger_runtime_state takes (n + 1) as the input diff --git a/cpp/src/barretenberg/proof_system/proving_key/proving_key.hpp b/cpp/src/barretenberg/proof_system/proving_key/proving_key.hpp index 7b3d2d087d..ceea1d76ad 100644 --- a/cpp/src/barretenberg/proof_system/proving_key/proving_key.hpp +++ b/cpp/src/barretenberg/proof_system/proving_key/proving_key.hpp @@ -1,12 +1,12 @@ #pragma once -#include +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/runtime_states.hpp" #include -#include -#include +#include "barretenberg/polynomials/evaluation_domain.hpp" +#include "barretenberg/polynomials/polynomial.hpp" -#include -#include -#include +#include "barretenberg/srs/reference_string/reference_string.hpp" +#include "barretenberg/plonk/proof_system/constants.hpp" +#include "barretenberg/proof_system/types/polynomial_manifest.hpp" #include #include "../polynomial_cache/polynomial_cache.hpp" diff --git a/cpp/src/barretenberg/proof_system/proving_key/proving_key.test.cpp b/cpp/src/barretenberg/proof_system/proving_key/proving_key.test.cpp index 929cd71e47..b99ba5b8a0 100644 --- a/cpp/src/barretenberg/proof_system/proving_key/proving_key.test.cpp +++ b/cpp/src/barretenberg/proof_system/proving_key/proving_key.test.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "barretenberg/common/test.hpp" +#include "barretenberg/common/streams.hpp" #include "proving_key.hpp" #include "serialize.hpp" #include "barretenberg/plonk/composer/standard_composer.hpp" diff --git a/cpp/src/barretenberg/proof_system/proving_key/serialize.hpp b/cpp/src/barretenberg/proof_system/proving_key/serialize.hpp index 0653d55fd6..424cea55a5 100644 --- a/cpp/src/barretenberg/proof_system/proving_key/serialize.hpp +++ b/cpp/src/barretenberg/proof_system/proving_key/serialize.hpp @@ -1,8 +1,8 @@ #pragma once #include "proving_key.hpp" -#include -#include -#include +#include "barretenberg/polynomials/serialize.hpp" +#include "barretenberg/common/throw_or_abort.hpp" +#include "barretenberg/common/serialize.hpp" namespace bonk { diff --git a/cpp/src/barretenberg/proof_system/types/polynomial_manifest.hpp b/cpp/src/barretenberg/proof_system/types/polynomial_manifest.hpp index e8467cd5ca..1b3a80c915 100644 --- a/cpp/src/barretenberg/proof_system/types/polynomial_manifest.hpp +++ b/cpp/src/barretenberg/proof_system/types/polynomial_manifest.hpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include "barretenberg/plonk/proof_system/constants.hpp" // ToDo(Arijit): The below namespace should be plonk once all the honk related stuffs are moved out namespace bonk { diff --git a/cpp/src/barretenberg/proof_system/verification_key/verification_key.cpp b/cpp/src/barretenberg/proof_system/verification_key/verification_key.cpp index b17098a6ad..3838656c8a 100644 --- a/cpp/src/barretenberg/proof_system/verification_key/verification_key.cpp +++ b/cpp/src/barretenberg/proof_system/verification_key/verification_key.cpp @@ -1,4 +1,4 @@ -#include +#include "barretenberg/crypto/sha256/sha256.hpp" #include "verification_key.hpp" #include "../../plonk/proof_system/constants.hpp" diff --git a/cpp/src/barretenberg/proof_system/verification_key/verification_key.hpp b/cpp/src/barretenberg/proof_system/verification_key/verification_key.hpp index 978bf5d2d8..08b0f85751 100644 --- a/cpp/src/barretenberg/proof_system/verification_key/verification_key.hpp +++ b/cpp/src/barretenberg/proof_system/verification_key/verification_key.hpp @@ -1,8 +1,8 @@ #pragma once #include -#include -#include -#include +#include "barretenberg/srs/reference_string/reference_string.hpp" +#include "barretenberg/polynomials/evaluation_domain.hpp" +#include "barretenberg/crypto/sha256/sha256.hpp" #include "../../proof_system/types/polynomial_manifest.hpp" namespace bonk { diff --git a/cpp/src/barretenberg/proof_system/verification_key/verification_key.test.cpp b/cpp/src/barretenberg/proof_system/verification_key/verification_key.test.cpp index 075960d696..8f74d875d6 100644 --- a/cpp/src/barretenberg/proof_system/verification_key/verification_key.test.cpp +++ b/cpp/src/barretenberg/proof_system/verification_key/verification_key.test.cpp @@ -1,5 +1,5 @@ -#include -#include +#include "barretenberg/common/test.hpp" +#include "barretenberg/common/streams.hpp" #include "verification_key.hpp" using namespace barretenberg; diff --git a/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp b/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp index 8997046a6a..d64d327e30 100644 --- a/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp +++ b/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp @@ -1,7 +1,7 @@ #include "work_queue.hpp" -#include -#include +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" namespace bonk { diff --git a/cpp/src/barretenberg/srs/io.cpp b/cpp/src/barretenberg/srs/io.cpp index c3f24ecdb8..8292fce42b 100644 --- a/cpp/src/barretenberg/srs/io.cpp +++ b/cpp/src/barretenberg/srs/io.cpp @@ -1,7 +1,7 @@ #include "io.hpp" -#include -#include -#include +#include "barretenberg/common/mem.hpp" +#include "barretenberg/common/net.hpp" +#include "barretenberg/common/throw_or_abort.hpp" #include #include diff --git a/cpp/src/barretenberg/srs/io.test.cpp b/cpp/src/barretenberg/srs/io.test.cpp index 33d00f8853..7ff2806227 100644 --- a/cpp/src/barretenberg/srs/io.test.cpp +++ b/cpp/src/barretenberg/srs/io.test.cpp @@ -1,7 +1,7 @@ -#include -#include +#include "barretenberg/ecc/curves/bn254/fq12.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" #include "io.hpp" -#include +#include "barretenberg/common/mem.hpp" #include using namespace barretenberg; diff --git a/cpp/src/barretenberg/srs/reference_string/file_reference_string.cpp b/cpp/src/barretenberg/srs/reference_string/file_reference_string.cpp index 464be2f719..e4dbae0bdd 100644 --- a/cpp/src/barretenberg/srs/reference_string/file_reference_string.cpp +++ b/cpp/src/barretenberg/srs/reference_string/file_reference_string.cpp @@ -1,7 +1,7 @@ #include "file_reference_string.hpp" #include "../io.hpp" -#include +#include "barretenberg/ecc/curves/bn254/pairing.hpp" namespace bonk { diff --git a/cpp/src/barretenberg/srs/reference_string/file_reference_string.hpp b/cpp/src/barretenberg/srs/reference_string/file_reference_string.hpp index 37b5767762..02ff6e6a0a 100644 --- a/cpp/src/barretenberg/srs/reference_string/file_reference_string.hpp +++ b/cpp/src/barretenberg/srs/reference_string/file_reference_string.hpp @@ -4,9 +4,9 @@ #pragma once #include "reference_string.hpp" -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/ecc/curves/bn254/g2.hpp" +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.hpp" #include #include diff --git a/cpp/src/barretenberg/srs/reference_string/mem_reference_string.cpp b/cpp/src/barretenberg/srs/reference_string/mem_reference_string.cpp index 915d700110..8fe33b25f3 100644 --- a/cpp/src/barretenberg/srs/reference_string/mem_reference_string.cpp +++ b/cpp/src/barretenberg/srs/reference_string/mem_reference_string.cpp @@ -1,8 +1,8 @@ #include "mem_reference_string.hpp" #include "../io.hpp" -#include -#include +#include "barretenberg/common/streams.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" #include diff --git a/cpp/src/barretenberg/srs/reference_string/mem_reference_string.hpp b/cpp/src/barretenberg/srs/reference_string/mem_reference_string.hpp index 4144859308..95a9598b88 100644 --- a/cpp/src/barretenberg/srs/reference_string/mem_reference_string.hpp +++ b/cpp/src/barretenberg/srs/reference_string/mem_reference_string.hpp @@ -5,7 +5,7 @@ #include "reference_string.hpp" -#include +#include "barretenberg/ecc/curves/bn254/scalar_multiplication/pippenger.hpp" namespace barretenberg::pairing { struct miller_lines; diff --git a/cpp/src/barretenberg/srs/reference_string/mem_reference_string.test.cpp b/cpp/src/barretenberg/srs/reference_string/mem_reference_string.test.cpp index 51d80de52b..598d6aa9cf 100644 --- a/cpp/src/barretenberg/srs/reference_string/mem_reference_string.test.cpp +++ b/cpp/src/barretenberg/srs/reference_string/mem_reference_string.test.cpp @@ -1,7 +1,7 @@ #include "file_reference_string.hpp" #include "mem_reference_string.hpp" -#include +#include "barretenberg/ecc/curves/bn254/pairing.hpp" #include diff --git a/cpp/src/barretenberg/srs/reference_string/reference_string.hpp b/cpp/src/barretenberg/srs/reference_string/reference_string.hpp index c1273e4c4f..13033d9f37 100644 --- a/cpp/src/barretenberg/srs/reference_string/reference_string.hpp +++ b/cpp/src/barretenberg/srs/reference_string/reference_string.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include -#include +#include "barretenberg/common/mem.hpp" +#include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/ecc/curves/bn254/g2.hpp" #include diff --git a/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp index f7abf534a4..fa45398119 100644 --- a/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp @@ -1,12 +1,12 @@ #include "./aes128.hpp" -#include +#include "barretenberg/plonk/composer/ultra_composer.hpp" -#include -#include -#include +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/numeric/bitop/sparse_form.hpp" +#include "barretenberg/crypto/aes128/aes128.hpp" -#include +#include "barretenberg/stdlib/primitives/plookup/plookup.hpp" using namespace crypto::aes128; using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp index a0e5f8f19b..ca97c0b11e 100644 --- a/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp @@ -1,8 +1,8 @@ #include "aes128.hpp" -#include +#include "barretenberg/plonk/composer/ultra_composer.hpp" -#include +#include "barretenberg/crypto/aes128/aes128.hpp" #include diff --git a/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp b/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp index 401dc8af9e..808bfbdf04 100644 --- a/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp @@ -3,8 +3,8 @@ #include "../../primitives/curves/secp256k1.hpp" #include "ecdsa.hpp" -#include -#include +#include "barretenberg/crypto/ecdsa/ecdsa.hpp" +#include "barretenberg/common/test.hpp" using namespace barretenberg; using namespace plonk; diff --git a/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp index d96bbbf30c..35ebcde4b9 100644 --- a/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp @@ -1,8 +1,8 @@ #include "schnorr.hpp" #include -#include -#include -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/stdlib/hash/blake2s/blake2s.hpp" #include "../../primitives/composers/composers.hpp" diff --git a/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp index 4af0c9a347..1e47ba80f5 100644 --- a/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp +++ b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/crypto/schnorr/schnorr.hpp" #include "../../primitives/field/field.hpp" #include "../../primitives/bool/bool.hpp" #include "../../primitives/witness/witness.hpp" diff --git a/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp index e6c7b7eb10..c5e43842f7 100644 --- a/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp @@ -1,8 +1,8 @@ #include "schnorr.hpp" -#include -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include -#include +#include "barretenberg/stdlib/types/types.hpp" namespace test_stdlib_schnorr { diff --git a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp index 748cacc58e..d2a20d8137 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp @@ -1,10 +1,10 @@ #include "blake2s.hpp" #include "blake2s_plookup.hpp" #include "blake_util.hpp" -#include -#include -#include -#include +#include "barretenberg/plonk/composer/standard_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp index 91da1ba980..242fbbc607 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" namespace plonk { class StandardComposer; diff --git a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp index 1f1bb19d92..ac920961f9 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp @@ -1,8 +1,8 @@ #include "blake2s.hpp" #include "blake2s_plookup.hpp" -#include +#include "barretenberg/crypto/blake2s/blake2s.hpp" #include -#include +#include "barretenberg/stdlib/types/types.hpp" using namespace barretenberg; using namespace plonk; diff --git a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp index 7fcd3cbf07..c967769cea 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp @@ -1,13 +1,13 @@ #include "blake2s_plookup.hpp" #include "blake_util.hpp" -#include -#include -#include -#include -#include -#include -#include +#include "barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp" +#include "barretenberg/plonk/composer/plookup_tables/sha256.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/stdlib/primitives/bit_array/bit_array.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/stdlib/primitives/plookup/plookup.hpp" /** * Optimizations: diff --git a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp index 8b49316747..97452fbce6 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp @@ -1,9 +1,9 @@ #pragma once #include -#include -#include +#include "barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" -#include +#include "barretenberg/numeric/bitop/sparse_form.hpp" #include "../../primitives/field/field.hpp" #include "../../primitives/composers/composers_fwd.hpp" diff --git a/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp index 9a95e99d8d..ce1e5ddc31 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "barretenberg/plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" +#include "barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp" +#include "barretenberg/stdlib/primitives/plookup/plookup.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp index 5c6a724d73..f8af0692ac 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp @@ -1,8 +1,8 @@ #include "blake3s.hpp" #include "blake3s_plookup.hpp" -#include -#include -#include +#include "barretenberg/plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" #include "../blake2s/blake_util.hpp" namespace plonk { diff --git a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp index 28571fbe0d..70e4c14b2e 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp +++ b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" namespace plonk { class TurboComposer; diff --git a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp index 5d0d18e0fc..3b9db59eec 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp @@ -1,9 +1,9 @@ #include "blake3s.hpp" #include "blake3s_plookup.hpp" -#include +#include "barretenberg/crypto/blake3s/blake3s.hpp" #include -#include -#include +#include "barretenberg/plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" using namespace barretenberg; using namespace plonk; diff --git a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp index b2f5bf92a9..b27c488bea 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp @@ -1,12 +1,12 @@ #include "blake3s_plookup.hpp" #include "../blake2s/blake_util.hpp" -#include -#include -#include -#include -#include -#include +#include "barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/stdlib/primitives/bit_array/bit_array.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/stdlib/primitives/plookup/plookup.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp index 3fcf4b371d..4d8a077955 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp +++ b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp @@ -1,9 +1,9 @@ #pragma once #include -#include -#include +#include "barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" -#include +#include "barretenberg/numeric/bitop/sparse_form.hpp" #include "../../primitives/field/field.hpp" #include "../../primitives/composers/composers_fwd.hpp" diff --git a/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp index 7f21ddbb15..09489e028c 100644 --- a/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp +++ b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp @@ -1,8 +1,8 @@ #include "keccak.hpp" -#include -#include -#include -#include +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/common/constexpr_utils.hpp" +#include "barretenberg/numeric/bitop/sparse_form.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp index 30221b6c7f..5c8423a03f 100644 --- a/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp +++ b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp @@ -1,8 +1,8 @@ #pragma once #include -#include -#include -#include +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp" +#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" namespace plonk { class UltraComposer; diff --git a/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp index 6935a588d0..5a914402c8 100644 --- a/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp +++ b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp @@ -1,8 +1,8 @@ #include "keccak.hpp" -#include +#include "barretenberg/crypto/keccak/keccak.hpp" #include -#include -#include +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/numeric/random/engine.hpp" #include "../../primitives/plookup/plookup.hpp" using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.bench.cpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.bench.cpp index 163868dcb9..1f330830d0 100644 --- a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.bench.cpp +++ b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.bench.cpp @@ -1,11 +1,11 @@ #include "pedersen.hpp" #include -#include -#include -#include -#include -#include -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" +#include "barretenberg/srs/reference_string/file_reference_string.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" #define BARRETENBERG_SRS_PATH "../srs_db/ignition" diff --git a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp index 197ea2064b..2d24f76bfd 100644 --- a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp +++ b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp @@ -1,7 +1,7 @@ #include "pedersen.hpp" #include "pedersen_plookup.hpp" -#include -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "../../primitives/composers/composers.hpp" #include "../../primitives/packed_byte_array/packed_byte_array.hpp" diff --git a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp index 1db698e62b..1f8b1afd52 100644 --- a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp +++ b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" #include "../../primitives/composers/composers_fwd.hpp" #include "../../primitives/field/field.hpp" #include "../../primitives/point/point.hpp" diff --git a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp index 7d1d324b92..9dc474f3ad 100644 --- a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp +++ b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.test.cpp @@ -1,11 +1,11 @@ #include "pedersen.hpp" #include "pedersen_plookup.hpp" -#include -#include -#include -#include -#include -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/crypto/pedersen/pedersen_lookup.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/common/test.hpp" +#include "barretenberg/stdlib/primitives/curves/bn254.hpp" namespace test_stdlib_pedersen { using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp index d35b11fb22..964f9e6371 100644 --- a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp +++ b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp @@ -1,8 +1,8 @@ #include "pedersen_plookup.hpp" -#include -#include +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include +#include "barretenberg/plonk/composer/plookup_tables/types.hpp" #include "../../primitives/composers/composers.hpp" #include "../../primitives/plookup/plookup.hpp" diff --git a/cpp/src/barretenberg/stdlib/hash/sha256/sha256.bench.cpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.bench.cpp index 09c3301956..11685b4188 100644 --- a/cpp/src/barretenberg/stdlib/hash/sha256/sha256.bench.cpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.bench.cpp @@ -1,8 +1,8 @@ #include "sha256.hpp" #include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/stdlib/types/types.hpp" using namespace benchmark; using namespace plonk::stdlib::types; diff --git a/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp index 5611373bc4..150f91b636 100644 --- a/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp @@ -1,9 +1,9 @@ #include "sha256.hpp" #include "sha256_plookup.hpp" -#include -#include -#include -#include +#include "barretenberg/plonk/composer/standard_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/stdlib/primitives/bit_array/bit_array.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp index 7fd17c35c3..ec30872a8f 100644 --- a/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp @@ -1,8 +1,8 @@ #pragma once #include -#include -#include -#include +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp" +#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" #include "sha256_plookup.hpp" diff --git a/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp index 6281777bbd..b9d9d3add7 100644 --- a/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp @@ -1,13 +1,13 @@ #include "sha256.hpp" -#include -#include -#include -#include -#include - -#include -#include -#include +#include "barretenberg/common/test.hpp" +#include "barretenberg/crypto/sha256/sha256.hpp" +#include "barretenberg/plonk/composer/standard_composer.hpp" +#include "barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp" +#include "barretenberg/stdlib/types/types.hpp" + +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/numeric/bitop/rotate.hpp" +#include "barretenberg/numeric/bitop/sparse_form.hpp" namespace { auto& engine = numeric::random::get_debug_engine(); diff --git a/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp index b2b724e78e..c86ca33195 100644 --- a/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp @@ -1,12 +1,12 @@ #include "sha256_plookup.hpp" -#include -#include -#include -#include -#include -#include -#include +#include "barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp" +#include "barretenberg/plonk/composer/plookup_tables/sha256.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/stdlib/primitives/bit_array/bit_array.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/stdlib/primitives/plookup/plookup.hpp" using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp index 21ce50268f..93c9dd861a 100644 --- a/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp @@ -1,10 +1,10 @@ #pragma once #include -#include -#include -#include +#include "barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/plonk/composer/composer_base.hpp" -#include +#include "barretenberg/numeric/bitop/sparse_form.hpp" #include "../../primitives/field/field.hpp" #include "../../primitives/packed_byte_array/packed_byte_array.hpp" diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp index ec620b6052..56af194120 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "barretenberg/common/net.hpp" +#include "barretenberg/crypto/blake2s/blake2s.hpp" +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/stdlib/hash/blake2s/blake2s.hpp" +#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" #include namespace plonk { diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp index 96906e58de..34874b412c 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp @@ -1,7 +1,7 @@ #include "hash.hpp" #include -#include -#include +#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" +#include "barretenberg/stdlib/types/types.hpp" using namespace barretenberg; using namespace plonk::stdlib::types; diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp index 69663452e9..174db8b7e2 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp @@ -1,7 +1,7 @@ #pragma once #include "hash.hpp" #include -#include +#include "barretenberg/stdlib/primitives/field/field.hpp" #include namespace plonk { diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp index 29245c682d..3273eefcf6 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp @@ -1,8 +1,8 @@ #pragma once #include "hash_path.hpp" -#include -#include -#include +#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" +#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp index 1ba283ce47..0dee186932 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp @@ -3,7 +3,7 @@ #include "memory_store.hpp" #include "memory_tree.hpp" #include -#include +#include "barretenberg/stdlib/types/types.hpp" using namespace barretenberg; using namespace plonk::stdlib::types; diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp index e6eccdda64..f0b735a1e4 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp @@ -1,6 +1,6 @@ #pragma once #include "hash_path.hpp" -#include +#include "barretenberg/common/streams.hpp" #include #include diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp index 7d99c6cc9b..cdceef6ea4 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp @@ -1,6 +1,6 @@ #include "memory_tree.hpp" #include -#include +#include "barretenberg/stdlib/types/types.hpp" using namespace barretenberg; using namespace plonk::stdlib::merkle_tree; diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp index 246de156fd..46a8ad9363 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp @@ -2,7 +2,7 @@ #include "memory_store.hpp" #include "merkle_tree.hpp" #include -#include +#include "barretenberg/numeric/random/engine.hpp" using namespace benchmark; using namespace plonk::stdlib::merkle_tree; diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp index 4a196b66c4..f37ed0c901 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp @@ -1,11 +1,11 @@ #include "merkle_tree.hpp" #include "hash.hpp" #include "memory_store.hpp" -#include +#include "barretenberg/common/net.hpp" #include -#include -#include -#include +#include "barretenberg/numeric/bitop/count_leading_zeros.hpp" +#include "barretenberg/numeric/bitop/keep_n_lsb.hpp" +#include "barretenberg/numeric/uint128/uint128.hpp" #include namespace plonk { diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp index 6b797e9c6c..4d34c41947 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp @@ -1,6 +1,6 @@ #pragma once #include "hash_path.hpp" -#include +#include "barretenberg/stdlib/primitives/field/field.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp index bebbd47b86..03e111b717 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp @@ -1,10 +1,10 @@ #include "merkle_tree.hpp" #include "memory_store.hpp" #include "memory_tree.hpp" -#include -#include -#include -#include +#include "barretenberg/common/streams.hpp" +#include "barretenberg/common/test.hpp" +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/stdlib/types/types.hpp" using namespace barretenberg; using namespace plonk::stdlib::merkle_tree; diff --git a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp index 0eaa9de5c7..610b5b2abd 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" +#include "barretenberg/ecc/curves/bn254/fq.hpp" // This is a global variable, so that the execution handling class could alter it and signal to the input tester // that the input should fail @@ -9,7 +9,7 @@ bool circuit_should_fail = false; #define HAVOC_TESTING // #define DISABLE_DIVISION 1 -#include +#include "barretenberg/common/fuzzer.hpp" FastRandom VarianceRNG(0); // #define DISABLE_DIVISION diff --git a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp index 4f5979438c..86b0d3f91f 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include -#include +#include "barretenberg/plonk/proof_system/constants.hpp" +#include "barretenberg/ecc/curves/bn254/fq.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/numeric/uintx/uintx.hpp" #include "../byte_array/byte_array.hpp" #include "../field/field.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp index 36067e4816..80fa53e855 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp @@ -1,9 +1,9 @@ #include -#include +#include "barretenberg/numeric/random/engine.hpp" -#include -#include +#include "barretenberg/ecc/curves/bn254/fq.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" #include "../bool/bool.hpp" #include "../byte_array/byte_array.hpp" @@ -12,13 +12,13 @@ #include "barretenberg/honk/composer/standard_honk_composer.hpp" #include "barretenberg/honk/composer/standard_plonk_composer.hpp" -#include -#include -#include +#include "barretenberg/stdlib/primitives/curves/bn254.hpp" +#include "barretenberg/plonk/proof_system/prover/prover.hpp" +#include "barretenberg/plonk/proof_system/verifier/verifier.hpp" #include #include -#include +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" namespace test_stdlib_bigfield { using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp index 77ffcd4329..17c7879e0c 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard | ComposerType::Turbo; #include "bigfield.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp index 194ba3502f..e7bbcf34ec 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/numeric/uintx/uintx.hpp" #include #include "../composers/composers.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp index a8a42cd144..58cb089452 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard; #include "bigfield.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp index dfde177a57..246321c8f9 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Turbo; #include "bigfield.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp index f903d1d0e0..a031f45dd0 100644 --- a/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp @@ -3,14 +3,14 @@ #include "../bigfield/bigfield.hpp" #include "../byte_array/byte_array.hpp" #include "../field/field.hpp" -#include +#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "../composers/composers_fwd.hpp" #include "../memory/rom_table.hpp" #include "../memory/twin_rom_table.hpp" -#include -#include -#include +#include "barretenberg/ecc/curves/secp256k1/secp256k1.hpp" +#include "barretenberg/ecc/curves/secp256r1/secp256r1.hpp" +#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "../composers/composers_fwd.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp index 2ffe384cc6..f16233e08f 100644 --- a/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp @@ -1,4 +1,4 @@ -#include +#include "barretenberg/common/test.hpp" #include #include "../bigfield/bigfield.hpp" @@ -7,12 +7,12 @@ #include "../field/field.hpp" #include "barretenberg/honk/composer/standard_honk_composer.hpp" -#include -#include -#include +#include "barretenberg/stdlib/primitives/curves/bn254.hpp" +#include "barretenberg/stdlib/primitives/curves/secp256r1.hpp" +#include "barretenberg/stdlib/primitives/curves/secp256k1.hpp" #include -#include +#include "barretenberg/numeric/random/engine.hpp" namespace test_stdlib_biggroup { namespace { diff --git a/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp index 6ffcb3ccba..ea107e2300 100644 --- a/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/numeric/uintx/uintx.hpp" #include #include "../composers/composers.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp index 344039f0eb..71cd984c30 100644 --- a/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/ecc/curves/secp256k1/secp256k1.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp index cd300c0e4f..d12d096965 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp @@ -1,5 +1,5 @@ -#include -#include +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/stdlib/primitives/bit_array/bit_array.hpp" #define MAX_ARRAY_SIZE 128 @@ -9,7 +9,7 @@ bool circuit_should_fail = false; #define HAVOC_TESTING -#include +#include "barretenberg/common/fuzzer.hpp" FastRandom VarianceRNG(0); // Enable this definition, when you want to find out the instructions that caused a failure diff --git a/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp index bbdab25d2e..03ef250443 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp @@ -1,7 +1,7 @@ #include "bit_array.hpp" #include -#include -#include +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/honk/composer/standard_honk_composer.hpp" // #include namespace test_stdlib_bit_array { diff --git a/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp index c398c87bbb..b0c2dea8de 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard | ComposerType::Turbo; #include "bit_array.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp index 885f566eda..ff0629b20c 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard; #include "bit_array.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp index 45543d3147..a2bb62031e 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Turbo; #include "bit_array.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp index bfc81bf368..bf3a04f803 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp @@ -1,5 +1,5 @@ -#include -#include +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/stdlib/primitives/bit_array/bit_array.hpp" // This is a global variable, so that the execution handling class could alter it and signal to the input tester that // the input should fail @@ -7,7 +7,7 @@ bool circuit_should_fail = false; #define HAVOC_TESTING -#include +#include "barretenberg/common/fuzzer.hpp" FastRandom VarianceRNG(0); // Enable this definition, when you want to find out the instructions that caused a failure diff --git a/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp b/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp index 113777cdcc..2d92aefd53 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp @@ -2,7 +2,7 @@ #include "barretenberg/plonk/proof_system/constants.hpp" #include // #include -#include +#include "barretenberg/honk/composer/standard_honk_composer.hpp" namespace test_stdlib_bool { using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp index 04b3f0379d..a4f7758fe3 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard | ComposerType::Turbo; #include "bool.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp index 5e0e1c37cc..98c247431f 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard; #include "bool.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp index 015d1e2126..800fd1059c 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Turbo; #include "bool.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp index c8040d554b..09a0430340 100644 --- a/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" +#include "barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp" #define MAX_ARRAY_SIZE 128 @@ -10,7 +10,7 @@ bool circuit_should_fail = false; #define HAVOC_TESTING -#include +#include "barretenberg/common/fuzzer.hpp" FastRandom VarianceRNG(0); // Enable this definition, when you want to find out the instructions that caused a failure diff --git a/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp index aa0a6a7660..f0ebaa919a 100644 --- a/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp @@ -1,8 +1,8 @@ #include "byte_array.hpp" #include -#include -#include -#include +#include "barretenberg/honk/composer/standard_honk_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" // ULTRATODO: make these typed tests namespace test_stdlib_byte_array { diff --git a/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp index a2693247bc..6795867726 100644 --- a/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard | ComposerType::Turbo; #include "byte_array.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp index cce9c7b782..c0e04755bc 100644 --- a/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard; #include "byte_array.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp index d124b62b8b..b24568ea12 100644 --- a/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Turbo; #include "byte_array.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp b/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp index b8d3a9280f..c06ea60f3a 100644 --- a/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp @@ -1,5 +1,5 @@ #pragma once -#include +#include "barretenberg/ecc/curves/types.hpp" #include "../bigfield/bigfield.hpp" #include "../biggroup/biggroup.hpp" #include "../field/field.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp b/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp index f970a9d6cf..7617302320 100644 --- a/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp @@ -4,7 +4,7 @@ #include "../biggroup/biggroup.hpp" #include "../field/field.hpp" -#include +#include "barretenberg/ecc/curves/secp256k1/secp256k1.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp b/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp index 7211b56cdd..87da0893dc 100644 --- a/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp @@ -4,7 +4,7 @@ #include "../biggroup/biggroup.hpp" #include "../field/field.hpp" -#include +#include "barretenberg/ecc/curves/secp256r1/secp256r1.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/primitives/field/field.cpp b/cpp/src/barretenberg/stdlib/primitives/field/field.cpp index e977fc779b..918aaff424 100644 --- a/cpp/src/barretenberg/stdlib/primitives/field/field.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field.cpp @@ -2,7 +2,7 @@ #include #include "../bool/bool.hpp" #include "../composers/composers.hpp" -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" using namespace bonk; diff --git a/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp index ea21fbb45e..239d06edda 100644 --- a/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp @@ -1,9 +1,9 @@ -#include -#include -#include -#include -#include -#include +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" +#include "barretenberg/stdlib/primitives/bool/bool.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" // This is a global variable, so that the execution handling class could alter it and signal to the input tester // that the input should fail @@ -11,7 +11,7 @@ bool circuit_should_fail = false; #define HAVOC_TESTING // #define DISABLE_DIVISION 1 -#include +#include "barretenberg/common/fuzzer.hpp" FastRandom VarianceRNG(0); // #define DISABLE_DIVISION diff --git a/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp b/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp index 7c22288b71..4c7d69f395 100644 --- a/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp @@ -2,11 +2,11 @@ #include "field.hpp" #include "barretenberg/plonk/proof_system/constants.hpp" #include -#include -#include -#include -#include -#include +#include "barretenberg/honk/composer/standard_honk_composer.hpp" +#include "barretenberg/plonk/composer/standard_composer.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" +#include "barretenberg/numeric/random/engine.hpp" using namespace bonk; diff --git a/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp index 4a1767b898..e38059c90e 100644 --- a/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard | ComposerType::Turbo; #include "field.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp index 4eab251be6..16c0b9a117 100644 --- a/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard; #include "field.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp index 802a7df2ba..47952895f8 100644 --- a/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Turbo; #include "field.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/group/group.hpp b/cpp/src/barretenberg/stdlib/primitives/group/group.hpp index 07d376168a..9697231122 100644 --- a/cpp/src/barretenberg/stdlib/primitives/group/group.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/group/group.hpp @@ -1,9 +1,9 @@ #pragma once #include "../field/field.hpp" -#include -#include -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/plonk/composer/composer_base.hpp" +#include "barretenberg/crypto/pedersen/pedersen.hpp" #include "../../hash/pedersen/pedersen.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp b/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp index 4eda97d5bd..2c69100a8d 100644 --- a/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp @@ -1,8 +1,8 @@ #include "../../types/types.hpp" #include "barretenberg/honk/composer/standard_honk_composer.hpp" #include "barretenberg/stdlib/primitives/witness/witness.hpp" -#include -#include +#include "barretenberg/common/test.hpp" +#include "barretenberg/numeric/random/engine.hpp" using namespace barretenberg; // using namespace plonk::stdlib::types; diff --git a/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp b/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp index 55a50d4ec5..a6c8189edd 100644 --- a/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp @@ -2,9 +2,9 @@ #include -#include +#include "barretenberg/numeric/random/engine.hpp" -#include +#include "barretenberg/plonk/composer/ultra_composer.hpp" namespace test_stdlib_rom_array { using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp b/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp index 3eb993dee6..42c6427e48 100644 --- a/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp @@ -3,12 +3,12 @@ #include // test currently doesn't construct or verify proof, but hey, why not. -#include +#include "barretenberg/honk/composer/standard_honk_composer.hpp" // #include // #include // #include -#include +#include "barretenberg/numeric/random/engine.hpp" namespace test_stdlib_packed_byte_array { using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp b/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp index c9551c5311..76905d0753 100644 --- a/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp @@ -1,7 +1,7 @@ #include "./plookup.hpp" -#include -#include -#include +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp" +#include "barretenberg/plonk/composer/plookup_tables/types.hpp" namespace plonk { class UltraComposer; diff --git a/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp b/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp index 3964505a2d..6c468e372d 100644 --- a/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp @@ -1,10 +1,10 @@ #pragma once #include #include -#include -#include -#include -#include +#include "barretenberg/plonk/composer/plookup_tables/plookup_tables.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/plonk/composer/plookup_tables/types.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp b/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp index 9f9ca5b57f..60c5947536 100644 --- a/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp @@ -1,14 +1,14 @@ #include "plookup.hpp" #include "../byte_array/byte_array.hpp" #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/numeric/bitop/rotate.hpp" +#include "barretenberg/crypto/pedersen/pedersen_lookup.hpp" +#include "barretenberg/stdlib/primitives/biggroup/biggroup.hpp" +#include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/stdlib/primitives/curves/secp256k1.hpp" namespace test_stdlib_plookups { using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/primitives/point/point.hpp b/cpp/src/barretenberg/stdlib/primitives/point/point.hpp index 7e43aafb6a..5252a6ee9a 100644 --- a/cpp/src/barretenberg/stdlib/primitives/point/point.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/point/point.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "../field/field.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp index 2766b4e92b..5669eea8ba 100644 --- a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp @@ -1,7 +1,7 @@ #include "safe_uint.hpp" #include "../bool/bool.hpp" #include "../composers/composers.hpp" -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp index 6f37d60eb9..3f3b02f7d1 100644 --- a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" // This is a global variable, so that the execution handling class could alter it and signal to the input tester that // the input should fail @@ -9,7 +9,7 @@ bool circuit_should_fail = false; #define HAVOC_TESTING -#include +#include "barretenberg/common/fuzzer.hpp" FastRandom VarianceRNG(0); // Enable this definition, when you want to find out the instructions that caused a failure diff --git a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp index ef721f6dd5..15d3f8ad3a 100644 --- a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp @@ -3,7 +3,7 @@ #include "../composers/composers_fwd.hpp" #include "../witness/witness.hpp" #include "../bool/bool.hpp" -#include +#include "barretenberg/common/assert.hpp" #include "../field/field.hpp" #include "barretenberg/honk/composer/standard_honk_composer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp index 1f742a97a1..234299629e 100644 --- a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp @@ -2,13 +2,13 @@ #include #include #include "safe_uint.hpp" -#include +#include "barretenberg/numeric/random/engine.hpp" #include "../byte_array/byte_array.hpp" -#include +#include "barretenberg/honk/composer/standard_honk_composer.hpp" // #include // #include // #include -#include +#include "barretenberg/stdlib/types/types.hpp" namespace { auto& engine = numeric::random::get_debug_engine(); diff --git a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp index d663fd7bbc..d2f2ece246 100644 --- a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard | ComposerType::Turbo; #include "safe_uint.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp index f087605ea7..8e1bd615f6 100644 --- a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard; #include "safe_uint.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp index 842c1552eb..1ff91bdcee 100644 --- a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Turbo; #include "safe_uint.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp index 578584d5d1..4b2c7fb385 100644 --- a/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp @@ -1,15 +1,15 @@ -#include -#include -#include -#include -#include +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" +#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" +#include "barretenberg/stdlib/primitives/bool/bool.hpp" // This is a global variable, so that the execution handling class could alter it and signal to the input tester that // the input should fail bool circuit_should_fail = false; #define HAVOC_TESTING -#include +#include "barretenberg/common/fuzzer.hpp" FastRandom VarianceRNG(0); // Enable this definition, when you want to find out the instructions that caused a failure diff --git a/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp index 9794a6976c..1747d12599 100644 --- a/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp @@ -7,10 +7,10 @@ #include "./plookup/uint.hpp" -#include -#include -#include -#include +#include "barretenberg/honk/composer/standard_honk_composer.hpp" +#include "barretenberg/plonk/composer/standard_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp index cfd80c087d..b9e7737fbf 100644 --- a/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp @@ -2,7 +2,7 @@ #include "barretenberg/honk/composer/standard_honk_composer.hpp" #include #include -#include +#include "barretenberg/numeric/random/engine.hpp" using namespace barretenberg; using namespace plonk; diff --git a/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp index f780949bc6..4c8f6a70bc 100644 --- a/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard | ComposerType::Turbo; #include "uint.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp index 3b1c99873c..2326494030 100644 --- a/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Standard; #include "uint.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp index b8282082d1..c5a59d827e 100644 --- a/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp @@ -1,3 +1,3 @@ -#include +#include "barretenberg/common/fuzzer_constants.hpp" constexpr uint64_t FuzzerComposerTypes = ComposerType::Turbo; #include "uint.fuzzer.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp b/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp index aed81e5d41..33fadf1bc9 100644 --- a/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp @@ -1,6 +1,6 @@ #pragma once -#include -#include +#include "barretenberg/plonk/composer/composer_base.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp b/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp index 9e316f0449..fd5352f78d 100644 --- a/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp +++ b/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp @@ -1,9 +1,9 @@ #pragma once -#include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/fq.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/transcript/transcript.hpp" #include "../../primitives/curves/bn254.hpp" #include "../verification_key/verification_key.hpp" diff --git a/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp b/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp index f7194d9530..598e91ba79 100644 --- a/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp +++ b/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp @@ -1,10 +1,10 @@ #include "transcript.hpp" #include -#include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/ecc/curves/bn254/g1.hpp" -#include +#include "barretenberg/transcript/transcript.hpp" using namespace plonk; diff --git a/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp b/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp index 2fc5383f01..b5b448bde9 100644 --- a/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp +++ b/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp @@ -1,19 +1,19 @@ #pragma once #include -#include -#include +#include "barretenberg/srs/reference_string/reference_string.hpp" +#include "barretenberg/polynomials/evaluation_domain.hpp" -#include +#include "barretenberg/proof_system/types/polynomial_manifest.hpp" -#include -#include +#include "barretenberg/plonk/proof_system/utils/kate_verification.hpp" +#include "barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp" -#include +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" -#include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/fq12.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/crypto/pedersen/pedersen_lookup.hpp" #include "../../primitives/uint/uint.hpp" #include "../../primitives/memory/rom_table.hpp" diff --git a/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp b/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp index 57e6ca79a7..c7f50f9ce7 100644 --- a/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp +++ b/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp @@ -1,6 +1,6 @@ #pragma once -#include +#include "barretenberg/plonk/proof_system/types/program_settings.hpp" #include "../transcript/transcript.hpp" diff --git a/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp index fca6065432..1b87e6ab44 100644 --- a/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp +++ b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp @@ -7,13 +7,13 @@ #include "../transcript/transcript.hpp" -#include -#include +#include "barretenberg/plonk/proof_system/utils/kate_verification.hpp" +#include "barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp" -#include +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" -#include -#include +#include "barretenberg/ecc/curves/bn254/fq12.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" namespace plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp index 764b65f149..1a6ee080bb 100644 --- a/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp +++ b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp @@ -1,10 +1,10 @@ #include "verifier.hpp" -#include -#include -#include -#include -#include -#include +#include "barretenberg/common/test.hpp" +#include "barretenberg/transcript/transcript.hpp" +#include "barretenberg/proof_system/proving_key/serialize.hpp" +#include "barretenberg/stdlib/primitives/curves/bn254.hpp" +#include "barretenberg/ecc/curves/bn254/fq12.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" #include "../../hash/blake3s/blake3s.hpp" #include "../../hash/pedersen/pedersen.hpp" #include "program_settings.hpp" diff --git a/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp index 040629355d..61d0b55a8f 100644 --- a/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp +++ b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp @@ -1,10 +1,10 @@ #include "verifier.hpp" -#include -#include -#include -#include -#include -#include +#include "barretenberg/common/test.hpp" +#include "barretenberg/transcript/transcript.hpp" +#include "barretenberg/proof_system/proving_key/serialize.hpp" +#include "barretenberg/stdlib/primitives/curves/bn254.hpp" +#include "barretenberg/ecc/curves/bn254/fq12.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" #include "../../hash/blake3s/blake3s.hpp" #include "../../hash/pedersen/pedersen.hpp" #include "program_settings.hpp" diff --git a/cpp/src/barretenberg/stdlib/types/types.hpp b/cpp/src/barretenberg/stdlib/types/types.hpp index 10de01a47d..5a1f40ef7f 100644 --- a/cpp/src/barretenberg/stdlib/types/types.hpp +++ b/cpp/src/barretenberg/stdlib/types/types.hpp @@ -1,25 +1,25 @@ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "barretenberg/plonk/proof_system/constants.hpp" +#include "barretenberg/plonk/composer/standard_composer.hpp" +#include "barretenberg/plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" +#include "barretenberg/stdlib/primitives/biggroup/biggroup.hpp" +#include "barretenberg/stdlib/primitives/bit_array/bit_array.hpp" +#include "barretenberg/stdlib/primitives/bool/bool.hpp" +#include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp" +#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/stdlib/primitives/witness/witness.hpp" +#include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" +#include "barretenberg/stdlib/primitives/biggroup/biggroup.hpp" +#include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" +#include "barretenberg/stdlib/merkle_tree/hash_path.hpp" +#include "barretenberg/stdlib/encryption/schnorr/schnorr.hpp" +#include "barretenberg/stdlib/primitives/curves/bn254.hpp" +#include "barretenberg/stdlib/primitives/curves/secp256k1.hpp" +#include "barretenberg/stdlib/primitives/memory/rom_table.hpp" +#include "barretenberg/stdlib/recursion/verifier/program_settings.hpp" namespace plonk::stdlib::types { diff --git a/cpp/src/barretenberg/transcript/transcript.cpp b/cpp/src/barretenberg/transcript/transcript.cpp index 5680d88857..2e5d5e9e02 100644 --- a/cpp/src/barretenberg/transcript/transcript.cpp +++ b/cpp/src/barretenberg/transcript/transcript.cpp @@ -1,13 +1,13 @@ #include "transcript.hpp" #include "manifest.hpp" #include -#include -#include -#include -#include -#include -#include -#include +#include "barretenberg/common/throw_or_abort.hpp" +#include "barretenberg/common/assert.hpp" +#include "barretenberg/common/net.hpp" +#include "barretenberg/crypto/blake3s/blake3s.hpp" +#include "barretenberg/crypto/keccak/keccak.hpp" +#include "barretenberg/crypto/pedersen/pedersen.hpp" +#include "barretenberg/crypto/pedersen/pedersen_lookup.hpp" #include #include #include diff --git a/cpp/src/barretenberg/transcript/transcript_wrappers.hpp b/cpp/src/barretenberg/transcript/transcript_wrappers.hpp index 96cfbbe915..bd33eff800 100644 --- a/cpp/src/barretenberg/transcript/transcript_wrappers.hpp +++ b/cpp/src/barretenberg/transcript/transcript_wrappers.hpp @@ -1,8 +1,8 @@ #pragma once #include "./transcript.hpp" -#include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/ecc/curves/bn254/g1.hpp" #include namespace transcript { From fd72be62893dfaa7b2bb4493cc01093820afde49 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Wed, 8 Mar 2023 13:40:32 -0600 Subject: [PATCH 03/10] fix removal of common --- cpp/src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 7e572edd91..b77bbcb519 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -38,6 +38,7 @@ else() message(STATUS "Using optimized assembly for field arithmetic.") endif() +add_subdirectory(barretenberg/common) add_subdirectory(barretenberg/env) add_subdirectory(barretenberg/numeric) add_subdirectory(barretenberg/srs) From e47b8ff6db95a825a871c141c9fbd5133c8b1156 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Wed, 8 Mar 2023 13:50:49 -0600 Subject: [PATCH 04/10] Remove files that were removed upstream --- .../composer_helper/composer_helper.cpp | 188 ------------------ .../composer_helper/composer_helper.hpp | 74 ------- 2 files changed, 262 deletions(-) delete mode 100644 cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.cpp delete mode 100644 cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.hpp diff --git a/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.cpp b/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.cpp deleted file mode 100644 index a65ffa0fc9..0000000000 --- a/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.cpp +++ /dev/null @@ -1,188 +0,0 @@ -#include "standard_honk_composer_helper.hpp" -#include "barretenberg/polynomials/polynomial.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" -#include "barretenberg/honk/pcs/commitment_key.hpp" -#include "barretenberg/numeric/bitop/get_msb.hpp" - -#include -#include -#include - -namespace honk { - -/** - * Compute proving key base. - * - * 1. Load crs. - * 2. Initialize this.circuit_proving_key. - * 3. Create constraint selector polynomials from each of this composer's `selectors` vectors and add them to the - * proving key. - * - * @param minimum_circuit_size Used as the total number of gates when larger than n + count of public inputs. - * @param num_reserved_gates The number of reserved gates. - * @return Pointer to the initialized proving key updated with selector polynomials. - * */ -template -std::shared_ptr StandardHonkComposerHelper::compute_proving_key_base( - const CircuitConstructor& constructor, const size_t minimum_circuit_size, const size_t num_randomized_gates) -{ - // Initialize circuit_proving_key - // TODO: replace composer types. - circuit_proving_key = initialize_proving_key(constructor, - crs_factory_.get(), - minimum_circuit_size, - num_randomized_gates, - plonk::ComposerType::STANDARD_HONK); - // Compute lagrange selectors - construct_lagrange_selector_forms(constructor, circuit_proving_key.get()); - - return circuit_proving_key; -} - -/** - * @brief Computes the verification key by computing the: - * (1) commitments to the selector, permutation, and lagrange (first/last) polynomials, - * (2) sets the polynomial manifest using the data from proving key. - */ - -template -std::shared_ptr StandardHonkComposerHelper::compute_verification_key_base( - std::shared_ptr const& proving_key, std::shared_ptr const& vrs) -{ - auto key = std::make_shared( - proving_key->circuit_size, proving_key->num_public_inputs, vrs, proving_key->composer_type); - // TODO(kesha): Dirty hack for now. Need to actually make commitment-agnositc - auto commitment_key = pcs::kzg::CommitmentKey(proving_key->circuit_size, "../srs_db/ignition"); - - // Compute and store commitments to all precomputed polynomials - key->commitments["Q_M"] = commitment_key.commit(proving_key->polynomial_cache.get("q_m_lagrange")); - key->commitments["Q_1"] = commitment_key.commit(proving_key->polynomial_cache.get("q_1_lagrange")); - key->commitments["Q_2"] = commitment_key.commit(proving_key->polynomial_cache.get("q_2_lagrange")); - key->commitments["Q_3"] = commitment_key.commit(proving_key->polynomial_cache.get("q_3_lagrange")); - key->commitments["Q_C"] = commitment_key.commit(proving_key->polynomial_cache.get("q_c_lagrange")); - key->commitments["SIGMA_1"] = commitment_key.commit(proving_key->polynomial_cache.get("sigma_1_lagrange")); - key->commitments["SIGMA_2"] = commitment_key.commit(proving_key->polynomial_cache.get("sigma_2_lagrange")); - key->commitments["SIGMA_3"] = commitment_key.commit(proving_key->polynomial_cache.get("sigma_3_lagrange")); - key->commitments["ID_1"] = commitment_key.commit(proving_key->polynomial_cache.get("id_1_lagrange")); - key->commitments["ID_2"] = commitment_key.commit(proving_key->polynomial_cache.get("id_2_lagrange")); - key->commitments["ID_3"] = commitment_key.commit(proving_key->polynomial_cache.get("id_3_lagrange")); - key->commitments["LAGRANGE_FIRST"] = commitment_key.commit(proving_key->polynomial_cache.get("L_first_lagrange")); - key->commitments["LAGRANGE_LAST"] = commitment_key.commit(proving_key->polynomial_cache.get("L_last_lagrange")); - - return key; -} - -/** - * Compute witness polynomials (w_1, w_2, w_3, w_4). - * - * @details Fills 3 or 4 witness polynomials w_1, w_2, w_3, w_4 with the values of in-circuit variables. The beginning - * of w_1, w_2 polynomials is filled with public_input values. - * @return Witness with computed witness polynomials. - * - * @tparam Program settings needed to establish if w_4 is being used. - * */ -template -void StandardHonkComposerHelper::compute_witness(const CircuitConstructor& circuit_constructor, - const size_t minimum_circuit_size) -{ - if (computed_witness) { - return; - } - wire_polynomials = compute_witness_base(circuit_constructor, minimum_circuit_size, NUM_RANDOMIZED_GATES); - - computed_witness = true; -} - -/** - * Compute proving key. - * Compute the polynomials q_l, q_r, etc. and sigma polynomial. - * - * @return Proving key with saved computed polynomials. - * */ - -template -std::shared_ptr StandardHonkComposerHelper::compute_proving_key( - const CircuitConstructor& circuit_constructor) -{ - if (circuit_proving_key) { - return circuit_proving_key; - } - // Compute q_l, q_r, q_o, etc polynomials - StandardHonkComposerHelper::compute_proving_key_base(circuit_constructor, plonk::ComposerType::STANDARD_HONK); - - // Compute sigma polynomials (we should update that late) - compute_standard_honk_sigma_permutations(circuit_constructor, - circuit_proving_key.get()); - compute_standard_honk_id_polynomials(circuit_proving_key.get()); - - compute_first_and_last_lagrange_polynomials(circuit_proving_key.get()); - - return circuit_proving_key; -} - -/** - * Compute verification key consisting of selector precommitments. - * - * @return Pointer to created circuit verification key. - * */ -template -std::shared_ptr StandardHonkComposerHelper::compute_verification_key( - const CircuitConstructor& circuit_constructor) -{ - if (circuit_verification_key) { - return circuit_verification_key; - } - if (!circuit_proving_key) { - compute_proving_key(circuit_constructor); - } - - circuit_verification_key = StandardHonkComposerHelper::compute_verification_key_base( - circuit_proving_key, crs_factory_->get_verifier_crs()); - circuit_verification_key->composer_type = circuit_proving_key->composer_type; - - return circuit_verification_key; -} - -template -StandardVerifier StandardHonkComposerHelper::create_verifier( - const CircuitConstructor& circuit_constructor) -{ - compute_verification_key(circuit_constructor); - StandardVerifier output_state( - circuit_verification_key, - honk::StandardHonk::create_manifest(circuit_constructor.public_inputs.size(), - numeric::get_msb(circuit_verification_key->circuit_size))); - - // TODO(Cody): This should be more generic - auto kate_verification_key = std::make_unique("../srs_db/ignition"); - - output_state.kate_verification_key = std::move(kate_verification_key); - - return output_state; -} - -template -template -// TODO(Cody): this file should be generic with regard to flavor/arithmetization/whatever. -StandardProver StandardHonkComposerHelper::create_prover( - const CircuitConstructor& circuit_constructor) -{ - compute_proving_key(circuit_constructor); - compute_witness(circuit_constructor); - - size_t num_sumcheck_rounds(circuit_proving_key->log_circuit_size); - auto manifest = Flavor::create_manifest(circuit_constructor.public_inputs.size(), num_sumcheck_rounds); - StandardProver output_state(std::move(wire_polynomials), circuit_proving_key, manifest); - - // TODO(Cody): This should be more generic - std::unique_ptr kate_commitment_key = - std::make_unique(circuit_proving_key->circuit_size, "../srs_db/ignition"); - - output_state.commitment_key = std::move(kate_commitment_key); - - return output_state; -} -template class StandardHonkComposerHelper; -template StandardProver StandardHonkComposerHelper::create_prover( - const StandardCircuitConstructor& circuit_constructor); -} // namespace honk diff --git a/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.hpp b/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.hpp deleted file mode 100644 index 012f4d6946..0000000000 --- a/cpp/src/barretenberg/honk/composer/composer_helper/composer_helper.hpp +++ /dev/null @@ -1,74 +0,0 @@ -#pragma once - -#include "barretenberg/polynomials/polynomial.hpp" -#include "barretenberg/srs/reference_string/file_reference_string.hpp" -#include "barretenberg/proof_system/proving_key/proving_key.hpp" -#include "barretenberg/honk/proof_system/prover.hpp" -#include "barretenberg/honk/proof_system/verifier.hpp" -#include "barretenberg/honk/circuit_constructors/standard_circuit_constructor.hpp" -#include "barretenberg/honk/pcs/commitment_key.hpp" -#include "barretenberg/proof_system/verification_key/verification_key.hpp" -#include "barretenberg/plonk/proof_system/verifier/verifier.hpp" -#include "barretenberg/proof_system/composer/composer_base.hpp" -#include "composer_helper_lib.hpp" -#include "permutation_helper.hpp" - -#include - -namespace honk { -// TODO(Kesha): change initializations to specify this parameter -// Cody: What does this mean? -template class StandardHonkComposerHelper { - public: - static constexpr size_t NUM_RANDOMIZED_GATES = 2; // equal to the number of multilinear evaluations leaked - static constexpr size_t program_width = CircuitConstructor::program_width; - std::shared_ptr circuit_proving_key; - std::vector wire_polynomials; - std::shared_ptr circuit_verification_key; - // TODO(kesha): we need to put this into the commitment key, so that the composer doesn't have to handle srs at all - std::shared_ptr crs_factory_; - bool computed_witness = false; - StandardHonkComposerHelper() - : StandardHonkComposerHelper( - std::shared_ptr(new bonk::FileReferenceStringFactory("../srs_db/ignition"))) - {} - StandardHonkComposerHelper(std::shared_ptr crs_factory) - : crs_factory_(std::move(crs_factory)) - {} - - StandardHonkComposerHelper(std::unique_ptr&& crs_factory) - : crs_factory_(std::move(crs_factory)) - {} - StandardHonkComposerHelper(std::shared_ptr p_key, std::shared_ptr v_key) - : circuit_proving_key(std::move(p_key)) - , circuit_verification_key(std::move(v_key)) - {} - StandardHonkComposerHelper(StandardHonkComposerHelper&& other) noexcept = default; - StandardHonkComposerHelper(const StandardHonkComposerHelper& other) = delete; - StandardHonkComposerHelper& operator=(StandardHonkComposerHelper&& other) noexcept = default; - StandardHonkComposerHelper& operator=(const StandardHonkComposerHelper& other) = delete; - ~StandardHonkComposerHelper() = default; - - std::shared_ptr compute_proving_key(const CircuitConstructor& circuit_constructor); - std::shared_ptr compute_verification_key(const CircuitConstructor& circuit_constructor); - - StandardVerifier create_verifier(const CircuitConstructor& circuit_constructor); - - template StandardProver create_prover(const CircuitConstructor& circuit_constructor); - - // TODO(Adrian): Seems error prone to provide the number of randomized gates - // Cody: Where should this go? In the flavor (or whatever that becomes)? - std::shared_ptr compute_proving_key_base( - const CircuitConstructor& circuit_constructor, - const size_t minimum_ciricut_size = 0, - const size_t num_randomized_gates = NUM_RANDOMIZED_GATES); - // This needs to be static as it may be used only to compute the selector commitments. - - static std::shared_ptr compute_verification_key_base( - std::shared_ptr const& proving_key, - std::shared_ptr const& vrs); - - void compute_witness(const CircuitConstructor& circuit_constructor, const size_t minimum_circuit_size = 0); -}; - -} // namespace honk From 67a390487f1cc145472e98408654077b697caa60 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Wed, 8 Mar 2023 13:57:26 -0600 Subject: [PATCH 05/10] Restore comment in master --- .../relations/grand_product_computation_relation.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cpp/src/barretenberg/honk/sumcheck/relations/grand_product_computation_relation.hpp b/cpp/src/barretenberg/honk/sumcheck/relations/grand_product_computation_relation.hpp index f9dddb55d3..7d6b760f0b 100644 --- a/cpp/src/barretenberg/honk/sumcheck/relations/grand_product_computation_relation.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/relations/grand_product_computation_relation.hpp @@ -18,9 +18,10 @@ template class GrandProductComputationRelation : public Relation Date: Wed, 8 Mar 2023 14:11:00 -0600 Subject: [PATCH 06/10] Remove another file removed in master --- .../lagrange_base_transformation/lagrange_base.hpp | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 cpp/src/barretenberg/srs/lagrange_base_transformation/lagrange_base.hpp diff --git a/cpp/src/barretenberg/srs/lagrange_base_transformation/lagrange_base.hpp b/cpp/src/barretenberg/srs/lagrange_base_transformation/lagrange_base.hpp deleted file mode 100644 index 031384ffc1..0000000000 --- a/cpp/src/barretenberg/srs/lagrange_base_transformation/lagrange_base.hpp +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "../../ecc/curves/bn254/g1.hpp" -#include "../../polynomials/evaluation_domain.hpp" -#include "../../ecc/groups/element.hpp" - -namespace barretenberg { -namespace lagrange_base { -void transform_srs(g1::affine_element*, g1::affine_element*, const size_t); -} -} // namespace barretenberg \ No newline at end of file From 3a4b0d82aa141246b977210d16ded9448dea712e Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Wed, 8 Mar 2023 14:16:48 -0600 Subject: [PATCH 07/10] Remove comment so to avoid incorrect include --- .../barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp index 03ef250443..56af6d4e66 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp @@ -2,7 +2,6 @@ #include #include "barretenberg/numeric/random/engine.hpp" #include "barretenberg/honk/composer/standard_honk_composer.hpp" -// #include namespace test_stdlib_bit_array { From 54e2459c05f33b05cae684e8c43289663ff013ab Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Wed, 8 Mar 2023 14:22:31 -0600 Subject: [PATCH 08/10] Remove comments so to avoid incorrect includes --- .../primitives/packed_byte_array/packed_byte_array.test.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp b/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp index 42c6427e48..3020c6e4d8 100644 --- a/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp @@ -4,9 +4,6 @@ #include // test currently doesn't construct or verify proof, but hey, why not. #include "barretenberg/honk/composer/standard_honk_composer.hpp" -// #include -// #include -// #include #include "barretenberg/numeric/random/engine.hpp" From 65011b29f9dee8e5acda2df90ceafcac086c2d9b Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Wed, 8 Mar 2023 14:25:02 -0600 Subject: [PATCH 09/10] Remove comments so to avoid incorrect includes --- .../stdlib/primitives/safe_uint/safe_uint.test.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp index 234299629e..9e566212f4 100644 --- a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp @@ -5,9 +5,6 @@ #include "barretenberg/numeric/random/engine.hpp" #include "../byte_array/byte_array.hpp" #include "barretenberg/honk/composer/standard_honk_composer.hpp" -// #include -// #include -// #include #include "barretenberg/stdlib/types/types.hpp" namespace { From 7924e22a2d9c728a86062ca458f1f27726daa84c Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Wed, 8 Mar 2023 14:28:36 -0600 Subject: [PATCH 10/10] Re-add removed header --- cpp/src/barretenberg/transcript/transcript_wrappers.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/cpp/src/barretenberg/transcript/transcript_wrappers.cpp b/cpp/src/barretenberg/transcript/transcript_wrappers.cpp index c698553344..a95943199d 100644 --- a/cpp/src/barretenberg/transcript/transcript_wrappers.cpp +++ b/cpp/src/barretenberg/transcript/transcript_wrappers.cpp @@ -1,4 +1,5 @@ #include "./transcript_wrappers.hpp" +#include "manifest.hpp" #include namespace transcript {