From 656e51a69ae971ab772b5956055e0088f88efde4 Mon Sep 17 00:00:00 2001 From: codygunton Date: Mon, 3 Jul 2023 10:19:57 +0000 Subject: [PATCH] Sort includes --- cpp/.clang-format | 2 +- cpp/src/barretenberg/barretenberg.hpp | 4 +-- .../honk_bench/benchmark_utilities.hpp | 12 ++++---- .../benchmark/honk_bench/honk.bench.cpp | 4 +-- .../honk_bench/standard_honk.bench.cpp | 2 +- .../honk_bench/standard_plonk.bench.cpp | 2 +- .../benchmark/honk_bench/ultra_honk.bench.cpp | 4 +-- .../honk_bench/ultra_plonk.bench.cpp | 2 +- .../benchmark/pippenger_bench/main.cpp | 6 ++-- .../benchmark/plonk_bench/plonk.bench.cpp | 4 +-- cpp/src/barretenberg/common/assert.hpp | 4 +-- cpp/src/barretenberg/common/c_bind.cpp | 2 +- cpp/src/barretenberg/common/c_bind.hpp | 4 +-- .../barretenberg/common/constexpr_utils.hpp | 2 +- cpp/src/barretenberg/common/container.hpp | 4 +-- cpp/src/barretenberg/common/log.hpp | 8 ++--- cpp/src/barretenberg/common/mem.cpp | 2 +- .../common/parallel_for_atomic_pool.cpp | 2 +- .../common/parallel_for_moody.cpp | 2 +- .../common/parallel_for_mutex_pool.cpp | 2 +- .../common/parallel_for_queued.cpp | 2 +- cpp/src/barretenberg/common/serialize.hpp | 12 ++++---- .../barretenberg/common/slab_allocator.cpp | 2 +- .../barretenberg/common/slab_allocator.hpp | 8 ++--- cpp/src/barretenberg/common/streams.hpp | 4 +-- cpp/src/barretenberg/common/thread.hpp | 8 ++--- .../barretenberg/common/throw_or_abort.hpp | 2 +- cpp/src/barretenberg/common/timer.hpp | 2 +- cpp/src/barretenberg/crypto/aes128/aes128.cpp | 4 +-- cpp/src/barretenberg/crypto/aes128/aes128.hpp | 4 +-- .../barretenberg/crypto/blake2s/blake2s.hpp | 4 +-- .../barretenberg/crypto/blake2s/c_bind.cpp | 2 +- .../barretenberg/crypto/blake2s/c_bind.hpp | 6 ++-- .../barretenberg/crypto/blake3s/blake3s.cpp | 2 +- .../crypto/blake3s/blake3s.test.cpp | 2 +- .../barretenberg/crypto/blake3s/c_bind.cpp | 2 +- .../crypto/blake3s_full/blake3s.cpp | 2 +- cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp | 4 +-- .../barretenberg/crypto/ecdsa/ecdsa.test.cpp | 4 +-- .../barretenberg/crypto/ecdsa/ecdsa_impl.hpp | 4 +-- .../generators/fixed_base_scalar_mul.hpp | 2 +- .../crypto/generators/generator_data.hpp | 2 +- .../crypto/generators/generator_data.test.cpp | 4 +-- cpp/src/barretenberg/crypto/hmac/hmac.hpp | 2 +- .../barretenberg/crypto/hmac/hmac.test.cpp | 4 +-- .../crypto/pedersen_commitment/c_bind.cpp | 8 ++--- .../crypto/pedersen_commitment/c_bind.hpp | 4 +-- .../crypto/pedersen_commitment/c_bind_new.cpp | 2 +- .../crypto/pedersen_commitment/c_bind_new.hpp | 2 +- .../crypto/pedersen_commitment/pedersen.hpp | 6 ++-- .../pedersen_lookup.test.cpp | 4 +-- .../sidon_set/sidon_set.hpp | 2 +- .../sidon_set/sidon_set.test.cpp | 2 +- .../crypto/pedersen_hash/c_bind.cpp | 8 ++--- .../crypto/pedersen_hash/c_bind.hpp | 2 +- .../crypto/pedersen_hash/c_bind_new.cpp | 4 +-- .../crypto/pedersen_hash/pedersen.hpp | 6 ++-- .../barretenberg/crypto/schnorr/c_bind.cpp | 2 +- .../barretenberg/crypto/schnorr/c_bind.hpp | 2 +- .../crypto/schnorr/c_bind_new.cpp | 2 +- .../barretenberg/crypto/schnorr/multisig.hpp | 2 +- .../schnorr/proof_of_possession.test.cpp | 2 +- .../crypto/schnorr/schnorr.test.cpp | 2 +- cpp/src/barretenberg/crypto/sha256/sha256.cpp | 2 +- cpp/src/barretenberg/crypto/sha256/sha256.hpp | 4 +-- .../dsl/acir_format/acir_format.hpp | 20 ++++++------- .../dsl/acir_format/acir_format.test.cpp | 5 ++-- .../dsl/acir_format/blake2s_constraint.hpp | 2 +- .../dsl/acir_format/block_constraint.cpp | 2 +- .../dsl/acir_format/block_constraint.hpp | 4 +-- .../dsl/acir_format/block_constraint.test.cpp | 2 +- .../dsl/acir_format/ecdsa_secp256k1.hpp | 2 +- .../dsl/acir_format/ecdsa_secp256k1.test.cpp | 4 +-- .../dsl/acir_format/fixed_base_scalar_mul.hpp | 2 +- .../dsl/acir_format/hash_to_field.hpp | 2 +- .../dsl/acir_format/keccak_constraint.cpp | 2 +- .../dsl/acir_format/keccak_constraint.hpp | 2 +- .../dsl/acir_format/logic_constraint.hpp | 2 +- .../barretenberg/dsl/acir_format/pedersen.hpp | 2 +- .../dsl/acir_format/range_constraint.hpp | 2 +- .../dsl/acir_format/recursion_constraint.hpp | 2 +- .../acir_format/recursion_constraint.test.cpp | 2 +- .../dsl/acir_format/schnorr_verify.cpp | 2 +- .../dsl/acir_format/schnorr_verify.hpp | 2 +- .../dsl/acir_format/sha256_constraint.cpp | 4 +-- .../dsl/acir_format/sha256_constraint.hpp | 2 +- .../dsl/acir_proofs/acir_composer.cpp | 7 ++--- .../dsl/acir_proofs/acir_composer.hpp | 8 ++--- .../barretenberg/dsl/acir_proofs/c_bind.cpp | 6 ++-- .../barretenberg/dsl/acir_proofs/c_bind.hpp | 6 ++-- cpp/src/barretenberg/dsl/types.hpp | 24 +++++++-------- .../barretenberg/ecc/curves/bn254/bn254.hpp | 2 +- .../barretenberg/ecc/curves/bn254/fq.test.cpp | 2 +- .../barretenberg/ecc/curves/bn254/fr.test.cpp | 2 +- .../ecc/curves/grumpkin/grumpkin.test.cpp | 2 +- .../ecc/curves/secp256k1/secp256k1.test.cpp | 2 +- .../ecc/curves/secp256r1/secp256r1.test.cpp | 2 +- cpp/src/barretenberg/ecc/fields/field.hpp | 6 ++-- .../barretenberg/ecc/fields/field_impl.hpp | 4 +-- .../ecc/groups/affine_element.hpp | 6 ++-- .../ecc/groups/affine_element.test.cpp | 6 ++-- .../ecc/groups/affine_element_impl.hpp | 2 +- cpp/src/barretenberg/ecc/groups/element.hpp | 4 +-- cpp/src/barretenberg/ecc/groups/group.hpp | 4 +-- cpp/src/barretenberg/ecc/groups/wnaf.hpp | 2 +- cpp/src/barretenberg/ecc/groups/wnaf.test.cpp | 2 +- .../ecc/scalar_multiplication/point_table.hpp | 2 +- .../scalar_multiplication/runtime_states.cpp | 2 +- .../scalar_multiplication.cpp | 4 +-- .../scalar_multiplication.hpp | 2 +- cpp/src/barretenberg/ecc/serialize.test.cpp | 4 +-- cpp/src/barretenberg/env/data_store.cpp | 8 ++--- cpp/src/barretenberg/examples/c_bind.cpp | 2 +- cpp/src/barretenberg/examples/c_bind.hpp | 4 +-- .../barretenberg/examples/simple/simple.cpp | 4 +-- .../examples/simple/simple.test.cpp | 2 +- .../grumpkin_srs_gen/grumpkin_srs_gen.cpp | 6 ++-- .../honk/composer/standard_composer.cpp | 2 +- .../honk/composer/standard_composer.hpp | 4 +-- .../honk/composer/standard_composer.test.cpp | 10 +++---- .../honk/composer/ultra_composer.hpp | 4 +-- .../honk/composer/ultra_composer.test.cpp | 10 +++---- cpp/src/barretenberg/honk/flavor/standard.hpp | 18 +++++------ .../honk/flavor/standard_grumpkin.hpp | 16 +++++----- cpp/src/barretenberg/honk/flavor/ultra.hpp | 30 +++++++++---------- .../honk/flavor/ultra_grumpkin.hpp | 28 ++++++++--------- .../barretenberg/honk/pcs/commitment_key.hpp | 10 +++---- .../honk/pcs/commitment_key.test.hpp | 4 +-- .../barretenberg/honk/pcs/gemini/gemini.cpp | 2 +- .../barretenberg/honk/pcs/gemini/gemini.hpp | 2 +- cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp | 10 +++---- .../barretenberg/honk/pcs/ipa/ipa.test.cpp | 10 +++---- cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp | 2 +- .../barretenberg/honk/pcs/kzg/kzg.test.cpp | 4 +-- .../honk/pcs/shplonk/shplonk.test.cpp | 6 ++-- .../honk/pcs/shplonk/shplonk_single.hpp | 2 +- cpp/src/barretenberg/honk/pcs/wrapper.hpp | 2 +- .../barretenberg/honk/proof_system/prover.hpp | 14 ++++----- .../honk/proof_system/prover_library.hpp | 4 +-- .../honk/proof_system/prover_library.test.cpp | 6 ++-- .../honk/proof_system/ultra_prover.cpp | 22 +++++++------- .../honk/proof_system/ultra_prover.hpp | 10 +++---- .../honk/proof_system/ultra_verifier.cpp | 4 +-- .../honk/proof_system/ultra_verifier.hpp | 2 +- .../honk/proof_system/verifier.cpp | 2 +- .../honk/proof_system/verifier.hpp | 4 +-- .../sumcheck/polynomials/barycentric_data.hpp | 4 +-- .../polynomials/barycentric_data.test.cpp | 4 +-- .../polynomials/multivariates.test.cpp | 4 +-- .../honk/sumcheck/polynomials/pow.test.cpp | 4 +-- .../honk/sumcheck/polynomials/univariate.hpp | 6 ++-- .../sumcheck/polynomials/univariate.test.cpp | 6 ++-- .../sumcheck/relations/lookup_relation.hpp | 2 +- .../relations/permutation_relation.hpp | 2 +- .../relations/relation_consistency.test.cpp | 10 +++---- .../relations/relation_correctness.test.cpp | 10 +++---- .../sumcheck/relations/relation_types.hpp | 14 +++++---- .../ultra_relation_consistency.test.cpp | 20 ++++++------- .../barretenberg/honk/sumcheck/sumcheck.hpp | 12 ++++---- .../honk/sumcheck/sumcheck.test.cpp | 26 ++++++++-------- .../honk/sumcheck/sumcheck_round.hpp | 10 +++---- .../honk/sumcheck/sumcheck_round.test.cpp | 6 ++-- .../honk/transcript/transcript.hpp | 6 ++-- .../honk/transcript/transcript.test.cpp | 4 +-- .../honk/utils/power_polynomial.hpp | 2 +- .../honk/utils/power_polynomial.test.cpp | 2 +- .../join_split_example/constants.hpp | 4 +-- .../fixtures/user_context.hpp | 2 +- .../proofs/compute_circuit_data.hpp | 6 ++-- .../inner_proof_data/inner_proof_data.hpp | 4 +-- .../proofs/join_split/c_bind.cpp | 14 ++++----- .../join_split/compute_circuit_data.cpp | 6 ++-- .../join_split/compute_circuit_data.hpp | 2 +- .../proofs/join_split/create_proof.hpp | 2 +- .../proofs/join_split/index.hpp | 2 +- .../proofs/join_split/join_split.cpp | 6 ++-- .../proofs/join_split/join_split.hpp | 4 +-- .../proofs/join_split/join_split.test.cpp | 6 ++-- .../proofs/join_split/join_split_circuit.cpp | 8 ++--- .../proofs/join_split/join_split_circuit.hpp | 4 +-- .../join_split/join_split_js_parity.test.cpp | 4 +-- .../proofs/join_split/join_split_tx.hpp | 2 +- .../proofs/join_split/sign_join_split_tx.cpp | 2 +- .../proofs/join_split/sign_join_split_tx.hpp | 2 +- .../proofs/join_split/verify_signature.hpp | 2 +- .../proofs/mock/mock_circuit.hpp | 13 ++++---- .../proofs/mock/mock_circuit.test.cpp | 2 +- .../notes/circuit/account/account_note.hpp | 1 - .../proofs/notes/circuit/account/commit.hpp | 4 +-- .../proofs/notes/circuit/asset_id.cpp | 2 +- .../proofs/notes/circuit/bridge_call_data.hpp | 4 +-- .../proofs/notes/circuit/claim/claim_note.hpp | 4 +-- .../claim/complete_partial_commitment.hpp | 2 +- .../notes/circuit/claim/compute_nullifier.hpp | 2 +- .../claim/create_partial_commitment.hpp | 2 +- .../notes/circuit/claim/witness_data.hpp | 4 +-- .../proofs/notes/circuit/index.hpp | 2 +- .../proofs/notes/circuit/value/commit.hpp | 4 +-- .../value/complete_partial_commitment.hpp | 2 +- .../circuit/value/compute_nullifier.test.cpp | 6 ++-- .../value/create_partial_commitment.hpp | 4 +-- .../proofs/notes/circuit/value/value_note.hpp | 2 +- .../notes/circuit/value/value_note.test.cpp | 4 +-- .../proofs/notes/constants.hpp | 4 +-- .../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/asset_id.hpp | 2 +- .../proofs/notes/native/bridge_call_data.hpp | 4 +-- .../proofs/notes/native/claim/claim_note.hpp | 4 +-- .../notes/native/claim/claim_note_tx_data.hpp | 2 +- .../claim/complete_partial_commitment.hpp | 2 +- .../notes/native/claim/compute_nullifier.hpp | 2 +- .../claim/create_partial_commitment.hpp | 4 +-- .../proofs/notes/native/claim/index.hpp | 2 +- .../proofs/notes/native/index.hpp | 2 +- .../value/complete_partial_commitment.hpp | 2 +- .../notes/native/value/compute_nullifier.cpp | 2 +- .../value/create_partial_commitment.hpp | 2 +- .../proofs/notes/native/value/index.hpp | 4 +-- .../proofs/notes/native/value/value_note.hpp | 2 +- .../join_split_example/proofs/verify.hpp | 2 +- .../barretenberg/join_split_example/types.hpp | 12 ++++---- cpp/src/barretenberg/numeric/bitop/pow.hpp | 2 +- .../numeric/bitop/sparse_form.hpp | 4 +-- .../barretenberg/numeric/random/engine.cpp | 2 +- .../numeric/random/engine.test.cpp | 4 +-- .../barretenberg/numeric/uint128/uint128.hpp | 2 +- .../barretenberg/numeric/uint256/uint256.hpp | 4 +-- cpp/src/barretenberg/numeric/uintx/uintx.hpp | 6 ++-- .../plonk/composer/standard_composer.cpp | 8 ++--- .../plonk/composer/standard_composer.hpp | 11 ++++--- .../plonk/composer/standard_composer.test.cpp | 4 +-- .../plonk/composer/turbo_composer.cpp | 13 ++++---- .../plonk/composer/turbo_composer.hpp | 8 ++--- .../plonk/composer/turbo_composer.test.cpp | 2 +- .../plonk/composer/ultra_composer.cpp | 2 +- .../plonk/composer/ultra_composer.hpp | 8 ++--- cpp/src/barretenberg/plonk/flavor/flavor.hpp | 2 +- .../commitment_scheme/commitment_scheme.hpp | 2 +- .../commitment_scheme.test.cpp | 10 +++---- .../kate_commitment_scheme.cpp | 2 +- .../plonk/proof_system/prover/prover.cpp | 6 ++-- .../plonk/proof_system/prover/prover.hpp | 8 ++--- .../plonk/proof_system/prover/prover.test.cpp | 8 ++--- .../proof_system/proving_key/proving_key.cpp | 2 +- .../proof_system/proving_key/proving_key.hpp | 6 ++-- .../proving_key/proving_key.test.cpp | 6 ++-- .../proof_system/proving_key/serialize.hpp | 8 ++--- .../public_inputs/public_inputs.test.cpp | 2 +- .../types/polynomial_manifest.hpp | 4 +-- .../proof_system/types/program_settings.hpp | 16 +++++----- .../plonk/proof_system/types/proof.hpp | 8 ++--- .../proof_system/utils/kate_verification.hpp | 2 +- .../verification_key/verification_key.cpp | 6 ++-- .../verification_key/verification_key.hpp | 8 ++--- .../verification_key.test.cpp | 2 +- .../plonk/proof_system/verifier/verifier.cpp | 4 +-- .../plonk/proof_system/verifier/verifier.hpp | 4 +-- .../proof_system/verifier/verifier.test.cpp | 14 ++++----- .../permutation_widget_impl.hpp | 6 ++-- .../random_widgets/plookup_widget_impl.hpp | 6 ++-- .../widgets/random_widgets/random_widget.hpp | 2 +- .../transition_widgets/transition_widget.hpp | 4 +-- .../polynomials/evaluation_domain.cpp | 8 ++--- .../barretenberg/polynomials/polynomial.cpp | 8 ++--- .../barretenberg/polynomials/polynomial.hpp | 10 +++---- .../polynomials/polynomial_arithmetic.cpp | 8 ++--- .../polynomial_arithmetic.test.cpp | 8 ++--- .../polynomials/polynomials.bench.cpp | 4 +-- .../arithmetization/arithmetization.hpp | 2 +- .../arithmetization/gate_data.hpp | 4 +-- .../circuit_builder/circuit_builder_base.hpp | 4 +-- .../standard_circuit_builder.cpp | 2 +- .../standard_circuit_builder.hpp | 4 +-- .../standard_circuit_builder.test.cpp | 4 +-- .../circuit_builder/turbo_circuit_builder.hpp | 4 +-- .../turbo_circuit_builder.test.cpp | 4 +-- .../circuit_builder/ultra_circuit_builder.cpp | 2 +- .../circuit_builder/ultra_circuit_builder.hpp | 12 ++++---- .../ultra_circuit_builder.test.cpp | 2 +- .../composer/composer_helper_lib.hpp | 2 +- .../proof_system/composer/composer_lib.hpp | 2 +- .../composer/composer_lib.test.cpp | 4 +-- .../proof_system/composer/permutation_lib.hpp | 5 ++-- .../composer/permutation_lib.test.cpp | 4 +-- .../proof_system/flavor/flavor.hpp | 8 ++--- .../proof_system/plookup_tables/aes128.hpp | 4 +-- .../proof_system/plookup_tables/blake2s.hpp | 2 +- .../plookup_tables/keccak/keccak_chi.hpp | 4 +-- .../plookup_tables/keccak/keccak_input.hpp | 4 +-- .../plookup_tables/keccak/keccak_output.hpp | 4 +-- .../plookup_tables/keccak/keccak_rho.hpp | 4 +-- .../plookup_tables/keccak/keccak_theta.hpp | 4 +-- .../non_native_group_generator.hpp | 2 +- .../proof_system/plookup_tables/pedersen.hpp | 2 +- .../plookup_tables/plookup_tables.hpp | 14 ++++----- .../proof_system/plookup_tables/sha256.hpp | 4 +-- .../proof_system/plookup_tables/sparse.hpp | 2 +- .../proof_system/plookup_tables/types.hpp | 2 +- .../polynomial_store.test.cpp | 2 +- .../polynomial_store_cache.hpp | 2 +- .../proof_system/types/circuit_type.hpp | 2 +- .../proof_system/work_queue/work_queue.cpp | 2 +- cpp/src/barretenberg/serialize/cbind.hpp | 2 +- cpp/src/barretenberg/serialize/msgpack.hpp | 4 +-- .../msgpack_impl/check_memory_span.hpp | 10 +++---- .../serialize/msgpack_impl/func_traits.hpp | 2 +- .../serialize/msgpack_impl/schema_impl.hpp | 6 ++-- .../serialize/msgpack_impl/schema_name.hpp | 2 +- .../msgpack_impl/struct_map_impl.hpp | 8 ++--- .../serialize/msgpack_schema.test.cpp | 2 +- .../barretenberg/serialize/raw_pointer.hpp | 2 +- .../barretenberg/serialize/test_helper.hpp | 2 +- .../circuits/blake_circuit.hpp | 2 +- .../circuits/recursive_circuit.hpp | 8 ++--- .../barretenberg/solidity_helpers/key_gen.cpp | 4 +-- .../solidity_helpers/proof_gen.cpp | 4 +-- .../solidity_helpers/utils/utils.hpp | 2 +- cpp/src/barretenberg/srs/c_bind.cpp | 4 +-- cpp/src/barretenberg/srs/c_bind.hpp | 2 +- .../srs/factories/file_crs_factory.hpp | 4 +-- .../srs/factories/mem_crs_factory.hpp | 4 +-- .../srs/factories/mem_crs_factory.test.cpp | 6 ++-- cpp/src/barretenberg/srs/global_crs.cpp | 2 +- cpp/src/barretenberg/srs/io.hpp | 2 +- cpp/src/barretenberg/srs/io.test.cpp | 2 +- .../srs/scalar_multiplication.test.cpp | 2 +- .../commitment/pedersen/pedersen.bench.cpp | 4 +-- .../stdlib/commitment/pedersen/pedersen.cpp | 4 +-- .../stdlib/commitment/pedersen/pedersen.hpp | 4 +-- .../commitment/pedersen/pedersen.test.cpp | 6 ++-- .../commitment/pedersen/pedersen_plookup.cpp | 4 +-- .../commitment/pedersen/pedersen_plookup.hpp | 2 +- .../pedersen/pedersen_plookup.test.cpp | 6 ++-- .../stdlib/encryption/aes128/aes128.cpp | 6 ++-- .../stdlib/encryption/aes128/aes128.hpp | 2 +- .../stdlib/encryption/aes128/aes128.test.cpp | 2 +- .../stdlib/encryption/ecdsa/ecdsa.hpp | 4 +-- .../stdlib/encryption/ecdsa/ecdsa.test.cpp | 4 +-- .../stdlib/encryption/schnorr/schnorr.cpp | 4 +-- .../stdlib/encryption/schnorr/schnorr.hpp | 8 ++--- .../encryption/schnorr/schnorr.test.cpp | 2 +- .../benchmarks/external/external.bench.cpp | 2 +- .../hash/benchmarks/sha256/sha256.bench.cpp | 2 +- .../stdlib/hash/blake2s/blake2s.cpp | 2 +- .../stdlib/hash/blake2s/blake2s.test.cpp | 4 +-- .../stdlib/hash/blake2s/blake2s_plookup.cpp | 2 +- .../stdlib/hash/blake2s/blake2s_plookup.hpp | 4 +-- .../stdlib/hash/blake2s/blake_util.hpp | 4 +-- .../stdlib/hash/blake3s/blake3s.cpp | 4 +-- .../stdlib/hash/blake3s/blake3s.test.cpp | 4 +-- .../stdlib/hash/blake3s/blake3s_plookup.cpp | 2 +- .../stdlib/hash/blake3s/blake3s_plookup.hpp | 4 +-- .../stdlib/hash/keccak/keccak.cpp | 2 +- .../stdlib/hash/keccak/keccak.hpp | 6 ++-- .../stdlib/hash/keccak/keccak.test.cpp | 6 ++-- .../stdlib/hash/pedersen/pedersen.cpp | 2 +- .../stdlib/hash/pedersen/pedersen.hpp | 2 +- .../stdlib/hash/pedersen/pedersen_gates.hpp | 4 +-- .../stdlib/hash/pedersen/pedersen_plookup.cpp | 2 +- .../stdlib/hash/pedersen/pedersen_plookup.hpp | 2 +- .../stdlib/hash/sha256/sha256.cpp | 2 +- .../stdlib/hash/sha256/sha256.hpp | 6 ++-- .../stdlib/hash/sha256/sha256.test.cpp | 6 ++-- .../stdlib/hash/sha256/sha256_plookup.cpp | 2 +- .../stdlib/hash/sha256/sha256_plookup.hpp | 2 +- .../barretenberg/stdlib/merkle_tree/hash.hpp | 2 +- .../stdlib/merkle_tree/hash_path.hpp | 2 +- .../barretenberg/stdlib/merkle_tree/index.hpp | 2 +- .../stdlib/merkle_tree/membership.hpp | 2 +- .../stdlib/merkle_tree/membership.test.cpp | 2 +- .../stdlib/merkle_tree/memory_store.hpp | 2 +- .../stdlib/merkle_tree/merkle_tree.bench.cpp | 2 +- .../stdlib/merkle_tree/merkle_tree.cpp | 6 ++-- .../stdlib/merkle_tree/merkle_tree.hpp | 2 +- .../stdlib/merkle_tree/merkle_tree.test.cpp | 6 ++-- .../nullifier_tree/nullifier_tree.cpp | 6 ++-- .../nullifier_tree/nullifier_tree.test.cpp | 4 +-- .../stdlib/primitives/address/address.hpp | 2 +- .../primitives/bigfield/bigfield.fuzzer.hpp | 4 +-- .../stdlib/primitives/bigfield/bigfield.hpp | 2 +- .../primitives/bigfield/bigfield.test.cpp | 6 ++-- .../stdlib/primitives/biggroup/biggroup.hpp | 10 +++---- .../primitives/biggroup/biggroup.test.cpp | 4 +-- .../primitives/bit_array/bit_array.test.cpp | 6 ++-- .../stdlib/primitives/bool/bool.test.cpp | 4 +-- .../primitives/byte_array/byte_array.test.cpp | 2 +- .../stdlib/primitives/curves/bn254.hpp | 2 +- .../stdlib/primitives/field/array.hpp | 4 +-- .../stdlib/primitives/field/array.test.cpp | 6 ++-- .../stdlib/primitives/field/field.cpp | 2 +- .../stdlib/primitives/field/field.fuzzer.hpp | 8 ++--- .../stdlib/primitives/field/field.hpp | 2 +- .../stdlib/primitives/field/field.test.cpp | 8 ++--- .../stdlib/primitives/group/group.hpp | 2 +- .../stdlib/primitives/group/group.test.cpp | 6 ++-- .../stdlib/primitives/logic/logic.test.cpp | 2 +- .../primitives/memory/dynamic_array.cpp | 2 +- .../primitives/memory/dynamic_array.hpp | 2 +- .../primitives/memory/ram_table.test.cpp | 2 +- .../primitives/memory/rom_table.test.cpp | 2 +- .../packed_byte_array/packed_byte_array.hpp | 4 +-- .../packed_byte_array.test.cpp | 4 +-- .../stdlib/primitives/plookup/plookup.hpp | 6 ++-- .../primitives/plookup/plookup.test.cpp | 14 ++++----- .../primitives/safe_uint/safe_uint.fuzzer.hpp | 4 +-- .../stdlib/primitives/safe_uint/safe_uint.hpp | 8 ++--- .../primitives/safe_uint/safe_uint.test.cpp | 8 ++--- .../stdlib/primitives/uint/uint.fuzzer.hpp | 6 ++-- .../stdlib/primitives/uint/uint.test.cpp | 2 +- .../native_aggregation_state.hpp | 4 +-- .../recursion/transcript/transcript.hpp | 8 ++--- .../recursion/transcript/transcript.test.cpp | 2 +- .../verification_key/verification_key.hpp | 12 ++++---- .../stdlib/recursion/verifier/verifier.hpp | 4 +-- .../recursion/verifier/verifier.test.cpp | 2 +- .../verifier/verifier_turbo.test.cpp | 2 +- cpp/src/barretenberg/stdlib/types/turbo.hpp | 14 ++++----- cpp/src/barretenberg/stdlib/types/ultra.hpp | 14 ++++----- .../barretenberg/transcript/transcript.cpp | 6 ++-- .../barretenberg/transcript/transcript.hpp | 2 +- .../transcript/transcript.test.cpp | 2 +- cpp/src/barretenberg/wasi/wasi_stubs.cpp | 2 +- 425 files changed, 968 insertions(+), 973 deletions(-) diff --git a/cpp/.clang-format b/cpp/.clang-format index bcd87ae23b..834e9c6900 100644 --- a/cpp/.clang-format +++ b/cpp/.clang-format @@ -25,4 +25,4 @@ BraceWrapping: SplitEmptyRecord: false SplitEmptyNamespace: false AllowShortFunctionsOnASingleLine : Inline -SortIncludes: false \ No newline at end of file +SortIncludes: true \ No newline at end of file diff --git a/cpp/src/barretenberg/barretenberg.hpp b/cpp/src/barretenberg/barretenberg.hpp index 0ae72fc165..694b73d16e 100644 --- a/cpp/src/barretenberg/barretenberg.hpp +++ b/cpp/src/barretenberg/barretenberg.hpp @@ -21,10 +21,10 @@ #include "ecc/curves/grumpkin/grumpkin.hpp" #include "numeric/random/engine.hpp" #include "numeric/uint256/uint256.hpp" -#include "proof_system/circuit_builder/turbo_circuit_builder.hpp" -#include "proof_system/circuit_builder/ultra_circuit_builder.hpp" #include "plonk/proof_system/types/proof.hpp" #include "plonk/proof_system/verification_key/verification_key.hpp" +#include "proof_system/circuit_builder/turbo_circuit_builder.hpp" +#include "proof_system/circuit_builder/ultra_circuit_builder.hpp" #include "proof_system/types/circuit_type.hpp" // TODO(https://github.com/AztecProtocol/barretenberg/issues/491): // consider helper header(s) for serialization and other non-stdlib includes diff --git a/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp b/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp index d67f0f31fc..e3c7cf7fad 100644 --- a/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp +++ b/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp @@ -2,16 +2,16 @@ #include "barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp" #include "barretenberg/stdlib/hash/keccak/keccak.hpp" -#include "barretenberg/stdlib/primitives/curves/secp256k1.hpp" -#include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp" #include "barretenberg/stdlib/hash/sha256/sha256.hpp" -#include "barretenberg/stdlib/primitives/bool/bool.hpp" -#include "barretenberg/stdlib/primitives/field/field.hpp" -#include "barretenberg/stdlib/primitives/witness/witness.hpp" -#include "barretenberg/stdlib/merkle_tree/merkle_tree.hpp" #include "barretenberg/stdlib/merkle_tree/membership.hpp" #include "barretenberg/stdlib/merkle_tree/memory_store.hpp" #include "barretenberg/stdlib/merkle_tree/memory_tree.hpp" +#include "barretenberg/stdlib/merkle_tree/merkle_tree.hpp" +#include "barretenberg/stdlib/primitives/bool/bool.hpp" +#include "barretenberg/stdlib/primitives/curves/secp256k1.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" +#include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp" +#include "barretenberg/stdlib/primitives/witness/witness.hpp" using namespace benchmark; diff --git a/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp b/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp index 7f8604f547..87b8c5a284 100644 --- a/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp +++ b/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp @@ -1,8 +1,8 @@ -#include -#include #include "barretenberg/honk/composer/standard_composer.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" #include "barretenberg/stdlib/primitives/witness/witness.hpp" +#include +#include using namespace benchmark; using namespace proof_system::plonk::stdlib; diff --git a/cpp/src/barretenberg/benchmark/honk_bench/standard_honk.bench.cpp b/cpp/src/barretenberg/benchmark/honk_bench/standard_honk.bench.cpp index 5ae3c2f7be..42fed512ff 100644 --- a/cpp/src/barretenberg/benchmark/honk_bench/standard_honk.bench.cpp +++ b/cpp/src/barretenberg/benchmark/honk_bench/standard_honk.bench.cpp @@ -1,6 +1,6 @@ #include "barretenberg/benchmark/honk_bench/benchmark_utilities.hpp" -#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" #include "barretenberg/honk/composer/standard_composer.hpp" +#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" using namespace benchmark; diff --git a/cpp/src/barretenberg/benchmark/honk_bench/standard_plonk.bench.cpp b/cpp/src/barretenberg/benchmark/honk_bench/standard_plonk.bench.cpp index 582e43d6d6..9ed605a348 100644 --- a/cpp/src/barretenberg/benchmark/honk_bench/standard_plonk.bench.cpp +++ b/cpp/src/barretenberg/benchmark/honk_bench/standard_plonk.bench.cpp @@ -1,6 +1,6 @@ #include "barretenberg/benchmark/honk_bench/benchmark_utilities.hpp" -#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" #include "barretenberg/plonk/composer/standard_composer.hpp" +#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" using namespace benchmark; diff --git a/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp b/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp index f66d159ecb..56c45d24ef 100644 --- a/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp +++ b/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp @@ -1,8 +1,8 @@ #include -#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" -#include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/benchmark/honk_bench/benchmark_utilities.hpp" +#include "barretenberg/honk/composer/ultra_composer.hpp" +#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" using namespace benchmark; using namespace proof_system::plonk; diff --git a/cpp/src/barretenberg/benchmark/honk_bench/ultra_plonk.bench.cpp b/cpp/src/barretenberg/benchmark/honk_bench/ultra_plonk.bench.cpp index 52049686ce..196245f4ea 100644 --- a/cpp/src/barretenberg/benchmark/honk_bench/ultra_plonk.bench.cpp +++ b/cpp/src/barretenberg/benchmark/honk_bench/ultra_plonk.bench.cpp @@ -1,6 +1,6 @@ #include "barretenberg/benchmark/honk_bench/benchmark_utilities.hpp" -#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" #include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.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 a5fb702f4b..3bcd6b920a 100644 --- a/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp +++ b/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp @@ -1,10 +1,10 @@ -#include #include "barretenberg/common/assert.hpp" -#include -#include "barretenberg/srs/factories/file_crs_factory.hpp" #include "barretenberg/ecc/curves/bn254/bn254.hpp" #include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp" #include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/srs/factories/file_crs_factory.hpp" +#include +#include // #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 9a90882f3f..add4ec750a 100644 --- a/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp +++ b/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp @@ -1,7 +1,7 @@ -#include -#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" #include "barretenberg/plonk/composer/standard_composer.hpp" +#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" +#include using namespace benchmark; diff --git a/cpp/src/barretenberg/common/assert.hpp b/cpp/src/barretenberg/common/assert.hpp index 48cb04aff7..aa8ba838a1 100644 --- a/cpp/src/barretenberg/common/assert.hpp +++ b/cpp/src/barretenberg/common/assert.hpp @@ -1,8 +1,8 @@ #pragma once #include "assert.h" -#include -#include #include +#include +#include // Compiler should optimize this out in release builds, without triggering an unused variable warning. #define DONT_EVALUATE(expression) \ diff --git a/cpp/src/barretenberg/common/c_bind.cpp b/cpp/src/barretenberg/common/c_bind.cpp index 005514c2ac..14c05b7d33 100644 --- a/cpp/src/barretenberg/common/c_bind.cpp +++ b/cpp/src/barretenberg/common/c_bind.cpp @@ -1,8 +1,8 @@ #include "./c_bind.hpp" #include "./mem.hpp" -#include "./timer.hpp" #include "./serialize.hpp" #include "./slab_allocator.hpp" +#include "./timer.hpp" #include #ifndef NO_MULTITHREADING diff --git a/cpp/src/barretenberg/common/c_bind.hpp b/cpp/src/barretenberg/common/c_bind.hpp index 0725d609cd..c26a68ca05 100644 --- a/cpp/src/barretenberg/common/c_bind.hpp +++ b/cpp/src/barretenberg/common/c_bind.hpp @@ -1,6 +1,6 @@ -#include -#include "./wasm_export.hpp" #include "./serialize.hpp" +#include "./wasm_export.hpp" +#include WASM_EXPORT void test_threads(uint32_t const* threads, uint32_t const* iterations, uint32_t* out); diff --git a/cpp/src/barretenberg/common/constexpr_utils.hpp b/cpp/src/barretenberg/common/constexpr_utils.hpp index 08afbcd200..23079bff70 100644 --- a/cpp/src/barretenberg/common/constexpr_utils.hpp +++ b/cpp/src/barretenberg/common/constexpr_utils.hpp @@ -1,8 +1,8 @@ #pragma once #include -#include #include +#include /** * @brief constexpr_utils defines some helper methods that perform some stl-equivalent operations diff --git a/cpp/src/barretenberg/common/container.hpp b/cpp/src/barretenberg/common/container.hpp index f82a40075f..7fb2f26c39 100644 --- a/cpp/src/barretenberg/common/container.hpp +++ b/cpp/src/barretenberg/common/container.hpp @@ -1,8 +1,8 @@ #pragma once +#include #include -#include #include -#include +#include template C slice(C const& container, size_t start) { diff --git a/cpp/src/barretenberg/common/log.hpp b/cpp/src/barretenberg/common/log.hpp index cbbeac735b..d246b1c092 100644 --- a/cpp/src/barretenberg/common/log.hpp +++ b/cpp/src/barretenberg/common/log.hpp @@ -1,10 +1,10 @@ #pragma once -#include +#include "barretenberg/env/logstr.hpp" +#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp" #include -#include +#include #include -#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp" -#include "barretenberg/env/logstr.hpp" +#include #define BENCHMARK_INFO_PREFIX "##BENCHMARK_INFO_PREFIX##" #define BENCHMARK_INFO_SEPARATOR "#" diff --git a/cpp/src/barretenberg/common/mem.cpp b/cpp/src/barretenberg/common/mem.cpp index 58b59226d0..c5c648ba9b 100644 --- a/cpp/src/barretenberg/common/mem.cpp +++ b/cpp/src/barretenberg/common/mem.cpp @@ -1,6 +1,6 @@ #include "./mem.hpp" -#include "./wasm_export.hpp" #include "./slab_allocator.hpp" +#include "./wasm_export.hpp" extern "C" { diff --git a/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp b/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp index 84f7d220f6..4f325ec658 100644 --- a/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp +++ b/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp @@ -1,5 +1,5 @@ -#include "thread.hpp" #include "log.hpp" +#include "thread.hpp" #include #include #include diff --git a/cpp/src/barretenberg/common/parallel_for_moody.cpp b/cpp/src/barretenberg/common/parallel_for_moody.cpp index aceb87754f..ad0c681836 100644 --- a/cpp/src/barretenberg/common/parallel_for_moody.cpp +++ b/cpp/src/barretenberg/common/parallel_for_moody.cpp @@ -1,6 +1,6 @@ #include "barretenberg/common/thread.hpp" -#include "moody/blockingconcurrentqueue.h" #include "log.hpp" +#include "moody/blockingconcurrentqueue.h" #include "timer.hpp" #include #include diff --git a/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp b/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp index bdd9d86cb3..7dbef9a0b9 100644 --- a/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp +++ b/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp @@ -1,5 +1,5 @@ -#include "thread.hpp" #include "log.hpp" +#include "thread.hpp" #include #include #include diff --git a/cpp/src/barretenberg/common/parallel_for_queued.cpp b/cpp/src/barretenberg/common/parallel_for_queued.cpp index 67911edd41..6fcca9161b 100644 --- a/cpp/src/barretenberg/common/parallel_for_queued.cpp +++ b/cpp/src/barretenberg/common/parallel_for_queued.cpp @@ -1,5 +1,5 @@ -#include "thread.hpp" #include "log.hpp" +#include "thread.hpp" #include #include #include diff --git a/cpp/src/barretenberg/common/serialize.hpp b/cpp/src/barretenberg/common/serialize.hpp index bae1f88b03..3d50f6b3f4 100644 --- a/cpp/src/barretenberg/common/serialize.hpp +++ b/cpp/src/barretenberg/common/serialize.hpp @@ -28,15 +28,15 @@ * - to_buffer */ #pragma once -#include -#include +#include "barretenberg/common/log.hpp" #include "barretenberg/common/net.hpp" -#include -#include -#include +#include +#include #include -#include "barretenberg/common/log.hpp" +#include #include +#include +#include #ifndef __i386__ __extension__ using uint128_t = unsigned __int128; diff --git a/cpp/src/barretenberg/common/slab_allocator.cpp b/cpp/src/barretenberg/common/slab_allocator.cpp index af25cac1c1..c5e678b9fb 100644 --- a/cpp/src/barretenberg/common/slab_allocator.cpp +++ b/cpp/src/barretenberg/common/slab_allocator.cpp @@ -1,7 +1,7 @@ #include "slab_allocator.hpp" +#include #include #include -#include #include #include diff --git a/cpp/src/barretenberg/common/slab_allocator.hpp b/cpp/src/barretenberg/common/slab_allocator.hpp index be5ef6ea1b..d88d34d529 100644 --- a/cpp/src/barretenberg/common/slab_allocator.hpp +++ b/cpp/src/barretenberg/common/slab_allocator.hpp @@ -1,10 +1,10 @@ #pragma once -#include -#include +#include "./assert.hpp" +#include "./log.hpp" #include +#include #include -#include "./log.hpp" -#include "./assert.hpp" +#include #ifndef NO_MULTITHREADING #include #endif diff --git a/cpp/src/barretenberg/common/streams.hpp b/cpp/src/barretenberg/common/streams.hpp index c3dd64aa7c..94e931eb8c 100644 --- a/cpp/src/barretenberg/common/streams.hpp +++ b/cpp/src/barretenberg/common/streams.hpp @@ -1,9 +1,9 @@ #pragma once #include -#include #include -#include #include +#include +#include namespace std { diff --git a/cpp/src/barretenberg/common/thread.hpp b/cpp/src/barretenberg/common/thread.hpp index ac083fcc71..c28e859512 100644 --- a/cpp/src/barretenberg/common/thread.hpp +++ b/cpp/src/barretenberg/common/thread.hpp @@ -1,10 +1,10 @@ #pragma once -#include -#include #include -#include -#include #include +#include +#include +#include +#include inline size_t get_num_cpus() { diff --git a/cpp/src/barretenberg/common/throw_or_abort.hpp b/cpp/src/barretenberg/common/throw_or_abort.hpp index 6232587246..bb140d8761 100644 --- a/cpp/src/barretenberg/common/throw_or_abort.hpp +++ b/cpp/src/barretenberg/common/throw_or_abort.hpp @@ -1,6 +1,6 @@ #pragma once -#include #include "log.hpp" +#include inline void throw_or_abort [[noreturn]] (std::string const& err) { diff --git a/cpp/src/barretenberg/common/timer.hpp b/cpp/src/barretenberg/common/timer.hpp index ca27a5d5ff..b291b3f213 100644 --- a/cpp/src/barretenberg/common/timer.hpp +++ b/cpp/src/barretenberg/common/timer.hpp @@ -1,9 +1,9 @@ #pragma once #include +#include #include #include #include -#include /** * @brief Get the execution between a block of code. diff --git a/cpp/src/barretenberg/crypto/aes128/aes128.cpp b/cpp/src/barretenberg/crypto/aes128/aes128.cpp index 9bdbf85513..629ca4e3c7 100644 --- a/cpp/src/barretenberg/crypto/aes128/aes128.cpp +++ b/cpp/src/barretenberg/crypto/aes128/aes128.cpp @@ -1,9 +1,9 @@ #include "aes128.hpp" +#include "memory.h" +#include #include #include -#include -#include "memory.h" #include namespace crypto { diff --git a/cpp/src/barretenberg/crypto/aes128/aes128.hpp b/cpp/src/barretenberg/crypto/aes128/aes128.hpp index 79cbf3f506..dcc366f0d6 100644 --- a/cpp/src/barretenberg/crypto/aes128/aes128.hpp +++ b/cpp/src/barretenberg/crypto/aes128/aes128.hpp @@ -8,10 +8,10 @@ * Based off of tiny-AES by @kokke : https://github.com/kokke/tiny-AES-c **/ +#include "memory.h" +#include #include #include -#include -#include "memory.h" #include namespace crypto { diff --git a/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp b/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp index d4f1a4cf30..c009296e5b 100644 --- a/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp +++ b/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp @@ -14,10 +14,10 @@ */ #pragma once -#include +#include #include +#include #include -#include namespace blake2 { diff --git a/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp b/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp index 6d5bd3e8da..6db43fe006 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 "barretenberg/ecc/curves/bn254/fr.hpp" +#include "blake2s.hpp" #include using namespace barretenberg; diff --git a/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp b/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp index f6f7d94ffd..03f312df8d 100644 --- a/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp +++ b/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp @@ -1,7 +1,7 @@ -#include -#include -#include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/common/wasm_export.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include +#include extern "C" { diff --git a/cpp/src/barretenberg/crypto/blake3s/blake3s.cpp b/cpp/src/barretenberg/crypto/blake3s/blake3s.cpp index 8f04fe9424..330f38557f 100644 --- a/cpp/src/barretenberg/crypto/blake3s/blake3s.cpp +++ b/cpp/src/barretenberg/crypto/blake3s/blake3s.cpp @@ -29,9 +29,9 @@ */ #include +#include #include #include -#include #include #include "blake3-impl.hpp" diff --git a/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp b/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp index 73b46dc864..eb1ebe5bd9 100644 --- a/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp +++ b/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp @@ -1,5 +1,5 @@ -#include "blake3s.hpp" #include "../blake2s/blake2s.hpp" +#include "blake3s.hpp" #include diff --git a/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp b/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp index bb056e41b8..f70e018391 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 "barretenberg/ecc/curves/bn254/fr.hpp" +#include "blake3s.hpp" #define WASM_EXPORT __attribute__((visibility("default"))) diff --git a/cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp b/cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp index b9bc4dc98b..e6545f3a83 100644 --- a/cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp +++ b/cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp @@ -18,9 +18,9 @@ */ #include +#include #include #include -#include #include "blake3-impl.hpp" diff --git a/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp b/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp index df1e887fdc..4089835ea6 100644 --- a/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp +++ b/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp @@ -1,9 +1,9 @@ #pragma once #include "../hashers/hashers.hpp" -#include -#include #include "barretenberg/ecc/curves/secp256k1/secp256k1.hpp" #include "barretenberg/serialize/msgpack.hpp" +#include +#include namespace crypto { namespace ecdsa { diff --git a/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp b/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp index 5d2781571a..9ea14acc7a 100644 --- a/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp +++ b/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp @@ -1,8 +1,8 @@ -#include "ecdsa.hpp" +#include "barretenberg/common/serialize.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "barretenberg/ecc/curves/secp256r1/secp256r1.hpp" -#include "barretenberg/common/serialize.hpp" #include "barretenberg/serialize/test_helper.hpp" +#include "ecdsa.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 06420e60ff..085ca71283 100644 --- a/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp +++ b/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp @@ -1,8 +1,8 @@ #pragma once -#include "barretenberg/numeric/uint256/uint256.hpp" -#include "barretenberg/common/serialize.hpp" #include "../hmac/hmac.hpp" +#include "barretenberg/common/serialize.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" namespace crypto { namespace ecdsa { diff --git a/cpp/src/barretenberg/crypto/generators/fixed_base_scalar_mul.hpp b/cpp/src/barretenberg/crypto/generators/fixed_base_scalar_mul.hpp index 2077483bda..555b8837f1 100644 --- a/cpp/src/barretenberg/crypto/generators/fixed_base_scalar_mul.hpp +++ b/cpp/src/barretenberg/crypto/generators/fixed_base_scalar_mul.hpp @@ -1,6 +1,6 @@ #pragma once -#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "./generator_data.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" namespace crypto { namespace generators { diff --git a/cpp/src/barretenberg/crypto/generators/generator_data.hpp b/cpp/src/barretenberg/crypto/generators/generator_data.hpp index 9b336ad5d0..34b1d107df 100644 --- a/cpp/src/barretenberg/crypto/generators/generator_data.hpp +++ b/cpp/src/barretenberg/crypto/generators/generator_data.hpp @@ -1,7 +1,7 @@ #pragma once +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include #include -#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" namespace crypto { namespace generators { diff --git a/cpp/src/barretenberg/crypto/generators/generator_data.test.cpp b/cpp/src/barretenberg/crypto/generators/generator_data.test.cpp index ae76d124b5..8d1e280031 100644 --- a/cpp/src/barretenberg/crypto/generators/generator_data.test.cpp +++ b/cpp/src/barretenberg/crypto/generators/generator_data.test.cpp @@ -1,7 +1,7 @@ -#include -#include "barretenberg/common/streams.hpp" #include "./fixed_base_scalar_mul.hpp" #include "./generator_data.hpp" +#include "barretenberg/common/streams.hpp" +#include using namespace crypto::generators; diff --git a/cpp/src/barretenberg/crypto/hmac/hmac.hpp b/cpp/src/barretenberg/crypto/hmac/hmac.hpp index e1f83905e5..ecbb61b418 100644 --- a/cpp/src/barretenberg/crypto/hmac/hmac.hpp +++ b/cpp/src/barretenberg/crypto/hmac/hmac.hpp @@ -1,12 +1,12 @@ #pragma once #include "barretenberg/common/serialize.hpp" +#include "barretenberg/numeric/uintx/uintx.hpp" #include #include #include #include #include -#include "barretenberg/numeric/uintx/uintx.hpp" namespace crypto { /** diff --git a/cpp/src/barretenberg/crypto/hmac/hmac.test.cpp b/cpp/src/barretenberg/crypto/hmac/hmac.test.cpp index 2a5d025493..5e66bc8389 100644 --- a/cpp/src/barretenberg/crypto/hmac/hmac.test.cpp +++ b/cpp/src/barretenberg/crypto/hmac/hmac.test.cpp @@ -3,10 +3,10 @@ #include "../hashers/hashers.hpp" -#include +#include #include +#include #include -#include std::array hex_to_bytes(const std::string& hex) { diff --git a/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.cpp b/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.cpp index 82905710dd..f067c5b865 100644 --- a/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.cpp +++ b/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.cpp @@ -1,10 +1,10 @@ #include "c_bind.hpp" -#include "pedersen.hpp" -#include "pedersen_lookup.hpp" -#include "barretenberg/common/serialize.hpp" -#include "barretenberg/common/timer.hpp" #include "barretenberg/common/mem.hpp" +#include "barretenberg/common/serialize.hpp" #include "barretenberg/common/streams.hpp" +#include "barretenberg/common/timer.hpp" +#include "pedersen.hpp" +#include "pedersen_lookup.hpp" #define WASM_EXPORT __attribute__((visibility("default"))) extern "C" { diff --git a/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp b/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp index 85454d2256..971bd717d4 100644 --- a/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp +++ b/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp @@ -1,8 +1,8 @@ #pragma once -#include "barretenberg/common/serialize.hpp" -#include "barretenberg/common/timer.hpp" #include "barretenberg/common/mem.hpp" +#include "barretenberg/common/serialize.hpp" #include "barretenberg/common/streams.hpp" +#include "barretenberg/common/timer.hpp" #define WASM_EXPORT __attribute__((visibility("default"))) extern "C" { diff --git a/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.cpp b/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.cpp index edbd94c0ed..627b2877f1 100644 --- a/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.cpp +++ b/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.cpp @@ -1,7 +1,7 @@ +#include "barretenberg/common/serialize.hpp" #include "c_bind.hpp" #include "pedersen.hpp" #include "pedersen_lookup.hpp" -#include "barretenberg/common/serialize.hpp" extern "C" { diff --git a/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.hpp b/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.hpp index 51043cd83e..559c8c51c5 100644 --- a/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.hpp +++ b/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.hpp @@ -1,6 +1,6 @@ #pragma once -#include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/common/wasm_export.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" extern "C" { diff --git a/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.hpp b/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.hpp index 0600e13b52..3571016ebd 100644 --- a/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.hpp +++ b/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "../generators/generator_data.hpp" #include "../generators/fixed_base_scalar_mul.hpp" +#include "../generators/generator_data.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include namespace crypto { namespace pedersen_commitment { diff --git a/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.test.cpp b/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.test.cpp index fa38853d74..49ca4825ab 100644 --- a/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.test.cpp +++ b/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.test.cpp @@ -1,9 +1,9 @@ -#include #include "barretenberg/numeric/bitop/get_msb.hpp" #include "barretenberg/numeric/random/engine.hpp" +#include -#include "./pedersen_lookup.hpp" #include "../pedersen_hash/pedersen_lookup.hpp" +#include "./pedersen_lookup.hpp" namespace { auto& engine = numeric::random::get_debug_engine(); diff --git a/cpp/src/barretenberg/crypto/pedersen_commitment/sidon_set/sidon_set.hpp b/cpp/src/barretenberg/crypto/pedersen_commitment/sidon_set/sidon_set.hpp index 3eeab15661..4329aefd2f 100644 --- a/cpp/src/barretenberg/crypto/pedersen_commitment/sidon_set/sidon_set.hpp +++ b/cpp/src/barretenberg/crypto/pedersen_commitment/sidon_set/sidon_set.hpp @@ -3,9 +3,9 @@ #include #include -#include "barretenberg/numeric/uintx/uintx.hpp" #include "barretenberg/ecc/fields/field.hpp" #include "barretenberg/ecc/fields/field2.hpp" +#include "barretenberg/numeric/uintx/uintx.hpp" namespace crypto { diff --git a/cpp/src/barretenberg/crypto/pedersen_commitment/sidon_set/sidon_set.test.cpp b/cpp/src/barretenberg/crypto/pedersen_commitment/sidon_set/sidon_set.test.cpp index 69b18b2234..79d09a131e 100644 --- a/cpp/src/barretenberg/crypto/pedersen_commitment/sidon_set/sidon_set.test.cpp +++ b/cpp/src/barretenberg/crypto/pedersen_commitment/sidon_set/sidon_set.test.cpp @@ -1,6 +1,6 @@ -#include #include "barretenberg/numeric/bitop/get_msb.hpp" #include "barretenberg/numeric/random/engine.hpp" +#include #include "./sidon_set.hpp" diff --git a/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.cpp b/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.cpp index 21c3ca8c89..cf6ae337e7 100644 --- a/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.cpp +++ b/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.cpp @@ -1,10 +1,10 @@ -#include "pedersen.hpp" -#include "pedersen_lookup.hpp" -#include "barretenberg/common/serialize.hpp" -#include "barretenberg/common/timer.hpp" #include "barretenberg/common/mem.hpp" +#include "barretenberg/common/serialize.hpp" #include "barretenberg/common/streams.hpp" +#include "barretenberg/common/timer.hpp" #include "barretenberg/common/wasm_export.hpp" +#include "pedersen.hpp" +#include "pedersen_lookup.hpp" extern "C" { diff --git a/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp b/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp index 7cedfcb513..d9b8c8735f 100644 --- a/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp +++ b/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp @@ -1,6 +1,6 @@ #pragma once -#include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/common/wasm_export.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" extern "C" { diff --git a/cpp/src/barretenberg/crypto/pedersen_hash/c_bind_new.cpp b/cpp/src/barretenberg/crypto/pedersen_hash/c_bind_new.cpp index bef9e81a2b..6fd60ebfbd 100644 --- a/cpp/src/barretenberg/crypto/pedersen_hash/c_bind_new.cpp +++ b/cpp/src/barretenberg/crypto/pedersen_hash/c_bind_new.cpp @@ -1,8 +1,8 @@ +#include "barretenberg/common/mem.hpp" +#include "barretenberg/common/serialize.hpp" #include "c_bind.hpp" #include "pedersen.hpp" #include "pedersen_lookup.hpp" -#include "barretenberg/common/serialize.hpp" -#include "barretenberg/common/mem.hpp" extern "C" { diff --git a/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.hpp b/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.hpp index 16665adfa7..40bdfc7ff8 100644 --- a/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.hpp +++ b/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.hpp @@ -1,8 +1,8 @@ #pragma once -#include -#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "../generators/generator_data.hpp" #include "../generators/fixed_base_scalar_mul.hpp" +#include "../generators/generator_data.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include namespace crypto { namespace pedersen_hash { diff --git a/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp b/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp index a9cee246a6..d677d16f94 100644 --- a/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp +++ b/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp @@ -1,5 +1,5 @@ -#include "schnorr.hpp" #include "multisig.hpp" +#include "schnorr.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" diff --git a/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp b/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp index 31985090bd..b6dc905876 100644 --- a/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp +++ b/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp @@ -1,6 +1,6 @@ +#include "barretenberg/common/wasm_export.hpp" #include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "barretenberg/common/wasm_export.hpp" #include "multisig.hpp" extern "C" { diff --git a/cpp/src/barretenberg/crypto/schnorr/c_bind_new.cpp b/cpp/src/barretenberg/crypto/schnorr/c_bind_new.cpp index c82c1e00ea..943751a7d8 100644 --- a/cpp/src/barretenberg/crypto/schnorr/c_bind_new.cpp +++ b/cpp/src/barretenberg/crypto/schnorr/c_bind_new.cpp @@ -1,6 +1,6 @@ #include "c_bind.hpp" -#include "schnorr.hpp" #include "multisig.hpp" +#include "schnorr.hpp" extern "C" { diff --git a/cpp/src/barretenberg/crypto/schnorr/multisig.hpp b/cpp/src/barretenberg/crypto/schnorr/multisig.hpp index 4c0751293a..16b497c220 100644 --- a/cpp/src/barretenberg/crypto/schnorr/multisig.hpp +++ b/cpp/src/barretenberg/crypto/schnorr/multisig.hpp @@ -7,8 +7,8 @@ #include #include -#include "schnorr.hpp" #include "proof_of_possession.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 e81cc7034f..8cc47209db 100644 --- a/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp +++ b/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp @@ -1,7 +1,7 @@ #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include #include "proof_of_possession.hpp" +#include using namespace barretenberg; diff --git a/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp b/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp index b485895235..69a446f41a 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 "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "schnorr.hpp" #include using namespace barretenberg; diff --git a/cpp/src/barretenberg/crypto/sha256/sha256.cpp b/cpp/src/barretenberg/crypto/sha256/sha256.cpp index 20b5d50be3..4a358c56cb 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 "barretenberg/common/assert.hpp" #include "barretenberg/common/net.hpp" +#include #include namespace sha256 { diff --git a/cpp/src/barretenberg/crypto/sha256/sha256.hpp b/cpp/src/barretenberg/crypto/sha256/sha256.hpp index eda1c83810..9483139bdc 100644 --- a/cpp/src/barretenberg/crypto/sha256/sha256.hpp +++ b/cpp/src/barretenberg/crypto/sha256/sha256.hpp @@ -1,11 +1,11 @@ #pragma once +#include "barretenberg/ecc/curves/bn254/fr.hpp" #include "stdint.h" -#include #include #include #include -#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include namespace sha256 { diff --git a/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp b/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp index cf8068bbb8..c8293be96f 100644 --- a/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp @@ -1,18 +1,18 @@ #pragma once #include "barretenberg/common/slab_allocator.hpp" -#include "logic_constraint.hpp" -#include "range_constraint.hpp" -#include "sha256_constraint.hpp" +#include "barretenberg/dsl/types.hpp" #include "blake2s_constraint.hpp" -#include "keccak_constraint.hpp" -#include "fixed_base_scalar_mul.hpp" -#include "schnorr_verify.hpp" -#include "ecdsa_secp256k1.hpp" -#include "recursion_constraint.hpp" #include "block_constraint.hpp" -#include "pedersen.hpp" +#include "ecdsa_secp256k1.hpp" +#include "fixed_base_scalar_mul.hpp" #include "hash_to_field.hpp" -#include "barretenberg/dsl/types.hpp" +#include "keccak_constraint.hpp" +#include "logic_constraint.hpp" +#include "pedersen.hpp" +#include "range_constraint.hpp" +#include "recursion_constraint.hpp" +#include "schnorr_verify.hpp" +#include "sha256_constraint.hpp" namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp b/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp index 8da37992f5..101870479d 100644 --- a/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp @@ -1,10 +1,9 @@ -#include #include +#include #include "acir_format.hpp" -#include "ecdsa_secp256k1.hpp" -#include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/common/streams.hpp" +#include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/serialize/test_helper.hpp" #include "ecdsa_secp256k1.hpp" diff --git a/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp b/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp index f78dd46ac5..a2a91def96 100644 --- a/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp @@ -1,7 +1,7 @@ #pragma once +#include "barretenberg/dsl/types.hpp" #include #include -#include "barretenberg/dsl/types.hpp" namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp b/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp index 811421aa9b..9eb908f0b0 100644 --- a/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp @@ -1,6 +1,6 @@ #include "block_constraint.hpp" -#include "barretenberg/stdlib/primitives/memory/rom_table.hpp" #include "barretenberg/stdlib/primitives/memory/ram_table.hpp" +#include "barretenberg/stdlib/primitives/memory/rom_table.hpp" using namespace proof_system::plonk; diff --git a/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp b/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp index a3b04d93bb..511ee83e1c 100644 --- a/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp @@ -1,8 +1,8 @@ #pragma once +#include "barretenberg/dsl/types.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" #include #include -#include "barretenberg/stdlib/primitives/field/field.hpp" -#include "barretenberg/dsl/types.hpp" namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp b/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp index a8c14e2455..f813634c44 100644 --- a/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp @@ -1,7 +1,7 @@ #include "acir_format.hpp" -#include "block_constraint.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp" +#include "block_constraint.hpp" #include #include diff --git a/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp b/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp index 75ff0bd42c..05400e09f5 100644 --- a/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp @@ -1,6 +1,6 @@ #pragma once -#include #include "barretenberg/dsl/types.hpp" +#include namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp b/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp index 21de8fcc2f..65a2c3e0e5 100644 --- a/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp @@ -1,8 +1,8 @@ #include "acir_format.hpp" -#include "ecdsa_secp256k1.hpp" +#include "barretenberg/crypto/ecdsa/ecdsa.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp" -#include "barretenberg/crypto/ecdsa/ecdsa.hpp" +#include "ecdsa_secp256k1.hpp" #include #include diff --git a/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.hpp b/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.hpp index a96c743e69..6e80b09947 100644 --- a/cpp/src/barretenberg/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 "barretenberg/dsl/types.hpp" +#include namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/hash_to_field.hpp b/cpp/src/barretenberg/dsl/acir_format/hash_to_field.hpp index d08c399c23..52a632051d 100644 --- a/cpp/src/barretenberg/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 "barretenberg/dsl/types.hpp" #include #include -#include "barretenberg/dsl/types.hpp" namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp b/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp index 048bcf9c22..748c3e927e 100644 --- a/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp @@ -1,6 +1,6 @@ #include "keccak_constraint.hpp" -#include "round.hpp" #include "barretenberg/stdlib/hash/keccak/keccak.hpp" +#include "round.hpp" namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.hpp b/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.hpp index 8f97fbe5f5..bba3e280a7 100644 --- a/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.hpp @@ -1,7 +1,7 @@ #pragma once +#include "barretenberg/dsl/types.hpp" #include #include -#include "barretenberg/dsl/types.hpp" namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp b/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp index c74817e4c7..7a4a480a21 100644 --- a/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp @@ -1,6 +1,6 @@ #pragma once -#include #include "barretenberg/dsl/types.hpp" +#include namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp b/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp index 52815fcdb5..e70b418d4f 100644 --- a/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp @@ -1,6 +1,6 @@ #pragma once -#include #include "barretenberg/dsl/types.hpp" +#include namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp b/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp index 7f5a512ce6..1d4e7e4dce 100644 --- a/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp @@ -1,6 +1,6 @@ #pragma once -#include #include "barretenberg/common/serialize.hpp" +#include namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp b/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp index d1a20a4855..38a8fde543 100644 --- a/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include "barretenberg/dsl/types.hpp" #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp" +#include namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp b/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp index 6c947a1851..7174486788 100644 --- a/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp +++ b/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp @@ -1,7 +1,7 @@ #include "acir_format.hpp" -#include "recursion_constraint.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp" +#include "recursion_constraint.hpp" #include #include diff --git a/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp b/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp index d520dc32be..5c05924b88 100644 --- a/cpp/src/barretenberg/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 "barretenberg/stdlib/encryption/schnorr/schnorr.hpp" #include "barretenberg/crypto/schnorr/schnorr.hpp" +#include "barretenberg/stdlib/encryption/schnorr/schnorr.hpp" namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp b/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp index d610f89b86..ccbfca767a 100644 --- a/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp @@ -1,6 +1,6 @@ #pragma once -#include #include "barretenberg/dsl/types.hpp" +#include namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp b/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp index ed4fe5d807..bc22dd8769 100644 --- a/cpp/src/barretenberg/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 "barretenberg/stdlib/hash/sha256/sha256.hpp" #include "barretenberg/dsl/types.hpp" +#include "barretenberg/stdlib/hash/sha256/sha256.hpp" +#include "round.hpp" namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp b/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp index a88612f3e4..c94fc3ad96 100644 --- a/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp +++ b/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp @@ -1,7 +1,7 @@ #pragma once +#include "barretenberg/dsl/types.hpp" #include #include -#include "barretenberg/dsl/types.hpp" namespace acir_format { diff --git a/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp b/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp index b2e8458045..5ff94a3ecc 100644 --- a/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp +++ b/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp @@ -1,13 +1,12 @@ #include "acir_composer.hpp" #include "barretenberg/common/serialize.hpp" #include "barretenberg/common/throw_or_abort.hpp" -#include "barretenberg/dsl/acir_format/recursion_constraint.hpp" -#include "barretenberg/plonk/proof_system/proving_key/serialize.hpp" #include "barretenberg/dsl/acir_format/acir_format.hpp" +#include "barretenberg/dsl/acir_format/recursion_constraint.hpp" #include "barretenberg/dsl/types.hpp" -#include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp" -#include "barretenberg/srs/factories/crs_factory.hpp" +#include "barretenberg/plonk/proof_system/proving_key/serialize.hpp" #include "barretenberg/plonk/proof_system/verification_key/sol_gen.hpp" +#include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" namespace acir_proofs { diff --git a/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp b/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp index 186aa95175..f32fd98828 100644 --- a/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp +++ b/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp @@ -1,9 +1,9 @@ -#include -#include -#include +#include #include #include -#include +#include +#include +#include namespace acir_proofs { diff --git a/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp b/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp index e04b96e056..dd755b305f 100644 --- a/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp +++ b/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp @@ -1,14 +1,14 @@ #include "c_bind.hpp" #include "acir_composer.hpp" -#include -#include -#include "barretenberg/common/net.hpp" #include "barretenberg/common/mem.hpp" +#include "barretenberg/common/net.hpp" #include "barretenberg/common/serialize.hpp" #include "barretenberg/common/slab_allocator.hpp" #include "barretenberg/dsl/acir_format/acir_format.hpp" #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp" #include "barretenberg/srs/global_crs.hpp" +#include +#include WASM_EXPORT void acir_get_circuit_sizes(uint8_t const* constraint_system_buf, uint32_t* exact, diff --git a/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp b/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp index 32cce90a08..e17af7a260 100644 --- a/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp +++ b/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp @@ -1,8 +1,8 @@ -#include -#include -#include #include +#include #include +#include +#include using namespace barretenberg; diff --git a/cpp/src/barretenberg/dsl/types.hpp b/cpp/src/barretenberg/dsl/types.hpp index abfb30ba36..f6a8a1b11f 100644 --- a/cpp/src/barretenberg/dsl/types.hpp +++ b/cpp/src/barretenberg/dsl/types.hpp @@ -2,29 +2,27 @@ #include "barretenberg/plonk/composer/turbo_composer.hpp" #include "barretenberg/plonk/composer/ultra_composer.hpp" -#include "barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp" #include "barretenberg/plonk/proof_system/prover/prover.hpp" +#include "barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp" +#include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" +#include "barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp" +#include "barretenberg/stdlib/encryption/schnorr/schnorr.hpp" +#include "barretenberg/stdlib/merkle_tree/hash_path.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/commitment/pedersen/pedersen.hpp" -#include "barretenberg/stdlib/commitment/pedersen/pedersen_plookup.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/primitives/memory/ram_table.hpp" -#include "barretenberg/stdlib/recursion/verifier/program_settings.hpp" -#include "barretenberg/stdlib/recursion/verification_key/verification_key.hpp" +#include "barretenberg/stdlib/primitives/memory/rom_table.hpp" +#include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/stdlib/primitives/witness/witness.hpp" #include "barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp" +#include "barretenberg/stdlib/recursion/verification_key/verification_key.hpp" +#include "barretenberg/stdlib/recursion/verifier/program_settings.hpp" namespace acir_format { diff --git a/cpp/src/barretenberg/ecc/curves/bn254/bn254.hpp b/cpp/src/barretenberg/ecc/curves/bn254/bn254.hpp index 5ecc714f44..ed8d3424ef 100644 --- a/cpp/src/barretenberg/ecc/curves/bn254/bn254.hpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/bn254.hpp @@ -1,7 +1,7 @@ #pragma once -#include "../bn254/fr.hpp" #include "../bn254/fq.hpp" #include "../bn254/fq2.hpp" +#include "../bn254/fr.hpp" #include "../bn254/g1.hpp" #include "../bn254/g2.hpp" diff --git a/cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp b/cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp index 0249eef031..f8d7903635 100644 --- a/cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp @@ -1,6 +1,6 @@ +#include "barretenberg/serialize/test_helper.hpp" #include "fq.hpp" #include "pseudorandom.hpp" -#include "barretenberg/serialize/test_helper.hpp" #include using namespace barretenberg; diff --git a/cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp b/cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp index afa148fd04..0c45f2301c 100644 --- a/cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp +++ b/cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp @@ -1,5 +1,5 @@ -#include "fr.hpp" #include "barretenberg/serialize/test_helper.hpp" +#include "fr.hpp" #include using namespace barretenberg; diff --git a/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp b/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp index 0cf2d7e1e6..3719c21f8d 100644 --- a/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp +++ b/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp @@ -1,6 +1,6 @@ #include "grumpkin.hpp" -#include #include +#include namespace test_grumpkin { diff --git a/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp b/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp index dd24f367e8..f292e7157f 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 "barretenberg/numeric/random/engine.hpp" #include "secp256k1.hpp" #include -#include "barretenberg/numeric/random/engine.hpp" namespace test_secp256k1 { diff --git a/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp b/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp index 9705cc15ff..7b94a71325 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 "barretenberg/numeric/random/engine.hpp" #include "secp256r1.hpp" #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 432495535f..cb0160bd08 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 "barretenberg/common/assert.hpp" #include "barretenberg/common/inline.hpp" #include "barretenberg/common/serialize.hpp" -#include -#include #include "barretenberg/numeric/random/engine.hpp" #include "barretenberg/numeric/uint128/uint128.hpp" #include "barretenberg/numeric/uint256/uint256.hpp" +#include +#include +#include #include #include diff --git a/cpp/src/barretenberg/ecc/fields/field_impl.hpp b/cpp/src/barretenberg/ecc/fields/field_impl.hpp index aae53e5887..7f31f20d12 100644 --- a/cpp/src/barretenberg/ecc/fields/field_impl.hpp +++ b/cpp/src/barretenberg/ecc/fields/field_impl.hpp @@ -1,13 +1,13 @@ #pragma once +#include "barretenberg/common/slab_allocator.hpp" #include "barretenberg/common/throw_or_abort.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" #include "barretenberg/numeric/random/engine.hpp" +#include "field_impl_generic.hpp" #include #include #include #include -#include "barretenberg/common/slab_allocator.hpp" -#include "field_impl_generic.hpp" #if (BBERG_NO_ASM == 0) #include "field_impl_x64.hpp" diff --git a/cpp/src/barretenberg/ecc/groups/affine_element.hpp b/cpp/src/barretenberg/ecc/groups/affine_element.hpp index ec8bc6a366..7307264b38 100644 --- a/cpp/src/barretenberg/ecc/groups/affine_element.hpp +++ b/cpp/src/barretenberg/ecc/groups/affine_element.hpp @@ -1,9 +1,9 @@ #pragma once -#include "barretenberg/numeric/uint256/uint256.hpp" -#include -#include #include "barretenberg/ecc/curves/bn254/fq2.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" #include "barretenberg/serialize/msgpack.hpp" +#include +#include 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 352cfe2351..16ed91083c 100644 --- a/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp +++ b/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp @@ -1,11 +1,11 @@ +#include "barretenberg/common/serialize.hpp" +#include "barretenberg/common/test.hpp" #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 "barretenberg/common/serialize.hpp" #include "barretenberg/serialize/test_helper.hpp" +#include 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 c1e61e729f..a23d5a3775 100644 --- a/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp +++ b/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp @@ -1,6 +1,6 @@ #pragma once -#include "barretenberg/crypto/keccak/keccak.hpp" #include "./element.hpp" +#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 3f93f0f552..c04bb0fce3 100644 --- a/cpp/src/barretenberg/ecc/groups/element.hpp +++ b/cpp/src/barretenberg/ecc/groups/element.hpp @@ -1,12 +1,12 @@ #pragma once #include "affine_element.hpp" -#include "wnaf.hpp" -#include #include "barretenberg/common/inline.hpp" #include "barretenberg/common/mem.hpp" #include "barretenberg/numeric/random/engine.hpp" #include "barretenberg/numeric/uint256/uint256.hpp" +#include "wnaf.hpp" +#include #include #include diff --git a/cpp/src/barretenberg/ecc/groups/group.hpp b/cpp/src/barretenberg/ecc/groups/group.hpp index 6faf886dae..3f59987d8e 100644 --- a/cpp/src/barretenberg/ecc/groups/group.hpp +++ b/cpp/src/barretenberg/ecc/groups/group.hpp @@ -1,14 +1,14 @@ #pragma once #include "../../common/assert.hpp" +#include "./affine_element.hpp" +#include "./element.hpp" #include "./wnaf.hpp" #include #include #include #include #include -#include "./affine_element.hpp" -#include "./element.hpp" namespace barretenberg { diff --git a/cpp/src/barretenberg/ecc/groups/wnaf.hpp b/cpp/src/barretenberg/ecc/groups/wnaf.hpp index 2a01f0a4c4..a7b3bacb90 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 "barretenberg/numeric/bitop/get_msb.hpp" +#include #include namespace barretenberg { diff --git a/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp b/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp index 56d80264bc..ec9cc198d3 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 "barretenberg/numeric/random/engine.hpp" #include "wnaf.hpp" #include -#include "barretenberg/numeric/random/engine.hpp" using namespace barretenberg; diff --git a/cpp/src/barretenberg/ecc/scalar_multiplication/point_table.hpp b/cpp/src/barretenberg/ecc/scalar_multiplication/point_table.hpp index 757c540e8c..0e51261d3b 100644 --- a/cpp/src/barretenberg/ecc/scalar_multiplication/point_table.hpp +++ b/cpp/src/barretenberg/ecc/scalar_multiplication/point_table.hpp @@ -1,7 +1,7 @@ #pragma once -#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/common/mem.hpp" #include "barretenberg/common/thread.hpp" +#include "barretenberg/ecc/curves/bn254/g1.hpp" #include namespace barretenberg { diff --git a/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.cpp b/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.cpp index 5df4b631c3..cb7cde0bfe 100644 --- a/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.cpp +++ b/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.cpp @@ -1,9 +1,9 @@ #include "runtime_states.hpp" #include "barretenberg/common/mem.hpp" +#include "barretenberg/common/slab_allocator.hpp" #include "barretenberg/common/thread.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" -#include "barretenberg/common/slab_allocator.hpp" namespace barretenberg { namespace scalar_multiplication { diff --git a/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp b/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp index e84ff078e8..1440889e7b 100644 --- a/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp +++ b/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp @@ -4,13 +4,13 @@ #include #include -#include "./scalar_multiplication.hpp" #include "./process_buckets.hpp" #include "./runtime_states.hpp" +#include "./scalar_multiplication.hpp" -#include "barretenberg/common/throw_or_abort.hpp" #include "barretenberg/common/mem.hpp" #include "barretenberg/common/thread.hpp" +#include "barretenberg/common/throw_or_abort.hpp" #include "barretenberg/ecc/groups/wnaf.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" diff --git a/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp b/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp index 121edb3905..bb308ad12c 100644 --- a/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp +++ b/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp @@ -1,8 +1,8 @@ #pragma once +#include "./runtime_states.hpp" #include "barretenberg/ecc/curves/bn254/bn254.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "./runtime_states.hpp" #include #include diff --git a/cpp/src/barretenberg/ecc/serialize.test.cpp b/cpp/src/barretenberg/ecc/serialize.test.cpp index dee51b44fa..a36b656e74 100644 --- a/cpp/src/barretenberg/ecc/serialize.test.cpp +++ b/cpp/src/barretenberg/ecc/serialize.test.cpp @@ -1,6 +1,6 @@ -#include -#include "barretenberg/serialize/test_helper.hpp" #include "barretenberg/ecc/fields/field.hpp" +#include "barretenberg/serialize/test_helper.hpp" +#include TEST(msgpack_tests, msgpack_field) { diff --git a/cpp/src/barretenberg/env/data_store.cpp b/cpp/src/barretenberg/env/data_store.cpp index a3f3c3b2fa..fba8fec60a 100644 --- a/cpp/src/barretenberg/env/data_store.cpp +++ b/cpp/src/barretenberg/env/data_store.cpp @@ -1,10 +1,10 @@ -#include #include "data_store.hpp" -#include -#include -#include #include #include +#include +#include +#include +#include // #include namespace { diff --git a/cpp/src/barretenberg/examples/c_bind.cpp b/cpp/src/barretenberg/examples/c_bind.cpp index 8ae3229f91..2312985726 100644 --- a/cpp/src/barretenberg/examples/c_bind.cpp +++ b/cpp/src/barretenberg/examples/c_bind.cpp @@ -1,6 +1,6 @@ #include "c_bind.hpp" -#include "simple/simple.hpp" #include "barretenberg/srs/global_crs.hpp" +#include "simple/simple.hpp" using namespace proof_system::plonk::stdlib::types; diff --git a/cpp/src/barretenberg/examples/c_bind.hpp b/cpp/src/barretenberg/examples/c_bind.hpp index 37c6c6768b..1c38aab7ae 100644 --- a/cpp/src/barretenberg/examples/c_bind.hpp +++ b/cpp/src/barretenberg/examples/c_bind.hpp @@ -1,5 +1,5 @@ -#include -#include #include "barretenberg/common/wasm_export.hpp" +#include +#include WASM_EXPORT void examples_simple_create_and_verify_proof(bool* valid); diff --git a/cpp/src/barretenberg/examples/simple/simple.cpp b/cpp/src/barretenberg/examples/simple/simple.cpp index 9ca8733899..a477ccb00a 100644 --- a/cpp/src/barretenberg/examples/simple/simple.cpp +++ b/cpp/src/barretenberg/examples/simple/simple.cpp @@ -1,7 +1,7 @@ #include "simple.hpp" -#include -#include #include +#include +#include #include namespace examples::simple { diff --git a/cpp/src/barretenberg/examples/simple/simple.test.cpp b/cpp/src/barretenberg/examples/simple/simple.test.cpp index 3faa4090dd..16399f08d4 100644 --- a/cpp/src/barretenberg/examples/simple/simple.test.cpp +++ b/cpp/src/barretenberg/examples/simple/simple.test.cpp @@ -1,6 +1,6 @@ #include "simple.hpp" -#include #include +#include #include namespace examples::simple { diff --git a/cpp/src/barretenberg/grumpkin_srs_gen/grumpkin_srs_gen.cpp b/cpp/src/barretenberg/grumpkin_srs_gen/grumpkin_srs_gen.cpp index f259335135..a6f8f059f4 100644 --- a/cpp/src/barretenberg/grumpkin_srs_gen/grumpkin_srs_gen.cpp +++ b/cpp/src/barretenberg/grumpkin_srs_gen/grumpkin_srs_gen.cpp @@ -1,10 +1,10 @@ -#include #include +#include -#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/common/net.hpp" #include "barretenberg/crypto/sha256/sha256.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "barretenberg/srs/io.hpp" -#include "barretenberg/common/net.hpp" const std::string protocol_name = "BARRETENBERG_GRUMPKIN_IPA_CRS"; /** diff --git a/cpp/src/barretenberg/honk/composer/standard_composer.cpp b/cpp/src/barretenberg/honk/composer/standard_composer.cpp index a25724a6ca..3b89a158b3 100644 --- a/cpp/src/barretenberg/honk/composer/standard_composer.cpp +++ b/cpp/src/barretenberg/honk/composer/standard_composer.cpp @@ -1,7 +1,7 @@ #include "standard_composer.hpp" -#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/honk/pcs/commitment_key.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" #include diff --git a/cpp/src/barretenberg/honk/composer/standard_composer.hpp b/cpp/src/barretenberg/honk/composer/standard_composer.hpp index 5ee5dedde9..b12a8bac23 100644 --- a/cpp/src/barretenberg/honk/composer/standard_composer.hpp +++ b/cpp/src/barretenberg/honk/composer/standard_composer.hpp @@ -1,12 +1,12 @@ #pragma once -#include -#include "barretenberg/srs/factories/file_crs_factory.hpp" #include "barretenberg/honk/proof_system/prover.hpp" #include "barretenberg/honk/proof_system/verifier.hpp" #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" #include "barretenberg/proof_system/composer/composer_lib.hpp" #include "barretenberg/proof_system/composer/permutation_lib.hpp" +#include "barretenberg/srs/factories/file_crs_factory.hpp" +#include #include "barretenberg/honk/flavor/standard.hpp" #include "barretenberg/honk/flavor/standard_grumpkin.hpp" diff --git a/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp b/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp index b6bce37130..c58426f69f 100644 --- a/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp +++ b/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp @@ -1,17 +1,17 @@ #include #include -#include #include +#include -#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" -#include "barretenberg/numeric/uint256/uint256.hpp" -#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/honk/composer/standard_composer.hpp" #include "barretenberg/honk/proof_system/prover.hpp" -#include "barretenberg/honk/sumcheck/relations/relation_parameters.hpp" #include "barretenberg/honk/sumcheck/relations/permutation_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/relation_parameters.hpp" #include "barretenberg/honk/sumcheck/sumcheck_round.hpp" #include "barretenberg/honk/utils/grand_product_delta.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" using namespace proof_system::honk; diff --git a/cpp/src/barretenberg/honk/composer/ultra_composer.hpp b/cpp/src/barretenberg/honk/composer/ultra_composer.hpp index ac62b2471c..f72eb22c52 100644 --- a/cpp/src/barretenberg/honk/composer/ultra_composer.hpp +++ b/cpp/src/barretenberg/honk/composer/ultra_composer.hpp @@ -1,9 +1,9 @@ #pragma once -#include "barretenberg/proof_system/composer/composer_lib.hpp" -#include "barretenberg/srs/factories/file_crs_factory.hpp" #include "barretenberg/honk/proof_system/ultra_prover.hpp" #include "barretenberg/honk/proof_system/ultra_verifier.hpp" +#include "barretenberg/proof_system/composer/composer_lib.hpp" +#include "barretenberg/srs/factories/file_crs_factory.hpp" #include #include diff --git a/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp b/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp index 24ab3e107e..07b35aa259 100644 --- a/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp +++ b/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp @@ -1,19 +1,19 @@ #include #include +#include #include #include -#include #include "barretenberg/common/log.hpp" -#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" #include "barretenberg/honk/composer/ultra_composer.hpp" +#include "barretenberg/honk/proof_system/prover.hpp" #include "barretenberg/honk/proof_system/ultra_prover.hpp" +#include "barretenberg/honk/sumcheck/relations/permutation_relation.hpp" #include "barretenberg/honk/sumcheck/relations/relation_parameters.hpp" -#include "barretenberg/numeric/uint256/uint256.hpp" -#include "barretenberg/honk/proof_system/prover.hpp" #include "barretenberg/honk/sumcheck/sumcheck_round.hpp" -#include "barretenberg/honk/sumcheck/relations/permutation_relation.hpp" #include "barretenberg/honk/utils/grand_product_delta.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" #include "barretenberg/proof_system/plookup_tables/types.hpp" using namespace proof_system::honk; diff --git a/cpp/src/barretenberg/honk/flavor/standard.hpp b/cpp/src/barretenberg/honk/flavor/standard.hpp index 47c2d3b6da..3469f9c6f2 100644 --- a/cpp/src/barretenberg/honk/flavor/standard.hpp +++ b/cpp/src/barretenberg/honk/flavor/standard.hpp @@ -1,23 +1,23 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/honk/pcs/commitment_key.hpp" -#include "barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp" #include "barretenberg/honk/pcs/kzg/kzg.hpp" +#include "barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp" #include "barretenberg/honk/sumcheck/polynomials/univariate.hpp" -#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/honk/sumcheck/relations/arithmetic_relation.hpp" #include "barretenberg/honk/sumcheck/relations/permutation_relation.hpp" #include "barretenberg/honk/transcript/transcript.hpp" #include "barretenberg/polynomials/evaluation_domain.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" -#include "barretenberg/srs/factories/crs_factory.hpp" #include "barretenberg/proof_system/flavor/flavor.hpp" +#include "barretenberg/srs/factories/crs_factory.hpp" +#include +#include +#include +#include +#include +#include namespace proof_system::honk::flavor { diff --git a/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp b/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp index b1d17e252d..e089a891f9 100644 --- a/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp +++ b/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp @@ -1,15 +1,9 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/honk/pcs/commitment_key.hpp" -#include "barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp" #include "barretenberg/honk/pcs/ipa/ipa.hpp" +#include "barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp" #include "barretenberg/honk/sumcheck/polynomials/univariate.hpp" -#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/honk/sumcheck/relations/arithmetic_relation.hpp" #include "barretenberg/honk/sumcheck/relations/permutation_relation.hpp" #include "barretenberg/honk/transcript/transcript.hpp" @@ -17,6 +11,12 @@ #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" #include "barretenberg/proof_system/flavor/flavor.hpp" +#include +#include +#include +#include +#include +#include namespace proof_system::honk::flavor { class StandardGrumpkin { diff --git a/cpp/src/barretenberg/honk/flavor/ultra.hpp b/cpp/src/barretenberg/honk/flavor/ultra.hpp index c7b207afd4..bb8eaf0448 100644 --- a/cpp/src/barretenberg/honk/flavor/ultra.hpp +++ b/cpp/src/barretenberg/honk/flavor/ultra.hpp @@ -1,27 +1,27 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/honk/pcs/commitment_key.hpp" -#include "barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp" #include "barretenberg/honk/pcs/kzg/kzg.hpp" +#include "barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp" #include "barretenberg/honk/sumcheck/polynomials/univariate.hpp" -#include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/honk/sumcheck/relations/auxiliary_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/elliptic_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/lookup_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/permutation_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/honk/transcript/transcript.hpp" #include "barretenberg/polynomials/evaluation_domain.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" -#include "barretenberg/srs/factories/crs_factory.hpp" #include "barretenberg/proof_system/flavor/flavor.hpp" -#include "barretenberg/honk/sumcheck/relations/ultra_arithmetic_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/permutation_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/lookup_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/gen_perm_sort_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/elliptic_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/auxiliary_relation.hpp" +#include "barretenberg/srs/factories/crs_factory.hpp" +#include +#include +#include +#include +#include +#include namespace proof_system::honk::flavor { diff --git a/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp b/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp index 05ed113d80..b09d77361d 100644 --- a/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp +++ b/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp @@ -1,26 +1,26 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/honk/pcs/commitment_key.hpp" -#include "barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp" #include "barretenberg/honk/pcs/ipa/ipa.hpp" +#include "barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp" #include "barretenberg/honk/sumcheck/polynomials/univariate.hpp" -#include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/honk/sumcheck/relations/auxiliary_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/elliptic_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/lookup_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/permutation_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/honk/transcript/transcript.hpp" #include "barretenberg/polynomials/evaluation_domain.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" #include "barretenberg/proof_system/flavor/flavor.hpp" -#include "barretenberg/honk/sumcheck/relations/ultra_arithmetic_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/permutation_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/lookup_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/gen_perm_sort_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/elliptic_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/auxiliary_relation.hpp" +#include +#include +#include +#include +#include +#include namespace proof_system::honk::flavor { diff --git a/cpp/src/barretenberg/honk/pcs/commitment_key.hpp b/cpp/src/barretenberg/honk/pcs/commitment_key.hpp index e03db71bee..e1856554bd 100644 --- a/cpp/src/barretenberg/honk/pcs/commitment_key.hpp +++ b/cpp/src/barretenberg/honk/pcs/commitment_key.hpp @@ -8,17 +8,17 @@ */ #include "barretenberg/ecc/curves/bn254/bn254.hpp" -#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" +#include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/numeric/bitop/pow.hpp" #include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" #include "barretenberg/srs/factories/file_crs_factory.hpp" -#include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp" -#include "barretenberg/ecc/curves/bn254/pairing.hpp" -#include "barretenberg/numeric/bitop/pow.hpp" #include -#include #include +#include namespace proof_system::honk::pcs { diff --git a/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp b/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp index 6a481d1679..a833187b58 100644 --- a/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp +++ b/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp @@ -3,14 +3,14 @@ #include #include -#include #include +#include #include #include +#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/srs/factories/file_crs_factory.hpp" -#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "../../transcript/transcript_wrappers.hpp" diff --git a/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp b/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp index 27135537ff..3ae81f1481 100644 --- a/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp +++ b/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp @@ -2,9 +2,9 @@ #include "gemini.hpp" #include "barretenberg/common/thread.hpp" +#include #include #include -#include /** * @brief Protocol for opening several multi-linear polynomials at the same point. diff --git a/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp b/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp index 4f19c365d8..88775d4f3f 100644 --- a/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp +++ b/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp @@ -2,8 +2,8 @@ #include "../claim.hpp" #include "barretenberg/honk/pcs/commitment_key.hpp" -#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/honk/transcript/transcript.hpp" +#include "barretenberg/polynomials/polynomial.hpp" #include diff --git a/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp b/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp index 174136d80f..25cc01431e 100644 --- a/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp +++ b/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp @@ -1,13 +1,13 @@ #pragma once -#include -#include -#include -#include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp" -#include #include "barretenberg/common/assert.hpp" +#include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp" #include "barretenberg/honk/pcs/claim.hpp" #include "barretenberg/honk/pcs/commitment_key.hpp" #include "barretenberg/honk/transcript/transcript.hpp" +#include +#include +#include +#include /** * @brief IPA (inner-product argument) commitment scheme class. Conforms to the specification diff --git a/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp b/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp index 898cb98f39..f5fb23df68 100644 --- a/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp +++ b/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp @@ -1,12 +1,12 @@ -#include "ipa.hpp" #include "barretenberg/common/mem.hpp" -#include -#include "barretenberg/ecc/curves/types.hpp" -#include "barretenberg/polynomials/polynomial_arithmetic.hpp" -#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/ecc/curves/bn254/fq12.hpp" +#include "barretenberg/ecc/curves/types.hpp" #include "barretenberg/honk/pcs/commitment_key.hpp" #include "barretenberg/honk/pcs/commitment_key.test.hpp" +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "ipa.hpp" +#include using namespace barretenberg; namespace proof_system::honk::pcs::ipa { diff --git a/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp b/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp index fb69278dee..f85ddd85d9 100644 --- a/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp +++ b/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp @@ -2,8 +2,8 @@ #include "../claim.hpp" #include "barretenberg/honk/pcs/commitment_key.hpp" -#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/honk/transcript/transcript.hpp" +#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 439b33cc9f..8c5dfe57a9 100644 --- a/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp +++ b/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp @@ -1,7 +1,7 @@ -#include "kzg.hpp" -#include "../shplonk/shplonk_single.hpp" #include "../gemini/gemini.hpp" +#include "../shplonk/shplonk_single.hpp" +#include "kzg.hpp" #include "../commitment_key.test.hpp" #include "barretenberg/honk/pcs/claim.hpp" diff --git a/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp index 059c44fd98..9763018e6a 100644 --- a/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp +++ b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp @@ -1,10 +1,10 @@ -#include "shplonk_single.hpp" #include "../gemini/gemini.hpp" +#include "shplonk_single.hpp" +#include #include -#include #include -#include +#include #include #include "../commitment_key.test.hpp" diff --git a/cpp/src/barretenberg/honk/pcs/shplonk/shplonk_single.hpp b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk_single.hpp index 95190804b9..262362eef9 100644 --- a/cpp/src/barretenberg/honk/pcs/shplonk/shplonk_single.hpp +++ b/cpp/src/barretenberg/honk/pcs/shplonk/shplonk_single.hpp @@ -1,8 +1,8 @@ #pragma once #include "barretenberg/honk/pcs/claim.hpp" -#include "shplonk.hpp" #include "barretenberg/honk/pcs/commitment_key.hpp" #include "barretenberg/honk/transcript/transcript.hpp" +#include "shplonk.hpp" namespace proof_system::honk::pcs::shplonk { diff --git a/cpp/src/barretenberg/honk/pcs/wrapper.hpp b/cpp/src/barretenberg/honk/pcs/wrapper.hpp index eb04f99565..037c8ac219 100644 --- a/cpp/src/barretenberg/honk/pcs/wrapper.hpp +++ b/cpp/src/barretenberg/honk/pcs/wrapper.hpp @@ -1,8 +1,8 @@ #pragma once +#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "commitment_key.hpp" #include "gemini/gemini.hpp" -#include "barretenberg/ecc/curves/bn254/g1.hpp" namespace proof_system::honk { diff --git a/cpp/src/barretenberg/honk/proof_system/prover.hpp b/cpp/src/barretenberg/honk/proof_system/prover.hpp index cf024c4c5a..d38366f8a5 100644 --- a/cpp/src/barretenberg/honk/proof_system/prover.hpp +++ b/cpp/src/barretenberg/honk/proof_system/prover.hpp @@ -1,15 +1,15 @@ #pragma once -#include "barretenberg/honk/pcs/shplonk/shplonk.hpp" -#include "barretenberg/plonk/proof_system/types/proof.hpp" +#include "barretenberg/honk/flavor/standard.hpp" +#include "barretenberg/honk/flavor/standard_grumpkin.hpp" #include "barretenberg/honk/pcs/gemini/gemini.hpp" +#include "barretenberg/honk/pcs/shplonk/shplonk.hpp" #include "barretenberg/honk/pcs/shplonk/shplonk_single.hpp" -#include "barretenberg/honk/transcript/transcript.hpp" -#include "barretenberg/honk/sumcheck/sumcheck.hpp" -#include "barretenberg/honk/sumcheck/sumcheck_output.hpp" #include "barretenberg/honk/proof_system/prover_library.hpp" #include "barretenberg/honk/proof_system/work_queue.hpp" -#include "barretenberg/honk/flavor/standard.hpp" -#include "barretenberg/honk/flavor/standard_grumpkin.hpp" +#include "barretenberg/honk/sumcheck/sumcheck.hpp" +#include "barretenberg/honk/sumcheck/sumcheck_output.hpp" +#include "barretenberg/honk/transcript/transcript.hpp" +#include "barretenberg/plonk/proof_system/types/proof.hpp" namespace proof_system::honk { diff --git a/cpp/src/barretenberg/honk/proof_system/prover_library.hpp b/cpp/src/barretenberg/honk/proof_system/prover_library.hpp index 61ec3bd2d1..ff53912b7e 100644 --- a/cpp/src/barretenberg/honk/proof_system/prover_library.hpp +++ b/cpp/src/barretenberg/honk/proof_system/prover_library.hpp @@ -1,9 +1,9 @@ #pragma once #include "barretenberg/ecc/curves/bn254/fr.hpp" -#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" -#include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/plonk/proof_system/types/program_settings.hpp" +#include "barretenberg/plonk/proof_system/types/proof.hpp" +#include "barretenberg/polynomials/polynomial.hpp" namespace proof_system::honk::prover_library { diff --git a/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp b/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp index 5d6dbf743b..28f306985f 100644 --- a/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp +++ b/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp @@ -2,16 +2,16 @@ #include "barretenberg/ecc/curves/bn254/bn254.hpp" #include "barretenberg/honk/flavor/standard.hpp" #include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/polynomials/polynomial.hpp" #include "prover.hpp" #include "prover_library.hpp" -#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/srs/factories/file_crs_factory.hpp" #include -#include -#include #include #include +#include +#include using namespace proof_system::honk; namespace prover_library_tests { diff --git a/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index ba61525755..09f2a451e7 100644 --- a/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -1,22 +1,22 @@ #include "ultra_prover.hpp" -#include -#include +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/honk/pcs/claim.hpp" +#include "barretenberg/honk/pcs/commitment_key.hpp" #include "barretenberg/honk/proof_system/prover_library.hpp" -#include "barretenberg/honk/sumcheck/sumcheck.hpp" -#include #include "barretenberg/honk/sumcheck/polynomials/univariate.hpp" // will go away +#include "barretenberg/honk/sumcheck/sumcheck.hpp" #include "barretenberg/honk/utils/power_polynomial.hpp" -#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/transcript/transcript_wrappers.hpp" +#include +#include +#include #include #include +#include #include #include -#include "barretenberg/ecc/curves/bn254/fr.hpp" -#include "barretenberg/ecc/curves/bn254/g1.hpp" -#include "barretenberg/polynomials/polynomial.hpp" -#include "barretenberg/transcript/transcript_wrappers.hpp" -#include -#include "barretenberg/honk/pcs/claim.hpp" namespace proof_system::honk { diff --git a/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp b/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp index 070d5e3df1..f848a9a672 100644 --- a/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp +++ b/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp @@ -1,13 +1,13 @@ #pragma once -#include "barretenberg/honk/proof_system/work_queue.hpp" -#include "barretenberg/plonk/proof_system/types/proof.hpp" -#include "barretenberg/honk/pcs/gemini/gemini.hpp" -#include "barretenberg/honk/pcs/shplonk/shplonk_single.hpp" -#include "barretenberg/honk/transcript/transcript.hpp" #include "barretenberg/honk/flavor/ultra.hpp" #include "barretenberg/honk/flavor/ultra_grumpkin.hpp" +#include "barretenberg/honk/pcs/gemini/gemini.hpp" +#include "barretenberg/honk/pcs/shplonk/shplonk_single.hpp" +#include "barretenberg/honk/proof_system/work_queue.hpp" #include "barretenberg/honk/sumcheck/relations/relation_parameters.hpp" #include "barretenberg/honk/sumcheck/sumcheck_output.hpp" +#include "barretenberg/honk/transcript/transcript.hpp" +#include "barretenberg/plonk/proof_system/types/proof.hpp" namespace proof_system::honk { diff --git a/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp index 4b70607dd3..4608d9017b 100644 --- a/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp +++ b/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp @@ -1,8 +1,8 @@ #include "./ultra_verifier.hpp" -#include "barretenberg/honk/transcript/transcript.hpp" -#include "barretenberg/numeric/bitop/get_msb.hpp" #include "barretenberg/honk/flavor/standard.hpp" +#include "barretenberg/honk/transcript/transcript.hpp" #include "barretenberg/honk/utils/power_polynomial.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" using namespace barretenberg; using namespace proof_system::honk::sumcheck; diff --git a/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp b/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp index 00a3736a99..39de3ebaf9 100644 --- a/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp +++ b/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp @@ -1,8 +1,8 @@ #pragma once #include "barretenberg/honk/flavor/ultra.hpp" #include "barretenberg/honk/flavor/ultra_grumpkin.hpp" -#include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/honk/sumcheck/sumcheck.hpp" +#include "barretenberg/plonk/proof_system/types/proof.hpp" namespace proof_system::honk { template class UltraVerifier_ { diff --git a/cpp/src/barretenberg/honk/proof_system/verifier.cpp b/cpp/src/barretenberg/honk/proof_system/verifier.cpp index a03b9060e9..452e2e0c3a 100644 --- a/cpp/src/barretenberg/honk/proof_system/verifier.cpp +++ b/cpp/src/barretenberg/honk/proof_system/verifier.cpp @@ -1,7 +1,7 @@ #include "./verifier.hpp" #include "barretenberg/honk/transcript/transcript.hpp" -#include "barretenberg/numeric/bitop/get_msb.hpp" #include "barretenberg/honk/utils/power_polynomial.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" using namespace barretenberg; using namespace proof_system::honk::sumcheck; diff --git a/cpp/src/barretenberg/honk/proof_system/verifier.hpp b/cpp/src/barretenberg/honk/proof_system/verifier.hpp index bbf7228aa9..94bf19ed03 100644 --- a/cpp/src/barretenberg/honk/proof_system/verifier.hpp +++ b/cpp/src/barretenberg/honk/proof_system/verifier.hpp @@ -1,8 +1,8 @@ #pragma once #include "barretenberg/honk/flavor/standard.hpp" -#include "barretenberg/plonk/proof_system/types/proof.hpp" -#include "barretenberg/honk/sumcheck/sumcheck.hpp" #include "barretenberg/honk/flavor/standard_grumpkin.hpp" +#include "barretenberg/honk/sumcheck/sumcheck.hpp" +#include "barretenberg/plonk/proof_system/types/proof.hpp" namespace proof_system::honk { template class StandardVerifier_ { diff --git a/cpp/src/barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp b/cpp/src/barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp index f7e13ceabf..a40238e2b4 100644 --- a/cpp/src/barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include #include "univariate.hpp" +#include +#include /* IMPROVEMENT(Cody): This could or should be improved in various ways. In no particular order: 1) Edge cases are not considered. One non-use case situation (I forget which) leads to a segfault. 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 ed2471d01e..c9925f7b79 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 "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barycentric_data.hpp" -#include #include "barretenberg/numeric/random/engine.hpp" +#include using namespace proof_system::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 f7417d5624..683fcd85df 100644 --- a/cpp/src/barretenberg/honk/sumcheck/polynomials/multivariates.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/polynomials/multivariates.test.cpp @@ -2,10 +2,10 @@ #include "barretenberg/honk/sumcheck/relations/arithmetic_relation.hpp" #include "barretenberg/honk/sumcheck/sumcheck.hpp" -#include +#include "barretenberg/honk/flavor/standard.hpp" #include "barretenberg/honk/transcript/transcript.hpp" #include "barretenberg/numeric/random/engine.hpp" -#include "barretenberg/honk/flavor/standard.hpp" +#include using namespace proof_system::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 a8dd2f5ef3..b67816d363 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 "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/honk/utils/power_polynomial.hpp" +#include "pow.hpp" #include namespace proof_system::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 a4a4a4b927..948382b845 100644 --- a/cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/polynomials/univariate.hpp @@ -1,10 +1,10 @@ #pragma once +#include "barretenberg/common/assert.hpp" +#include "barretenberg/common/serialize.hpp" #include #include -#include #include -#include "barretenberg/common/serialize.hpp" -#include "barretenberg/common/assert.hpp" +#include namespace proof_system::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 ffc870e46d..91417fec90 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 "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barycentric_data.hpp" +#include "univariate.hpp" -#include #include "barretenberg/numeric/random/engine.hpp" +#include using namespace proof_system::honk::sumcheck; namespace test_univariate { diff --git a/cpp/src/barretenberg/honk/sumcheck/relations/lookup_relation.hpp b/cpp/src/barretenberg/honk/sumcheck/relations/lookup_relation.hpp index 2442febb64..1e6fc09721 100644 --- a/cpp/src/barretenberg/honk/sumcheck/relations/lookup_relation.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/relations/lookup_relation.hpp @@ -1,6 +1,6 @@ #pragma once -#include "relation_parameters.hpp" #include "../polynomials/univariate.hpp" +#include "relation_parameters.hpp" #include "relation_types.hpp" #pragma GCC diagnostic ignored "-Wunused-variable" diff --git a/cpp/src/barretenberg/honk/sumcheck/relations/permutation_relation.hpp b/cpp/src/barretenberg/honk/sumcheck/relations/permutation_relation.hpp index 65bd51cfa7..ffb113af21 100644 --- a/cpp/src/barretenberg/honk/sumcheck/relations/permutation_relation.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/relations/permutation_relation.hpp @@ -1,6 +1,6 @@ #pragma once -#include "relation_parameters.hpp" #include "../polynomials/univariate.hpp" +#include "relation_parameters.hpp" #include "relation_types.hpp" // TODO(luke): change name of this file to permutation_grand_product_relation(s).hpp and move 'init' relation into it. diff --git a/cpp/src/barretenberg/honk/sumcheck/relations/relation_consistency.test.cpp b/cpp/src/barretenberg/honk/sumcheck/relations/relation_consistency.test.cpp index cb3c5ce36c..038212c28f 100644 --- a/cpp/src/barretenberg/honk/sumcheck/relations/relation_consistency.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/relations/relation_consistency.test.cpp @@ -1,11 +1,11 @@ +#include "../polynomials/barycentric_data.hpp" +#include "../polynomials/univariate.hpp" +#include "arithmetic_relation.hpp" +#include "barretenberg/honk/flavor/standard.hpp" #include "barretenberg/honk/sumcheck/relations/lookup_relation.hpp" #include "barretenberg/honk/sumcheck/relations/ultra_arithmetic_relation.hpp" -#include "barretenberg/honk/flavor/standard.hpp" -#include "relation_parameters.hpp" -#include "arithmetic_relation.hpp" #include "permutation_relation.hpp" -#include "../polynomials/univariate.hpp" -#include "../polynomials/barycentric_data.hpp" +#include "relation_parameters.hpp" #include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/numeric/random/engine.hpp" diff --git a/cpp/src/barretenberg/honk/sumcheck/relations/relation_correctness.test.cpp b/cpp/src/barretenberg/honk/sumcheck/relations/relation_correctness.test.cpp index 88a992bced..44b30d808b 100644 --- a/cpp/src/barretenberg/honk/sumcheck/relations/relation_correctness.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/relations/relation_correctness.test.cpp @@ -3,14 +3,14 @@ #include "barretenberg/honk/composer/standard_composer.hpp" #include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/honk/proof_system/prover_library.hpp" -#include "barretenberg/honk/sumcheck/relations/relation_parameters.hpp" #include "barretenberg/honk/sumcheck/relations/arithmetic_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/auxiliary_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/elliptic_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/lookup_relation.hpp" #include "barretenberg/honk/sumcheck/relations/permutation_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/relation_parameters.hpp" #include "barretenberg/honk/sumcheck/relations/ultra_arithmetic_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/lookup_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/gen_perm_sort_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/elliptic_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/auxiliary_relation.hpp" using namespace proof_system::honk; diff --git a/cpp/src/barretenberg/honk/sumcheck/relations/relation_types.hpp b/cpp/src/barretenberg/honk/sumcheck/relations/relation_types.hpp index e23a4e820b..27012ceea8 100644 --- a/cpp/src/barretenberg/honk/sumcheck/relations/relation_types.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/relations/relation_types.hpp @@ -6,8 +6,10 @@ #include "relation_parameters.hpp" namespace proof_system::honk::sumcheck { -template -concept HasSubrelationLinearlyIndependentMember = requires(T) { T::Relation::SUBRELATION_LINEARLY_INDEPENDENT; }; +template concept HasSubrelationLinearlyIndependentMember = requires(T) +{ + T::Relation::SUBRELATION_LINEARLY_INDEPENDENT; +}; /** * @brief The templates defined herein facilitate sharing the relation arithmetic between the prover and the verifier. * @@ -75,8 +77,8 @@ template typename RelationBase> class Relation * @tparam size_t */ template - static constexpr bool is_subrelation_linearly_independent() - requires(!HasSubrelationLinearlyIndependentMember) + static constexpr bool is_subrelation_linearly_independent() requires( + !HasSubrelationLinearlyIndependentMember) { return true; } @@ -87,8 +89,8 @@ template typename RelationBase> class Relation * @tparam size_t */ template - static constexpr bool is_subrelation_linearly_independent() - requires(HasSubrelationLinearlyIndependentMember) + static constexpr bool is_subrelation_linearly_independent() requires( + HasSubrelationLinearlyIndependentMember) { return std::get(Relation::SUBRELATION_LINEARLY_INDEPENDENT); } diff --git a/cpp/src/barretenberg/honk/sumcheck/relations/ultra_relation_consistency.test.cpp b/cpp/src/barretenberg/honk/sumcheck/relations/ultra_relation_consistency.test.cpp index ddf85ef38b..df3da161c9 100644 --- a/cpp/src/barretenberg/honk/sumcheck/relations/ultra_relation_consistency.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/relations/ultra_relation_consistency.test.cpp @@ -1,15 +1,15 @@ -#include "barretenberg/honk/sumcheck/relations/ultra_arithmetic_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/permutation_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/lookup_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/gen_perm_sort_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/elliptic_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/auxiliary_relation.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" -#include "relation_parameters.hpp" +#include "../polynomials/barycentric_data.hpp" +#include "../polynomials/univariate.hpp" #include "arithmetic_relation.hpp" +#include "barretenberg/honk/flavor/ultra.hpp" +#include "barretenberg/honk/sumcheck/relations/auxiliary_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/elliptic_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/lookup_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/permutation_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/ultra_arithmetic_relation.hpp" #include "permutation_relation.hpp" -#include "../polynomials/univariate.hpp" -#include "../polynomials/barycentric_data.hpp" +#include "relation_parameters.hpp" #include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/numeric/random/engine.hpp" diff --git a/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp b/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp index 1f7f5ab847..2f56572930 100644 --- a/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp @@ -1,20 +1,20 @@ #pragma once #include "barretenberg/common/serialize.hpp" -#include +#include "barretenberg/common/throw_or_abort.hpp" +#include "barretenberg/honk/proof_system/prover.hpp" #include "barretenberg/honk/sumcheck/relations/relation_parameters.hpp" +#include "barretenberg/honk/sumcheck/sumcheck_output.hpp" #include "barretenberg/honk/transcript/transcript.hpp" #include "barretenberg/honk/utils/grand_product_delta.hpp" -#include "barretenberg/common/throw_or_abort.hpp" -#include "sumcheck_round.hpp" #include "polynomials/univariate.hpp" +#include "sumcheck_round.hpp" #include +#include #include +#include #include #include #include -#include "barretenberg/honk/proof_system/prover.hpp" -#include "barretenberg/honk/sumcheck/sumcheck_output.hpp" -#include namespace proof_system::honk::sumcheck { diff --git a/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp b/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp index 9856317555..4109e6152c 100644 --- a/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp @@ -1,26 +1,26 @@ -#include "sumcheck.hpp" -#include "barretenberg/honk/transcript/transcript.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/honk/composer/standard_composer.hpp" +#include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/honk/flavor/standard.hpp" +#include "barretenberg/honk/sumcheck/relations/auxiliary_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/elliptic_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/lookup_relation.hpp" +#include "barretenberg/honk/sumcheck/relations/ultra_arithmetic_relation.hpp" +#include "barretenberg/honk/transcript/transcript.hpp" +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/transcript/manifest.hpp" #include "barretenberg/transcript/transcript_wrappers.hpp" #include "relations/arithmetic_relation.hpp" #include "relations/permutation_relation.hpp" -#include "barretenberg/transcript/manifest.hpp" +#include "sumcheck.hpp" #include #include #include -#include "barretenberg/ecc/curves/bn254/fr.hpp" #include -#include "barretenberg/numeric/random/engine.hpp" -#include "barretenberg/honk/composer/standard_composer.hpp" -#include "barretenberg/honk/composer/ultra_composer.hpp" -#include "barretenberg/honk/sumcheck/relations/ultra_arithmetic_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/lookup_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/gen_perm_sort_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/elliptic_relation.hpp" -#include "barretenberg/honk/sumcheck/relations/auxiliary_relation.hpp" -#include #include +#include #include #include #include diff --git a/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp b/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp index faf96a0d76..e853816b1e 100644 --- a/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp +++ b/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp @@ -1,15 +1,15 @@ #pragma once #include "barretenberg/common/log.hpp" -#include -#include -#include #include "barretenberg/common/thread.hpp" +#include "barretenberg/honk/flavor/ultra.hpp" #include "polynomials/barycentric_data.hpp" -#include "polynomials/univariate.hpp" #include "polynomials/pow.hpp" +#include "polynomials/univariate.hpp" #include "relations/relation_parameters.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" +#include +#include #include +#include namespace proof_system::honk::sumcheck { diff --git a/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp b/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp index d07421fd5b..987f87999d 100644 --- a/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp +++ b/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp @@ -1,8 +1,8 @@ -#include "sumcheck_round.hpp" -#include "polynomials/univariate.hpp" #include "barretenberg/ecc/curves/bn254/fr.hpp" -#include "barretenberg/numeric/random/engine.hpp" #include "barretenberg/honk/flavor/standard.hpp" +#include "barretenberg/numeric/random/engine.hpp" +#include "polynomials/univariate.hpp" +#include "sumcheck_round.hpp" #include diff --git a/cpp/src/barretenberg/honk/transcript/transcript.hpp b/cpp/src/barretenberg/honk/transcript/transcript.hpp index fec507a642..1ee7a101af 100644 --- a/cpp/src/barretenberg/honk/transcript/transcript.hpp +++ b/cpp/src/barretenberg/honk/transcript/transcript.hpp @@ -1,19 +1,19 @@ #pragma once #include "barretenberg/common/serialize.hpp" -#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/crypto/blake3s/blake3s.hpp" +#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" +#include #include #include #include #include +#include #include #include #include #include -#include -#include namespace proof_system::honk { diff --git a/cpp/src/barretenberg/honk/transcript/transcript.test.cpp b/cpp/src/barretenberg/honk/transcript/transcript.test.cpp index 069e37b365..2749bb1011 100644 --- a/cpp/src/barretenberg/honk/transcript/transcript.test.cpp +++ b/cpp/src/barretenberg/honk/transcript/transcript.test.cpp @@ -1,11 +1,11 @@ -#include "transcript.hpp" #include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/honk/composer/standard_composer.hpp" #include "barretenberg/honk/composer/ultra_composer.hpp" +#include "barretenberg/honk/flavor/standard.hpp" #include "barretenberg/honk/sumcheck/polynomials/univariate.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" -#include "barretenberg/honk/flavor/standard.hpp" #include "barretenberg/proof_system/flavor/flavor.hpp" +#include "transcript.hpp" #include #include #include diff --git a/cpp/src/barretenberg/honk/utils/power_polynomial.hpp b/cpp/src/barretenberg/honk/utils/power_polynomial.hpp index c93ba0da4b..3ac1fee8a0 100644 --- a/cpp/src/barretenberg/honk/utils/power_polynomial.hpp +++ b/cpp/src/barretenberg/honk/utils/power_polynomial.hpp @@ -1,5 +1,5 @@ -#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/common/thread.hpp" +#include "barretenberg/polynomials/polynomial.hpp" #include namespace proof_system::honk::power_polynomial { diff --git a/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp b/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp index 748731f014..194e04de6c 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 "barretenberg/numeric/random/engine.hpp" +#include "power_polynomial.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 03dd820cf7..b76efe183b 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 "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" #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 7899b499f4..5f5624b46d 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 "barretenberg/crypto/schnorr/schnorr.hpp" #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 d8e577b95d..e73a1be11e 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 @@ -2,12 +2,12 @@ #include #include -#include "mock/mock_circuit.hpp" #include "../constants.hpp" -#include "join_split/join_split.hpp" -#include "barretenberg/common/timer.hpp" #include "barretenberg/common/log.hpp" +#include "barretenberg/common/timer.hpp" #include "barretenberg/plonk/proof_system/proving_key/serialize.hpp" +#include "join_split/join_split.hpp" +#include "mock/mock_circuit.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 db2be3f718..803d07bd51 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 "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 "barretenberg/numeric/uint128/uint128.hpp" +#include "barretenberg/numeric/uint256/uint256.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 49cb0e319c..6fb7e970ab 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 @@ -1,17 +1,17 @@ #include #include -#include "c_bind.h" -#include "join_split.hpp" -#include "compute_signing_data.hpp" #include "../mock/mock_circuit.hpp" -#include "barretenberg/common/streams.hpp" -#include "barretenberg/common/mem.hpp" #include "barretenberg/common/container.hpp" +#include "barretenberg/common/mem.hpp" +#include "barretenberg/common/streams.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "barretenberg/srs/global_crs.hpp" -#include "barretenberg/plonk/proof_system/proving_key/serialize.hpp" #include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/plonk/proof_system/proving_key/serialize.hpp" +#include "barretenberg/srs/global_crs.hpp" +#include "c_bind.h" +#include "compute_signing_data.hpp" +#include "join_split.hpp" using namespace barretenberg; using namespace join_split_example::proofs::join_split; 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 b92bf13c73..c81913eaef 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 @@ -1,9 +1,9 @@ #include "compute_circuit_data.hpp" -#include "join_split_circuit.hpp" -#include "sign_join_split_tx.hpp" #include "../notes/native/index.hpp" -#include "barretenberg/stdlib/merkle_tree/hash_path.hpp" #include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/stdlib/merkle_tree/hash_path.hpp" +#include "join_split_circuit.hpp" +#include "sign_join_split_tx.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp index 05c7aa46d3..4f467f2f16 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp @@ -1,6 +1,6 @@ #pragma once -#include "join_split_tx.hpp" #include "../compute_circuit_data.hpp" +#include "join_split_tx.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp index dddc0b91d6..2c3c3aa3ba 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp @@ -1,8 +1,8 @@ #pragma once +#include "../../fixtures/user_context.hpp" #include "compute_circuit_data.hpp" #include "join_split_circuit.hpp" #include "sign_join_split_tx.hpp" -#include "../../fixtures/user_context.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp index 0840de8192..03f094fe7f 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp @@ -1,8 +1,8 @@ #pragma once #include "compute_circuit_data.hpp" #include "create_proof.hpp" +#include "join_split.hpp" #include "join_split_circuit.hpp" #include "join_split_tx.hpp" -#include "join_split.hpp" #include "sign_join_split_tx.hpp" #include "verify_signature.hpp" \ No newline at end of file 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 c6e7789c11..3bb2bc4a17 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,8 +1,8 @@ #include "join_split.hpp" -#include "join_split_circuit.hpp" -#include "compute_circuit_data.hpp" -#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" #include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" +#include "compute_circuit_data.hpp" +#include "join_split_circuit.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 f836684aba..91e83de2e9 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 "barretenberg/srs/factories/crs_factory.hpp" #include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/srs/factories/crs_factory.hpp" +#include "join_split_tx.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 43a9a17a35..c24012a91b 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 @@ -2,14 +2,14 @@ #include "../../constants.hpp" #include "../inner_proof_data/inner_proof_data.hpp" -#include "index.hpp" #include "../notes/native/index.hpp" -#include "join_split_circuit.hpp" #include "barretenberg/common/streams.hpp" #include "barretenberg/common/test.hpp" +#include "barretenberg/join_split_example/types.hpp" #include "barretenberg/plonk/proof_system/proving_key/serialize.hpp" #include "barretenberg/stdlib/merkle_tree/index.hpp" -#include "barretenberg/join_split_example/types.hpp" +#include "index.hpp" +#include "join_split_circuit.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 4efa78f2d5..1f1693d732 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 @@ -1,12 +1,12 @@ #include "join_split_circuit.hpp" #include "../../constants.hpp" -#include "../notes/circuit/value/compute_nullifier.hpp" -#include "../notes/circuit/value/value_note.hpp" #include "../notes/circuit/account/account_note.hpp" #include "../notes/circuit/claim/claim_note.hpp" -#include "verify_signature.hpp" -#include "barretenberg/stdlib/merkle_tree/membership.hpp" +#include "../notes/circuit/value/compute_nullifier.hpp" +#include "../notes/circuit/value/value_note.hpp" #include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/stdlib/merkle_tree/membership.hpp" +#include "verify_signature.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 5ae3e23ed6..736aec45bf 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 @@ -1,9 +1,9 @@ #pragma once -#include "join_split_tx.hpp" -#include "../notes/circuit/value/witness_data.hpp" #include "../notes/circuit/claim/witness_data.hpp" +#include "../notes/circuit/value/witness_data.hpp" #include "barretenberg/crypto/schnorr/schnorr.hpp" #include "barretenberg/join_split_example/types.hpp" +#include "join_split_tx.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 4544bf1a27..3407d31949 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 @@ -1,12 +1,12 @@ #include "../../constants.hpp" #include "../inner_proof_data/inner_proof_data.hpp" -#include "index.hpp" #include "../notes/native/index.hpp" #include "barretenberg/common/streams.hpp" #include "barretenberg/common/test.hpp" +#include "barretenberg/crypto/sha256/sha256.hpp" #include "barretenberg/plonk/proof_system/proving_key/serialize.hpp" #include "barretenberg/stdlib/merkle_tree/index.hpp" -#include "barretenberg/crypto/sha256/sha256.hpp" +#include "index.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 fe309b8dac..e0c0620d30 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 @@ -2,8 +2,8 @@ #include "../notes/native/claim/claim_note_tx_data.hpp" #include "../notes/native/value/value_note.hpp" #include "barretenberg/crypto/schnorr/schnorr.hpp" -#include "barretenberg/stdlib/merkle_tree/hash_path.hpp" #include "barretenberg/join_split_example/types.hpp" +#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/sign_join_split_tx.cpp b/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp index df20aeab5d..c542477828 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 "barretenberg/crypto/schnorr/schnorr.hpp" +#include "compute_signing_data.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 1942a46045..af100ddc91 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,6 +1,6 @@ #pragma once -#include "barretenberg/crypto/schnorr/schnorr.hpp" #include "../notes/native/value/value_note.hpp" +#include "barretenberg/crypto/schnorr/schnorr.hpp" #include "join_split_tx.hpp" namespace join_split_example { 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 96f538f4f2..3e895c174c 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 "barretenberg/stdlib/encryption/schnorr/schnorr.hpp" #include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" +#include "barretenberg/stdlib/encryption/schnorr/schnorr.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 ba299de9ca..d13f330730 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,21 +1,22 @@ #pragma once #include "barretenberg/common/map.hpp" -#include "barretenberg/stdlib/primitives/field/field.hpp" #include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" namespace join_split_example { namespace proofs { namespace mock { -using namespace proof_system::plonk::stdlib; +using namespace proof_system::plonk; -template void mock_circuit(Builder& builder, std::vector const& public_inputs_) +template void mock_circuit(Builder& builder, std::vector const& public_inputs_) { - const auto public_inputs = map(public_inputs_, [&](auto& i) { return field_t(witness_t(&builder, i)); }); + const auto public_inputs = + map(public_inputs_, [&](auto& i) { return stdlib::field_t(stdlib::witness_t(&builder, i)); }); for (auto& p : public_inputs) { p.set_public(); } - plonk::stdlib::pedersen_commitment::compress(field_t(witness_t(&builder, 1)), - field_t(witness_t(&builder, 1))); + stdlib::pedersen_commitment::compress(stdlib::field_t(stdlib::witness_t(&builder, 1)), + stdlib::field_t(stdlib::witness_t(&builder, 1))); } } // namespace mock 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 6960962095..f4d9c2830e 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 "barretenberg/common/test.hpp" #include "barretenberg/join_split_example/types.hpp" +#include "mock_circuit.hpp" using namespace proof_system::plonk::stdlib; 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 30390eb103..bf85eeef34 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,7 +1,6 @@ #pragma once #include "barretenberg/join_split_example/types.hpp" #include "commit.hpp" -#include "barretenberg/join_split_example/types.hpp" namespace join_split_example { namespace proofs { 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 4dc6623580..fef9f8700d 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,8 +1,8 @@ #pragma once -#include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" -#include "barretenberg/stdlib/primitives/point/point.hpp" #include "../../constants.hpp" #include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" +#include "barretenberg/stdlib/primitives/point/point.hpp" namespace join_split_example { namespace proofs { 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 6a7a559b70..c58cb8cf29 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,5 +1,5 @@ -#include "barretenberg/join_split_example/types.hpp" #include "../constants.hpp" +#include "barretenberg/join_split_example/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 c1f49ad7a0..8617b9641e 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,8 +1,8 @@ #pragma once -#include "barretenberg/join_split_example/types.hpp" +#include "../constants.hpp" #include "../native/bridge_call_data.hpp" #include "./asset_id.hpp" -#include "../constants.hpp" +#include "barretenberg/join_split_example/types.hpp" namespace join_split_example { namespace proofs { 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 8a23ff9f93..9efbe896fe 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 @@ -2,10 +2,10 @@ #include "barretenberg/join_split_example/types.hpp" #include "../bridge_call_data.hpp" -#include "witness_data.hpp" #include "../value/create_partial_commitment.hpp" -#include "create_partial_commitment.hpp" #include "complete_partial_commitment.hpp" +#include "create_partial_commitment.hpp" +#include "witness_data.hpp" namespace join_split_example { namespace proofs { 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 fb20d7fef9..eb0ed66a92 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,6 +1,6 @@ #pragma once -#include "barretenberg/join_split_example/types.hpp" #include "../../constants.hpp" +#include "barretenberg/join_split_example/types.hpp" #include "barretenberg/stdlib/commitment/pedersen/pedersen.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 2ffb181bb2..384192ff9e 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,8 +1,8 @@ #pragma once +#include "../../constants.hpp" #include "barretenberg/join_split_example/types.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" -#include "../../constants.hpp" namespace join_split_example { namespace proofs { 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 66583b1f2d..575ad3d565 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,7 +1,7 @@ #pragma once +#include "../../constants.hpp" #include "barretenberg/join_split_example/types.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" -#include "../../constants.hpp" namespace join_split_example { namespace proofs { 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 e1bebb5e6d..23b9e7abfa 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,10 +1,10 @@ #pragma once -#include "barretenberg/join_split_example/types.hpp" +#include "../../constants.hpp" #include "../../native/claim/claim_note.hpp" #include "../../native/claim/claim_note_tx_data.hpp" -#include "../../constants.hpp" #include "../bridge_call_data.hpp" +#include "barretenberg/join_split_example/types.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp index e8886528ca..1abf528193 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp @@ -1,5 +1,5 @@ +#include "account/index.hpp" #include "asset_id.hpp" #include "bridge_call_data.hpp" -#include "account/index.hpp" #include "claim/index.hpp" #include "value/index.hpp" \ No newline at end of file diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp index 80be9279f8..00294dcd2e 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp @@ -1,7 +1,7 @@ #pragma once -#include "witness_data.hpp" -#include "create_partial_commitment.hpp" #include "complete_partial_commitment.hpp" +#include "create_partial_commitment.hpp" +#include "witness_data.hpp" namespace join_split_example { namespace proofs { 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 b3a6f22a72..bb17b874a5 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,8 +1,8 @@ #pragma once +#include "../../constants.hpp" #include "barretenberg/join_split_example/types.hpp" #include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" -#include "../../constants.hpp" namespace join_split_example { namespace proofs { namespace notes { 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 906a12bd99..c114a914b6 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 @@ -1,10 +1,10 @@ -#include #include "../../../../fixtures/user_context.hpp" -#include "./compute_nullifier.hpp" -#include "./value_note.hpp" #include "../../native/value/compute_nullifier.hpp" #include "../../native/value/value_note.hpp" +#include "./compute_nullifier.hpp" +#include "./value_note.hpp" #include "barretenberg/join_split_example/types.hpp" +#include namespace join_split_example { using namespace join_split_example::proofs::notes; 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 ac6104c65a..9ebca962d9 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,7 +1,7 @@ #pragma once -#include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" -#include "barretenberg/join_split_example/types.hpp" #include "../../constants.hpp" +#include "barretenberg/join_split_example/types.hpp" +#include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" namespace join_split_example { namespace proofs { 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 9f2d47a6c6..7e9e334fee 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,7 +1,7 @@ #pragma once #include "barretenberg/join_split_example/types.hpp" -#include "witness_data.hpp" #include "commit.hpp" +#include "witness_data.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/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 index 92ada18413..586255b47d 100644 --- a/cpp/src/barretenberg/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 @@ -1,8 +1,8 @@ -#include "value_note.hpp" #include "../../../../fixtures/user_context.hpp" -#include "../../native/value/value_note.hpp" #include "../../constants.hpp" +#include "../../native/value/value_note.hpp" #include "barretenberg/join_split_example/types.hpp" +#include "value_note.hpp" #include namespace join_split_example { 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 9cbdd32a10..02dd07b98f 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include "barretenberg/numeric/uint256/uint256.hpp" #include "../../constants.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" +#include namespace join_split_example { namespace proofs { 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 ab68a0bc72..7b668b5345 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,6 +1,6 @@ #include "account_note.hpp" -#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "../../constants.hpp" +#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" namespace join_split_example { namespace proofs { 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 7f10d40c3a..33ac735f78 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,7 +1,7 @@ #pragma once -#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "../../constants.hpp" +#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" +#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/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 e7eaa29700..246400ae04 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,7 +1,7 @@ #pragma once +#include "../../constants.hpp" #include "account_note.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" -#include "../../constants.hpp" namespace join_split_example { namespace proofs { 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 a88b18ed32..25fe124456 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,7 +1,7 @@ #pragma once +#include "../../constants.hpp" #include "account_note.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" -#include "../../constants.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp index 82d19549a0..dd1b21d59c 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp @@ -1,6 +1,6 @@ #pragma once -#include #include +#include namespace join_split_example::proofs::notes::native { 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 22d79996ad..bfd852ba30 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 "barretenberg/common/serialize.hpp" #include "../constants.hpp" +#include "barretenberg/common/serialize.hpp" +#include "barretenberg/common/throw_or_abort.hpp" #include "barretenberg/crypto/pedersen_commitment/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 a89e12bcfb..0b2e5688f1 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,10 +1,10 @@ #pragma once +#include "../bridge_call_data.hpp" #include "barretenberg/common/serialize.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "create_partial_commitment.hpp" #include "complete_partial_commitment.hpp" -#include "../bridge_call_data.hpp" +#include "create_partial_commitment.hpp" namespace join_split_example { namespace proofs { 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 83c2f6375c..c37fac0763 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,8 +1,8 @@ #pragma once +#include "../bridge_call_data.hpp" #include "barretenberg/common/serialize.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "../bridge_call_data.hpp" namespace join_split_example { namespace proofs { 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 27407bf567..7d6ccc89b1 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,8 +1,8 @@ #pragma once +#include "../../constants.hpp" #include "barretenberg/common/serialize.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "../../constants.hpp" namespace join_split_example { namespace proofs { 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 513b8bfe2e..c1077753bc 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,8 +1,8 @@ #pragma once +#include "../../constants.hpp" #include "barretenberg/common/serialize.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "../../constants.hpp" namespace join_split_example { namespace proofs { 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 fd5c302007..fe0a49a8ea 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,7 +1,7 @@ #pragma once -#include "claim_note.hpp" -#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "../../constants.hpp" +#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" +#include "claim_note.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp index c8e82c34aa..6c03f18de2 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp @@ -1,6 +1,6 @@ #pragma once -#include "claim_note_tx_data.hpp" #include "claim_note.hpp" +#include "claim_note_tx_data.hpp" #include "complete_partial_commitment.hpp" #include "compute_nullifier.hpp" #include "create_partial_commitment.hpp" \ No newline at end of file diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp index f477c95540..779219abe9 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp @@ -1,6 +1,6 @@ #pragma once +#include "account/index.hpp" #include "asset_id.hpp" #include "bridge_call_data.hpp" -#include "account/index.hpp" #include "claim/index.hpp" #include "value/index.hpp" \ No newline at end of file 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 0d33dc091b..b464a4bd11 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,6 +1,6 @@ #pragma once -#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "../../constants.hpp" +#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" namespace join_split_example { namespace proofs { 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 d16a4bb722..066bd0414d 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 "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/crypto/blake2s/blake2s.hpp" +#include "barretenberg/crypto/pedersen_commitment/pedersen.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 5105074c02..e0b3d948e6 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,8 +1,8 @@ #pragma once +#include "../../constants.hpp" #include "barretenberg/common/serialize.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "../../constants.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp index 1aff8bc460..19d71aa13a 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp @@ -1,3 +1,3 @@ #pragma once -#include "value_note.hpp" -#include "compute_nullifier.hpp" \ No newline at end of file +#include "compute_nullifier.hpp" +#include "value_note.hpp" \ No newline at end of file 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 421106004d..0dda4e2634 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 @@ -2,8 +2,8 @@ #include "barretenberg/common/serialize.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "create_partial_commitment.hpp" #include "complete_partial_commitment.hpp" +#include "create_partial_commitment.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/proofs/verify.hpp b/cpp/src/barretenberg/join_split_example/proofs/verify.hpp index 2506e740cb..d79d42d156 100644 --- a/cpp/src/barretenberg/join_split_example/proofs/verify.hpp +++ b/cpp/src/barretenberg/join_split_example/proofs/verify.hpp @@ -2,8 +2,8 @@ #include "./mock/mock_circuit.hpp" #include "barretenberg/ecc/curves/bn254/fq12.hpp" #include "barretenberg/ecc/curves/bn254/pairing.hpp" -#include "barretenberg/stdlib/recursion/verifier/verifier.hpp" #include "barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp" +#include "barretenberg/stdlib/recursion/verifier/verifier.hpp" namespace join_split_example { namespace proofs { diff --git a/cpp/src/barretenberg/join_split_example/types.hpp b/cpp/src/barretenberg/join_split_example/types.hpp index dc17ed85c7..2fff791d38 100644 --- a/cpp/src/barretenberg/join_split_example/types.hpp +++ b/cpp/src/barretenberg/join_split_example/types.hpp @@ -1,20 +1,20 @@ #pragma once +#include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/plonk/composer/standard_composer.hpp" #include "barretenberg/plonk/composer/turbo_composer.hpp" #include "barretenberg/plonk/composer/ultra_composer.hpp" -#include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/plonk/proof_system/prover/prover.hpp" -#include "barretenberg/stdlib/primitives/bool/bool.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/commitment/pedersen/pedersen.hpp" #include "barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp" -#include "barretenberg/stdlib/merkle_tree/hash_path.hpp" #include "barretenberg/stdlib/encryption/schnorr/schnorr.hpp" +#include "barretenberg/stdlib/merkle_tree/hash_path.hpp" +#include "barretenberg/stdlib/primitives/bool/bool.hpp" +#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/stdlib/primitives/witness/witness.hpp" namespace join_split_example { diff --git a/cpp/src/barretenberg/numeric/bitop/pow.hpp b/cpp/src/barretenberg/numeric/bitop/pow.hpp index 9c200944cb..7d2b391f8c 100644 --- a/cpp/src/barretenberg/numeric/bitop/pow.hpp +++ b/cpp/src/barretenberg/numeric/bitop/pow.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include "./get_msb.hpp" +#include namespace numeric { constexpr uint64_t pow64(const uint64_t input, const uint64_t exponent) diff --git a/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp b/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp index cb4028ab4e..651ca694d5 100644 --- a/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp +++ b/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp @@ -1,9 +1,9 @@ #pragma once +#include "barretenberg/common/throw_or_abort.hpp" +#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 a925367c3e..fe8ac086cd 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 "barretenberg/common/assert.hpp" +#include #include #include diff --git a/cpp/src/barretenberg/numeric/random/engine.test.cpp b/cpp/src/barretenberg/numeric/random/engine.test.cpp index f8db4e9582..69fa536fae 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 "barretenberg/common/log.hpp" #include "barretenberg/common/streams.hpp" +#include "engine.hpp" +#include TEST(engine, get_random_uint64) { diff --git a/cpp/src/barretenberg/numeric/uint128/uint128.hpp b/cpp/src/barretenberg/numeric/uint128/uint128.hpp index 884c73e9c6..e0ec587400 100644 --- a/cpp/src/barretenberg/numeric/uint128/uint128.hpp +++ b/cpp/src/barretenberg/numeric/uint128/uint128.hpp @@ -3,8 +3,8 @@ #include #ifdef __i386__ -#include #include "barretenberg/common/serialize.hpp" +#include namespace numeric { diff --git a/cpp/src/barretenberg/numeric/uint256/uint256.hpp b/cpp/src/barretenberg/numeric/uint256/uint256.hpp index 52c6411e1c..22aa382ded 100644 --- a/cpp/src/barretenberg/numeric/uint256/uint256.hpp +++ b/cpp/src/barretenberg/numeric/uint256/uint256.hpp @@ -11,12 +11,12 @@ **/ #pragma once +#include "../uint128/uint128.hpp" +#include "barretenberg/common/serialize.hpp" #include #include #include #include -#include "barretenberg/common/serialize.hpp" -#include "../uint128/uint128.hpp" namespace numeric { diff --git a/cpp/src/barretenberg/numeric/uintx/uintx.hpp b/cpp/src/barretenberg/numeric/uintx/uintx.hpp index 4299fca3b1..39827bdace 100644 --- a/cpp/src/barretenberg/numeric/uintx/uintx.hpp +++ b/cpp/src/barretenberg/numeric/uintx/uintx.hpp @@ -11,12 +11,12 @@ **/ #pragma once +#include "../uint256/uint256.hpp" +#include "barretenberg/common/assert.hpp" +#include "barretenberg/common/throw_or_abort.hpp" #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/plonk/composer/standard_composer.cpp b/cpp/src/barretenberg/plonk/composer/standard_composer.cpp index 6118219671..c14107dfcc 100644 --- a/cpp/src/barretenberg/plonk/composer/standard_composer.cpp +++ b/cpp/src/barretenberg/plonk/composer/standard_composer.cpp @@ -1,12 +1,12 @@ #include "standard_composer.hpp" -#include "barretenberg/polynomials/polynomial.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/composer/composer_lib.hpp" #include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" +#include "barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp" +#include "barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp" +#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/proof_system/composer/composer_lib.hpp" -#include "barretenberg/plonk/composer/composer_lib.hpp" #include "barretenberg/proof_system/composer/permutation_lib.hpp" #include diff --git a/cpp/src/barretenberg/plonk/composer/standard_composer.hpp b/cpp/src/barretenberg/plonk/composer/standard_composer.hpp index 421b7c2ce7..b96679a7ab 100644 --- a/cpp/src/barretenberg/plonk/composer/standard_composer.hpp +++ b/cpp/src/barretenberg/plonk/composer/standard_composer.hpp @@ -1,15 +1,14 @@ #pragma once +#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/plonk/composer/composer_lib.hpp" #include "barretenberg/plonk/flavor/flavor.hpp" -#include "barretenberg/srs/factories/file_crs_factory.hpp" -#include "barretenberg/plonk/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/proof_system/circuit_builder/standard_circuit_builder.hpp" -#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp" #include "barretenberg/plonk/proof_system/verifier/verifier.hpp" -#include "barretenberg/plonk/composer/composer_lib.hpp" +#include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" +#include "barretenberg/srs/factories/file_crs_factory.hpp" #include namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp b/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp index 0324b03a76..54f95ffa78 100644 --- a/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp +++ b/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp @@ -1,9 +1,9 @@ -#include -#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/crypto/generators/generator_data.hpp" +#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/plonk/composer/standard_composer.hpp" #include "barretenberg/plonk/proof_system/proving_key/serialize.hpp" #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" +#include using namespace barretenberg; using namespace proof_system; diff --git a/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp b/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp index 21c1ba113a..b4c741d9fa 100644 --- a/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp +++ b/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp @@ -1,17 +1,16 @@ #include "turbo_composer.hpp" -#include "barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/plonk/composer/composer_lib.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.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 "barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp" #include "barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp" -#include "barretenberg/proof_system/composer/permutation_lib.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/proof_system/circuit_builder/turbo_circuit_builder.hpp" #include "barretenberg/proof_system/composer/composer_lib.hpp" -#include "barretenberg/plonk/composer/composer_lib.hpp" +#include "barretenberg/proof_system/composer/permutation_lib.hpp" using namespace barretenberg; diff --git a/cpp/src/barretenberg/plonk/composer/turbo_composer.hpp b/cpp/src/barretenberg/plonk/composer/turbo_composer.hpp index 469fe3915f..b9b64ea0b2 100644 --- a/cpp/src/barretenberg/plonk/composer/turbo_composer.hpp +++ b/cpp/src/barretenberg/plonk/composer/turbo_composer.hpp @@ -1,12 +1,12 @@ #pragma once -#include "barretenberg/plonk/flavor/flavor.hpp" #include "barretenberg/plonk/composer/composer_lib.hpp" -#include "barretenberg/proof_system/composer/composer_lib.hpp" -#include "barretenberg/srs/factories/file_crs_factory.hpp" -#include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" +#include "barretenberg/plonk/flavor/flavor.hpp" #include "barretenberg/plonk/proof_system/prover/prover.hpp" +#include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" #include "barretenberg/plonk/proof_system/verifier/verifier.hpp" +#include "barretenberg/proof_system/composer/composer_lib.hpp" +#include "barretenberg/srs/factories/file_crs_factory.hpp" namespace proof_system::plonk { class TurboComposer { diff --git a/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp b/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp index 6a37d1fb13..3c280bafc0 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 -#include "barretenberg/crypto/generators/generator_data.hpp" #include "barretenberg/crypto/generators/fixed_base_scalar_mul.hpp" +#include "barretenberg/crypto/generators/generator_data.hpp" #include "barretenberg/plonk/composer/turbo_composer.hpp" #include "barretenberg/plonk/proof_system/proving_key/serialize.hpp" #include "barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp" diff --git a/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp b/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp index d25a43aafb..244bf770a2 100644 --- a/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp +++ b/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp @@ -1,10 +1,10 @@ #include "ultra_composer.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" #include "barretenberg/plonk/proof_system/types/program_settings.hpp" #include "barretenberg/plonk/proof_system/types/prover_settings.hpp" #include "barretenberg/plonk/proof_system/verifier/verifier.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" #include "barretenberg/proof_system/composer/permutation_lib.hpp" -#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" #include #include diff --git a/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp b/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp index 9ad3eac3e8..eace805e71 100644 --- a/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp +++ b/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp @@ -1,13 +1,13 @@ #pragma once -#include "barretenberg/plonk/flavor/flavor.hpp" -#include "barretenberg/proof_system/composer/composer_lib.hpp" #include "barretenberg/plonk/composer/composer_lib.hpp" -#include "barretenberg/srs/factories/file_crs_factory.hpp" -#include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" +#include "barretenberg/plonk/flavor/flavor.hpp" #include "barretenberg/plonk/proof_system/prover/prover.hpp" +#include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" #include "barretenberg/plonk/proof_system/verifier/verifier.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" +#include "barretenberg/proof_system/composer/composer_lib.hpp" +#include "barretenberg/srs/factories/file_crs_factory.hpp" #include #include diff --git a/cpp/src/barretenberg/plonk/flavor/flavor.hpp b/cpp/src/barretenberg/plonk/flavor/flavor.hpp index 9c1cd2ee97..b50fccf33d 100644 --- a/cpp/src/barretenberg/plonk/flavor/flavor.hpp +++ b/cpp/src/barretenberg/plonk/flavor/flavor.hpp @@ -1,9 +1,9 @@ #pragma once #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" -#include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" #include "barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" namespace proof_system::plonk::flavor { class Standard { diff --git a/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp b/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp index 88c22654ee..32102304fc 100644 --- a/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp @@ -1,7 +1,7 @@ #pragma once +#include "../../../polynomials/polynomial.hpp" #include "../../../polynomials/polynomial_arithmetic.hpp" #include "../../../proof_system/work_queue/work_queue.hpp" -#include "../../../polynomials/polynomial.hpp" #include "../types/commitment_open_proof.hpp" #include "../types/program_settings.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 2e52e04649..95606da380 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,14 +2,14 @@ #include "commitment_scheme.hpp" #include "kate_commitment_scheme.hpp" -#include "barretenberg/common/mem.hpp" -#include -#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 "barretenberg/common/mem.hpp" +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" #include "barretenberg/srs/factories/file_crs_factory.hpp" +#include +#include #include "barretenberg/ecc/curves/bn254/fq12.hpp" #include "barretenberg/ecc/curves/bn254/pairing.hpp" 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 47bac02abf..ccdf2eb4c1 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,6 +1,6 @@ -#include "barretenberg/common/throw_or_abort.hpp" #include "kate_commitment_scheme.hpp" #include "../../../polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/common/throw_or_abort.hpp" namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp b/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp index 2d42d9bf28..6d1b9de2ad 100644 --- a/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp @@ -1,11 +1,11 @@ #include "prover.hpp" #include "../public_inputs/public_inputs.hpp" -#include "barretenberg/plonk/proof_system/types/prover_settings.hpp" -#include "barretenberg/polynomials/polynomial.hpp" -#include #include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/plonk/proof_system/types/prover_settings.hpp" #include "barretenberg/polynomials/iterate_over_domain.hpp" +#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include using namespace barretenberg; diff --git a/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp b/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp index 89d6f65c21..166bcbdb14 100644 --- a/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp @@ -1,11 +1,11 @@ #pragma once -#include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" -#include "../types/proof.hpp" +#include "../../../proof_system/work_queue/work_queue.hpp" +#include "../commitment_scheme/commitment_scheme.hpp" #include "../types/program_settings.hpp" +#include "../types/proof.hpp" #include "../widgets/random_widgets/random_widget.hpp" -#include "../../../proof_system/work_queue/work_queue.hpp" #include "../widgets/transition_widgets/transition_widget.hpp" -#include "../commitment_scheme/commitment_scheme.hpp" +#include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" namespace proof_system::plonk { 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 55e6a711b0..23a5439649 100644 --- a/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp @@ -1,13 +1,13 @@ #include "../utils/permutation.hpp" -#include "../widgets/transition_widgets/arithmetic_widget.hpp" #include "../widgets/random_widgets/permutation_widget.hpp" +#include "../widgets/transition_widgets/arithmetic_widget.hpp" #include "barretenberg/ecc/curves/bn254/bn254.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/srs/factories/file_crs_factory.hpp" #include "prover.hpp" #include -#include "barretenberg/srs/factories/file_crs_factory.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/proving_key/proving_key.cpp b/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp index 7a6a4b65ab..b4c2d30c1a 100644 --- a/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp @@ -1,7 +1,7 @@ #include "proving_key.hpp" -#include "barretenberg/polynomials/polynomial_arithmetic.hpp" #include "barretenberg/common/throw_or_abort.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp b/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp index 7f10ea82dd..a986806584 100644 --- a/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp @@ -2,13 +2,13 @@ #include #include +#include "barretenberg/ecc/curves/bn254/bn254.hpp" #include "barretenberg/ecc/scalar_multiplication/runtime_states.hpp" +#include "barretenberg/plonk/proof_system/constants.hpp" +#include "barretenberg/plonk/proof_system/types/polynomial_manifest.hpp" #include "barretenberg/polynomials/evaluation_domain.hpp" #include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" -#include "barretenberg/plonk/proof_system/constants.hpp" -#include "barretenberg/plonk/proof_system/types/polynomial_manifest.hpp" -#include "barretenberg/ecc/curves/bn254/bn254.hpp" #ifdef __wasm__ #include "barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp" diff --git a/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp b/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp index 78d7da8c71..53a1166b36 100644 --- a/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp @@ -1,11 +1,11 @@ -#include "barretenberg/common/test.hpp" #include "barretenberg/common/streams.hpp" -#include "proving_key.hpp" -#include "serialize.hpp" +#include "barretenberg/common/test.hpp" #include "barretenberg/plonk/composer/standard_composer.hpp" #include "barretenberg/plonk/composer/ultra_composer.hpp" #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" +#include "proving_key.hpp" +#include "serialize.hpp" #ifndef __wasm__ #include diff --git a/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp b/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp index 5b30163891..a434d00dee 100644 --- a/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp @@ -1,12 +1,12 @@ #pragma once +#include "barretenberg/common/serialize.hpp" +#include "barretenberg/common/throw_or_abort.hpp" #include "barretenberg/crypto/sha256/sha256.hpp" -#include "proving_key.hpp" #include "barretenberg/polynomials/serialize.hpp" -#include "barretenberg/common/throw_or_abort.hpp" -#include "barretenberg/common/serialize.hpp" +#include "proving_key.hpp" +#include #include #include -#include namespace proof_system::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 33e47a32e8..d73b186bd6 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 "barretenberg/polynomials/evaluation_domain.hpp" #include "public_inputs.hpp" #include -#include "barretenberg/polynomials/evaluation_domain.hpp" using namespace barretenberg; diff --git a/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp b/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp index c1684766fd..b4115ce9a5 100644 --- a/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp @@ -1,9 +1,9 @@ #pragma once +#include "barretenberg/proof_system/types/circuit_type.hpp" #include -#include #include -#include "barretenberg/proof_system/types/circuit_type.hpp" +#include namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp b/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp index 39c98c2784..ea450a11b9 100644 --- a/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp @@ -3,18 +3,18 @@ #include #include "../../../transcript/transcript.hpp" +#include "../widgets/random_widgets/permutation_widget.hpp" +#include "../widgets/random_widgets/plookup_widget.hpp" +#include "../widgets/random_widgets/random_widget.hpp" #include "../widgets/transition_widgets/arithmetic_widget.hpp" -#include "../widgets/transition_widgets/turbo_arithmetic_widget.hpp" -#include "../widgets/transition_widgets/plookup_arithmetic_widget.hpp" +#include "../widgets/transition_widgets/elliptic_widget.hpp" #include "../widgets/transition_widgets/fixed_base_widget.hpp" +#include "../widgets/transition_widgets/genperm_sort_widget.hpp" +#include "../widgets/transition_widgets/plookup_arithmetic_widget.hpp" +#include "../widgets/transition_widgets/plookup_auxiliary_widget.hpp" +#include "../widgets/transition_widgets/turbo_arithmetic_widget.hpp" #include "../widgets/transition_widgets/turbo_logic_widget.hpp" #include "../widgets/transition_widgets/turbo_range_widget.hpp" -#include "../widgets/transition_widgets/elliptic_widget.hpp" -#include "../widgets/transition_widgets/plookup_auxiliary_widget.hpp" -#include "../widgets/transition_widgets/genperm_sort_widget.hpp" -#include "../widgets/random_widgets/random_widget.hpp" -#include "../widgets/random_widgets/permutation_widget.hpp" -#include "../widgets/random_widgets/plookup_widget.hpp" #include "./prover_settings.hpp" namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp b/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp index 376645dfb4..9ac63d39d6 100644 --- a/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp @@ -1,10 +1,10 @@ #pragma once -#include -#include -#include -#include #include "barretenberg/common/serialize.hpp" #include "barretenberg/serialize/msgpack.hpp" +#include +#include +#include +#include namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp b/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp index 2f4a9bb47a..b5bd03fed8 100644 --- a/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp" +#include namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp b/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp index e29eab851d..0de60f52fb 100644 --- a/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp @@ -1,9 +1,9 @@ -#include "barretenberg/crypto/sha256/sha256.hpp" +#include "verification_key.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp" -#include "barretenberg/polynomials/evaluation_domain.hpp" -#include "verification_key.hpp" +#include "barretenberg/crypto/sha256/sha256.hpp" #include "barretenberg/plonk/proof_system/constants.hpp" +#include "barretenberg/polynomials/evaluation_domain.hpp" namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp b/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp index 52f4741fd8..a9ca0331dd 100644 --- a/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp @@ -1,12 +1,12 @@ #pragma once -#include #include "barretenberg/common/streams.hpp" -#include "barretenberg/srs/global_crs.hpp" -#include "barretenberg/ecc/curves/bn254/fr.hpp" -#include "barretenberg/polynomials/evaluation_domain.hpp" #include "barretenberg/crypto/sha256/sha256.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/plonk/proof_system/types/polynomial_manifest.hpp" +#include "barretenberg/polynomials/evaluation_domain.hpp" #include "barretenberg/serialize/msgpack.hpp" +#include "barretenberg/srs/global_crs.hpp" +#include namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp b/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp index 01e3aabdb5..c6465ea3cf 100644 --- a/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp @@ -1,5 +1,5 @@ -#include "barretenberg/common/test.hpp" #include "barretenberg/common/streams.hpp" +#include "barretenberg/common/test.hpp" #include "barretenberg/numeric/random/engine.hpp" #include "verification_key.hpp" diff --git a/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp index 6987ecf875..02ad1297d8 100644 --- a/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp @@ -1,11 +1,11 @@ -#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 "barretenberg/common/throw_or_abort.hpp" #include "barretenberg/ecc/curves/bn254/fq12.hpp" #include "barretenberg/ecc/curves/bn254/pairing.hpp" #include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/plonk/proof_system/constants.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 951cef26d6..568fac727a 100644 --- a/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp +++ b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp @@ -1,9 +1,9 @@ #pragma once -#include "../types/proof.hpp" #include "../types/program_settings.hpp" +#include "../types/proof.hpp" #include "../widgets/random_widgets/random_widget.hpp" -#include "barretenberg/transcript/manifest.hpp" #include "barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp" +#include "barretenberg/transcript/manifest.hpp" namespace proof_system::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 3fc3efb89e..fcf4cfc93a 100644 --- a/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp +++ b/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp @@ -1,16 +1,16 @@ +#include "../../../transcript/transcript.hpp" #include "../prover/prover.hpp" -#include "barretenberg/ecc/curves/bn254/bn254.hpp" -#include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" #include "../utils/permutation.hpp" #include "../widgets/transition_widgets/arithmetic_widget.hpp" -#include "../../../transcript/transcript.hpp" +#include "barretenberg/ecc/curves/bn254/bn254.hpp" +#include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp" #include "barretenberg/plonk/composer/standard_composer.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" +#include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/srs/factories/file_crs_factory.hpp" #include "verifier.hpp" -#include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp" #include -#include "barretenberg/srs/factories/file_crs_factory.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 7b2848982f..b38ae3c3b1 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,12 +1,12 @@ #pragma once #include "barretenberg/common/mem.hpp" +#include "barretenberg/common/slab_allocator.hpp" #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" #include "barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp" -#include "barretenberg/polynomials/polynomial.hpp" -#include "barretenberg/common/slab_allocator.hpp" -#include "barretenberg/transcript/transcript.hpp" #include "barretenberg/polynomials/iterate_over_domain.hpp" +#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/polynomials/polynomial_arithmetic.hpp" +#include "barretenberg/transcript/transcript.hpp" namespace proof_system::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 4dc1a6906e..c88e641fc9 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 "barretenberg/common/map.hpp" +#include "barretenberg/common/mem.hpp" #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" -#include "barretenberg/transcript/transcript.hpp" #include "barretenberg/polynomials/iterate_over_domain.hpp" #include "barretenberg/polynomials/polynomial_arithmetic.hpp" -#include "barretenberg/common/mem.hpp" -#include "barretenberg/common/map.hpp" +#include "barretenberg/transcript/transcript.hpp" #include namespace proof_system::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 39829799cc..d19e9aa6ab 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,6 +1,6 @@ #pragma once -#include "../../../../transcript/transcript.hpp" #include "../../../../proof_system/work_queue/work_queue.hpp" +#include "../../../../transcript/transcript.hpp" #include "barretenberg/ecc/curves/bn254/fr.hpp" #include 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 464f5ffd53..311ead04ab 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 @@ -2,13 +2,13 @@ #include #include -#include #include #include +#include -#include "barretenberg/polynomials/iterate_over_domain.hpp" #include "../../types/prover_settings.hpp" #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" +#include "barretenberg/polynomials/iterate_over_domain.hpp" #include "barretenberg/proof_system/work_queue/work_queue.hpp" using namespace proof_system; diff --git a/cpp/src/barretenberg/polynomials/evaluation_domain.cpp b/cpp/src/barretenberg/polynomials/evaluation_domain.cpp index ecf51c06da..8a6ed0e554 100644 --- a/cpp/src/barretenberg/polynomials/evaluation_domain.cpp +++ b/cpp/src/barretenberg/polynomials/evaluation_domain.cpp @@ -1,12 +1,12 @@ #include "evaluation_domain.hpp" -#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "barretenberg/common/assert.hpp" #include "barretenberg/common/mem.hpp" +#include "barretenberg/common/slab_allocator.hpp" +#include "barretenberg/common/thread.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" #include #include -#include "barretenberg/numeric/bitop/get_msb.hpp" -#include "barretenberg/common/thread.hpp" -#include "barretenberg/common/slab_allocator.hpp" namespace barretenberg { diff --git a/cpp/src/barretenberg/polynomials/polynomial.cpp b/cpp/src/barretenberg/polynomials/polynomial.cpp index 22034d46d1..1fe1e128be 100644 --- a/cpp/src/barretenberg/polynomials/polynomial.cpp +++ b/cpp/src/barretenberg/polynomials/polynomial.cpp @@ -1,15 +1,15 @@ #include "polynomial.hpp" -#include "polynomial_arithmetic.hpp" #include "barretenberg/common/assert.hpp" #include "barretenberg/common/slab_allocator.hpp" +#include "polynomial_arithmetic.hpp" #include +#include +#include #include +#include #include -#include #include #include -#include -#include namespace barretenberg { diff --git a/cpp/src/barretenberg/polynomials/polynomial.hpp b/cpp/src/barretenberg/polynomials/polynomial.hpp index f68fc4eac1..14c9fbd103 100644 --- a/cpp/src/barretenberg/polynomials/polynomial.hpp +++ b/cpp/src/barretenberg/polynomials/polynomial.hpp @@ -1,13 +1,13 @@ #pragma once -#include "evaluation_domain.hpp" -#include -#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "barretenberg/common/mem.hpp" #include "barretenberg/crypto/sha256/sha256.hpp" -#include +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "evaluation_domain.hpp" +#include "polynomial_arithmetic.hpp" #include +#include +#include #include -#include "polynomial_arithmetic.hpp" namespace barretenberg { diff --git a/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp b/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp index 8b28ae94f0..8dfb0e40d0 100644 --- a/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp +++ b/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp @@ -1,13 +1,13 @@ #include "polynomial_arithmetic.hpp" -#include "barretenberg/common/slab_allocator.hpp" -#include "iterate_over_domain.hpp" #include "barretenberg/common/assert.hpp" #include "barretenberg/common/mem.hpp" +#include "barretenberg/common/slab_allocator.hpp" +#include "barretenberg/common/thread.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "iterate_over_domain.hpp" #include #include #include -#include "barretenberg/numeric/bitop/get_msb.hpp" -#include "barretenberg/common/thread.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 6d44d817c1..7193a38937 100644 --- a/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp +++ b/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp @@ -1,12 +1,12 @@ +#include "barretenberg/common/mem.hpp" +#include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/numeric/random/engine.hpp" +#include "polynomial.hpp" #include "polynomial_arithmetic.hpp" #include -#include "barretenberg/common/mem.hpp" #include #include #include -#include "barretenberg/numeric/bitop/get_msb.hpp" -#include "barretenberg/numeric/random/engine.hpp" -#include "polynomial.hpp" using namespace barretenberg; diff --git a/cpp/src/barretenberg/polynomials/polynomials.bench.cpp b/cpp/src/barretenberg/polynomials/polynomials.bench.cpp index 91a78f2dc2..8d5ff0b010 100644 --- a/cpp/src/barretenberg/polynomials/polynomials.bench.cpp +++ b/cpp/src/barretenberg/polynomials/polynomials.bench.cpp @@ -1,15 +1,15 @@ -#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/scalar_multiplication/scalar_multiplication.hpp" #include "barretenberg/ecc/groups/wnaf.hpp" +#include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" #include "barretenberg/polynomials/polynomial_arithmetic.hpp" #include "barretenberg/srs/io.hpp" +#include using namespace benchmark; using namespace barretenberg; diff --git a/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp b/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp index 1aa89393a0..fc7f4e16ca 100644 --- a/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp +++ b/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp @@ -1,8 +1,8 @@ #pragma once #include +#include #include #include -#include namespace arithmetization { diff --git a/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp b/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp index 5175867bfd..a054c3b792 100644 --- a/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp +++ b/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/common/serialize.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include namespace proof_system { struct add_triple { diff --git a/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp b/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp index 3edf243647..4d98845767 100644 --- a/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp +++ b/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp @@ -1,8 +1,8 @@ #pragma once +#include "barretenberg/common/slab_allocator.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/proof_system/arithmetization/arithmetization.hpp" #include "barretenberg/proof_system/arithmetization/gate_data.hpp" -#include "barretenberg/ecc/curves/bn254/fr.hpp" -#include "barretenberg/common/slab_allocator.hpp" #include namespace proof_system { diff --git a/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp b/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp index ad23708024..0f312f3d8f 100644 --- a/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp +++ b/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp @@ -1,6 +1,6 @@ #include "standard_circuit_builder.hpp" -#include #include +#include using namespace barretenberg; diff --git a/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp b/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp index 82e669c542..ac93ea41ad 100644 --- a/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp +++ b/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp @@ -1,9 +1,9 @@ #pragma once -#include -#include "circuit_builder_base.hpp" #include "barretenberg/proof_system/types/circuit_type.hpp" #include "barretenberg/proof_system/types/merkle_hash_type.hpp" #include "barretenberg/proof_system/types/pedersen_commitment_type.hpp" +#include "circuit_builder_base.hpp" +#include namespace proof_system { inline std::vector standard_selector_names() diff --git a/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp b/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp index c54af20819..9c9833bdf2 100644 --- a/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp +++ b/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp @@ -1,7 +1,7 @@ +#include "barretenberg/crypto/generators/generator_data.hpp" +#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "standard_circuit_builder.hpp" #include -#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" -#include "barretenberg/crypto/generators/generator_data.hpp" using namespace barretenberg; using namespace proof_system; diff --git a/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp b/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp index 795e119fca..af77bf341e 100644 --- a/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp +++ b/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp @@ -1,9 +1,9 @@ #pragma once -#include -#include "circuit_builder_base.hpp" #include "barretenberg/proof_system/types/circuit_type.hpp" #include "barretenberg/proof_system/types/merkle_hash_type.hpp" #include "barretenberg/proof_system/types/pedersen_commitment_type.hpp" +#include "circuit_builder_base.hpp" +#include namespace proof_system { diff --git a/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.test.cpp b/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.test.cpp index ec4ffd3e10..6b84323572 100644 --- a/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.test.cpp +++ b/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.test.cpp @@ -1,6 +1,6 @@ -#include "turbo_circuit_builder.hpp" -#include "barretenberg/crypto/generators/generator_data.hpp" #include "barretenberg/crypto/generators/fixed_base_scalar_mul.hpp" +#include "barretenberg/crypto/generators/generator_data.hpp" +#include "turbo_circuit_builder.hpp" #include using namespace barretenberg; diff --git a/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp b/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp index a61a7dbce3..3c9b063504 100644 --- a/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp +++ b/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp @@ -9,8 +9,8 @@ */ #include "ultra_circuit_builder.hpp" #include -#include #include +#include using namespace barretenberg; diff --git a/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp index c990549166..47ff143b32 100644 --- a/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp +++ b/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp @@ -1,14 +1,14 @@ #pragma once -#include "barretenberg/proof_system/arithmetization/arithmetization.hpp" -#include "barretenberg/plonk/proof_system/types/polynomial_manifest.hpp" -#include "circuit_builder_base.hpp" #include "barretenberg/plonk/proof_system/constants.hpp" -#include "barretenberg/proof_system/types/merkle_hash_type.hpp" +#include "barretenberg/plonk/proof_system/types/polynomial_manifest.hpp" +#include "barretenberg/plonk/proof_system/types/prover_settings.hpp" #include "barretenberg/polynomials/polynomial.hpp" -#include "barretenberg/proof_system/plookup_tables/types.hpp" +#include "barretenberg/proof_system/arithmetization/arithmetization.hpp" #include "barretenberg/proof_system/plookup_tables/plookup_tables.hpp" -#include "barretenberg/plonk/proof_system/types/prover_settings.hpp" +#include "barretenberg/proof_system/plookup_tables/types.hpp" +#include "barretenberg/proof_system/types/merkle_hash_type.hpp" #include "barretenberg/proof_system/types/pedersen_commitment_type.hpp" +#include "circuit_builder_base.hpp" #include namespace proof_system { diff --git a/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp b/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp index cd9b4a86d1..ecbf2231b0 100644 --- a/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp +++ b/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp @@ -1,5 +1,5 @@ -#include "ultra_circuit_builder.hpp" #include "barretenberg/crypto/generators/generator_data.hpp" +#include "ultra_circuit_builder.hpp" #include using namespace barretenberg; diff --git a/cpp/src/barretenberg/proof_system/composer/composer_helper_lib.hpp b/cpp/src/barretenberg/proof_system/composer/composer_helper_lib.hpp index e982da1d09..9544179766 100644 --- a/cpp/src/barretenberg/proof_system/composer/composer_helper_lib.hpp +++ b/cpp/src/barretenberg/proof_system/composer/composer_helper_lib.hpp @@ -1,8 +1,8 @@ #pragma once -#include #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" #include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" +#include namespace proof_system { diff --git a/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp b/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp index e982da1d09..9544179766 100644 --- a/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp +++ b/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp @@ -1,8 +1,8 @@ #pragma once -#include #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" #include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" +#include namespace proof_system { diff --git a/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp b/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp index 525258850d..45d1a81844 100644 --- a/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp +++ b/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp @@ -1,10 +1,10 @@ -#include -#include #include "barretenberg/common/slab_allocator.hpp" #include "barretenberg/honk/flavor/standard.hpp" // TODO: needed? #include "barretenberg/proof_system/composer/composer_lib.hpp" #include "barretenberg/proof_system/types/circuit_type.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" +#include +#include namespace proof_system::test_composer_lib { diff --git a/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp b/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp index 65f547f1a6..ab63a82834 100644 --- a/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp +++ b/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp @@ -8,15 +8,14 @@ #pragma once #include "barretenberg/ecc/curves/bn254/fr.hpp" -#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp" #include "barretenberg/polynomials/iterate_over_domain.hpp" +#include "barretenberg/polynomials/polynomial.hpp" #include +#include #include #include -#include -#include #include #include #include diff --git a/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp b/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp index 7087d9e8e3..80aa86f13b 100644 --- a/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp +++ b/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp @@ -1,10 +1,10 @@ -#include -#include #include "barretenberg/honk/flavor/standard.hpp" // TODO: needed? #include "barretenberg/proof_system/composer/composer_lib.hpp" #include "barretenberg/proof_system/composer/permutation_lib.hpp" #include "barretenberg/proof_system/types/circuit_type.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" +#include +#include namespace proof_system::test_composer_lib { diff --git a/cpp/src/barretenberg/proof_system/flavor/flavor.hpp b/cpp/src/barretenberg/proof_system/flavor/flavor.hpp index 345f6c9dc4..38cb073e7d 100644 --- a/cpp/src/barretenberg/proof_system/flavor/flavor.hpp +++ b/cpp/src/barretenberg/proof_system/flavor/flavor.hpp @@ -64,13 +64,13 @@ */ #pragma once -#include -#include -#include #include "barretenberg/honk/sumcheck/polynomials/barycentric_data.hpp" +#include "barretenberg/honk/sumcheck/polynomials/univariate.hpp" #include "barretenberg/polynomials/evaluation_domain.hpp" #include "barretenberg/proof_system/types/circuit_type.hpp" -#include "barretenberg/honk/sumcheck/polynomials/univariate.hpp" +#include +#include +#include namespace proof_system::honk::flavor { diff --git a/cpp/src/barretenberg/proof_system/plookup_tables/aes128.hpp b/cpp/src/barretenberg/proof_system/plookup_tables/aes128.hpp index 3dfaff4f36..7c714effd4 100644 --- a/cpp/src/barretenberg/proof_system/plookup_tables/aes128.hpp +++ b/cpp/src/barretenberg/proof_system/plookup_tables/aes128.hpp @@ -1,12 +1,12 @@ #pragma once #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 "barretenberg/numeric/uint256/uint256.hpp" -#include "types.hpp" #include "sparse.hpp" +#include "types.hpp" namespace plookup { namespace aes128_tables { diff --git a/cpp/src/barretenberg/proof_system/plookup_tables/blake2s.hpp b/cpp/src/barretenberg/proof_system/plookup_tables/blake2s.hpp index 22ba606571..39df081ca0 100644 --- a/cpp/src/barretenberg/proof_system/plookup_tables/blake2s.hpp +++ b/cpp/src/barretenberg/proof_system/plookup_tables/blake2s.hpp @@ -2,8 +2,8 @@ #include "barretenberg/numeric/bitop/rotate.hpp" -#include "types.hpp" #include "sparse.hpp" +#include "types.hpp" namespace plookup { namespace blake2s_tables { diff --git a/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_chi.hpp b/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_chi.hpp index fab70497ae..5db06fc8e7 100644 --- a/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_chi.hpp +++ b/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_chi.hpp @@ -1,8 +1,8 @@ #pragma once -#include "barretenberg/numeric/bitop/pow.hpp" -#include "barretenberg/common/constexpr_utils.hpp" #include "../types.hpp" +#include "barretenberg/common/constexpr_utils.hpp" +#include "barretenberg/numeric/bitop/pow.hpp" namespace plookup { namespace keccak_tables { diff --git a/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_input.hpp b/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_input.hpp index b6e8765158..ce161d24eb 100644 --- a/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_input.hpp +++ b/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_input.hpp @@ -1,9 +1,9 @@ #pragma once +#include "../types.hpp" +#include "barretenberg/common/constexpr_utils.hpp" #include "barretenberg/numeric/bitop/pow.hpp" #include "barretenberg/numeric/bitop/sparse_form.hpp" -#include "barretenberg/common/constexpr_utils.hpp" -#include "../types.hpp" namespace plookup { namespace keccak_tables { diff --git a/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_output.hpp b/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_output.hpp index d6af17403e..3aaebfcdc3 100644 --- a/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_output.hpp +++ b/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_output.hpp @@ -1,11 +1,11 @@ #pragma once +#include "barretenberg/common/constexpr_utils.hpp" #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" +#include "../types.hpp" namespace plookup { namespace keccak_tables { diff --git a/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_rho.hpp b/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_rho.hpp index c052c53d37..d29f4009b0 100644 --- a/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_rho.hpp +++ b/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_rho.hpp @@ -1,8 +1,8 @@ #pragma once -#include "barretenberg/numeric/bitop/pow.hpp" -#include "barretenberg/common/constexpr_utils.hpp" #include "../types.hpp" +#include "barretenberg/common/constexpr_utils.hpp" +#include "barretenberg/numeric/bitop/pow.hpp" namespace plookup { namespace keccak_tables { diff --git a/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_theta.hpp b/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_theta.hpp index 51422f829a..f7ed27f908 100644 --- a/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_theta.hpp +++ b/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_theta.hpp @@ -1,8 +1,8 @@ #pragma once -#include "barretenberg/numeric/bitop/pow.hpp" -#include "barretenberg/common/constexpr_utils.hpp" #include "../types.hpp" +#include "barretenberg/common/constexpr_utils.hpp" +#include "barretenberg/numeric/bitop/pow.hpp" namespace plookup { namespace keccak_tables { diff --git a/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.hpp b/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.hpp index 3fad0b85c9..b579d77026 100644 --- a/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.hpp +++ b/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.hpp @@ -1,10 +1,10 @@ #pragma once #include "./types.hpp" -#include #include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/ecc/curves/secp256k1/secp256k1.hpp" +#include namespace plookup { namespace ecc_generator_tables { diff --git a/cpp/src/barretenberg/proof_system/plookup_tables/pedersen.hpp b/cpp/src/barretenberg/proof_system/plookup_tables/pedersen.hpp index 91107bb624..e9f2e5490c 100644 --- a/cpp/src/barretenberg/proof_system/plookup_tables/pedersen.hpp +++ b/cpp/src/barretenberg/proof_system/plookup_tables/pedersen.hpp @@ -3,9 +3,9 @@ #include "./types.hpp" #include "barretenberg/crypto/pedersen_hash/pedersen_lookup.hpp" +#include "barretenberg/numeric/bitop/pow.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/proof_system/plookup_tables/plookup_tables.hpp b/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.hpp index 2e674befa2..d915409550 100644 --- a/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.hpp +++ b/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.hpp @@ -1,20 +1,20 @@ #pragma once #include "barretenberg/common/throw_or_abort.hpp" -#include "types.hpp" -#include "sha256.hpp" #include "aes128.hpp" -#include "sparse.hpp" -#include "pedersen.hpp" -#include "uint.hpp" -#include "non_native_group_generator.hpp" #include "blake2s.hpp" +#include "dummy.hpp" #include "keccak/keccak_chi.hpp" #include "keccak/keccak_input.hpp" #include "keccak/keccak_output.hpp" #include "keccak/keccak_rho.hpp" #include "keccak/keccak_theta.hpp" -#include "dummy.hpp" +#include "non_native_group_generator.hpp" +#include "pedersen.hpp" +#include "sha256.hpp" +#include "sparse.hpp" +#include "types.hpp" +#include "uint.hpp" namespace plookup { diff --git a/cpp/src/barretenberg/proof_system/plookup_tables/sha256.hpp b/cpp/src/barretenberg/proof_system/plookup_tables/sha256.hpp index ced149cbf3..b738571db1 100644 --- a/cpp/src/barretenberg/proof_system/plookup_tables/sha256.hpp +++ b/cpp/src/barretenberg/proof_system/plookup_tables/sha256.hpp @@ -1,12 +1,12 @@ #pragma once #include "barretenberg/crypto/aes128/aes128.hpp" +#include "barretenberg/numeric/bitop/pow.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" +#include "types.hpp" namespace plookup { namespace sha256_tables { diff --git a/cpp/src/barretenberg/proof_system/plookup_tables/sparse.hpp b/cpp/src/barretenberg/proof_system/plookup_tables/sparse.hpp index 4d7397f67d..006f9a3c7b 100644 --- a/cpp/src/barretenberg/proof_system/plookup_tables/sparse.hpp +++ b/cpp/src/barretenberg/proof_system/plookup_tables/sparse.hpp @@ -3,9 +3,9 @@ #include "./types.hpp" #include "barretenberg/crypto/aes128/aes128.hpp" +#include "barretenberg/numeric/bitop/pow.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/proof_system/plookup_tables/types.hpp b/cpp/src/barretenberg/proof_system/plookup_tables/types.hpp index f6c7c0f6df..e7fd4e400e 100644 --- a/cpp/src/barretenberg/proof_system/plookup_tables/types.hpp +++ b/cpp/src/barretenberg/proof_system/plookup_tables/types.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include +#include #include "barretenberg/ecc/curves/bn254/fr.hpp" diff --git a/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp b/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp index 55271a45f8..e6f93b54d7 100644 --- a/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp +++ b/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp @@ -1,8 +1,8 @@ #include #include -#include "polynomial_store.hpp" #include "barretenberg/polynomials/polynomial.hpp" +#include "polynomial_store.hpp" namespace proof_system { diff --git a/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp b/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp index c8d9e94226..b0d138471c 100644 --- a/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp +++ b/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp @@ -1,6 +1,6 @@ #pragma once -#include "barretenberg/polynomials/polynomial.hpp" #include "./polynomial_store_wasm.hpp" +#include "barretenberg/polynomials/polynomial.hpp" #include #include diff --git a/cpp/src/barretenberg/proof_system/types/circuit_type.hpp b/cpp/src/barretenberg/proof_system/types/circuit_type.hpp index 2b3a5a44ea..d6acab670a 100644 --- a/cpp/src/barretenberg/proof_system/types/circuit_type.hpp +++ b/cpp/src/barretenberg/proof_system/types/circuit_type.hpp @@ -1,6 +1,6 @@ #pragma once -#include #include +#include namespace proof_system { enum class CircuitType : uint32_t { STANDARD, TURBO, ULTRA, UNDEFINED }; 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 7ada146c3e..6b1f15f468 100644 --- a/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp +++ b/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp @@ -1,6 +1,6 @@ #include "work_queue.hpp" -#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp" +#include "barretenberg/polynomials/polynomial.hpp" #include "barretenberg/polynomials/polynomial_arithmetic.hpp" namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/serialize/cbind.hpp b/cpp/src/barretenberg/serialize/cbind.hpp index 74983312ad..9bdfa5c875 100644 --- a/cpp/src/barretenberg/serialize/cbind.hpp +++ b/cpp/src/barretenberg/serialize/cbind.hpp @@ -7,13 +7,13 @@ #include "msgpack_impl/check_memory_span.hpp" #include "msgpack_impl/concepts.hpp" +#include "msgpack_impl/func_traits.hpp" #include "msgpack_impl/msgpack_impl.hpp" #include "msgpack_impl/name_value_pair_macro.hpp" #include "msgpack_impl/schema_impl.hpp" #include "msgpack_impl/schema_name.hpp" #include "msgpack_impl/struct_map_impl.hpp" #include "msgpack_impl/variant_impl.hpp" -#include "msgpack_impl/func_traits.hpp" #include #include diff --git a/cpp/src/barretenberg/serialize/msgpack.hpp b/cpp/src/barretenberg/serialize/msgpack.hpp index 5bbe3dac94..41e3c79f52 100644 --- a/cpp/src/barretenberg/serialize/msgpack.hpp +++ b/cpp/src/barretenberg/serialize/msgpack.hpp @@ -91,9 +91,9 @@ e.g. unpacking msgpack::unpack((const char*)encoded_data, encoded_data_size).get().convert(*value); ``` */ -#include -#include "msgpack_impl/name_value_pair_macro.hpp" #include "msgpack_impl/concepts.hpp" +#include "msgpack_impl/name_value_pair_macro.hpp" +#include // Helper for above documented syntax // Define a macro that takes any amount of parameters and expands to a msgpack method definition diff --git a/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp b/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp index 7a310f7cf3..a9d7abe01e 100644 --- a/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp +++ b/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp @@ -2,13 +2,13 @@ // Note: heavy header due to serialization logic, don't include outside of tests #include -#include -#include -#include -#include -#include #include "barretenberg/common/throw_or_abort.hpp" #include "schema_name.hpp" +#include +#include +#include +#include +#include namespace msgpack { template uintptr_t __aligned_for(uintptr_t ptr) diff --git a/cpp/src/barretenberg/serialize/msgpack_impl/func_traits.hpp b/cpp/src/barretenberg/serialize/msgpack_impl/func_traits.hpp index d328c67f52..b6de580957 100644 --- a/cpp/src/barretenberg/serialize/msgpack_impl/func_traits.hpp +++ b/cpp/src/barretenberg/serialize/msgpack_impl/func_traits.hpp @@ -1,6 +1,6 @@ #pragma once -#include #include "../msgpack.hpp" +#include // Define a template struct to deduce function traits for different function types template struct func_traits; diff --git a/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp b/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp index a5d4213635..eaa93245a7 100644 --- a/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp +++ b/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp @@ -1,10 +1,10 @@ #pragma once -#include +#include "schema_name.hpp" +#include #include +#include #include -#include -#include "schema_name.hpp" struct MsgpackSchemaPacker; diff --git a/cpp/src/barretenberg/serialize/msgpack_impl/schema_name.hpp b/cpp/src/barretenberg/serialize/msgpack_impl/schema_name.hpp index c70c8f2a5b..ac794af49c 100644 --- a/cpp/src/barretenberg/serialize/msgpack_impl/schema_name.hpp +++ b/cpp/src/barretenberg/serialize/msgpack_impl/schema_name.hpp @@ -1,7 +1,7 @@ #pragma once #include "barretenberg/ecc/curves/bn254/g1.hpp" -#include #include +#include /** * Converts C++ type information into a human-readable format. diff --git a/cpp/src/barretenberg/serialize/msgpack_impl/struct_map_impl.hpp b/cpp/src/barretenberg/serialize/msgpack_impl/struct_map_impl.hpp index 0bc101eeb8..37d09d917d 100644 --- a/cpp/src/barretenberg/serialize/msgpack_impl/struct_map_impl.hpp +++ b/cpp/src/barretenberg/serialize/msgpack_impl/struct_map_impl.hpp @@ -1,13 +1,13 @@ #pragma once // Note: heavy header due to serialization logic, don't include if msgpack.hpp will do -#include -#include +#include #include +#include #include -#include +#include #define MSGPACK_NO_BOOST -#include #include "concepts.hpp" +#include namespace msgpack { template auto drop_keys_impl(Tuple&& tuple, std::index_sequence) diff --git a/cpp/src/barretenberg/serialize/msgpack_schema.test.cpp b/cpp/src/barretenberg/serialize/msgpack_schema.test.cpp index 516caac5f5..c5f50b2df0 100644 --- a/cpp/src/barretenberg/serialize/msgpack_schema.test.cpp +++ b/cpp/src/barretenberg/serialize/msgpack_schema.test.cpp @@ -1,5 +1,5 @@ -#include "barretenberg/serialize/msgpack.hpp" #include "barretenberg/serialize/cbind.hpp" +#include "barretenberg/serialize/msgpack.hpp" #include diff --git a/cpp/src/barretenberg/serialize/raw_pointer.hpp b/cpp/src/barretenberg/serialize/raw_pointer.hpp index 7556bdfa06..92ff7ea780 100644 --- a/cpp/src/barretenberg/serialize/raw_pointer.hpp +++ b/cpp/src/barretenberg/serialize/raw_pointer.hpp @@ -1,6 +1,6 @@ #pragma once -#include #include "msgpack_impl/schema_name.hpp" +#include // Holds a raw pointer to an object of type T. // It provides methods for packing and unpacking the pointer using MessagePack, diff --git a/cpp/src/barretenberg/serialize/test_helper.hpp b/cpp/src/barretenberg/serialize/test_helper.hpp index 903ea3c431..8c6efc418e 100644 --- a/cpp/src/barretenberg/serialize/test_helper.hpp +++ b/cpp/src/barretenberg/serialize/test_helper.hpp @@ -1,6 +1,6 @@ #pragma once -#include #include "cbind.hpp" +#include /*** * Do a roundtrip test encode/decode of an object. diff --git a/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp b/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp index 1d28415857..5a3f019df2 100644 --- a/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp +++ b/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp @@ -1,6 +1,6 @@ +#include "barretenberg/stdlib/hash/blake2s/blake2s.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" #include "barretenberg/stdlib/primitives/witness/witness.hpp" -#include "barretenberg/stdlib/hash/blake2s/blake2s.hpp" using namespace proof_system::plonk; using namespace proof_system::plonk::stdlib; diff --git a/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp b/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp index 9605997034..3c336b390d 100644 --- a/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp +++ b/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp @@ -1,10 +1,10 @@ -#include "barretenberg/transcript/transcript.hpp" +#include "barretenberg/ecc/curves/bn254/fq12.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" #include "barretenberg/plonk/proof_system/proving_key/serialize.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" -#include "barretenberg/stdlib/recursion/verifier/verifier.hpp" #include "barretenberg/stdlib/recursion/verifier/program_settings.hpp" -#include "barretenberg/ecc/curves/bn254/fq12.hpp" -#include "barretenberg/ecc/curves/bn254/pairing.hpp" +#include "barretenberg/stdlib/recursion/verifier/verifier.hpp" +#include "barretenberg/transcript/transcript.hpp" using namespace proof_system::plonk; diff --git a/cpp/src/barretenberg/solidity_helpers/key_gen.cpp b/cpp/src/barretenberg/solidity_helpers/key_gen.cpp index 8b59a4a2ca..b62198ed91 100644 --- a/cpp/src/barretenberg/solidity_helpers/key_gen.cpp +++ b/cpp/src/barretenberg/solidity_helpers/key_gen.cpp @@ -4,12 +4,12 @@ #include "barretenberg/plonk/composer/ultra_composer.hpp" #include "barretenberg/plonk/proof_system/verification_key/sol_gen.hpp" -#include "circuits/blake_circuit.hpp" #include "circuits/add_2_circuit.hpp" +#include "circuits/blake_circuit.hpp" #include "circuits/recursive_circuit.hpp" -#include "utils/utils.hpp" #include "utils/instance_sol_gen.hpp" +#include "utils/utils.hpp" template typename Circuit> void generate_keys(std::string output_path, std::string flavour_prefix, std::string circuit_name) diff --git a/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp b/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp index af5cea646f..d052b1b7f0 100644 --- a/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp +++ b/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp @@ -1,12 +1,12 @@ +#include #include #include -#include #include "barretenberg/plonk/composer/standard_composer.hpp" #include "barretenberg/plonk/composer/ultra_composer.hpp" -#include "circuits/blake_circuit.hpp" #include "circuits/add_2_circuit.hpp" +#include "circuits/blake_circuit.hpp" #include "circuits/recursive_circuit.hpp" #include "utils/utils.hpp" diff --git a/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp b/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp index 0567e73739..9871660c1a 100644 --- a/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp +++ b/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp @@ -1,5 +1,5 @@ -#include #include +#include std::string bytes_to_hex_string(const std::vector& input) { diff --git a/cpp/src/barretenberg/srs/c_bind.cpp b/cpp/src/barretenberg/srs/c_bind.cpp index 4b000b0f4e..fde3b61d3f 100644 --- a/cpp/src/barretenberg/srs/c_bind.cpp +++ b/cpp/src/barretenberg/srs/c_bind.cpp @@ -1,10 +1,10 @@ #include "c_bind.hpp" +#include "./io.hpp" #include "barretenberg/ecc/curves/bn254/bn254.hpp" #include "global_crs.hpp" -#include "./io.hpp" +#include #include #include -#include using namespace barretenberg; diff --git a/cpp/src/barretenberg/srs/c_bind.hpp b/cpp/src/barretenberg/srs/c_bind.hpp index 7461f26e4d..fa496f1e29 100644 --- a/cpp/src/barretenberg/srs/c_bind.hpp +++ b/cpp/src/barretenberg/srs/c_bind.hpp @@ -1,4 +1,4 @@ -#include #include +#include WASM_EXPORT void srs_init_srs(uint8_t const* points_buf, uint32_t const* num_points, uint8_t const* g2_point_buf); \ No newline at end of file diff --git a/cpp/src/barretenberg/srs/factories/file_crs_factory.hpp b/cpp/src/barretenberg/srs/factories/file_crs_factory.hpp index 8647ad3045..83ea35d84e 100644 --- a/cpp/src/barretenberg/srs/factories/file_crs_factory.hpp +++ b/cpp/src/barretenberg/srs/factories/file_crs_factory.hpp @@ -1,9 +1,9 @@ #pragma once #include "barretenberg/ecc/curves/bn254/bn254.hpp" -#include "crs_factory.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include +#include "crs_factory.hpp" #include +#include namespace barretenberg::srs::factories { diff --git a/cpp/src/barretenberg/srs/factories/mem_crs_factory.hpp b/cpp/src/barretenberg/srs/factories/mem_crs_factory.hpp index c6ec5c7018..c4c9fba8d5 100644 --- a/cpp/src/barretenberg/srs/factories/mem_crs_factory.hpp +++ b/cpp/src/barretenberg/srs/factories/mem_crs_factory.hpp @@ -1,10 +1,10 @@ #pragma once #include "barretenberg/ecc/curves/bn254/bn254.hpp" -#include "crs_factory.hpp" #include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/ecc/curves/bn254/g2.hpp" -#include +#include "crs_factory.hpp" #include +#include namespace barretenberg::srs::factories { diff --git a/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp b/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp index c4d27f5e07..57b725e9e2 100644 --- a/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp +++ b/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp @@ -1,10 +1,10 @@ +#include "../io.hpp" #include "barretenberg/ecc/curves/bn254/bn254.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" #include "file_crs_factory.hpp" #include "mem_crs_factory.hpp" -#include "../io.hpp" -#include "barretenberg/ecc/curves/bn254/pairing.hpp" -#include #include +#include using namespace barretenberg; using namespace barretenberg::srs::factories; diff --git a/cpp/src/barretenberg/srs/global_crs.cpp b/cpp/src/barretenberg/srs/global_crs.cpp index 2be2a86b5c..912a5758d7 100644 --- a/cpp/src/barretenberg/srs/global_crs.cpp +++ b/cpp/src/barretenberg/srs/global_crs.cpp @@ -1,6 +1,6 @@ #include "./global_crs.hpp" -#include "./factories/mem_crs_factory.hpp" #include "./factories/file_crs_factory.hpp" +#include "./factories/mem_crs_factory.hpp" #include "barretenberg/common/throw_or_abort.hpp" namespace { diff --git a/cpp/src/barretenberg/srs/io.hpp b/cpp/src/barretenberg/srs/io.hpp index 594deb77eb..bc85e1b691 100644 --- a/cpp/src/barretenberg/srs/io.hpp +++ b/cpp/src/barretenberg/srs/io.hpp @@ -1,8 +1,8 @@ #pragma once #include "../ecc/curves/bn254/bn254.hpp" #include "../ecc/curves/grumpkin/grumpkin.hpp" -#include #include +#include #include #include #include diff --git a/cpp/src/barretenberg/srs/io.test.cpp b/cpp/src/barretenberg/srs/io.test.cpp index 81452638a4..a2886a71ee 100644 --- a/cpp/src/barretenberg/srs/io.test.cpp +++ b/cpp/src/barretenberg/srs/io.test.cpp @@ -1,7 +1,7 @@ +#include "barretenberg/common/mem.hpp" #include "barretenberg/ecc/curves/bn254/fq12.hpp" #include "barretenberg/ecc/curves/bn254/pairing.hpp" #include "io.hpp" -#include "barretenberg/common/mem.hpp" #include using namespace barretenberg; diff --git a/cpp/src/barretenberg/srs/scalar_multiplication.test.cpp b/cpp/src/barretenberg/srs/scalar_multiplication.test.cpp index 1ee5d0600d..8082a76fb8 100644 --- a/cpp/src/barretenberg/srs/scalar_multiplication.test.cpp +++ b/cpp/src/barretenberg/srs/scalar_multiplication.test.cpp @@ -14,8 +14,8 @@ #include "barretenberg/ecc/scalar_multiplication/point_table.hpp" #include "barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp" #include "barretenberg/numeric/random/engine.hpp" -#include "barretenberg/srs/io.hpp" #include "barretenberg/srs/factories/file_crs_factory.hpp" +#include "barretenberg/srs/io.hpp" #include #include diff --git a/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.bench.cpp b/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.bench.cpp index 4aa4d15dc3..723a291a90 100644 --- a/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.bench.cpp +++ b/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.bench.cpp @@ -1,11 +1,11 @@ -#include "pedersen.hpp" -#include #include "barretenberg/crypto/pedersen_commitment/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/factories/file_crs_factory.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" +#include "pedersen.hpp" +#include #define BARRETENBERG_SRS_PATH "../srs_db/ignition" diff --git a/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp b/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp index 490dff7a17..25b49a59c8 100644 --- a/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp +++ b/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp @@ -1,7 +1,7 @@ #include "pedersen.hpp" -#include "pedersen_plookup.hpp" -#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "../../hash/pedersen/pedersen.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include "pedersen_plookup.hpp" #include "../../primitives/packed_byte_array/packed_byte_array.hpp" diff --git a/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp b/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp index fa7761ea83..fd3eca12d7 100644 --- a/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp +++ b/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp @@ -1,9 +1,9 @@ #pragma once -#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" +#include "../../primitives/byte_array/byte_array.hpp" #include "../../primitives/circuit_builders/circuit_builders_fwd.hpp" #include "../../primitives/field/field.hpp" #include "../../primitives/point/point.hpp" -#include "../../primitives/byte_array/byte_array.hpp" +#include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp b/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp index d45ce54659..d638410ddb 100644 --- a/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp +++ b/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp @@ -1,11 +1,11 @@ -#include "pedersen.hpp" -#include "pedersen_plookup.hpp" +#include "barretenberg/common/test.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/crypto/pedersen_commitment/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" +#include "pedersen.hpp" +#include "pedersen_plookup.hpp" namespace test_stdlib_pedersen { using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.cpp b/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.cpp index c10d78450b..0058ca25c3 100644 --- a/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.cpp +++ b/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.cpp @@ -1,10 +1,10 @@ #include "pedersen_plookup.hpp" +#include "../../hash/pedersen/pedersen_plookup.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "../../hash/pedersen/pedersen_plookup.hpp" -#include "barretenberg/proof_system/plookup_tables/types.hpp" #include "../../primitives/plookup/plookup.hpp" +#include "barretenberg/proof_system/plookup_tables/types.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp b/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp index e29be90285..aa74a15877 100644 --- a/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp +++ b/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp @@ -1,8 +1,8 @@ #pragma once #include "../../primitives/circuit_builders/circuit_builders_fwd.hpp" #include "../../primitives/field/field.hpp" -#include "../../primitives/point/point.hpp" #include "../../primitives/packed_byte_array/packed_byte_array.hpp" +#include "../../primitives/point/point.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.test.cpp b/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.test.cpp index c7ed36a261..e782531f29 100644 --- a/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.test.cpp +++ b/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.test.cpp @@ -1,11 +1,11 @@ -#include "pedersen.hpp" -#include "pedersen_plookup.hpp" +#include "barretenberg/common/test.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp" #include "barretenberg/crypto/pedersen_hash/pedersen_lookup.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "barretenberg/common/test.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" +#include "pedersen.hpp" +#include "pedersen_plookup.hpp" namespace test_stdlib_pedersen { using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp index 69044c57e6..c9193f6c5f 100644 --- a/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp @@ -1,11 +1,11 @@ #include "./aes128.hpp" -#include "barretenberg/numeric/uint256/uint256.hpp" -#include "barretenberg/numeric/bitop/sparse_form.hpp" #include "barretenberg/crypto/aes128/aes128.hpp" +#include "barretenberg/numeric/bitop/sparse_form.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" -#include "barretenberg/stdlib/primitives/plookup/plookup.hpp" #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" +#include "barretenberg/stdlib/primitives/plookup/plookup.hpp" using namespace crypto::aes128; using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp index 77c5026ddf..28b4f4057d 100644 --- a/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp +++ b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp @@ -3,9 +3,9 @@ #include #include -#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp" #include "../../primitives/field/field.hpp" #include "../../primitives/witness/witness.hpp" +#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp index 36568492d0..1d7c131c28 100644 --- a/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp @@ -1,6 +1,6 @@ #include "aes128.hpp" -#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" #include "barretenberg/crypto/aes128/aes128.hpp" +#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" #include diff --git a/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp b/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp index 83bb092a9d..8dffc2afb0 100644 --- a/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp +++ b/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp @@ -1,9 +1,9 @@ #pragma once -#include "barretenberg/crypto/ecdsa/ecdsa.hpp" #include "../../primitives/byte_array/byte_array.hpp" -#include "../../primitives/uint/uint.hpp" #include "../../primitives/circuit_builders/circuit_builders_fwd.hpp" +#include "../../primitives/uint/uint.hpp" +#include "barretenberg/crypto/ecdsa/ecdsa.hpp" namespace proof_system::plonk { namespace stdlib { namespace ecdsa { diff --git a/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp b/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp index 27205d7bd5..33e74fba5a 100644 --- a/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp @@ -2,9 +2,9 @@ #include "../../primitives/biggroup/biggroup.hpp" #include "../../primitives/curves/secp256k1.hpp" #include "../../primitives/curves/secp256r1.hpp" -#include "ecdsa.hpp" -#include "barretenberg/crypto/ecdsa/ecdsa.hpp" #include "barretenberg/common/test.hpp" +#include "barretenberg/crypto/ecdsa/ecdsa.hpp" +#include "ecdsa.hpp" using namespace barretenberg; using namespace proof_system::plonk; diff --git a/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp index 3d7303af65..52f7e698d4 100644 --- a/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp @@ -1,9 +1,9 @@ #include "schnorr.hpp" -#include #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "barretenberg/stdlib/hash/blake2s/blake2s.hpp" #include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" +#include "barretenberg/stdlib/hash/blake2s/blake2s.hpp" +#include namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp index cf581b97f9..082799a8ac 100644 --- a/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp +++ b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp @@ -1,11 +1,11 @@ #pragma once -#include "barretenberg/crypto/schnorr/schnorr.hpp" -#include "../../primitives/field/field.hpp" #include "../../primitives/bool/bool.hpp" -#include "../../primitives/witness/witness.hpp" #include "../../primitives/byte_array/byte_array.hpp" -#include "../../primitives/point/point.hpp" +#include "../../primitives/field/field.hpp" #include "../../primitives/group/group.hpp" +#include "../../primitives/point/point.hpp" +#include "../../primitives/witness/witness.hpp" +#include "barretenberg/crypto/schnorr/schnorr.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp index 912090ec05..9e7110e844 100644 --- a/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp +++ b/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp @@ -1,10 +1,10 @@ #include -#include "schnorr.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" #include "barretenberg/stdlib/primitives/point/point.hpp" +#include "schnorr.hpp" namespace proof_system::test_stdlib_schnorr { diff --git a/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp b/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp index 502b29064f..8458d3a3fa 100644 --- a/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp +++ b/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp @@ -7,8 +7,8 @@ #include #include "barretenberg/plonk/composer/ultra_composer.hpp" -#include "barretenberg/stdlib/hash/sha256/sha256.hpp" #include "barretenberg/stdlib/hash/blake3s/blake3s.hpp" +#include "barretenberg/stdlib/hash/sha256/sha256.hpp" using namespace benchmark; diff --git a/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp b/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp index 26e081e4db..e63c5a3c37 100644 --- a/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp +++ b/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp @@ -1,6 +1,6 @@ -#include #include "barretenberg/plonk/composer/ultra_composer.hpp" #include "barretenberg/stdlib/hash/sha256/sha256.hpp" +#include using namespace benchmark; diff --git a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp index de26ccdab8..340f99508d 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp @@ -1,7 +1,7 @@ #include "blake2s.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" #include "blake2s_plookup.hpp" #include "blake_util.hpp" -#include "barretenberg/stdlib/primitives/uint/uint.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp index b774326a54..17f5308160 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 "barretenberg/crypto/blake2s/blake2s.hpp" +#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" #include "blake2s.hpp" #include "blake2s_plookup.hpp" #include -#include "barretenberg/crypto/blake2s/blake2s.hpp" -#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" using namespace barretenberg; using namespace proof_system::plonk::stdlib; diff --git a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp index 7062169830..1a9ee17fc9 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp @@ -5,8 +5,8 @@ #include "barretenberg/proof_system/plookup_tables/sha256.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" +#include "barretenberg/stdlib/primitives/uint/uint.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 8c34f95a39..272986210c 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp @@ -1,12 +1,12 @@ #pragma once -#include #include "barretenberg/proof_system/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/circuit_builders/circuit_builders_fwd.hpp" +#include "../../primitives/field/field.hpp" #include "../../primitives/packed_byte_array/packed_byte_array.hpp" namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp b/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp index 3cc506ed62..ae95162cca 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp +++ b/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp @@ -1,8 +1,8 @@ #pragma once -#include "barretenberg/stdlib/primitives/uint/uint.hpp" -#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" #include "barretenberg/proof_system/plookup_tables/plookup_tables.hpp" +#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" #include "barretenberg/stdlib/primitives/plookup/plookup.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp index 816d11b64f..298368268f 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp @@ -1,7 +1,7 @@ #include "blake3s.hpp" -#include "blake3s_plookup.hpp" -#include "barretenberg/stdlib/primitives/uint/uint.hpp" #include "../blake2s/blake_util.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "blake3s_plookup.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp index 5148b3c352..d401000249 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp @@ -1,7 +1,7 @@ +#include "barretenberg/common/streams.hpp" +#include "barretenberg/crypto/blake3s/blake3s.hpp" #include "blake3s.hpp" #include "blake3s_plookup.hpp" -#include "barretenberg/crypto/blake3s/blake3s.hpp" -#include "barretenberg/common/streams.hpp" #include using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp index 252c5306f6..04540fdb28 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp +++ b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp @@ -4,8 +4,8 @@ #include "barretenberg/proof_system/plookup_tables/plookup_tables.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" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" namespace proof_system::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 a4d069ec40..1fec0298b2 100644 --- a/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp +++ b/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp @@ -1,12 +1,12 @@ #pragma once -#include #include "barretenberg/proof_system/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/circuit_builders/circuit_builders_fwd.hpp" +#include "../../primitives/field/field.hpp" #include "../../primitives/packed_byte_array/packed_byte_array.hpp" namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp index 7946f8b862..2a5351ecd0 100644 --- a/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp +++ b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp @@ -1,7 +1,7 @@ #include "keccak.hpp" -#include "barretenberg/stdlib/primitives/uint/uint.hpp" #include "barretenberg/common/constexpr_utils.hpp" #include "barretenberg/numeric/bitop/sparse_form.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp index f8017797a1..a04b275d01 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 "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 "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include namespace proof_system::plonk { class UltraPlonkComposer; diff --git a/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp b/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp index aa99f4b957..30ec11f60e 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 "../../primitives/plookup/plookup.hpp" #include "barretenberg/crypto/keccak/keccak.hpp" -#include #include "barretenberg/numeric/random/engine.hpp" -#include "../../primitives/plookup/plookup.hpp" +#include "keccak.hpp" +#include using namespace barretenberg; using namespace proof_system::plonk; diff --git a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp index a454c7a6fe..e642faecb0 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 "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "pedersen_gates.hpp" +#include "pedersen_plookup.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp index 649e6616ad..951b90752e 100644 --- a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp +++ b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp @@ -1,8 +1,8 @@ #pragma once -#include "barretenberg/crypto/pedersen_hash/pedersen.hpp" #include "../../primitives/circuit_builders/circuit_builders_fwd.hpp" #include "../../primitives/field/field.hpp" #include "../../primitives/point/point.hpp" +#include "barretenberg/crypto/pedersen_hash/pedersen.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_gates.hpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_gates.hpp index 38f902daa0..b91574306e 100644 --- a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_gates.hpp +++ b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_gates.hpp @@ -1,9 +1,9 @@ #pragma once -#include "barretenberg/proof_system/arithmetization/gate_data.hpp" +#include "../../primitives/byte_array/byte_array.hpp" #include "../../primitives/circuit_builders/circuit_builders_fwd.hpp" #include "../../primitives/field/field.hpp" #include "../../primitives/point/point.hpp" -#include "../../primitives/byte_array/byte_array.hpp" +#include "barretenberg/proof_system/arithmetization/gate_data.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp index 9f27d3d701..67e95f1735 100644 --- a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp +++ b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp @@ -2,8 +2,8 @@ #include "barretenberg/crypto/pedersen_hash/pedersen.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "barretenberg/proof_system/plookup_tables/types.hpp" #include "../../primitives/plookup/plookup.hpp" +#include "barretenberg/proof_system/plookup_tables/types.hpp" using namespace proof_system; diff --git a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp index 7377b27286..1333be4410 100644 --- a/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp +++ b/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp @@ -1,8 +1,8 @@ #pragma once #include "../../primitives/circuit_builders/circuit_builders_fwd.hpp" #include "../../primitives/field/field.hpp" -#include "../../primitives/point/point.hpp" #include "../../primitives/packed_byte_array/packed_byte_array.hpp" +#include "../../primitives/point/point.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp index 3b0c093d5d..306b3a12ba 100644 --- a/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp @@ -1,7 +1,7 @@ #include "sha256.hpp" -#include "sha256_plookup.hpp" #include "barretenberg/stdlib/primitives/bit_array/bit_array.hpp" #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" +#include "sha256_plookup.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp index 7dd6997a3b..d3cc1767dc 100644 --- a/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp @@ -1,10 +1,10 @@ #pragma once -#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 "barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp" +#include "barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" #include "sha256_plookup.hpp" +#include // namespace proof_system::plonk namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp b/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp index 867b2fcdb3..96659dc910 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 "barretenberg/common/test.hpp" #include "barretenberg/crypto/sha256/sha256.hpp" -#include "barretenberg/proof_system/plookup_tables/plookup_tables.hpp" #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" +#include "barretenberg/proof_system/plookup_tables/plookup_tables.hpp" +#include "sha256.hpp" -#include "barretenberg/numeric/random/engine.hpp" #include "barretenberg/numeric/bitop/rotate.hpp" #include "barretenberg/numeric/bitop/sparse_form.hpp" +#include "barretenberg/numeric/random/engine.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 08929e846b..acdd8c6262 100644 --- a/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp @@ -4,8 +4,8 @@ #include "barretenberg/proof_system/plookup_tables/sha256.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" +#include "barretenberg/stdlib/primitives/uint/uint.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 6b374c0735..48bf3ae4a9 100644 --- a/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp +++ b/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp @@ -1,7 +1,7 @@ #pragma once -#include #include "barretenberg/proof_system/plookup_tables/plookup_tables.hpp" #include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include #include "barretenberg/numeric/bitop/sparse_form.hpp" #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp" diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp index 63b647d7eb..2ebc14b256 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp @@ -1,9 +1,9 @@ #pragma once #include "barretenberg/common/net.hpp" #include "barretenberg/crypto/blake2s/blake2s.hpp" +#include "barretenberg/crypto/pedersen_commitment/convert_buffer_to_field.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/crypto/pedersen_hash/pedersen_lookup.hpp" -#include "barretenberg/crypto/pedersen_commitment/convert_buffer_to_field.hpp" #include "barretenberg/stdlib/hash/blake2s/blake2s.hpp" #include "barretenberg/stdlib/hash/pedersen/pedersen.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp index 1c52ffc961..d6f899aca6 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 "barretenberg/stdlib/primitives/field/field.hpp" #include "hash.hpp" #include -#include "barretenberg/stdlib/primitives/field/field.hpp" #include namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/index.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/index.hpp index 9453daeda7..a069c9a2ec 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/index.hpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/index.hpp @@ -1,6 +1,6 @@ #pragma once -#include "hash_path.hpp" #include "hash.hpp" +#include "hash_path.hpp" #include "membership.hpp" #include "memory_store.hpp" #include "memory_tree.hpp" diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp index 97b852242f..d9682794cb 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 "barretenberg/stdlib/hash/pedersen/pedersen.hpp" #include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" +#include "hash_path.hpp" namespace proof_system::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 5439b3b483..bd0ddb2703 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp @@ -1,9 +1,9 @@ #include -#include "merkle_tree.hpp" #include "membership.hpp" #include "memory_store.hpp" #include "memory_tree.hpp" +#include "merkle_tree.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp index d1aad8b551..d3e69928a4 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 "barretenberg/common/streams.hpp" +#include "hash_path.hpp" #include #include 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 86fa9ef38a..4a6f4b7dec 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp @@ -1,8 +1,8 @@ +#include "barretenberg/numeric/random/engine.hpp" #include "hash.hpp" #include "memory_store.hpp" #include "merkle_tree.hpp" #include -#include "barretenberg/numeric/random/engine.hpp" using namespace benchmark; using namespace proof_system::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 ec78b9cd17..74f0ba80e3 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 "barretenberg/common/net.hpp" -#include #include "barretenberg/numeric/bitop/count_leading_zeros.hpp" #include "barretenberg/numeric/bitop/keep_n_lsb.hpp" #include "barretenberg/numeric/uint128/uint128.hpp" +#include "hash.hpp" +#include "memory_store.hpp" +#include #include namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp index 7e9ca411b8..161941207e 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 "barretenberg/stdlib/primitives/field/field.hpp" +#include "hash_path.hpp" namespace proof_system::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 94bf105871..db210fc8fe 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp @@ -1,9 +1,9 @@ -#include "merkle_tree.hpp" -#include "memory_store.hpp" -#include "memory_tree.hpp" #include "barretenberg/common/streams.hpp" #include "barretenberg/common/test.hpp" #include "barretenberg/numeric/random/engine.hpp" +#include "memory_store.hpp" +#include "memory_tree.hpp" +#include "merkle_tree.hpp" namespace proof_system::test_stdlib_merkle_tree { diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp index 0280670f15..74f03c575e 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp @@ -1,13 +1,13 @@ #include "nullifier_tree.hpp" -#include "../merkle_tree.hpp" #include "../hash.hpp" #include "../memory_store.hpp" -#include -#include +#include "../merkle_tree.hpp" #include "barretenberg/common/net.hpp" #include "barretenberg/numeric/bitop/count_leading_zeros.hpp" #include "barretenberg/numeric/bitop/keep_n_lsb.hpp" #include "barretenberg/numeric/uint128/uint128.hpp" +#include +#include namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp b/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp index f7deed21da..2c8effe507 100644 --- a/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp +++ b/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp @@ -1,9 +1,9 @@ #include "../memory_store.hpp" -#include "nullifier_memory_tree.hpp" -#include "nullifier_tree.hpp" #include "barretenberg/common/streams.hpp" #include "barretenberg/common/test.hpp" #include "barretenberg/numeric/random/engine.hpp" +#include "nullifier_memory_tree.hpp" +#include "nullifier_tree.hpp" using namespace barretenberg; using namespace proof_system::plonk::stdlib::merkle_tree; diff --git a/cpp/src/barretenberg/stdlib/primitives/address/address.hpp b/cpp/src/barretenberg/stdlib/primitives/address/address.hpp index 2bb14a2865..28dfdb915a 100644 --- a/cpp/src/barretenberg/stdlib/primitives/address/address.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/address/address.hpp @@ -1,8 +1,8 @@ #pragma once #include "barretenberg/numeric/uint256/uint256.hpp" #include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" -#include "barretenberg/stdlib/primitives/field/field.hpp" #include "barretenberg/stdlib/primitives/bool/bool.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" #include "barretenberg/stdlib/primitives/group/group.hpp" #include "barretenberg/stdlib/primitives/point/point.hpp" #include "barretenberg/stdlib/primitives/witness/witness.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp index bf2897f6ee..1480c61407 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 "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/ecc/curves/bn254/fq.hpp" #include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" -#include "barretenberg/ecc/curves/bn254/fq.hpp" #pragma clang diagnostic push // TODO(luke/kesha): Add a comment explaining why we need this ignore and what the solution is. #pragma clang diagnostic ignored "-Wc99-designator" diff --git a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp index b400baa05a..2ccbcac523 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 "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 "barretenberg/plonk/proof_system/constants.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 895db02aa7..09647b5869 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp @@ -9,14 +9,14 @@ #include "../byte_array/byte_array.hpp" #include "../field/field.hpp" #include "./bigfield.hpp" -#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" -#include "barretenberg/stdlib/primitives/curves/bn254.hpp" #include "barretenberg/plonk/proof_system/prover/prover.hpp" #include "barretenberg/plonk/proof_system/verifier/verifier.hpp" +#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" +#include "barretenberg/stdlib/primitives/curves/bn254.hpp" +#include "barretenberg/polynomials/polynomial_arithmetic.hpp" #include #include -#include "barretenberg/polynomials/polynomial_arithmetic.hpp" namespace test_stdlib_bigfield { using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp index 62945b1b6a..43d59a7d0f 100644 --- a/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp @@ -8,9 +8,9 @@ #include "../circuit_builders/circuit_builders_fwd.hpp" #include "../memory/rom_table.hpp" #include "../memory/twin_rom_table.hpp" +#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/ecc/curves/secp256k1/secp256k1.hpp" #include "barretenberg/ecc/curves/secp256r1/secp256r1.hpp" -#include "barretenberg/ecc/curves/bn254/g1.hpp" namespace proof_system::plonk { namespace stdlib { @@ -890,9 +890,9 @@ inline std::ostream& operator<<(std::ostream& os, element const& v } // namespace stdlib } // namespace proof_system::plonk -#include "biggroup_nafs.hpp" -#include "biggroup_tables.hpp" -#include "biggroup_impl.hpp" #include "biggroup_batch_mul.hpp" -#include "biggroup_secp256k1.hpp" #include "biggroup_bn254.hpp" +#include "biggroup_impl.hpp" +#include "biggroup_nafs.hpp" +#include "biggroup_secp256k1.hpp" +#include "biggroup_tables.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp index 1575a53802..b661e370a3 100644 --- a/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp @@ -8,11 +8,11 @@ #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" #include "barretenberg/stdlib/primitives/curves/bn254.hpp" -#include "barretenberg/stdlib/primitives/curves/secp256r1.hpp" #include "barretenberg/stdlib/primitives/curves/secp256k1.hpp" +#include "barretenberg/stdlib/primitives/curves/secp256r1.hpp" -#include #include "barretenberg/numeric/random/engine.hpp" +#include namespace test_stdlib_biggroup { namespace { 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 0afd1c5029..2467103701 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,10 +1,10 @@ -#include "bit_array.hpp" -#include #include "barretenberg/numeric/random/engine.hpp" -#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" #include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" +#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" #include "barretenberg/stdlib/primitives/witness/witness.hpp" +#include "bit_array.hpp" +#include #pragma GCC diagnostic ignored "-Wunused-local-typedefs" diff --git a/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp b/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp index 71d3a70cec..93c48e95cb 100644 --- a/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp @@ -1,7 +1,7 @@ +#include "barretenberg/stdlib/primitives/byte_array/byte_array.cpp" +#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" #include "bool.hpp" #include -#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" -#include "barretenberg/stdlib/primitives/byte_array/byte_array.cpp" #define STDLIB_TYPE_ALIASES \ using Composer = TypeParam; \ 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 1dfb717123..77e71ec771 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,9 +1,9 @@ #include -#include "byte_array.hpp" #include "barretenberg/stdlib/primitives/bool/bool.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" #include "barretenberg/stdlib/primitives/witness/witness.hpp" +#include "byte_array.hpp" #pragma GCC diagnostic ignored "-Wunused-local-typedefs" diff --git a/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp b/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp index 4919ff490f..7c84e7c2f1 100644 --- a/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp @@ -1,8 +1,8 @@ #pragma once -#include "barretenberg/ecc/curves/types.hpp" #include "../bigfield/bigfield.hpp" #include "../biggroup/biggroup.hpp" #include "../field/field.hpp" +#include "barretenberg/ecc/curves/types.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/primitives/field/array.hpp b/cpp/src/barretenberg/stdlib/primitives/field/array.hpp index b7d1178833..d70cded5ae 100644 --- a/cpp/src/barretenberg/stdlib/primitives/field/array.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/array.hpp @@ -1,7 +1,7 @@ #pragma once -#include "field.hpp" -#include "../safe_uint/safe_uint.hpp" #include "../bool/bool.hpp" +#include "../safe_uint/safe_uint.hpp" +#include "field.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp b/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp index 77c6dbe48d..4ab2db56d6 100644 --- a/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp @@ -1,10 +1,10 @@ #include "../bool/bool.hpp" -#include "field.hpp" #include "array.hpp" +#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" +#include "field.hpp" #include #include -#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" -#include "barretenberg/numeric/random/engine.hpp" namespace test_stdlib_array { diff --git a/cpp/src/barretenberg/stdlib/primitives/field/field.cpp b/cpp/src/barretenberg/stdlib/primitives/field/field.cpp index 0eda3606d6..46a6487e6a 100644 --- a/cpp/src/barretenberg/stdlib/primitives/field/field.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field.cpp @@ -1,8 +1,8 @@ -#include #include "field.hpp" #include "../bool/bool.hpp" #include "../circuit_builders/circuit_builders.hpp" #include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" +#include using namespace proof_system; diff --git a/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp index 925dfe90f1..53483c9f2f 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 "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "barretenberg/numeric/random/engine.hpp" -#include "barretenberg/stdlib/primitives/field/field.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" #include "barretenberg/stdlib/primitives/bool/bool.hpp" -#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" -#include "barretenberg/ecc/curves/bn254/fr.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wc99-designator" diff --git a/cpp/src/barretenberg/stdlib/primitives/field/field.hpp b/cpp/src/barretenberg/stdlib/primitives/field/field.hpp index fed2471ffc..9d81760b93 100644 --- a/cpp/src/barretenberg/stdlib/primitives/field/field.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/field/field.hpp @@ -1,8 +1,8 @@ #pragma once -#include #include "../circuit_builders/circuit_builders_fwd.hpp" #include "../witness/witness.hpp" #include "barretenberg/common/assert.hpp" +#include namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp b/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp index 670731b397..43181df588 100644 --- a/cpp/src/barretenberg/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 "array.hpp" +#include "barretenberg/common/streams.hpp" +#include "barretenberg/numeric/random/engine.hpp" #include "barretenberg/plonk/proof_system/constants.hpp" +#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" +#include "field.hpp" #include #include -#include "barretenberg/numeric/random/engine.hpp" -#include "barretenberg/common/streams.hpp" -#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" using namespace proof_system; diff --git a/cpp/src/barretenberg/stdlib/primitives/group/group.hpp b/cpp/src/barretenberg/stdlib/primitives/group/group.hpp index 7e1b6c6a1f..8023dad30d 100644 --- a/cpp/src/barretenberg/stdlib/primitives/group/group.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/group/group.hpp @@ -1,8 +1,8 @@ #pragma once #include "../field/field.hpp" -#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "../../hash/pedersen/pedersen.hpp" #include "../../hash/pedersen/pedersen_gates.hpp" diff --git a/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp b/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp index 03c4c56ea0..84fc7c4db4 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 -#include "barretenberg/stdlib/primitives/witness/witness.hpp" +#include "barretenberg/numeric/random/engine.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" #include "barretenberg/stdlib/primitives/group/group.hpp" -#include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/stdlib/primitives/witness/witness.hpp" +#include #define STDLIB_TYPE_ALIASES \ using Composer = TypeParam; \ diff --git a/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp b/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp index e70077c581..4d77e33231 100644 --- a/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp @@ -2,10 +2,10 @@ #include "../bool/bool.hpp" #include "../circuit_builders/circuit_builders.hpp" -#include "logic.hpp" #include "barretenberg/numeric/random/engine.hpp" #include "barretenberg/numeric/uint256/uint256.hpp" #include "barretenberg/proof_system/types/circuit_type.hpp" +#include "logic.hpp" #pragma GCC diagnostic ignored "-Wunused-local-typedefs" diff --git a/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp b/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp index 3406b0b9eb..eea139a957 100644 --- a/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp @@ -1,7 +1,7 @@ #include "dynamic_array.hpp" -#include "../circuit_builders/circuit_builders.hpp" #include "../bool/bool.hpp" +#include "../circuit_builders/circuit_builders.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp b/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp index 829142f6b5..fe8127d3fd 100644 --- a/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp @@ -1,6 +1,6 @@ #pragma once -#include "ram_table.hpp" #include "../circuit_builders/circuit_builders_fwd.hpp" +#include "ram_table.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp b/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp index f2b466f847..cd75ae5078 100644 --- a/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp @@ -1,8 +1,8 @@ #include -#include "ram_table.hpp" #include "barretenberg/numeric/random/engine.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" +#include "ram_table.hpp" namespace test_stdlib_ram_table { 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 7209d5ce25..947ce35a23 100644 --- a/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp @@ -1,9 +1,9 @@ #include -#include "rom_table.hpp" #include "barretenberg/numeric/random/engine.hpp" #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" +#include "rom_table.hpp" namespace test_stdlib_rom_array { using namespace barretenberg; diff --git a/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp b/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp index d081d5af19..a59cab0f8b 100644 --- a/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp @@ -1,8 +1,8 @@ #pragma once -#include "../circuit_builders/circuit_builders_fwd.hpp" -#include "../field/field.hpp" #include "../bool/bool.hpp" #include "../byte_array/byte_array.hpp" +#include "../circuit_builders/circuit_builders_fwd.hpp" +#include "../field/field.hpp" namespace proof_system::plonk { namespace stdlib { 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 03763101d4..a98be47b07 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 @@ -1,9 +1,9 @@ #include -#include "packed_byte_array.hpp" -#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" #include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" +#include "packed_byte_array.hpp" #pragma GCC diagnostic ignored "-Wunused-local-typedefs" diff --git a/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp b/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp index cc4633cbd2..589c09133d 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 "barretenberg/proof_system/plookup_tables/plookup_tables.hpp" -#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp" #include "barretenberg/proof_system/plookup_tables/types.hpp" +#include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" +#include +#include namespace proof_system::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 ed08ff45f0..f74dd8ba22 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 "barretenberg/numeric/random/engine.hpp" -#include "barretenberg/numeric/bitop/rotate.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp" -#include "barretenberg/stdlib/primitives/biggroup/biggroup.hpp" +#include "barretenberg/numeric/bitop/rotate.hpp" +#include "barretenberg/numeric/random/engine.hpp" #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" -#include "barretenberg/stdlib/primitives/uint/uint.hpp" -#include "barretenberg/stdlib/primitives/curves/secp256k1.hpp" +#include "barretenberg/stdlib/primitives/biggroup/biggroup.hpp" #include "barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp" +#include "barretenberg/stdlib/primitives/curves/secp256k1.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "plookup.hpp" +#include namespace test_stdlib_plookups { using namespace barretenberg; 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 30f4e61fcc..d41b51107e 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 "barretenberg/numeric/uint256/uint256.hpp" +#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #include "barretenberg/numeric/random/engine.hpp" +#include "barretenberg/numeric/uint256/uint256.hpp" #include "barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp" -#include "barretenberg/ecc/curves/grumpkin/grumpkin.hpp" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wc99-designator" 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 adc6685747..52b12c19f2 100644 --- a/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp @@ -1,11 +1,11 @@ #pragma once -#include -#include "../circuit_builders/circuit_builders_fwd.hpp" +#include "../bool/bool.hpp" #include "../circuit_builders/circuit_builders.hpp" +#include "../circuit_builders/circuit_builders_fwd.hpp" +#include "../field/field.hpp" #include "../witness/witness.hpp" -#include "../bool/bool.hpp" #include "barretenberg/common/assert.hpp" -#include "../field/field.hpp" +#include // 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/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp b/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp index 6e3b8c7a29..d8cb0e5cf0 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 @@ -1,11 +1,11 @@ -#include -#include +#include "../byte_array/byte_array.hpp" +#include "barretenberg/numeric/random/engine.hpp" #include "barretenberg/stdlib/primitives/bool/bool.hpp" #include "barretenberg/stdlib/primitives/witness/witness.hpp" #include "safe_uint.hpp" -#include "barretenberg/numeric/random/engine.hpp" -#include "../byte_array/byte_array.hpp" +#include +#include #pragma GCC diagnostic ignored "-Wunused-local-typedefs" diff --git a/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp index bec00312ff..921f5cbc0e 100644 --- a/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp @@ -1,8 +1,8 @@ #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" +#include "barretenberg/stdlib/primitives/byte_array/byte_array.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wc99-designator" diff --git a/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp b/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp index 8f07683736..5b0e1a6287 100644 --- a/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp +++ b/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp @@ -1,7 +1,7 @@ +#include "barretenberg/numeric/random/engine.hpp" #include "uint.hpp" #include #include -#include "barretenberg/numeric/random/engine.hpp" using namespace barretenberg; using namespace proof_system::plonk; diff --git a/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp b/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp index 1e97da3f77..7767e4c9c4 100644 --- a/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp +++ b/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp @@ -1,7 +1,7 @@ #pragma once -#include "barretenberg/ecc/groups/affine_element.hpp" -#include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/common/streams.hpp" +#include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/ecc/groups/affine_element.hpp" namespace proof_system::plonk { namespace stdlib { diff --git a/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp b/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp index 59f83b4eee..c43aa99480 100644 --- a/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp +++ b/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp @@ -5,16 +5,16 @@ #include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/transcript/transcript.hpp" -#include "../../primitives/curves/bn254.hpp" -#include "../verification_key/verification_key.hpp" -#include "../../hash/blake3s/blake3s.hpp" #include "../../commitment/pedersen/pedersen.hpp" #include "../../commitment/pedersen/pedersen_plookup.hpp" +#include "../../hash/blake3s/blake3s.hpp" #include "../../primitives/bigfield/bigfield.hpp" #include "../../primitives/biggroup/biggroup.hpp" +#include "../../primitives/bool/bool.hpp" +#include "../../primitives/curves/bn254.hpp" #include "../../primitives/field/field.hpp" #include "../../primitives/witness/witness.hpp" -#include "../../primitives/bool/bool.hpp" +#include "../verification_key/verification_key.hpp" namespace proof_system::plonk::stdlib::recursion { template class Transcript { diff --git a/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp b/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp index fdf7e86403..4f969db445 100644 --- a/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp +++ b/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp @@ -1,9 +1,9 @@ #include -#include "transcript.hpp" #include "barretenberg/ecc/curves/bn254/fr.hpp" #include "barretenberg/ecc/curves/bn254/g1.hpp" #include "barretenberg/transcript/transcript.hpp" +#include "transcript.hpp" namespace proof_system::plonk::stdlib::recursion { 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 6452828ab3..b5ac65cb7f 100644 --- a/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp +++ b/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp @@ -1,7 +1,7 @@ #pragma once -#include -#include "barretenberg/srs/factories/crs_factory.hpp" #include "barretenberg/polynomials/evaluation_domain.hpp" +#include "barretenberg/srs/factories/crs_factory.hpp" +#include #include "barretenberg/plonk/proof_system/types/polynomial_manifest.hpp" @@ -9,16 +9,16 @@ #include "barretenberg/polynomials/polynomial_arithmetic.hpp" -#include "barretenberg/ecc/curves/bn254/fq12.hpp" -#include "barretenberg/ecc/curves/bn254/pairing.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp" +#include "barretenberg/ecc/curves/bn254/fq12.hpp" +#include "barretenberg/ecc/curves/bn254/pairing.hpp" -#include "../../primitives/uint/uint.hpp" -#include "../../primitives/memory/rom_table.hpp" #include "../../commitment/pedersen/pedersen.hpp" #include "../../commitment/pedersen/pedersen_plookup.hpp" #include "../../primitives/curves/bn254.hpp" +#include "../../primitives/memory/rom_table.hpp" +#include "../../primitives/uint/uint.hpp" #include "barretenberg/crypto/pedersen_commitment/convert_buffer_to_field.hpp" diff --git a/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp index d4a694cc7c..15162939fb 100644 --- a/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp +++ b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp @@ -3,15 +3,15 @@ #include "barretenberg/ecc/curves/bn254/fq12.hpp" #include "barretenberg/ecc/curves/bn254/pairing.hpp" #include "barretenberg/plonk/flavor/flavor.hpp" +#include "barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/plonk/proof_system/utils/kate_verification.hpp" -#include "barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp" #include "barretenberg/stdlib/primitives/bigfield/bigfield.hpp" #include "barretenberg/stdlib/primitives/biggroup/biggroup.hpp" #include "barretenberg/stdlib/primitives/bool/bool.hpp" #include "barretenberg/stdlib/primitives/field/field.hpp" -#include "barretenberg/stdlib/recursion/transcript/transcript.hpp" #include "barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp" +#include "barretenberg/stdlib/recursion/transcript/transcript.hpp" #include "barretenberg/stdlib/recursion/verifier/program_settings.hpp" namespace proof_system::plonk { diff --git a/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp index 24919baa26..bb85ae46c5 100644 --- a/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp +++ b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp @@ -1,5 +1,5 @@ -#include "verifier.hpp" #include "program_settings.hpp" +#include "verifier.hpp" #include "barretenberg/common/test.hpp" #include "barretenberg/ecc/curves/bn254/fq12.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 5238996eab..877515b829 100644 --- a/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp +++ b/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp @@ -1,5 +1,5 @@ -#include "verifier.hpp" #include "program_settings.hpp" +#include "verifier.hpp" #include "barretenberg/common/test.hpp" #include "barretenberg/ecc/curves/bn254/fq12.hpp" diff --git a/cpp/src/barretenberg/stdlib/types/turbo.hpp b/cpp/src/barretenberg/stdlib/types/turbo.hpp index e324e25e5d..6ec21e6955 100644 --- a/cpp/src/barretenberg/stdlib/types/turbo.hpp +++ b/cpp/src/barretenberg/stdlib/types/turbo.hpp @@ -1,22 +1,22 @@ #pragma once #include "barretenberg/plonk/composer/turbo_composer.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" #include "barretenberg/plonk/proof_system/prover/prover.hpp" #include "barretenberg/plonk/proof_system/types/prover_settings.hpp" +#include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" +#include "barretenberg/stdlib/encryption/schnorr/schnorr.hpp" +#include "barretenberg/stdlib/merkle_tree/hash_path.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/commitment/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/packed_byte_array/packed_byte_array.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/stdlib/primitives/witness/witness.hpp" #include "barretenberg/stdlib/recursion/verifier/program_settings.hpp" -#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" namespace proof_system::plonk::stdlib::types { diff --git a/cpp/src/barretenberg/stdlib/types/ultra.hpp b/cpp/src/barretenberg/stdlib/types/ultra.hpp index 5f3cfbcd41..ce8c40c317 100644 --- a/cpp/src/barretenberg/stdlib/types/ultra.hpp +++ b/cpp/src/barretenberg/stdlib/types/ultra.hpp @@ -1,23 +1,23 @@ #pragma once #include "barretenberg/plonk/composer/ultra_composer.hpp" +#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" #include "barretenberg/plonk/proof_system/prover/prover.hpp" #include "barretenberg/plonk/proof_system/types/prover_settings.hpp" +#include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" +#include "barretenberg/stdlib/encryption/schnorr/schnorr.hpp" +#include "barretenberg/stdlib/merkle_tree/hash_path.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/commitment/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/primitives/packed_byte_array/packed_byte_array.hpp" +#include "barretenberg/stdlib/primitives/uint/uint.hpp" +#include "barretenberg/stdlib/primitives/witness/witness.hpp" #include "barretenberg/stdlib/recursion/verifier/program_settings.hpp" -#include "barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp" namespace proof_system::plonk::stdlib::types { diff --git a/cpp/src/barretenberg/transcript/transcript.cpp b/cpp/src/barretenberg/transcript/transcript.cpp index 1371a08eac..89eea69a9d 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 "barretenberg/common/throw_or_abort.hpp" #include "barretenberg/common/assert.hpp" #include "barretenberg/common/net.hpp" +#include "barretenberg/common/throw_or_abort.hpp" #include "barretenberg/crypto/blake3s/blake3s.hpp" #include "barretenberg/crypto/keccak/keccak.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen.hpp" #include "barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp" +#include "manifest.hpp" +#include #include #include #include diff --git a/cpp/src/barretenberg/transcript/transcript.hpp b/cpp/src/barretenberg/transcript/transcript.hpp index 92c73c77e4..b0e684203c 100644 --- a/cpp/src/barretenberg/transcript/transcript.hpp +++ b/cpp/src/barretenberg/transcript/transcript.hpp @@ -1,10 +1,10 @@ #pragma once #include "manifest.hpp" #include +#include #include #include #include -#include #include "barretenberg/plonk/proof_system/verification_key/verification_key.hpp" diff --git a/cpp/src/barretenberg/transcript/transcript.test.cpp b/cpp/src/barretenberg/transcript/transcript.test.cpp index b953173ae5..0603a7e220 100644 --- a/cpp/src/barretenberg/transcript/transcript.test.cpp +++ b/cpp/src/barretenberg/transcript/transcript.test.cpp @@ -1,9 +1,9 @@ +#include "../honk/sumcheck/polynomials/univariate.hpp" #include "transcript_wrappers.hpp" #include #include #include #include -#include "../honk/sumcheck/polynomials/univariate.hpp" namespace { transcript::Manifest create_manifest(const size_t num_public_inputs) diff --git a/cpp/src/barretenberg/wasi/wasi_stubs.cpp b/cpp/src/barretenberg/wasi/wasi_stubs.cpp index 4cee1b5543..4a2c0aa5bb 100644 --- a/cpp/src/barretenberg/wasi/wasi_stubs.cpp +++ b/cpp/src/barretenberg/wasi/wasi_stubs.cpp @@ -1,8 +1,8 @@ // If building WASM, we can stub out functions we know we don't need, to save the host // environment from having to stub them itself. +#include #include #include -#include #include extern "C" {