From eed0ec5318cef0d539ed72bbe91d3c26e4c18416 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Wed, 6 Sep 2023 17:10:59 +0000 Subject: [PATCH 01/36] initial agg protocol in prover and verifier --- .../honk/proof_system/ultra_prover.cpp | 71 +++++++++++++++++++ .../honk/proof_system/ultra_prover.hpp | 2 + .../honk/proof_system/ultra_verifier.cpp | 26 ++++++- .../barretenberg/polynomials/polynomial.hpp | 20 ++++++ 4 files changed, 118 insertions(+), 1 deletion(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index c26dfdbfbc62..05989a164192 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -242,6 +242,72 @@ template void UltraProver_::execute_pcs_evaluation_ } } +template void UltraProver_::execute_op_queue_transcript_aggregation_round() +{ + if constexpr (IsGoblinFlavor) { + // WORKTODO: Extract degree M_{i-1} of T_{i-1} + size_t shift_magnitude = 1; // M_{i-1} + auto circuit_size = key->circuit_size; + + // Construct right-shifted op wires while ensuring that the last 'shift_magnitude' coefficients of the + // original op wires are zero. + // WORKTODO: also need to ensure that M_{i-1} + m_i < n. If this is not the case then we should still be able to + // compute the commitment but we have to be careful. Maybe just construct shift as Polynomial(M_{i-1} + m_i)? + std::array shifted_op_wires; + size_t wire_idx = 0; + for (auto& op_wire : key->get_ecc_op_wires()) { + shifted_op_wires[wire_idx] = Polynomial(circuit_size); + for (size_t idx = 0; idx < shift_magnitude; ++idx) { + ASSERT(op_wire[circuit_size - idx - 1].is_zero()); + shifted_op_wires[wire_idx][idx + shift_magnitude] = op_wire[idx]; + } + wire_idx++; + } + + // Commit to the right-shifted op wire polynomials + std::array shifted_op_wire_commitments; + for (size_t idx = 0; idx < shifted_op_wires.size(); ++idx) { + // queue.add_commitment(shifted_op_wires[idx], "SHIFTED_ECC_OP_WIRE_" + std::to_string(idx + 1)); + shifted_op_wire_commitments[idx] = pcs_commitment_key->commit(shifted_op_wires[idx]); + std::string label = "SHIFTED_ECC_OP_WIRE_" + std::to_string(idx + 1); + transcript.send_to_verifier(label, shifted_op_wire_commitments[idx]); + } + + // Get and send commitments [T_{i-1}] + std::array previous_aggregate_op_queue_commitments; + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + // WORKTODO: Maybe we can store [T_{i-1}] in the ecc op queue for now? + previous_aggregate_op_queue_commitments[idx] = Commitment::one(); + std::string label = "PREV_AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1); + transcript.send_to_verifier(label, previous_aggregate_op_queue_commitments[idx]); + } + + // Compute and send commitments [T_i] = [T_{i-1}] + [t_i^{shift}] + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + auto aggregate_op_queue_commitment = + previous_aggregate_op_queue_commitments[idx] + shifted_op_wire_commitments[idx]; + std::string label = "AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1); + transcript.send_to_verifier(label, aggregate_op_queue_commitment); + } + + // // Compute evaluations T_i(γ), T_{i-1}(γ), t_i^{shift}(γ), add to transcript + // // - just use the polynomial.evaluate() method to evaluate as univariates + // auto kappa_challenge = transcript.get_challenge("kappa"); + // for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + // auto evaluation = shifted_op_wires[idx].evaluate(kappa_challenge); + // gemini_output.opening_pairs.emplace_back(kappa_challenge, evaluation); + // // WORKTODO: probably want to std::move these + // gemini_output.witnesses.emplace_back(shifted_op_wires[idx]); + // std::string label = "op_wire_eval_" + std::to_string(idx + 1); + // transcript.send_to_verifier(label, evaluation); + // } + + // Add polynomials T_i, T_{i-1}, t_i^{shift} and their evaluations to the set of opening pairs and witness + // polynomials that are passed to Shplonk. This should be sufficient to make Shplonk produce the updated Q and + // Q_z. + } +} + /** * - Do Fiat-Shamir to get "nu" challenge. * - Compute commitment [Q]_1 @@ -316,6 +382,9 @@ template plonk::proof& UltraProver_::construct_proo // Compute Fold evaluations execute_pcs_evaluation_round(); + // ECC op queue transcript aggregation + execute_op_queue_transcript_aggregation_round(); + // Fiat-Shamir: nu // Compute Shplonk batched quotient commitment Q execute_shplonk_batched_quotient_round(); @@ -329,6 +398,8 @@ template plonk::proof& UltraProver_::construct_proo // Compute PCS opening proof (either KZG quotient commitment or IPA opening proof) execute_final_pcs_round(); + transcript.print(); + return export_proof(); } diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp index 9aeea1327fc9..2aa661b217ee 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp @@ -17,6 +17,7 @@ namespace proof_system::honk { template class UltraProver_ { using FF = typename Flavor::FF; + using Commitment = typename Flavor::Commitment; using PCS = typename Flavor::PCS; using CommitmentKey = typename Flavor::CommitmentKey; using ProvingKey = typename Flavor::ProvingKey; @@ -35,6 +36,7 @@ template class UltraProver_ { void execute_relation_check_rounds(); void execute_univariatization_round(); void execute_pcs_evaluation_round(); + void execute_op_queue_transcript_aggregation_round(); void execute_shplonk_batched_quotient_round(); void execute_shplonk_partial_evaluation_round(); void execute_final_pcs_round(); diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp index 548c8177a817..683479f67fa7 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp @@ -164,10 +164,34 @@ template bool UltraVerifier_::verify_proof(const plonk batched_commitment_to_be_shifted, transcript); + if constexpr (IsGoblinFlavor) { + // Perform transcript aggregation protocol + // - Receive commitments, generate challenge + std::array shifted_op_wire_commitments; + std::array prev_agg_op_queue_commitments; + std::array agg_op_queue_commitments; + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + shifted_op_wire_commitments[idx] = transcript.template receive_from_prover("SHIFTED_ECC_OP_WIRE_" + std::to_string(idx + 1)); + } + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + prev_agg_op_queue_commitments[idx] = transcript.template receive_from_prover("PREV_AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); + } + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + agg_op_queue_commitments[idx] = transcript.template receive_from_prover("AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); + } + + + // - Receive transcript poly evaluations + // - Check that aggregation identity holds: T_i(γ) = T_{i-1}(γ) + t_i^{shift}(γ) + // - Add 3 {opening_pair, commitment} to the gemini_claim (rename univariate opening claims?) + } + // Produce a Shplonk claim: commitment [Q] - [Q_z], evaluation zero (at random challenge z) auto shplonk_claim = Shplonk::reduce_verification(pcs_verification_key, gemini_claim, transcript); - // // Verify the Shplonk claim with KZG or IPA + transcript.print(); + + // Verify the Shplonk claim with KZG or IPA return PCS::verify(pcs_verification_key, shplonk_claim, transcript); } diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp index 7b9be45c8e8c..c7009b6e869d 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp @@ -149,6 +149,26 @@ template class Polynomial { return std::span{ coefficients_.get() + 1, size_ }; } + // /** + // * @brief Returns the right-shift of self by given magnitude k. + // * + // * @details Asserts that the last k coefficients of self are zero. + // */ + // [[nodiscard]] Polynomial get_right_shifted(size_t k = 1) const + // { + // ASSERT(size_ > 0); + // // Ensure that the final k coefficients of the pre-shifted polynomial are zero + // for (size_t idx = size_-k; idx < size_; ++idx) { + // ASSERT(coefficients_[idx].is_zero()); + // } + // // Compute the right-shift-by-k of the polynomial + // Polynomial right_shifted(size_); + // for (size_t idx = 0; idx < k; ++idx) { + // right_shifted[idx + k] = coefficients_[idx]; + // } + // return right_shifted; + // } + /** * @brief adds the polynomial q(X) 'other', multiplied by a scaling factor. * From 9c6c0ba0c49f9ac154cdcb8f5bf149e0cf4884ff Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Wed, 6 Sep 2023 18:26:11 +0000 Subject: [PATCH 02/36] set ultra ops in op queue plus test --- .../goblin_ultra_circuit_builder.test.cpp | 33 +++++++++++++++++ .../circuit_builder/ultra_circuit_builder.cpp | 36 ++++++++++++++----- .../circuit_builder/ultra_circuit_builder.hpp | 4 +-- .../proof_system/op_queue/ecc_op_queue.hpp | 17 ++++++++- 4 files changed, 78 insertions(+), 12 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp index 860e1b056be7..8ea667efa50c 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp @@ -77,4 +77,37 @@ TEST(UltraCircuitBuilder, GoblinSimple) auto P2_y = P2_y_lo + (P2_y_hi << CHUNK_SIZE); EXPECT_EQ(P2_y, uint256_t(P2.y)); } + +/** + * @brief Check that the ultra ops are recorded correctly in the EccOpQueue + * + */ +TEST(UltraCircuitBuilder, GoblinEccOpQueueUltraOps) +{ + // Construct a simple circuit with op gates + auto builder = UltraCircuitBuilder(); + + // Compute a simple point accumulation natively + auto P1 = g1::affine_element::random_element(); + auto P2 = g1::affine_element::random_element(); + auto z = fr::random_element(); + + // Add gates corresponding to the above operations + builder.queue_ecc_add_accum(P1); + builder.queue_ecc_mul_accum(P2, z); + builder.queue_ecc_eq(); + + // Check that the ultra ops recorded in the EccOpQueue match the ops recorded in the wires + auto ultra_ops = builder.op_queue.get_ultra_ops(); + for (size_t i = 1; i < 4; ++i) { + for (size_t j = 0; j < builder.num_ecc_op_gates; ++j) { + auto op_wire_val = builder.variables[builder.ecc_op_wires[i][j]]; + auto ultra_op_val = ultra_ops[i][j]; + info("op_wire_val = ", op_wire_val); + info("ultra_op_val = ", ultra_op_val); + ASSERT_EQ(op_wire_val, ultra_op_val); + } + } +} + } // namespace proof_system \ No newline at end of file diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp index 3446b5cef878..9d2ff1c2f40a 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp @@ -527,7 +527,7 @@ ecc_op_tuple UltraCircuitBuilder_::queue_ecc_add_accum(const barretenberg::g */ template ecc_op_tuple UltraCircuitBuilder_::queue_ecc_mul_accum(const barretenberg::g1::affine_element& point, - const barretenberg::fr& scalar) + const FF& scalar) { // Add raw op to op queue op_queue.mul_accumulate(point, scalar); @@ -565,28 +565,46 @@ template ecc_op_tuple UltraCircuitBuilder_::queue_ecc_eq() * @return ecc_op_tuple Tuple of indices into variables array used to construct pair of ecc op gates */ template -ecc_op_tuple UltraCircuitBuilder_::make_ecc_op_tuple(uint32_t op, const g1::affine_element& point, const fr& scalar) +ecc_op_tuple UltraCircuitBuilder_::make_ecc_op_tuple(uint32_t op, const g1::affine_element& point, const FF& scalar) { const size_t CHUNK_SIZE = 2 * DEFAULT_NON_NATIVE_FIELD_LIMB_BITS; auto x_256 = uint256_t(point.x); auto y_256 = uint256_t(point.y); - auto x_lo_idx = this->add_variable(x_256.slice(0, CHUNK_SIZE)); - auto x_hi_idx = this->add_variable(x_256.slice(CHUNK_SIZE, CHUNK_SIZE * 2)); - auto y_lo_idx = this->add_variable(y_256.slice(0, CHUNK_SIZE)); - auto y_hi_idx = this->add_variable(y_256.slice(CHUNK_SIZE, CHUNK_SIZE * 2)); + auto x_lo = FF(x_256.slice(0, CHUNK_SIZE)); + auto x_hi = FF(x_256.slice(CHUNK_SIZE, CHUNK_SIZE * 2)); + auto y_lo = FF(y_256.slice(0, CHUNK_SIZE)); + auto y_hi = FF(y_256.slice(CHUNK_SIZE, CHUNK_SIZE * 2)); + auto x_lo_idx = this->add_variable(x_lo); + auto x_hi_idx = this->add_variable(x_hi); + auto y_lo_idx = this->add_variable(y_lo); + auto y_hi_idx = this->add_variable(y_hi); // Split scalar into 128 bit endomorphism scalars - fr z_1 = 0; - fr z_2 = 0; + FF z_1 = 0; + FF z_2 = 0; // TODO(luke): do this montgomery conversion here? // auto converted = scalar.from_montgomery_form(); // fr::split_into_endomorphism_scalars(converted, z_1, z_2); // z_1 = z_1.to_montgomery_form(); // z_2 = z_2.to_montgomery_form(); - fr::split_into_endomorphism_scalars(scalar, z_1, z_2); + FF::split_into_endomorphism_scalars(scalar, z_1, z_2); auto z_1_idx = this->add_variable(z_1); auto z_2_idx = this->add_variable(z_2); + // Populate ultra ops in OpQueue + // WORKTODO: Need to decide where to put this. It's possible the decompositions should take place in the EccOpQueue + // and the adding of variables and constructing of witnesses should take place in the builder. Decide on the right + // division of labor. Is there a way to have only one know about the wayn in which ops are placed across wires? + op_queue.ultra_ops[0].emplace_back(op); + op_queue.ultra_ops[1].emplace_back(x_lo); + op_queue.ultra_ops[2].emplace_back(x_hi); + op_queue.ultra_ops[3].emplace_back(y_lo); + + op_queue.ultra_ops[0].emplace_back(op); // TODO(luke): second op val is sort of a dummy. use "op" again? + op_queue.ultra_ops[1].emplace_back(y_hi); + op_queue.ultra_ops[2].emplace_back(z_1); + op_queue.ultra_ops[3].emplace_back(z_2); + return { op, x_lo_idx, x_hi_idx, y_lo_idx, y_hi_idx, z_1_idx, z_2_idx }; } diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp index f34a3a6dbb05..7ee309f8baca 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp @@ -708,12 +708,12 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBase raw_ops; - std::vector> ultra_ops; + std::array, 4> ultra_ops; std::vector> eccvm_ops; uint32_t get_number_of_muls() @@ -60,6 +60,21 @@ class ECCOpQueue { Point get_accumulator() { return accumulator; } + /** + * @brief Get a 'view' of the ultra ops object + * + * @return std::vector> + */ + std::vector> get_ultra_ops() + { + std::vector> result; + result.reserve(ultra_ops.size()); + for (auto& entry : ultra_ops) { + result.emplace_back(entry); + } + return result; + } + /** * @brief Write point addition op to queue and natively perform addition * From 75b568c8fd98efaa5f28e41a2d5f3578629f5484 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Wed, 6 Sep 2023 19:09:23 +0000 Subject: [PATCH 03/36] prover has a pointer to op queue --- .../honk/composer/ultra_composer.cpp | 1 + .../barretenberg/honk/flavor/goblin_ultra.hpp | 2 ++ .../honk/proof_system/ultra_prover.cpp | 32 ++++++++++++------- .../honk/proof_system/ultra_verifier.cpp | 12 ++++++- .../goblin_ultra_circuit_builder.test.cpp | 4 +-- .../circuit_builder/ultra_circuit_builder.cpp | 24 +++++++------- .../circuit_builder/ultra_circuit_builder.hpp | 3 +- .../primitives/biggroup/biggroup_goblin.hpp | 2 +- 8 files changed, 52 insertions(+), 28 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp index 6d088299f4b2..ca1bc657417d 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp @@ -284,6 +284,7 @@ std::shared_ptr UltraComposer_::compute_pro if constexpr (IsGoblinFlavor) { proving_key->num_ecc_op_gates = num_ecc_op_gates; + proving_key->op_queue = circuit_constructor.op_queue; } return proving_key; diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp index 37049f218665..d5d61175e0d2 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp @@ -288,6 +288,8 @@ class GoblinUltra { size_t num_ecc_op_gates; // needed to determine public input offset + std::shared_ptr op_queue; + // The plookup wires that store plookup read data. std::array get_table_column_wires() { return { w_l, w_r, w_o }; }; }; diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index 05989a164192..b43613b57e85 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -290,17 +290,27 @@ template void UltraProver_::execute_op_queue_transc transcript.send_to_verifier(label, aggregate_op_queue_commitment); } - // // Compute evaluations T_i(γ), T_{i-1}(γ), t_i^{shift}(γ), add to transcript - // // - just use the polynomial.evaluate() method to evaluate as univariates - // auto kappa_challenge = transcript.get_challenge("kappa"); - // for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - // auto evaluation = shifted_op_wires[idx].evaluate(kappa_challenge); - // gemini_output.opening_pairs.emplace_back(kappa_challenge, evaluation); - // // WORKTODO: probably want to std::move these - // gemini_output.witnesses.emplace_back(shifted_op_wires[idx]); - // std::string label = "op_wire_eval_" + std::to_string(idx + 1); - // transcript.send_to_verifier(label, evaluation); - // } + // Compute evaluations T_i(γ), T_{i-1}(γ), t_i^{shift}(γ), add to transcript + // - just use the polynomial.evaluate() method to evaluate as univariates + auto kappa_challenge = transcript.get_challenge("kappa"); + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + auto evaluation = shifted_op_wires[idx].evaluate(kappa_challenge); + // gemini_output.opening_pairs.emplace_back(kappa_challenge, evaluation); + // WORKTODO: probably want to std::move these + // gemini_output.witnesses.emplace_back(shifted_op_wires[idx]); + std::string label = "op_wire_eval_" + std::to_string(idx + 1); + transcript.send_to_verifier(label, evaluation); + } + auto aggregate_ecc_op_transcript = key->op_queue->get_ultra_ops(); + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + auto polynomial = Polynomial(aggregate_ecc_op_transcript[idx]); + auto evaluation = polynomial.evaluate(kappa_challenge); + // gemini_output.opening_pairs.emplace_back(kappa_challenge, evaluation); + // WORKTODO: probably want to std::move these + // gemini_output.witnesses.emplace_back(polynomial); + std::string label = "agg_ecc_op_queue_eval_" + std::to_string(idx + 1); + transcript.send_to_verifier(label, evaluation); + } // Add polynomials T_i, T_{i-1}, t_i^{shift} and their evaluations to the set of opening pairs and witness // polynomials that are passed to Shplonk. This should be sufficient to make Shplonk produce the updated Q and diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp index 683479f67fa7..08c26c556ea3 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp @@ -180,8 +180,18 @@ template bool UltraVerifier_::verify_proof(const plonk agg_op_queue_commitments[idx] = transcript.template receive_from_prover("AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); } - // - Receive transcript poly evaluations + FF kappa = transcript.get_challenge("kappa"); + (void)kappa; + std::array shifted_op_wire_evals; + // std::array prev_agg_op_queue_evals; + std::array agg_op_queue_evals; + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + shifted_op_wire_evals[idx] = transcript.template receive_from_prover("op_wire_eval_" + std::to_string(idx + 1)); + } + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + agg_op_queue_evals[idx] = transcript.template receive_from_prover("agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); + } // - Check that aggregation identity holds: T_i(γ) = T_{i-1}(γ) + t_i^{shift}(γ) // - Add 3 {opening_pair, commitment} to the gemini_claim (rename univariate opening claims?) } diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp index 8ea667efa50c..3137fcd48396 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp @@ -46,7 +46,7 @@ TEST(UltraCircuitBuilder, GoblinSimple) EXPECT_EQ(P_result_y, uint256_t(P_expected.y)); // Check that the accumulator in the op queue has been reset to 0 - auto accumulator = builder.op_queue.get_accumulator(); + auto accumulator = builder.op_queue->get_accumulator(); EXPECT_EQ(accumulator, g1::affine_point_at_infinity); // Check number of ecc op "gates"/rows = 3 ops * 2 rows per op = 6 @@ -98,7 +98,7 @@ TEST(UltraCircuitBuilder, GoblinEccOpQueueUltraOps) builder.queue_ecc_eq(); // Check that the ultra ops recorded in the EccOpQueue match the ops recorded in the wires - auto ultra_ops = builder.op_queue.get_ultra_ops(); + auto ultra_ops = builder.op_queue->get_ultra_ops(); for (size_t i = 1; i < 4; ++i) { for (size_t j = 0; j < builder.num_ecc_op_gates; ++j) { auto op_wire_val = builder.variables[builder.ecc_op_wires[i][j]]; diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp index 9d2ff1c2f40a..6e7235ea4111 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp @@ -508,7 +508,7 @@ template ecc_op_tuple UltraCircuitBuilder_::queue_ecc_add_accum(const barretenberg::g1::affine_element& point) { // Add raw op to queue - op_queue.add_accumulate(point); + op_queue->add_accumulate(point); // Add ecc op gates auto op_tuple = make_ecc_op_tuple(EccOpCode::ADD_ACCUM, point); @@ -530,7 +530,7 @@ ecc_op_tuple UltraCircuitBuilder_::queue_ecc_mul_accum(const barretenberg::g const FF& scalar) { // Add raw op to op queue - op_queue.mul_accumulate(point, scalar); + op_queue->mul_accumulate(point, scalar); // Add ecc op gates auto op_tuple = make_ecc_op_tuple(EccOpCode::MUL_ACCUM, point, scalar); @@ -547,7 +547,7 @@ ecc_op_tuple UltraCircuitBuilder_::queue_ecc_mul_accum(const barretenberg::g template ecc_op_tuple UltraCircuitBuilder_::queue_ecc_eq() { // Add raw op to op queue - auto point = op_queue.eq(); + auto point = op_queue->eq(); // Add ecc op gates auto op_tuple = make_ecc_op_tuple(EccOpCode::EQUALITY, point); @@ -595,15 +595,15 @@ ecc_op_tuple UltraCircuitBuilder_::make_ecc_op_tuple(uint32_t op, const g1:: // WORKTODO: Need to decide where to put this. It's possible the decompositions should take place in the EccOpQueue // and the adding of variables and constructing of witnesses should take place in the builder. Decide on the right // division of labor. Is there a way to have only one know about the wayn in which ops are placed across wires? - op_queue.ultra_ops[0].emplace_back(op); - op_queue.ultra_ops[1].emplace_back(x_lo); - op_queue.ultra_ops[2].emplace_back(x_hi); - op_queue.ultra_ops[3].emplace_back(y_lo); - - op_queue.ultra_ops[0].emplace_back(op); // TODO(luke): second op val is sort of a dummy. use "op" again? - op_queue.ultra_ops[1].emplace_back(y_hi); - op_queue.ultra_ops[2].emplace_back(z_1); - op_queue.ultra_ops[3].emplace_back(z_2); + op_queue->ultra_ops[0].emplace_back(op); + op_queue->ultra_ops[1].emplace_back(x_lo); + op_queue->ultra_ops[2].emplace_back(x_hi); + op_queue->ultra_ops[3].emplace_back(y_lo); + + op_queue->ultra_ops[0].emplace_back(op); // TODO(luke): second op val is sort of a dummy. use "op" again? + op_queue->ultra_ops[1].emplace_back(y_hi); + op_queue->ultra_ops[2].emplace_back(z_1); + op_queue->ultra_ops[3].emplace_back(z_2); return { op, x_lo_idx, x_hi_idx, y_lo_idx, y_hi_idx, z_1_idx, z_2_idx }; } diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp index 7ee309f8baca..9d39f242803f 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp @@ -40,7 +40,7 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBase op_queue; struct non_native_field_witnesses { // first 4 array elements = limbs @@ -597,6 +597,7 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBase>(ultra_selector_names(), size_hint) + , op_queue(std::make_shared()) { w_l.reserve(size_hint); w_r.reserve(size_hint); diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp index 8217b08c2a18..675ed03396d6 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp @@ -34,7 +34,7 @@ element element::goblin_batch_mul(const std::vector< auto builder = points[0].get_context(); // Check that the internal accumulator is zero? - ASSERT(builder->op_queue.get_accumulator().is_point_at_infinity()); + ASSERT(builder->op_queue->get_accumulator().is_point_at_infinity()); // Loop over all points and scalars size_t num_points = points.size(); From 485fd844fbd2039feef348e6ac734e0b9d6c053c Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Wed, 6 Sep 2023 20:43:05 +0000 Subject: [PATCH 04/36] infra for getting prev agg transcript from op queue --- .../honk/proof_system/ultra_prover.cpp | 9 ++++- .../honk/proof_system/ultra_verifier.cpp | 3 ++ .../goblin_ultra_circuit_builder.test.cpp | 2 +- .../circuit_builder/ultra_circuit_builder.cpp | 4 ++ .../proof_system/op_queue/ecc_op_queue.hpp | 40 ++++++++++++++++--- 5 files changed, 51 insertions(+), 7 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index b43613b57e85..f24ef07163f3 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -301,7 +301,7 @@ template void UltraProver_::execute_op_queue_transc std::string label = "op_wire_eval_" + std::to_string(idx + 1); transcript.send_to_verifier(label, evaluation); } - auto aggregate_ecc_op_transcript = key->op_queue->get_ultra_ops(); + auto aggregate_ecc_op_transcript = key->op_queue->get_aggregate_transcript(); for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { auto polynomial = Polynomial(aggregate_ecc_op_transcript[idx]); auto evaluation = polynomial.evaluate(kappa_challenge); @@ -311,6 +311,13 @@ template void UltraProver_::execute_op_queue_transc std::string label = "agg_ecc_op_queue_eval_" + std::to_string(idx + 1); transcript.send_to_verifier(label, evaluation); } + // auto previous_aggregate_ecc_op_transcript = key->op_queue->get_previous_aggregate_transcript(); + // for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + // auto polynomial = Polynomial(previous_aggregate_ecc_op_transcript[idx]); + // auto evaluation = polynomial.evaluate(kappa_challenge); + // std::string label = "prev_agg_ecc_op_queue_eval_" + std::to_string(idx + 1); + // transcript.send_to_verifier(label, evaluation); + // } // Add polynomials T_i, T_{i-1}, t_i^{shift} and their evaluations to the set of opening pairs and witness // polynomials that are passed to Shplonk. This should be sufficient to make Shplonk produce the updated Q and diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp index 08c26c556ea3..9b503cb3da15 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp @@ -192,6 +192,9 @@ template bool UltraVerifier_::verify_proof(const plonk for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { agg_op_queue_evals[idx] = transcript.template receive_from_prover("agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); } + // for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + // agg_op_queue_evals[idx] = transcript.template receive_from_prover("prev_agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); + // } // - Check that aggregation identity holds: T_i(γ) = T_{i-1}(γ) + t_i^{shift}(γ) // - Add 3 {opening_pair, commitment} to the gemini_claim (rename univariate opening claims?) } diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp index 3137fcd48396..5766736d2585 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp @@ -98,7 +98,7 @@ TEST(UltraCircuitBuilder, GoblinEccOpQueueUltraOps) builder.queue_ecc_eq(); // Check that the ultra ops recorded in the EccOpQueue match the ops recorded in the wires - auto ultra_ops = builder.op_queue->get_ultra_ops(); + auto ultra_ops = builder.op_queue->get_aggregate_transcript(); for (size_t i = 1; i < 4; ++i) { for (size_t j = 0; j < builder.num_ecc_op_gates; ++j) { auto op_wire_val = builder.variables[builder.ecc_op_wires[i][j]]; diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp index 6e7235ea4111..f9d3ff58c8fe 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp @@ -46,6 +46,10 @@ template void UltraCircuitBuilder_::finalize_circuit() process_ROM_arrays(); process_RAM_arrays(); process_range_lists(); + + // Set internally the current and previous size of the aggregate op queue transcript + op_queue->set_size_data(); + circuit_finalised = true; } } diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp index 74ae14158a9e..f4c486cb6a22 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp @@ -39,9 +39,12 @@ class ECCOpQueue { public: std::vector raw_ops; - std::array, 4> ultra_ops; + std::array, 4> ultra_ops; // ops encoded in the width-4 Ultra format std::vector> eccvm_ops; + size_t current_ultra_transcript_size = 0; // M_i + size_t previous_ultra_transcript_size = 0; // M_{i-1} + uint32_t get_number_of_muls() { uint32_t num_muls = 0; @@ -61,11 +64,23 @@ class ECCOpQueue { Point get_accumulator() { return accumulator; } /** - * @brief Get a 'view' of the ultra ops object - * - * @return std::vector> + * @brief Set the current and previous size of the ultra_ops transcript + * + * @details previous_ultra_transcript_size = M_{i-1} is needed by the prover to extract the previous aggregate op + * queue transcript T_{i-1} from the current one T_i. + */ + void set_size_data() + { + previous_ultra_transcript_size = current_ultra_transcript_size; + current_ultra_transcript_size = ultra_ops.size(); + } + + /** + * @brief Get a 'view' of the current ultra ops object + * + * @return std::vector> */ - std::vector> get_ultra_ops() + std::vector> get_aggregate_transcript() { std::vector> result; result.reserve(ultra_ops.size()); @@ -75,6 +90,21 @@ class ECCOpQueue { return result; } + /** + * @brief Get a 'view' of the previous ultra ops object + * + * @return std::vector> + */ + std::vector> get_previous_aggregate_transcript() + { + std::vector> result; + result.reserve(ultra_ops.size()); + for (auto& entry : ultra_ops) { + result.emplace_back(entry.begin(), previous_ultra_transcript_size); + } + return result; + } + /** * @brief Write point addition op to queue and natively perform addition * From afe3a0707921ad57b165184742a638c40f0e2a51 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Thu, 7 Sep 2023 17:27:07 +0000 Subject: [PATCH 05/36] tests passing with only shifted t claims --- .../honk/proof_system/ultra_prover.cpp | 77 +++++++++++++------ .../honk/proof_system/ultra_prover.hpp | 2 +- .../honk/proof_system/ultra_verifier.cpp | 25 ++++-- .../polynomial_arithmetic.test.cpp | 19 +++++ 4 files changed, 90 insertions(+), 33 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index f24ef07163f3..4d520ace6e3b 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -232,12 +232,12 @@ template void UltraProver_::execute_univariatizatio template void UltraProver_::execute_pcs_evaluation_round() { const FF r_challenge = transcript.get_challenge("Gemini:r"); - gemini_output = Gemini::compute_fold_polynomial_evaluations( + univariate_openings = Gemini::compute_fold_polynomial_evaluations( sumcheck_output.challenge_point, std::move(fold_polynomials), r_challenge); for (size_t l = 0; l < key->log_circuit_size; ++l) { std::string label = "Gemini:a_" + std::to_string(l); - const auto& evaluation = gemini_output.opening_pairs[l + 1].evaluation; + const auto& evaluation = univariate_openings.opening_pairs[l + 1].evaluation; transcript.send_to_verifier(label, evaluation); } } @@ -246,24 +246,35 @@ template void UltraProver_::execute_op_queue_transc { if constexpr (IsGoblinFlavor) { // WORKTODO: Extract degree M_{i-1} of T_{i-1} - size_t shift_magnitude = 1; // M_{i-1} + size_t shift_magnitude = 0; // M_{i-1} auto circuit_size = key->circuit_size; // Construct right-shifted op wires while ensuring that the last 'shift_magnitude' coefficients of the // original op wires are zero. - // WORKTODO: also need to ensure that M_{i-1} + m_i < n. If this is not the case then we should still be able to + // WORKTODO: Need to ensure that M_{i-1} + m_i < n. If this is not the case then we should still be able to // compute the commitment but we have to be careful. Maybe just construct shift as Polynomial(M_{i-1} + m_i)? std::array shifted_op_wires; size_t wire_idx = 0; for (auto& op_wire : key->get_ecc_op_wires()) { shifted_op_wires[wire_idx] = Polynomial(circuit_size); + // Ensure final M_{i-1} elements are zero for (size_t idx = 0; idx < shift_magnitude; ++idx) { ASSERT(op_wire[circuit_size - idx - 1].is_zero()); + } + // Construct right shift by M_{i-1} + for (size_t idx = 0; idx < circuit_size; ++idx) { shifted_op_wires[wire_idx][idx + shift_magnitude] = op_wire[idx]; } wire_idx++; } + // for (auto& wire : key->get_ecc_op_wires()) { + // info("WIRE \n"); + // for (auto& coeff : wire) { + // info("coeff = ", coeff); + // } + // } + // Commit to the right-shifted op wire polynomials std::array shifted_op_wire_commitments; for (size_t idx = 0; idx < shifted_op_wires.size(); ++idx) { @@ -273,19 +284,19 @@ template void UltraProver_::execute_op_queue_transc transcript.send_to_verifier(label, shifted_op_wire_commitments[idx]); } - // Get and send commitments [T_{i-1}] - std::array previous_aggregate_op_queue_commitments; - for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - // WORKTODO: Maybe we can store [T_{i-1}] in the ecc op queue for now? - previous_aggregate_op_queue_commitments[idx] = Commitment::one(); - std::string label = "PREV_AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1); - transcript.send_to_verifier(label, previous_aggregate_op_queue_commitments[idx]); - } + // // Get and send commitments [T_{i-1}] + // std::array previous_aggregate_op_queue_commitments; + // for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + // // WORKTODO: Maybe we can store [T_{i-1}] in the ecc op queue for now? + // previous_aggregate_op_queue_commitments[idx] = Commitment::one(); + // std::string label = "PREV_AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1); + // transcript.send_to_verifier(label, previous_aggregate_op_queue_commitments[idx]); + // } // Compute and send commitments [T_i] = [T_{i-1}] + [t_i^{shift}] for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - auto aggregate_op_queue_commitment = - previous_aggregate_op_queue_commitments[idx] + shifted_op_wire_commitments[idx]; + // WORKTODO: add prev agg commitment to RHS + auto aggregate_op_queue_commitment = shifted_op_wire_commitments[idx]; std::string label = "AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1); transcript.send_to_verifier(label, aggregate_op_queue_commitment); } @@ -295,22 +306,37 @@ template void UltraProver_::execute_op_queue_transc auto kappa_challenge = transcript.get_challenge("kappa"); for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { auto evaluation = shifted_op_wires[idx].evaluate(kappa_challenge); - // gemini_output.opening_pairs.emplace_back(kappa_challenge, evaluation); - // WORKTODO: probably want to std::move these - // gemini_output.witnesses.emplace_back(shifted_op_wires[idx]); + info("t_i eval = ", evaluation); + univariate_openings.opening_pairs.emplace_back(kappa_challenge, evaluation); + univariate_openings.witnesses.emplace_back(shifted_op_wires[idx]); // WORKTODO: std::move these + // info("univariate_openings.witnesses.size() = ", univariate_openings.witnesses.size()); std::string label = "op_wire_eval_" + std::to_string(idx + 1); transcript.send_to_verifier(label, evaluation); } + + for (size_t idx = 0; idx < shifted_op_wires[0].size(); ++idx) { + info(idx, ": ", shifted_op_wires[0][idx]); + } + auto aggregate_ecc_op_transcript = key->op_queue->get_aggregate_transcript(); + for (size_t idx = 0; idx < aggregate_ecc_op_transcript[0].size(); ++idx) { + info(idx, ": ", aggregate_ecc_op_transcript[0][idx]); + } + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - auto polynomial = Polynomial(aggregate_ecc_op_transcript[idx]); + auto polynomial = Polynomial(shifted_op_wires[idx]); + // WORKTODO: Does this need to be a power of 2 to work properly for some reason? + // auto polynomial = Polynomial(aggregate_ecc_op_transcript[idx]); auto evaluation = polynomial.evaluate(kappa_challenge); - // gemini_output.opening_pairs.emplace_back(kappa_challenge, evaluation); + info("T_i eval = ", evaluation); + univariate_openings.opening_pairs.emplace_back(kappa_challenge, evaluation); // WORKTODO: probably want to std::move these - // gemini_output.witnesses.emplace_back(polynomial); + univariate_openings.witnesses.emplace_back(polynomial); + // info("univariate_openings.witnesses.size() = ", univariate_openings.witnesses.size()); std::string label = "agg_ecc_op_queue_eval_" + std::to_string(idx + 1); transcript.send_to_verifier(label, evaluation); } + // auto previous_aggregate_ecc_op_transcript = key->op_queue->get_previous_aggregate_transcript(); // for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { // auto polynomial = Polynomial(previous_aggregate_ecc_op_transcript[idx]); @@ -333,8 +359,8 @@ template void UltraProver_::execute_shplonk_batched { nu_challenge = transcript.get_challenge("Shplonk:nu"); - batched_quotient_Q = - Shplonk::compute_batched_quotient(gemini_output.opening_pairs, gemini_output.witnesses, nu_challenge); + batched_quotient_Q = Shplonk::compute_batched_quotient( + univariate_openings.opening_pairs, univariate_openings.witnesses, nu_challenge); // commit to Q(X) and add [Q] to the transcript queue.add_commitment(batched_quotient_Q, "Shplonk:Q"); @@ -348,8 +374,11 @@ template void UltraProver_::execute_shplonk_partial { const FF z_challenge = transcript.get_challenge("Shplonk:z"); - shplonk_output = Shplonk::compute_partially_evaluated_batched_quotient( - gemini_output.opening_pairs, gemini_output.witnesses, std::move(batched_quotient_Q), nu_challenge, z_challenge); + shplonk_output = Shplonk::compute_partially_evaluated_batched_quotient(univariate_openings.opening_pairs, + univariate_openings.witnesses, + std::move(batched_quotient_Q), + nu_challenge, + z_challenge); } /** * - Compute final PCS opening proof: diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp index 2aa661b217ee..c3fa27634c81 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp @@ -69,7 +69,7 @@ template class UltraProver_ { work_queue queue; sumcheck::SumcheckOutput sumcheck_output; - pcs::gemini::ProverOutput gemini_output; + pcs::gemini::ProverOutput univariate_openings; pcs::shplonk::ProverOutput shplonk_output; std::shared_ptr pcs_commitment_key; diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp index 9b503cb3da15..374864dd3cca 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp @@ -3,6 +3,7 @@ #include "barretenberg/honk/transcript/transcript.hpp" #include "barretenberg/honk/utils/power_polynomial.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" +#include "barretenberg/honk/pcs/claim.hpp" using namespace barretenberg; using namespace proof_system::honk::sumcheck; @@ -158,7 +159,7 @@ template bool UltraVerifier_::verify_proof(const plonk // Produce a Gemini claim consisting of: // - d+1 commitments [Fold_{r}^(0)], [Fold_{-r}^(0)], and [Fold^(l)], l = 1:d-1 // - d+1 evaluations a_0_pos, and a_l, l = 0:d-1 - auto gemini_claim = Gemini::reduce_verification(multivariate_challenge, + auto univariate_opening_claims = Gemini::reduce_verification(multivariate_challenge, batched_evaluation, batched_commitment_unshifted, batched_commitment_to_be_shifted, @@ -168,14 +169,14 @@ template bool UltraVerifier_::verify_proof(const plonk // Perform transcript aggregation protocol // - Receive commitments, generate challenge std::array shifted_op_wire_commitments; - std::array prev_agg_op_queue_commitments; + // std::array prev_agg_op_queue_commitments; std::array agg_op_queue_commitments; for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { shifted_op_wire_commitments[idx] = transcript.template receive_from_prover("SHIFTED_ECC_OP_WIRE_" + std::to_string(idx + 1)); } - for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - prev_agg_op_queue_commitments[idx] = transcript.template receive_from_prover("PREV_AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); - } + // for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + // prev_agg_op_queue_commitments[idx] = transcript.template receive_from_prover("PREV_AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); + // } for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { agg_op_queue_commitments[idx] = transcript.template receive_from_prover("AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); } @@ -188,19 +189,27 @@ template bool UltraVerifier_::verify_proof(const plonk std::array agg_op_queue_evals; for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { shifted_op_wire_evals[idx] = transcript.template receive_from_prover("op_wire_eval_" + std::to_string(idx + 1)); + univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, shifted_op_wire_evals[idx]}, shifted_op_wire_commitments[idx] }); + // info("univariate_opening_claims.size() = ", univariate_opening_claims.size()); } for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { agg_op_queue_evals[idx] = transcript.template receive_from_prover("agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); + univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, agg_op_queue_evals[idx]}, agg_op_queue_commitments[idx] }); + // info("univariate_opening_claims.size() = ", univariate_opening_claims.size()); } // for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - // agg_op_queue_evals[idx] = transcript.template receive_from_prover("prev_agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); + // prev_agg_op_queue_evals[idx] = transcript.template receive_from_prover("prev_agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); // } + // - Check that aggregation identity holds: T_i(γ) = T_{i-1}(γ) + t_i^{shift}(γ) - // - Add 3 {opening_pair, commitment} to the gemini_claim (rename univariate opening claims?) + + // - Add 3 {opening_pair, commitment} to the univariate_opening_claims (rename univariate opening claims?) + + } // Produce a Shplonk claim: commitment [Q] - [Q_z], evaluation zero (at random challenge z) - auto shplonk_claim = Shplonk::reduce_verification(pcs_verification_key, gemini_claim, transcript); + auto shplonk_claim = Shplonk::reduce_verification(pcs_verification_key, univariate_opening_claims, transcript); transcript.print(); diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp index 5bb675a20642..913fad308dfb 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp @@ -11,6 +11,25 @@ using namespace barretenberg; +/** + * @brief Ensure evaluate() gives consistent result for polynomials of different size but same non-zero coefficients. + */ +TEST(polynomials, evaluate) +{ + auto poly1 = polynomial(15); // non power of 2 + auto poly2 = polynomial(64); + for (size_t i = 0; i < poly1.size(); ++i) { + poly1[i] = fr::random_element(); + poly2[i] = poly1[i]; + } + + auto challenge = fr::random_element(); + auto eval1 = poly1.evaluate(challenge); + auto eval2 = poly2.evaluate(challenge); + + EXPECT_EQ(eval1, eval2); +} + TEST(polynomials, fft_with_small_degree) { constexpr size_t n = 16; From 08bf084c19ee3ea4f9b51d93c246476d8bc8e20d Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Thu, 7 Sep 2023 17:25:29 +0000 Subject: [PATCH 06/36] op codes constrained to constant variables --- .../circuit_builder/ultra_circuit_builder.cpp | 14 +++++++------- .../circuit_builder/ultra_circuit_builder.hpp | 11 +++++++++++ .../proof_system/composer/permutation_lib.hpp | 5 +---- .../proof_system/op_queue/ecc_op_queue.hpp | 2 +- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp index f9d3ff58c8fe..c0c0aabaaa57 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp @@ -515,7 +515,7 @@ ecc_op_tuple UltraCircuitBuilder_::queue_ecc_add_accum(const barretenberg::g op_queue->add_accumulate(point); // Add ecc op gates - auto op_tuple = make_ecc_op_tuple(EccOpCode::ADD_ACCUM, point); + auto op_tuple = make_ecc_op_tuple(add_accum_op_idx, point); populate_ecc_op_wires(op_tuple); return op_tuple; @@ -537,7 +537,7 @@ ecc_op_tuple UltraCircuitBuilder_::queue_ecc_mul_accum(const barretenberg::g op_queue->mul_accumulate(point, scalar); // Add ecc op gates - auto op_tuple = make_ecc_op_tuple(EccOpCode::MUL_ACCUM, point, scalar); + auto op_tuple = make_ecc_op_tuple(mul_accum_op_idx, point, scalar); populate_ecc_op_wires(op_tuple); return op_tuple; @@ -554,7 +554,7 @@ template ecc_op_tuple UltraCircuitBuilder_::queue_ecc_eq() auto point = op_queue->eq(); // Add ecc op gates - auto op_tuple = make_ecc_op_tuple(EccOpCode::EQUALITY, point); + auto op_tuple = make_ecc_op_tuple(equality_op_idx, point); populate_ecc_op_wires(op_tuple); return op_tuple; @@ -569,7 +569,7 @@ template ecc_op_tuple UltraCircuitBuilder_::queue_ecc_eq() * @return ecc_op_tuple Tuple of indices into variables array used to construct pair of ecc op gates */ template -ecc_op_tuple UltraCircuitBuilder_::make_ecc_op_tuple(uint32_t op, const g1::affine_element& point, const FF& scalar) +ecc_op_tuple UltraCircuitBuilder_::make_ecc_op_tuple(uint32_t op_idx, const g1::affine_element& point, const FF& scalar) { const size_t CHUNK_SIZE = 2 * DEFAULT_NON_NATIVE_FIELD_LIMB_BITS; auto x_256 = uint256_t(point.x); @@ -599,17 +599,17 @@ ecc_op_tuple UltraCircuitBuilder_::make_ecc_op_tuple(uint32_t op, const g1:: // WORKTODO: Need to decide where to put this. It's possible the decompositions should take place in the EccOpQueue // and the adding of variables and constructing of witnesses should take place in the builder. Decide on the right // division of labor. Is there a way to have only one know about the wayn in which ops are placed across wires? - op_queue->ultra_ops[0].emplace_back(op); + op_queue->ultra_ops[0].emplace_back(op_idx); op_queue->ultra_ops[1].emplace_back(x_lo); op_queue->ultra_ops[2].emplace_back(x_hi); op_queue->ultra_ops[3].emplace_back(y_lo); - op_queue->ultra_ops[0].emplace_back(op); // TODO(luke): second op val is sort of a dummy. use "op" again? + op_queue->ultra_ops[0].emplace_back(op_idx); // TODO(luke): second op val is sort of a dummy. use "op" again? op_queue->ultra_ops[1].emplace_back(y_hi); op_queue->ultra_ops[2].emplace_back(z_1); op_queue->ultra_ops[3].emplace_back(z_2); - return { op, x_lo_idx, x_hi_idx, y_lo_idx, y_hi_idx, z_1_idx, z_2_idx }; + return { op_idx, x_lo_idx, x_hi_idx, y_lo_idx, y_hi_idx, z_1_idx, z_2_idx }; } /** diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp index 9d39f242803f..3a7f23623bb2 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp @@ -42,6 +42,12 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBase op_queue; + // Indices for constant variables corresponding to ECCOpQueue op codes + uint32_t null_op_idx; + uint32_t add_accum_op_idx; + uint32_t mul_accum_op_idx; + uint32_t equality_op_idx; + struct non_native_field_witnesses { // first 4 array elements = limbs // 5th element = prime basis limb @@ -605,6 +611,11 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBasezero_idx = put_constant_variable(FF::zero()); this->tau.insert({ DUMMY_TAG, DUMMY_TAG }); // TODO(luke): explain this + // Set indices to constants corresponding to Goblin ECC op codes + null_op_idx = this->zero_idx; + add_accum_op_idx = put_constant_variable(FF(EccOpCode::ADD_ACCUM)); + mul_accum_op_idx = put_constant_variable(FF(EccOpCode::MUL_ACCUM)); + equality_op_idx = put_constant_variable(FF(EccOpCode::EQUALITY)); }; UltraCircuitBuilder_(const UltraCircuitBuilder_& other) = delete; UltraCircuitBuilder_(UltraCircuitBuilder_&& other) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp index 65c5e318e998..e4c47d2a109b 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp @@ -112,10 +112,7 @@ std::vector compute_wire_copy_cycles(const typename Flavor::C const auto& op_wires = circuit_constructor.ecc_op_wires; // Iterate over all variables of the ecc op gates, and add a corresponding node to the cycle for that variable for (size_t i = 0; i < num_ecc_op_gates; ++i) { - // Note: We exclude the first op wire since it contains the op codes which are not stored in variables - // TODO(luke): Kesha pointed out that we may need to constrain the op code values in some way, either with a - // copy cycle that constrains them to a constant or with a relation. Resolve this. - for (size_t op_wire_idx = 1; op_wire_idx < 4; ++op_wire_idx) { + for (size_t op_wire_idx = 0; op_wire_idx < 4; ++op_wire_idx) { const uint32_t var_index = circuit_constructor.real_variable_index[op_wires[op_wire_idx][i]]; const auto wire_index = static_cast(op_wire_idx); const auto gate_idx = static_cast(i + op_gates_offset); diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp index f4c486cb6a22..8a1fcc7c9071 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp @@ -4,7 +4,7 @@ namespace proof_system { -enum EccOpCode { ADD_ACCUM, MUL_ACCUM, EQUALITY, NULL_OP }; +enum EccOpCode { NULL_OP, ADD_ACCUM, MUL_ACCUM, EQUALITY}; /** * @brief Raw description of an ECC operation used to produce equivalent descriptions over different curves. From 0f76d3bb2dc7c4e009fb6be724f619095860b999 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Thu, 7 Sep 2023 20:28:44 +0000 Subject: [PATCH 07/36] passing with claims on t and T --- .../honk/proof_system/ultra_prover.cpp | 33 +++++---------- .../barretenberg/polynomials/polynomial.cpp | 1 + .../barretenberg/polynomials/polynomial.hpp | 41 ++++++++++--------- 3 files changed, 33 insertions(+), 42 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index 4d520ace6e3b..d7321ade8ba7 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -247,34 +247,23 @@ template void UltraProver_::execute_op_queue_transc if constexpr (IsGoblinFlavor) { // WORKTODO: Extract degree M_{i-1} of T_{i-1} size_t shift_magnitude = 0; // M_{i-1} - auto circuit_size = key->circuit_size; + (void)shift_magnitude; + // auto circuit_size = key->circuit_size; // Construct right-shifted op wires while ensuring that the last 'shift_magnitude' coefficients of the // original op wires are zero. // WORKTODO: Need to ensure that M_{i-1} + m_i < n. If this is not the case then we should still be able to // compute the commitment but we have to be careful. Maybe just construct shift as Polynomial(M_{i-1} + m_i)? std::array shifted_op_wires; - size_t wire_idx = 0; - for (auto& op_wire : key->get_ecc_op_wires()) { - shifted_op_wires[wire_idx] = Polynomial(circuit_size); - // Ensure final M_{i-1} elements are zero - for (size_t idx = 0; idx < shift_magnitude; ++idx) { - ASSERT(op_wire[circuit_size - idx - 1].is_zero()); - } - // Construct right shift by M_{i-1} - for (size_t idx = 0; idx < circuit_size; ++idx) { - shifted_op_wires[wire_idx][idx + shift_magnitude] = op_wire[idx]; - } - wire_idx++; + auto op_wires = key->get_ecc_op_wires(); + for (size_t i = 0; i < op_wires.size(); ++i) { + auto op_wire = Polynomial(op_wires[i]); + // WORKTODO: shifting one to the left right now to account for the zero-row-offset that is not present in + // T_i. Need to make a decision on whether to account for this issue in the t_i or in the T_i. + shifted_op_wires[i] = Polynomial(op_wire.shifted()); + // shifted_op_wires[i] = op_wire.get_right_shifted(shift_magnitude); } - // for (auto& wire : key->get_ecc_op_wires()) { - // info("WIRE \n"); - // for (auto& coeff : wire) { - // info("coeff = ", coeff); - // } - // } - // Commit to the right-shifted op wire polynomials std::array shifted_op_wire_commitments; for (size_t idx = 0; idx < shifted_op_wires.size(); ++idx) { @@ -324,9 +313,7 @@ template void UltraProver_::execute_op_queue_transc } for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - auto polynomial = Polynomial(shifted_op_wires[idx]); - // WORKTODO: Does this need to be a power of 2 to work properly for some reason? - // auto polynomial = Polynomial(aggregate_ecc_op_transcript[idx]); + auto polynomial = Polynomial(aggregate_ecc_op_transcript[idx]); auto evaluation = polynomial.evaluate(kappa_challenge); info("T_i eval = ", evaluation); univariate_openings.opening_pairs.emplace_back(kappa_challenge, evaluation); diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp index 47d57d8b986d..13c2679eeca2 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp @@ -63,6 +63,7 @@ Polynomial::Polynomial(std::span coefficients) memcpy(static_cast(coefficients_.get()), static_cast(coefficients.data()), sizeof(Fr) * coefficients.size()); + zero_memory_beyond(size_); } template diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp index c7009b6e869d..b655fabf692a 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp @@ -149,25 +149,28 @@ template class Polynomial { return std::span{ coefficients_.get() + 1, size_ }; } - // /** - // * @brief Returns the right-shift of self by given magnitude k. - // * - // * @details Asserts that the last k coefficients of self are zero. - // */ - // [[nodiscard]] Polynomial get_right_shifted(size_t k = 1) const - // { - // ASSERT(size_ > 0); - // // Ensure that the final k coefficients of the pre-shifted polynomial are zero - // for (size_t idx = size_-k; idx < size_; ++idx) { - // ASSERT(coefficients_[idx].is_zero()); - // } - // // Compute the right-shift-by-k of the polynomial - // Polynomial right_shifted(size_); - // for (size_t idx = 0; idx < k; ++idx) { - // right_shifted[idx + k] = coefficients_[idx]; - // } - // return right_shifted; - // } + /** + * @brief Returns the right-shift of self by given magnitude k. + * + * @details Asserts that the last k coefficients of self are zero. + */ + [[nodiscard]] Polynomial get_right_shifted(size_t shift_size = 1) const + { + ASSERT(size_ > 0); + ASSERT(shift_size < size_); + // Ensure that the last k coefficients of the pre-shifted polynomial are zero + for (size_t i = 0; i < shift_size; ++i) { + size_t idx = size_ - shift_size - 1; + ASSERT(coefficients_[(std::ptrdiff_t)idx].is_zero()); + } + // Compute the right-shift-by-k of the polynomial + // Note: first shift_size coefficients of result will be zero + Polynomial right_shifted(size_); + for (size_t idx = 0; idx < size_ - shift_size; ++idx) { + right_shifted.at(idx + shift_size) = coefficients_[(std::ptrdiff_t)idx]; + } + return right_shifted; + } /** * @brief adds the polynomial q(X) 'other', multiplied by a scaling factor. From f29901d247ac28061ce0a5d149cd92ef06cd7d63 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Thu, 7 Sep 2023 21:18:20 +0000 Subject: [PATCH 08/36] verifier checks identity plus cleanup --- .../honk/proof_system/ultra_prover.cpp | 94 +++++++------------ .../honk/proof_system/ultra_verifier.cpp | 35 +++---- 2 files changed, 48 insertions(+), 81 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index d7321ade8ba7..1b664a1d9ca7 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -245,7 +245,7 @@ template void UltraProver_::execute_pcs_evaluation_ template void UltraProver_::execute_op_queue_transcript_aggregation_round() { if constexpr (IsGoblinFlavor) { - // WORKTODO: Extract degree M_{i-1} of T_{i-1} + // WORKTODO: Extract degree M_{i-1} of T_{i-1} from op_queue size_t shift_magnitude = 0; // M_{i-1} (void)shift_magnitude; // auto circuit_size = key->circuit_size; @@ -264,77 +264,51 @@ template void UltraProver_::execute_op_queue_transc // shifted_op_wires[i] = op_wire.get_right_shifted(shift_magnitude); } - // Commit to the right-shifted op wire polynomials + // Get commitments [t_i^{shift}], [T_{i-1}], and [T_i] and add to transcript std::array shifted_op_wire_commitments; + // std::array prev_aggregate_op_queue_commitments; + std::array aggregate_op_queue_commitments; for (size_t idx = 0; idx < shifted_op_wires.size(); ++idx) { - // queue.add_commitment(shifted_op_wires[idx], "SHIFTED_ECC_OP_WIRE_" + std::to_string(idx + 1)); shifted_op_wire_commitments[idx] = pcs_commitment_key->commit(shifted_op_wires[idx]); - std::string label = "SHIFTED_ECC_OP_WIRE_" + std::to_string(idx + 1); - transcript.send_to_verifier(label, shifted_op_wire_commitments[idx]); - } - - // // Get and send commitments [T_{i-1}] - // std::array previous_aggregate_op_queue_commitments; - // for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - // // WORKTODO: Maybe we can store [T_{i-1}] in the ecc op queue for now? - // previous_aggregate_op_queue_commitments[idx] = Commitment::one(); - // std::string label = "PREV_AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1); - // transcript.send_to_verifier(label, previous_aggregate_op_queue_commitments[idx]); - // } + // prev_aggregate_op_queue_commitments[idx] = WORKTODO: get_previous_agg_op_queue_commitments(); + aggregate_op_queue_commitments[idx] = shifted_op_wire_commitments[idx]; // WORKTODO: plus [T_{i-1}] - // Compute and send commitments [T_i] = [T_{i-1}] + [t_i^{shift}] - for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - // WORKTODO: add prev agg commitment to RHS - auto aggregate_op_queue_commitment = shifted_op_wire_commitments[idx]; - std::string label = "AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1); - transcript.send_to_verifier(label, aggregate_op_queue_commitment); + std::string suffix = std::to_string(idx + 1); + transcript.send_to_verifier("SHIFTED_ECC_OP_WIRE_" + suffix, shifted_op_wire_commitments[idx]); + // transcript.send_to_verifier("PREV_AGG_ECC_OP_QUEUE_" + suffix, prev_aggregate_op_queue_commitments[idx]); + transcript.send_to_verifier("AGG_ECC_OP_QUEUE_" + suffix, aggregate_op_queue_commitments[idx]); } - // Compute evaluations T_i(γ), T_{i-1}(γ), t_i^{shift}(γ), add to transcript - // - just use the polynomial.evaluate() method to evaluate as univariates - auto kappa_challenge = transcript.get_challenge("kappa"); + // Compute evaluations T_i(γ), T_{i-1}(γ), t_i^{shift}(γ), add to transcript. + // Note: For each polynomial we add a univariate opening claim {(γ, p(γ)), p(X)} to the set of claims to be + // combined in the batch polynomial Q in Shplonk. (The other univariate claims come from the output of Gemini). + auto kappa = transcript.get_challenge("kappa"); + auto evaluation = FF(0); + // auto prev_aggregate_ecc_op_transcript = key->op_queue->get_previous_aggregate_transcript(); + auto aggregate_ecc_op_transcript = key->op_queue->get_aggregate_transcript(); for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - auto evaluation = shifted_op_wires[idx].evaluate(kappa_challenge); - info("t_i eval = ", evaluation); - univariate_openings.opening_pairs.emplace_back(kappa_challenge, evaluation); - univariate_openings.witnesses.emplace_back(shifted_op_wires[idx]); // WORKTODO: std::move these - // info("univariate_openings.witnesses.size() = ", univariate_openings.witnesses.size()); - std::string label = "op_wire_eval_" + std::to_string(idx + 1); - transcript.send_to_verifier(label, evaluation); - } + std::string suffix = std::to_string(idx + 1); - for (size_t idx = 0; idx < shifted_op_wires[0].size(); ++idx) { - info(idx, ": ", shifted_op_wires[0][idx]); - } + // t_i^{shift}(γ) + evaluation = shifted_op_wires[idx].evaluate(kappa); + univariate_openings.opening_pairs.emplace_back(kappa, evaluation); + univariate_openings.witnesses.emplace_back(shifted_op_wires[idx]); // WORKTODO: std::move these + transcript.send_to_verifier("op_wire_eval_", evaluation); - auto aggregate_ecc_op_transcript = key->op_queue->get_aggregate_transcript(); - for (size_t idx = 0; idx < aggregate_ecc_op_transcript[0].size(); ++idx) { - info(idx, ": ", aggregate_ecc_op_transcript[0][idx]); - } + // T_{i-1}(γ) + // auto polynomial = Polynomial(prev_aggregate_ecc_op_transcript[idx]); + // evaluation = polynomial.evaluate(kappa); + // univariate_openings.opening_pairs.emplace_back(kappa, evaluation); + // univariate_openings.witnesses.emplace_back(polynomial); // WORKTODO: std::move these + // transcript.send_to_verifier("prev_agg_ecc_op_queue_eval_" + suffix, evaluation); - for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + // T_i(γ) auto polynomial = Polynomial(aggregate_ecc_op_transcript[idx]); - auto evaluation = polynomial.evaluate(kappa_challenge); - info("T_i eval = ", evaluation); - univariate_openings.opening_pairs.emplace_back(kappa_challenge, evaluation); - // WORKTODO: probably want to std::move these - univariate_openings.witnesses.emplace_back(polynomial); - // info("univariate_openings.witnesses.size() = ", univariate_openings.witnesses.size()); - std::string label = "agg_ecc_op_queue_eval_" + std::to_string(idx + 1); - transcript.send_to_verifier(label, evaluation); + evaluation = polynomial.evaluate(kappa); + univariate_openings.opening_pairs.emplace_back(kappa, evaluation); + univariate_openings.witnesses.emplace_back(polynomial); // WORKTODO: std::move these + transcript.send_to_verifier("agg_ecc_op_queue_eval_" + suffix, evaluation); } - - // auto previous_aggregate_ecc_op_transcript = key->op_queue->get_previous_aggregate_transcript(); - // for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - // auto polynomial = Polynomial(previous_aggregate_ecc_op_transcript[idx]); - // auto evaluation = polynomial.evaluate(kappa_challenge); - // std::string label = "prev_agg_ecc_op_queue_eval_" + std::to_string(idx + 1); - // transcript.send_to_verifier(label, evaluation); - // } - - // Add polynomials T_i, T_{i-1}, t_i^{shift} and their evaluations to the set of opening pairs and witness - // polynomials that are passed to Shplonk. This should be sufficient to make Shplonk produce the updated Q and - // Q_z. } } diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp index 374864dd3cca..c580b59bc125 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp @@ -165,47 +165,40 @@ template bool UltraVerifier_::verify_proof(const plonk batched_commitment_to_be_shifted, transcript); + + // Perform ECC op queue transcript aggregation protocol if constexpr (IsGoblinFlavor) { - // Perform transcript aggregation protocol - // - Receive commitments, generate challenge + // Receive commitments [t_i^{shift}], [T_{i-1}], and [T_i] std::array shifted_op_wire_commitments; // std::array prev_agg_op_queue_commitments; std::array agg_op_queue_commitments; for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { shifted_op_wire_commitments[idx] = transcript.template receive_from_prover("SHIFTED_ECC_OP_WIRE_" + std::to_string(idx + 1)); - } - // for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - // prev_agg_op_queue_commitments[idx] = transcript.template receive_from_prover("PREV_AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); - // } - for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + // prev_agg_op_queue_commitments[idx] = transcript.template receive_from_prover("PREV_AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); agg_op_queue_commitments[idx] = transcript.template receive_from_prover("AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); } - // - Receive transcript poly evaluations + // Receive transcript poly evaluations FF kappa = transcript.get_challenge("kappa"); - (void)kappa; std::array shifted_op_wire_evals; // std::array prev_agg_op_queue_evals; std::array agg_op_queue_evals; for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { shifted_op_wire_evals[idx] = transcript.template receive_from_prover("op_wire_eval_" + std::to_string(idx + 1)); univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, shifted_op_wire_evals[idx]}, shifted_op_wire_commitments[idx] }); - // info("univariate_opening_claims.size() = ", univariate_opening_claims.size()); - } - for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + // prev_agg_op_queue_evals[idx] = transcript.template receive_from_prover("prev_agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); + // univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, prev_agg_op_queue_evals[idx]}, prev_agg_op_queue_commitments[idx] }); agg_op_queue_evals[idx] = transcript.template receive_from_prover("agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, agg_op_queue_evals[idx]}, agg_op_queue_commitments[idx] }); - // info("univariate_opening_claims.size() = ", univariate_opening_claims.size()); } - // for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - // prev_agg_op_queue_evals[idx] = transcript.template receive_from_prover("prev_agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); - // } - - // - Check that aggregation identity holds: T_i(γ) = T_{i-1}(γ) + t_i^{shift}(γ) - - // - Add 3 {opening_pair, commitment} to the univariate_opening_claims (rename univariate opening claims?) - + // Check the identity T_i(γ) = T_{i-1}(γ) + t_i^{shift}(γ). If it fails, return false + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + // WORKTODO: add T_{i-1}(γ) to this check + if (agg_op_queue_evals[idx] != shifted_op_wire_evals[idx]) { + return false; + } + } } // Produce a Shplonk claim: commitment [Q] - [Q_z], evaluation zero (at random challenge z) From 3ccc7110e1ef200da132becfe2ed8185d05fa688 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Fri, 8 Sep 2023 19:31:42 +0000 Subject: [PATCH 09/36] basic prover functionality in place --- .../honk/proof_system/ultra_prover.cpp | 37 +++++++++++-------- .../proof_system/op_queue/ecc_op_queue.hpp | 22 +++++++---- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index 1b664a1d9ca7..851e17d8bc4d 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -246,14 +246,14 @@ template void UltraProver_::execute_op_queue_transc { if constexpr (IsGoblinFlavor) { // WORKTODO: Extract degree M_{i-1} of T_{i-1} from op_queue - size_t shift_magnitude = 0; // M_{i-1} - (void)shift_magnitude; - // auto circuit_size = key->circuit_size; + size_t prev_op_queue_degree = key->op_queue->get_previous_size(); // M_{i-1} + auto circuit_size = key->circuit_size; // Construct right-shifted op wires while ensuring that the last 'shift_magnitude' coefficients of the // original op wires are zero. // WORKTODO: Need to ensure that M_{i-1} + m_i < n. If this is not the case then we should still be able to // compute the commitment but we have to be careful. Maybe just construct shift as Polynomial(M_{i-1} + m_i)? + ASSERT(prev_op_queue_degree + key->num_ecc_op_gates < circuit_size); // M_{i-1} + m_i < n std::array shifted_op_wires; auto op_wires = key->get_ecc_op_wires(); for (size_t i = 0; i < op_wires.size(); ++i) { @@ -264,18 +264,23 @@ template void UltraProver_::execute_op_queue_transc // shifted_op_wires[i] = op_wire.get_right_shifted(shift_magnitude); } - // Get commitments [t_i^{shift}], [T_{i-1}], and [T_i] and add to transcript + // Compute/get commitments [t_i^{shift}], [T_{i-1}], and [T_i] and add to transcript + std::array prev_aggregate_op_queue_commitments; std::array shifted_op_wire_commitments; - // std::array prev_aggregate_op_queue_commitments; std::array aggregate_op_queue_commitments; for (size_t idx = 0; idx < shifted_op_wires.size(); ++idx) { + if (prev_op_queue_degree > 0) { + // WORKTODO: how to handle this. Can we serialize infinity? + prev_aggregate_op_queue_commitments[idx] = Commitment::infinity(); + } shifted_op_wire_commitments[idx] = pcs_commitment_key->commit(shifted_op_wires[idx]); - // prev_aggregate_op_queue_commitments[idx] = WORKTODO: get_previous_agg_op_queue_commitments(); aggregate_op_queue_commitments[idx] = shifted_op_wire_commitments[idx]; // WORKTODO: plus [T_{i-1}] std::string suffix = std::to_string(idx + 1); + if (prev_op_queue_degree > 0) { + transcript.send_to_verifier("PREV_AGG_ECC_OP_QUEUE_" + suffix, prev_aggregate_op_queue_commitments[idx]); + } transcript.send_to_verifier("SHIFTED_ECC_OP_WIRE_" + suffix, shifted_op_wire_commitments[idx]); - // transcript.send_to_verifier("PREV_AGG_ECC_OP_QUEUE_" + suffix, prev_aggregate_op_queue_commitments[idx]); transcript.send_to_verifier("AGG_ECC_OP_QUEUE_" + suffix, aggregate_op_queue_commitments[idx]); } @@ -284,24 +289,26 @@ template void UltraProver_::execute_op_queue_transc // combined in the batch polynomial Q in Shplonk. (The other univariate claims come from the output of Gemini). auto kappa = transcript.get_challenge("kappa"); auto evaluation = FF(0); - // auto prev_aggregate_ecc_op_transcript = key->op_queue->get_previous_aggregate_transcript(); + auto prev_aggregate_ecc_op_transcript = key->op_queue->get_previous_aggregate_transcript(); auto aggregate_ecc_op_transcript = key->op_queue->get_aggregate_transcript(); for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { std::string suffix = std::to_string(idx + 1); + // T_{i-1}(γ) + if (prev_op_queue_degree > 0) { + auto polynomial = Polynomial(prev_aggregate_ecc_op_transcript[idx]); + evaluation = polynomial.evaluate(kappa); + univariate_openings.opening_pairs.emplace_back(kappa, evaluation); + univariate_openings.witnesses.emplace_back(polynomial); // WORKTODO: std::move these + transcript.send_to_verifier("prev_agg_ecc_op_queue_eval_" + suffix, evaluation); + } + // t_i^{shift}(γ) evaluation = shifted_op_wires[idx].evaluate(kappa); univariate_openings.opening_pairs.emplace_back(kappa, evaluation); univariate_openings.witnesses.emplace_back(shifted_op_wires[idx]); // WORKTODO: std::move these transcript.send_to_verifier("op_wire_eval_", evaluation); - // T_{i-1}(γ) - // auto polynomial = Polynomial(prev_aggregate_ecc_op_transcript[idx]); - // evaluation = polynomial.evaluate(kappa); - // univariate_openings.opening_pairs.emplace_back(kappa, evaluation); - // univariate_openings.witnesses.emplace_back(polynomial); // WORKTODO: std::move these - // transcript.send_to_verifier("prev_agg_ecc_op_queue_eval_" + suffix, evaluation); - // T_i(γ) auto polynomial = Polynomial(aggregate_ecc_op_transcript[idx]); evaluation = polynomial.evaluate(kappa); diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp index 8a1fcc7c9071..7bbc93ed7b03 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp @@ -4,7 +4,7 @@ namespace proof_system { -enum EccOpCode { NULL_OP, ADD_ACCUM, MUL_ACCUM, EQUALITY}; +enum EccOpCode { NULL_OP, ADD_ACCUM, MUL_ACCUM, EQUALITY }; /** * @brief Raw description of an ECC operation used to produce equivalent descriptions over different curves. @@ -42,8 +42,11 @@ class ECCOpQueue { std::array, 4> ultra_ops; // ops encoded in the width-4 Ultra format std::vector> eccvm_ops; - size_t current_ultra_transcript_size = 0; // M_i - size_t previous_ultra_transcript_size = 0; // M_{i-1} + size_t current_ultra_ops_size = 0; // M_i + size_t previous_ultra_ops_size = 0; // M_{i-1} + + std::array ultra_ops_commitments; + std::array previous_ultra_ops_commitments; uint32_t get_number_of_muls() { @@ -66,15 +69,17 @@ class ECCOpQueue { /** * @brief Set the current and previous size of the ultra_ops transcript * - * @details previous_ultra_transcript_size = M_{i-1} is needed by the prover to extract the previous aggregate op - * queue transcript T_{i-1} from the current one T_i. + * @details previous_ultra_ops_size = M_{i-1} is needed by the prover to extract the previous aggregate op + * queue transcript T_{i-1} from the current one T_i. This method should be called when a circuit is 'finalized'. */ void set_size_data() { - previous_ultra_transcript_size = current_ultra_transcript_size; - current_ultra_transcript_size = ultra_ops.size(); + previous_ultra_ops_size = current_ultra_ops_size; + current_ultra_ops_size = ultra_ops.size(); } + [[nodiscard]] size_t get_previous_size() const { return previous_ultra_ops_size; } + /** * @brief Get a 'view' of the current ultra ops object * @@ -99,8 +104,9 @@ class ECCOpQueue { { std::vector> result; result.reserve(ultra_ops.size()); + // Construct T_{i-1} as a view of size M_{i-1} into T_i for (auto& entry : ultra_ops) { - result.emplace_back(entry.begin(), previous_ultra_transcript_size); + result.emplace_back(entry.begin(), previous_ultra_ops_size); } return result; } From 1138b7d2ef3dd3303f1b95696e7fa7a9b9e49cdd Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Sun, 10 Sep 2023 20:57:47 +0000 Subject: [PATCH 10/36] full protocol passing with mock prev op queue data --- .../composer/goblin_ultra_composer.test.cpp | 141 ++++++++++++++---- .../honk/proof_system/ultra_prover.cpp | 54 ++++--- .../honk/proof_system/ultra_verifier.cpp | 12 +- .../circuit_builder/ultra_circuit_builder.hpp | 6 +- .../proof_system/op_queue/ecc_op_queue.hpp | 7 +- 5 files changed, 158 insertions(+), 62 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp index ff4249f37b10..c2dae6013606 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp @@ -18,48 +18,131 @@ auto& engine = numeric::random::get_debug_engine(); class GoblinUltraHonkComposerTests : public ::testing::Test { protected: static void SetUpTestSuite() { barretenberg::srs::init_crs_factory("../srs_db/ignition"); } + + using Curve = curve::BN254; + using FF = Curve::ScalarField; + using Commitment = Curve::AffineElement; + using CommitmentKey = pcs::CommitmentKey; + + /** + * @brief Generate a simple test circuit with some ECC op gates and conventional arithmetic gates + * + * @param builder + */ + void generate_test_circuit(auto& builder) + { + // Add some ecc op gates + for (size_t i = 0; i < 3; ++i) { + auto point = g1::affine_one * FF::random_element(); + auto scalar = FF::random_element(); + builder.queue_ecc_mul_accum(point, scalar); + } + builder.queue_ecc_eq(); + + // Add some conventional gates that utilize public inputs + for (size_t i = 0; i < 10; ++i) { + FF a = FF::random_element(); + FF b = FF::random_element(); + FF c = FF::random_element(); + FF d = a + b + c; + uint32_t a_idx = builder.add_public_variable(a); + uint32_t b_idx = builder.add_variable(b); + uint32_t c_idx = builder.add_variable(c); + uint32_t d_idx = builder.add_variable(d); + + builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, FF(1), FF(1), FF(1), FF(-1), FF(0) }); + } + } + + /** + * @brief Populate ECC op queue with mock data as stand in for "previous circuit" in tests + * @details We currently cannot support Goblin proofs (specifically, transcript aggregation) if there is not + * existing data in the ECC op queue (since this leads to zero-commitment issues). This method populates the op + * queue with mock data so that the prover for a non-trivial circuit can behave as if it were not the prover over + * the first circuit in the stack. + * + * @param op_queue + */ + static void populate_ecc_op_queue_with_mock_data(std::shared_ptr& op_queue) + { + // WORKTODO: try to simplify this back to the 1 row example using g1(1) to commit? + size_t num_mock_rows = 2; + auto crs_factory = std::make_shared>("../srs_db/ignition"); + auto commitment_key = std::make_shared(num_mock_rows, crs_factory); + + std::array mock_op_queue_commitments; + size_t idx = 0; + for (auto& entry : op_queue->ultra_ops) { + for (size_t i = 0; i < num_mock_rows; ++i) { + auto mock_data = FF::random_element(); + entry.emplace_back(mock_data); + } + mock_op_queue_commitments[idx++] = commitment_key->commit(entry); + } + op_queue->set_size_data(); + op_queue->set_commitment_data(mock_op_queue_commitments); + } }; +// WORKTODO: currently cant support this test since T_{i-1} is empty. Either resolve this or ditch the test. +// /** +// * @brief Test proof construction/verification for a circuit with ECC op gates, public inputs, and basic arithmetic +// * gates +// * +// */ +// TEST_F(GoblinUltraHonkComposerTests, SimpleCircuit) +// { +// auto builder = UltraCircuitBuilder(); + +// generate_test_circuit(builder); + +// auto composer = GoblinUltraComposer(); +// auto prover = composer.create_prover(builder); +// auto verifier = composer.create_verifier(builder); +// auto proof = prover.construct_proof(); +// bool verified = verifier.verify_proof(proof); +// EXPECT_EQ(verified, true); +// } + /** * @brief Test proof construction/verification for a circuit with ECC op gates, public inputs, and basic arithmetic * gates * */ -TEST_F(GoblinUltraHonkComposerTests, SimpleCircuit) +TEST_F(GoblinUltraHonkComposerTests, MultipleCircuits) { - auto builder = UltraCircuitBuilder(); + // Instantiate EccOpQueue. This will be shared across all circuits in the series + auto op_queue = std::make_shared(); - // Define an arbitrary number of operations/gates - size_t num_ecc_ops = 3; - size_t num_conventional_gates = 10; + populate_ecc_op_queue_with_mock_data(op_queue); - // Add some ecc op gates - for (size_t i = 0; i < num_ecc_ops; ++i) { - auto point = g1::affine_one * fr::random_element(); - auto scalar = fr::random_element(); - builder.queue_ecc_mul_accum(point, scalar); - } + // Construct first circuit and its proof + { + auto builder = UltraCircuitBuilder(op_queue); - // Add some conventional gates that utlize public inputs - for (size_t i = 0; i < num_conventional_gates; ++i) { - fr a = fr::random_element(); - fr b = fr::random_element(); - fr c = fr::random_element(); - fr d = a + b + c; - uint32_t a_idx = builder.add_public_variable(a); - uint32_t b_idx = builder.add_variable(b); - uint32_t c_idx = builder.add_variable(c); - uint32_t d_idx = builder.add_variable(d); - - builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, fr(1), fr(1), fr(1), fr(-1), fr(0) }); + generate_test_circuit(builder); + + auto composer = GoblinUltraComposer(); + auto prover = composer.create_prover(builder); + auto verifier = composer.create_verifier(builder); + auto proof = prover.construct_proof(); + bool verified = verifier.verify_proof(proof); + EXPECT_EQ(verified, true); } - auto composer = GoblinUltraComposer(); - auto prover = composer.create_prover(builder); - auto verifier = composer.create_verifier(builder); - auto proof = prover.construct_proof(); - bool verified = verifier.verify_proof(proof); - EXPECT_EQ(verified, true); + // // Construct second circuit + // { + // auto builder = UltraCircuitBuilder(op_queue); + + // generate_test_circuit(builder); + + // auto composer = GoblinUltraComposer(); + // auto prover = composer.create_prover(builder); + // auto verifier = composer.create_verifier(builder); + // auto proof = prover.construct_proof(); + // bool verified = verifier.verify_proof(proof); + // EXPECT_EQ(verified, true); + // } } } // namespace test_ultra_honk_composer diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index 851e17d8bc4d..a8c40a927f76 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -245,23 +245,27 @@ template void UltraProver_::execute_pcs_evaluation_ template void UltraProver_::execute_op_queue_transcript_aggregation_round() { if constexpr (IsGoblinFlavor) { - // WORKTODO: Extract degree M_{i-1} of T_{i-1} from op_queue - size_t prev_op_queue_degree = key->op_queue->get_previous_size(); // M_{i-1} + // Extract size M_{i-1} of T_{i-1} from op_queue + size_t prev_op_queue_size = key->op_queue->get_previous_size(); // M_{i-1} + // WORKTODO: Cannot currently support an empty T_{i-1}. Need to be able to properly handle zero commitment. + ASSERT(prev_op_queue_size > 0); + auto circuit_size = key->circuit_size; // Construct right-shifted op wires while ensuring that the last 'shift_magnitude' coefficients of the // original op wires are zero. // WORKTODO: Need to ensure that M_{i-1} + m_i < n. If this is not the case then we should still be able to // compute the commitment but we have to be careful. Maybe just construct shift as Polynomial(M_{i-1} + m_i)? - ASSERT(prev_op_queue_degree + key->num_ecc_op_gates < circuit_size); // M_{i-1} + m_i < n + ASSERT(prev_op_queue_size + key->num_ecc_op_gates < circuit_size); // M_{i-1} + m_i < n std::array shifted_op_wires; + // WORKTODO: maybe implement get_shifted_ecc_op_wires since we actually ne the left-shift-by-1 auto op_wires = key->get_ecc_op_wires(); for (size_t i = 0; i < op_wires.size(); ++i) { auto op_wire = Polynomial(op_wires[i]); - // WORKTODO: shifting one to the left right now to account for the zero-row-offset that is not present in - // T_i. Need to make a decision on whether to account for this issue in the t_i or in the T_i. - shifted_op_wires[i] = Polynomial(op_wire.shifted()); - // shifted_op_wires[i] = op_wire.get_right_shifted(shift_magnitude); + // WORKTODO: First we get t_i via a left-shift of the op wires (to remove the zero row)... + auto current_op_queue_data = Polynomial(op_wire.shifted()); + // Then we shift the result right by M_{i-1} + shifted_op_wires[i] = current_op_queue_data.get_right_shifted(prev_op_queue_size); } // Compute/get commitments [t_i^{shift}], [T_{i-1}], and [T_i] and add to transcript @@ -269,21 +273,23 @@ template void UltraProver_::execute_op_queue_transc std::array shifted_op_wire_commitments; std::array aggregate_op_queue_commitments; for (size_t idx = 0; idx < shifted_op_wires.size(); ++idx) { - if (prev_op_queue_degree > 0) { - // WORKTODO: how to handle this. Can we serialize infinity? - prev_aggregate_op_queue_commitments[idx] = Commitment::infinity(); - } + prev_aggregate_op_queue_commitments[idx] = key->op_queue->ultra_ops_commitments[idx]; shifted_op_wire_commitments[idx] = pcs_commitment_key->commit(shifted_op_wires[idx]); - aggregate_op_queue_commitments[idx] = shifted_op_wire_commitments[idx]; // WORKTODO: plus [T_{i-1}] + aggregate_op_queue_commitments[idx] = + prev_aggregate_op_queue_commitments[idx] + shifted_op_wire_commitments[idx]; + // WORKTODO: right now only send if [T_{i-1}] != infinity, i.e. if we're proving a circuit that is not the + // first in a series. How to handle this? Need serialization of infinity? std::string suffix = std::to_string(idx + 1); - if (prev_op_queue_degree > 0) { - transcript.send_to_verifier("PREV_AGG_ECC_OP_QUEUE_" + suffix, prev_aggregate_op_queue_commitments[idx]); - } + transcript.send_to_verifier("PREV_AGG_ECC_OP_QUEUE_" + suffix, prev_aggregate_op_queue_commitments[idx]); transcript.send_to_verifier("SHIFTED_ECC_OP_WIRE_" + suffix, shifted_op_wire_commitments[idx]); transcript.send_to_verifier("AGG_ECC_OP_QUEUE_" + suffix, aggregate_op_queue_commitments[idx]); } + // WORKTODO: Store the commitments [T_{i-1}] (to be used later in subsequent iterations as [T_{i-1}]). If this + // is correct way to do this then it should probably be done outside of the prover in the 'ambient' space. + key->op_queue->set_commitment_data(aggregate_op_queue_commitments); + // Compute evaluations T_i(γ), T_{i-1}(γ), t_i^{shift}(γ), add to transcript. // Note: For each polynomial we add a univariate opening claim {(γ, p(γ)), p(X)} to the set of claims to be // combined in the batch polynomial Q in Shplonk. (The other univariate claims come from the output of Gemini). @@ -294,23 +300,23 @@ template void UltraProver_::execute_op_queue_transc for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { std::string suffix = std::to_string(idx + 1); + // WORKTODO: implement evaluate method that takes a span and a point + // T_{i-1}(γ) - if (prev_op_queue_degree > 0) { - auto polynomial = Polynomial(prev_aggregate_ecc_op_transcript[idx]); - evaluation = polynomial.evaluate(kappa); - univariate_openings.opening_pairs.emplace_back(kappa, evaluation); - univariate_openings.witnesses.emplace_back(polynomial); // WORKTODO: std::move these - transcript.send_to_verifier("prev_agg_ecc_op_queue_eval_" + suffix, evaluation); - } + auto polynomial = Polynomial(prev_aggregate_ecc_op_transcript[idx]); + evaluation = polynomial.evaluate(kappa); + univariate_openings.opening_pairs.emplace_back(kappa, evaluation); + univariate_openings.witnesses.emplace_back(polynomial); // WORKTODO: std::move these + transcript.send_to_verifier("prev_agg_ecc_op_queue_eval_" + suffix, evaluation); // t_i^{shift}(γ) evaluation = shifted_op_wires[idx].evaluate(kappa); univariate_openings.opening_pairs.emplace_back(kappa, evaluation); univariate_openings.witnesses.emplace_back(shifted_op_wires[idx]); // WORKTODO: std::move these - transcript.send_to_verifier("op_wire_eval_", evaluation); + transcript.send_to_verifier("op_wire_eval_" + suffix, evaluation); // T_i(γ) - auto polynomial = Polynomial(aggregate_ecc_op_transcript[idx]); + polynomial = Polynomial(aggregate_ecc_op_transcript[idx]); evaluation = polynomial.evaluate(kappa); univariate_openings.opening_pairs.emplace_back(kappa, evaluation); univariate_openings.witnesses.emplace_back(polynomial); // WORKTODO: std::move these diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp index c580b59bc125..c28f8418d853 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp @@ -170,24 +170,24 @@ template bool UltraVerifier_::verify_proof(const plonk if constexpr (IsGoblinFlavor) { // Receive commitments [t_i^{shift}], [T_{i-1}], and [T_i] std::array shifted_op_wire_commitments; - // std::array prev_agg_op_queue_commitments; + std::array prev_agg_op_queue_commitments; std::array agg_op_queue_commitments; for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { shifted_op_wire_commitments[idx] = transcript.template receive_from_prover("SHIFTED_ECC_OP_WIRE_" + std::to_string(idx + 1)); - // prev_agg_op_queue_commitments[idx] = transcript.template receive_from_prover("PREV_AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); + prev_agg_op_queue_commitments[idx] = transcript.template receive_from_prover("PREV_AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); agg_op_queue_commitments[idx] = transcript.template receive_from_prover("AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); } // Receive transcript poly evaluations FF kappa = transcript.get_challenge("kappa"); std::array shifted_op_wire_evals; - // std::array prev_agg_op_queue_evals; + std::array prev_agg_op_queue_evals; std::array agg_op_queue_evals; for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { shifted_op_wire_evals[idx] = transcript.template receive_from_prover("op_wire_eval_" + std::to_string(idx + 1)); univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, shifted_op_wire_evals[idx]}, shifted_op_wire_commitments[idx] }); - // prev_agg_op_queue_evals[idx] = transcript.template receive_from_prover("prev_agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); - // univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, prev_agg_op_queue_evals[idx]}, prev_agg_op_queue_commitments[idx] }); + prev_agg_op_queue_evals[idx] = transcript.template receive_from_prover("prev_agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); + univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, prev_agg_op_queue_evals[idx]}, prev_agg_op_queue_commitments[idx] }); agg_op_queue_evals[idx] = transcript.template receive_from_prover("agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, agg_op_queue_evals[idx]}, agg_op_queue_commitments[idx] }); } @@ -195,7 +195,7 @@ template bool UltraVerifier_::verify_proof(const plonk // Check the identity T_i(γ) = T_{i-1}(γ) + t_i^{shift}(γ). If it fails, return false for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { // WORKTODO: add T_{i-1}(γ) to this check - if (agg_op_queue_evals[idx] != shifted_op_wire_evals[idx]) { + if (agg_op_queue_evals[idx] != prev_agg_op_queue_evals[idx] + shifted_op_wire_evals[idx]) { return false; } } diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp index 3a7f23623bb2..3db0c1d41504 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp @@ -601,9 +601,9 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBase op_queue_in = std::make_shared()) : CircuitBuilderBase>(ultra_selector_names(), size_hint) - , op_queue(std::make_shared()) + , op_queue(op_queue_in) { w_l.reserve(size_hint); w_r.reserve(size_hint); @@ -617,6 +617,8 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBase op_queue_in) + : UltraCircuitBuilder_(0, op_queue_in) {} UltraCircuitBuilder_(const UltraCircuitBuilder_& other) = delete; UltraCircuitBuilder_(UltraCircuitBuilder_&& other) : CircuitBuilderBase>(std::move(other)) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp index 7bbc93ed7b03..7197035b76d6 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp @@ -75,11 +75,16 @@ class ECCOpQueue { void set_size_data() { previous_ultra_ops_size = current_ultra_ops_size; - current_ultra_ops_size = ultra_ops.size(); + current_ultra_ops_size = ultra_ops[0].size(); } [[nodiscard]] size_t get_previous_size() const { return previous_ultra_ops_size; } + void set_commitment_data(std::array& commitments) { + previous_ultra_ops_commitments = ultra_ops_commitments; + ultra_ops_commitments = commitments; + } + /** * @brief Get a 'view' of the current ultra ops object * From ce0e92e773f0c53c4a187c8a3922b4deee36e4da Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Mon, 11 Sep 2023 21:00:01 +0000 Subject: [PATCH 11/36] test improvement, new right shift, cleanup --- .../composer/goblin_ultra_composer.test.cpp | 106 +++++++++++------- .../honk/proof_system/ultra_prover.cpp | 68 +++++------ .../honk/proof_system/ultra_verifier.cpp | 6 +- .../barretenberg/polynomials/polynomial.hpp | 35 ++++++ 4 files changed, 133 insertions(+), 82 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp index c2dae6013606..afda145a755f 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp @@ -58,51 +58,53 @@ class GoblinUltraHonkComposerTests : public ::testing::Test { * @brief Populate ECC op queue with mock data as stand in for "previous circuit" in tests * @details We currently cannot support Goblin proofs (specifically, transcript aggregation) if there is not * existing data in the ECC op queue (since this leads to zero-commitment issues). This method populates the op - * queue with mock data so that the prover for a non-trivial circuit can behave as if it were not the prover over - * the first circuit in the stack. + * queue with mock data so that the prover of an arbitrary 'first' circuit can behave as if it were not the prover + * over the first circuit in the stack. * * @param op_queue */ static void populate_ecc_op_queue_with_mock_data(std::shared_ptr& op_queue) { - // WORKTODO: try to simplify this back to the 1 row example using g1(1) to commit? - size_t num_mock_rows = 2; - auto crs_factory = std::make_shared>("../srs_db/ignition"); - auto commitment_key = std::make_shared(num_mock_rows, crs_factory); - + // Add a single row of data to the op queue and commit to each column as [1] * FF(data) std::array mock_op_queue_commitments; size_t idx = 0; for (auto& entry : op_queue->ultra_ops) { - for (size_t i = 0; i < num_mock_rows; ++i) { - auto mock_data = FF::random_element(); - entry.emplace_back(mock_data); - } - mock_op_queue_commitments[idx++] = commitment_key->commit(entry); + auto mock_data = FF::random_element(); + entry.emplace_back(mock_data); + mock_op_queue_commitments[idx++] = Commitment::one() * mock_data; } + // Set some internal data based on the size of the op queue data op_queue->set_size_data(); + // Add the commitments to the op queue data for use by the next circuit op_queue->set_commitment_data(mock_op_queue_commitments); } }; -// WORKTODO: currently cant support this test since T_{i-1} is empty. Either resolve this or ditch the test. -// /** -// * @brief Test proof construction/verification for a circuit with ECC op gates, public inputs, and basic arithmetic -// * gates -// * -// */ -// TEST_F(GoblinUltraHonkComposerTests, SimpleCircuit) -// { -// auto builder = UltraCircuitBuilder(); - -// generate_test_circuit(builder); - -// auto composer = GoblinUltraComposer(); -// auto prover = composer.create_prover(builder); -// auto verifier = composer.create_verifier(builder); -// auto proof = prover.construct_proof(); -// bool verified = verifier.verify_proof(proof); -// EXPECT_EQ(verified, true); -// } +/** + * @brief Test proof construction/verification for a circuit with ECC op gates, public inputs, and basic arithmetic + * gates + * @note We simulate op queue interactions with a previous circuit so the actual circuit under test utilizes an op queue + * with non-empty 'previous' data. This avoid complications with zero-commitments etc. + * + */ +TEST_F(GoblinUltraHonkComposerTests, SingleCircuit) +{ + auto op_queue = std::make_shared(); + + // Add mock data to op queue to simulate interaction with a previous circuit + populate_ecc_op_queue_with_mock_data(op_queue); + + auto builder = UltraCircuitBuilder(op_queue); + + generate_test_circuit(builder); + + auto composer = GoblinUltraComposer(); + auto prover = composer.create_prover(builder); + auto verifier = composer.create_verifier(builder); + auto proof = prover.construct_proof(); + bool verified = verifier.verify_proof(proof); + EXPECT_EQ(verified, true); +} /** * @brief Test proof construction/verification for a circuit with ECC op gates, public inputs, and basic arithmetic @@ -114,13 +116,18 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuits) // Instantiate EccOpQueue. This will be shared across all circuits in the series auto op_queue = std::make_shared(); + // Add mock data to op queue to simulate interaction with a previous circuit populate_ecc_op_queue_with_mock_data(op_queue); + // Track the expected size of the op queue transcript + size_t expected_op_queue_size = 1; // +1 from mock data + // Construct first circuit and its proof { auto builder = UltraCircuitBuilder(op_queue); generate_test_circuit(builder); + expected_op_queue_size += builder.num_ecc_op_gates; auto composer = GoblinUltraComposer(); auto prover = composer.create_prover(builder); @@ -130,19 +137,34 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuits) EXPECT_EQ(verified, true); } - // // Construct second circuit - // { - // auto builder = UltraCircuitBuilder(op_queue); + // Construct second circuit + { + auto builder = UltraCircuitBuilder(op_queue); - // generate_test_circuit(builder); + generate_test_circuit(builder); + expected_op_queue_size += builder.num_ecc_op_gates; - // auto composer = GoblinUltraComposer(); - // auto prover = composer.create_prover(builder); - // auto verifier = composer.create_verifier(builder); - // auto proof = prover.construct_proof(); - // bool verified = verifier.verify_proof(proof); - // EXPECT_EQ(verified, true); - // } + auto composer = GoblinUltraComposer(); + auto prover = composer.create_prover(builder); + auto verifier = composer.create_verifier(builder); + auto proof = prover.construct_proof(); + bool verified = verifier.verify_proof(proof); + EXPECT_EQ(verified, true); + } + + // Check that the op queue contains the expected number of entries + size_t aggregate_op_queue_size = op_queue->current_ultra_ops_size; + EXPECT_EQ(expected_op_queue_size, aggregate_op_queue_size); + + // Compute the commitments to the aggregate op queue directly and check that they match those that were computed + // iteratively during transcript aggregation by the provers and stored in the op queue. + auto crs_factory = std::make_shared>("../srs_db/ignition"); + auto commitment_key = std::make_shared(aggregate_op_queue_size, crs_factory); + size_t idx = 0; + for (auto& result : op_queue->ultra_ops_commitments) { + auto expected = commitment_key->commit(op_queue->ultra_ops[idx++]); + EXPECT_EQ(result, expected); + } } } // namespace test_ultra_honk_composer diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index a8c40a927f76..c29de6d2d1f5 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -247,79 +247,73 @@ template void UltraProver_::execute_op_queue_transc if constexpr (IsGoblinFlavor) { // Extract size M_{i-1} of T_{i-1} from op_queue size_t prev_op_queue_size = key->op_queue->get_previous_size(); // M_{i-1} - // WORKTODO: Cannot currently support an empty T_{i-1}. Need to be able to properly handle zero commitment. + // TODO(#723): Cannot currently support an empty T_{i-1}. Need to be able to properly handle zero commitment. ASSERT(prev_op_queue_size > 0); auto circuit_size = key->circuit_size; - // Construct right-shifted op wires while ensuring that the last 'shift_magnitude' coefficients of the - // original op wires are zero. - // WORKTODO: Need to ensure that M_{i-1} + m_i < n. If this is not the case then we should still be able to - // compute the commitment but we have to be careful. Maybe just construct shift as Polynomial(M_{i-1} + m_i)? + // TODO(#723): The below assert ensures that M_{i-1} + m_i < n, i.e. the right shifted result can be expressed + // as a size n polynomial. If this is not the case then we should still be able to proceed without increasing + // the circuit size but need to handle with care. ASSERT(prev_op_queue_size + key->num_ecc_op_gates < circuit_size); // M_{i-1} + m_i < n - std::array shifted_op_wires; - // WORKTODO: maybe implement get_shifted_ecc_op_wires since we actually ne the left-shift-by-1 + + // Construct right-shift of op wires t_i^{shift} so that T_i(X) = T_{i-1}(X) + t_i^{shift}(X). + // Note: The op_wire polynomials (like all others) have constant coefficient equal to zero. Thus to obtain + // t_i^{shift} we must left-shift by 1 then right-shift by M_{i-1}, or equivalently, right-shift by + // M_{i-1} - 1. + std::array right_shifted_op_wires; auto op_wires = key->get_ecc_op_wires(); for (size_t i = 0; i < op_wires.size(); ++i) { - auto op_wire = Polynomial(op_wires[i]); - // WORKTODO: First we get t_i via a left-shift of the op wires (to remove the zero row)... - auto current_op_queue_data = Polynomial(op_wire.shifted()); - // Then we shift the result right by M_{i-1} - shifted_op_wires[i] = current_op_queue_data.get_right_shifted(prev_op_queue_size); + // Right shift by M_{i-1} - 1. + right_shifted_op_wires[i].set_to_right_shifted(op_wires[i], prev_op_queue_size - 1); } // Compute/get commitments [t_i^{shift}], [T_{i-1}], and [T_i] and add to transcript - std::array prev_aggregate_op_queue_commitments; - std::array shifted_op_wire_commitments; std::array aggregate_op_queue_commitments; - for (size_t idx = 0; idx < shifted_op_wires.size(); ++idx) { - prev_aggregate_op_queue_commitments[idx] = key->op_queue->ultra_ops_commitments[idx]; - shifted_op_wire_commitments[idx] = pcs_commitment_key->commit(shifted_op_wires[idx]); - aggregate_op_queue_commitments[idx] = - prev_aggregate_op_queue_commitments[idx] + shifted_op_wire_commitments[idx]; - - // WORKTODO: right now only send if [T_{i-1}] != infinity, i.e. if we're proving a circuit that is not the - // first in a series. How to handle this? Need serialization of infinity? + for (size_t idx = 0; idx < right_shifted_op_wires.size(); ++idx) { + // Get previous transcript commitment [T_{i-1}] from op queue + auto prev_aggregate_op_queue_commitment = key->op_queue->ultra_ops_commitments[idx]; + // Compute commitment [t_i^{shift}] directly + auto shifted_op_wire_commitment = pcs_commitment_key->commit(right_shifted_op_wires[idx]); + // Compute updated aggregate transcript commitmen as [T_i] = [T_{i-1}] + [t_i^{shift}] + aggregate_op_queue_commitments[idx] = prev_aggregate_op_queue_commitment + shifted_op_wire_commitment; + std::string suffix = std::to_string(idx + 1); - transcript.send_to_verifier("PREV_AGG_ECC_OP_QUEUE_" + suffix, prev_aggregate_op_queue_commitments[idx]); - transcript.send_to_verifier("SHIFTED_ECC_OP_WIRE_" + suffix, shifted_op_wire_commitments[idx]); + transcript.send_to_verifier("PREV_AGG_ECC_OP_QUEUE_" + suffix, prev_aggregate_op_queue_commitment); + transcript.send_to_verifier("SHIFTED_ECC_OP_WIRE_" + suffix, shifted_op_wire_commitment); transcript.send_to_verifier("AGG_ECC_OP_QUEUE_" + suffix, aggregate_op_queue_commitments[idx]); } - // WORKTODO: Store the commitments [T_{i-1}] (to be used later in subsequent iterations as [T_{i-1}]). If this - // is correct way to do this then it should probably be done outside of the prover in the 'ambient' space. + // Store the commitments [T_{i}] (to be used later in subsequent iterations as [T_{i-1}]). key->op_queue->set_commitment_data(aggregate_op_queue_commitments); - // Compute evaluations T_i(γ), T_{i-1}(γ), t_i^{shift}(γ), add to transcript. - // Note: For each polynomial we add a univariate opening claim {(γ, p(γ)), p(X)} to the set of claims to be - // combined in the batch polynomial Q in Shplonk. (The other univariate claims come from the output of Gemini). + // Compute evaluations T_i(γ), T_{i-1}(γ), t_i^{shift}(γ), add to transcript. For each polynomial we add a + // univariate opening claim {(γ, p(γ)), p(X)} to the set of claims to be combined in the batch univariate + // polynomial Q in Shplonk. (The other univariate claims come from the output of Gemini). auto kappa = transcript.get_challenge("kappa"); - auto evaluation = FF(0); auto prev_aggregate_ecc_op_transcript = key->op_queue->get_previous_aggregate_transcript(); auto aggregate_ecc_op_transcript = key->op_queue->get_aggregate_transcript(); for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { std::string suffix = std::to_string(idx + 1); - // WORKTODO: implement evaluate method that takes a span and a point - // T_{i-1}(γ) auto polynomial = Polynomial(prev_aggregate_ecc_op_transcript[idx]); - evaluation = polynomial.evaluate(kappa); + auto evaluation = polynomial.evaluate(kappa); univariate_openings.opening_pairs.emplace_back(kappa, evaluation); - univariate_openings.witnesses.emplace_back(polynomial); // WORKTODO: std::move these + univariate_openings.witnesses.emplace_back(std::move(polynomial)); transcript.send_to_verifier("prev_agg_ecc_op_queue_eval_" + suffix, evaluation); // t_i^{shift}(γ) - evaluation = shifted_op_wires[idx].evaluate(kappa); + evaluation = right_shifted_op_wires[idx].evaluate(kappa); univariate_openings.opening_pairs.emplace_back(kappa, evaluation); - univariate_openings.witnesses.emplace_back(shifted_op_wires[idx]); // WORKTODO: std::move these + univariate_openings.witnesses.emplace_back(std::move(right_shifted_op_wires[idx])); transcript.send_to_verifier("op_wire_eval_" + suffix, evaluation); // T_i(γ) polynomial = Polynomial(aggregate_ecc_op_transcript[idx]); evaluation = polynomial.evaluate(kappa); univariate_openings.opening_pairs.emplace_back(kappa, evaluation); - univariate_openings.witnesses.emplace_back(polynomial); // WORKTODO: std::move these + univariate_openings.witnesses.emplace_back(std::move(polynomial)); transcript.send_to_verifier("agg_ecc_op_queue_eval_" + suffix, evaluation); } } diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp index c28f8418d853..017f89cb9d13 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp @@ -185,16 +185,16 @@ template bool UltraVerifier_::verify_proof(const plonk std::array agg_op_queue_evals; for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { shifted_op_wire_evals[idx] = transcript.template receive_from_prover("op_wire_eval_" + std::to_string(idx + 1)); - univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, shifted_op_wire_evals[idx]}, shifted_op_wire_commitments[idx] }); prev_agg_op_queue_evals[idx] = transcript.template receive_from_prover("prev_agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); - univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, prev_agg_op_queue_evals[idx]}, prev_agg_op_queue_commitments[idx] }); agg_op_queue_evals[idx] = transcript.template receive_from_prover("agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); + + univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, shifted_op_wire_evals[idx]}, shifted_op_wire_commitments[idx] }); + univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, prev_agg_op_queue_evals[idx]}, prev_agg_op_queue_commitments[idx] }); univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, agg_op_queue_evals[idx]}, agg_op_queue_commitments[idx] }); } // Check the identity T_i(γ) = T_{i-1}(γ) + t_i^{shift}(γ). If it fails, return false for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - // WORKTODO: add T_{i-1}(γ) to this check if (agg_op_queue_evals[idx] != prev_agg_op_queue_evals[idx] + shifted_op_wire_evals[idx]) { return false; } diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp index b655fabf692a..b535a5db1d06 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp @@ -149,6 +149,41 @@ template class Polynomial { return std::span{ coefficients_.get() + 1, size_ }; } + /** + * @brief Set self to the right shift of input coefficients + * @details Set the size of self to match the input then set coefficients equal to right shift of input, assuming + * last shift-size many inputs are zero. + * + * @param coeffs_in + * @param shift_size + */ + void set_to_right_shifted(std::span coeffs_in, size_t shift_size = 1) + { + auto size_in = coeffs_in.size(); + ASSERT(size_in > 0); + ASSERT(shift_size < size_in); + // Ensure that the last shift_size-many input coefficients are zero + for (size_t i = 0; i < shift_size; ++i) { + size_t idx = size_in - shift_size - 1; + ASSERT(coeffs_in[idx].is_zero()); + } + + // Set size of self equal to size of input + size_ = size_in; + coefficients_ = allocate_aligned_memory(sizeof(Fr) * capacity()); + + // Zero out the first shift_size-many coefficients + memset(static_cast(coefficients_.get()), 0, sizeof(Fr) * shift_size); + + // Complete construction of right shift by copying num_to_copy-many input coeffs into self at the shift_size-th + // index. + std::size_t num_to_copy = size_ - shift_size; + memcpy(static_cast(coefficients_.get() + shift_size), + static_cast(coeffs_in.data()), + sizeof(Fr) * num_to_copy); + zero_memory_beyond(size_); + } + /** * @brief Returns the right-shift of self by given magnitude k. * From 81fbe06fee35bb3f3ea6347f6dfafdaacb0334d7 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Mon, 11 Sep 2023 22:14:25 +0000 Subject: [PATCH 12/36] resolve some todos in the builder --- .../circuit_builder/ultra_circuit_builder.cpp | 50 +++++++++---------- .../circuit_builder/ultra_circuit_builder.hpp | 2 +- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp index c0c0aabaaa57..3274c3e6ba8f 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp @@ -514,8 +514,8 @@ ecc_op_tuple UltraCircuitBuilder_::queue_ecc_add_accum(const barretenberg::g // Add raw op to queue op_queue->add_accumulate(point); - // Add ecc op gates - auto op_tuple = make_ecc_op_tuple(add_accum_op_idx, point); + // Decompose operation inputs into width-four form and add ecc op gates + auto op_tuple = decompose_ecc_operands(add_accum_op_idx, point); populate_ecc_op_wires(op_tuple); return op_tuple; @@ -536,8 +536,8 @@ ecc_op_tuple UltraCircuitBuilder_::queue_ecc_mul_accum(const barretenberg::g // Add raw op to op queue op_queue->mul_accumulate(point, scalar); - // Add ecc op gates - auto op_tuple = make_ecc_op_tuple(mul_accum_op_idx, point, scalar); + // Decompose operation inputs into width-four form and add ecc op gates + auto op_tuple = decompose_ecc_operands(mul_accum_op_idx, point, scalar); populate_ecc_op_wires(op_tuple); return op_tuple; @@ -553,8 +553,8 @@ template ecc_op_tuple UltraCircuitBuilder_::queue_ecc_eq() // Add raw op to op queue auto point = op_queue->eq(); - // Add ecc op gates - auto op_tuple = make_ecc_op_tuple(equality_op_idx, point); + // Decompose operation inputs into width-four form and add ecc op gates + auto op_tuple = decompose_ecc_operands(equality_op_idx, point); populate_ecc_op_wires(op_tuple); return op_tuple; @@ -563,14 +563,15 @@ template ecc_op_tuple UltraCircuitBuilder_::queue_ecc_eq() /** * @brief Decompose ecc operands into components, add corresponding variables, return ecc op tuple * - * @param op + * @param op_idx Index of op code in variables array * @param point * @param scalar * @return ecc_op_tuple Tuple of indices into variables array used to construct pair of ecc op gates */ template -ecc_op_tuple UltraCircuitBuilder_::make_ecc_op_tuple(uint32_t op_idx, const g1::affine_element& point, const FF& scalar) +ecc_op_tuple UltraCircuitBuilder_::decompose_ecc_operands(uint32_t op_idx, const g1::affine_element& point, const FF& scalar) { + // Decompose point coordinates (Fq) into hi-lo chunks (Fr) const size_t CHUNK_SIZE = 2 * DEFAULT_NON_NATIVE_FIELD_LIMB_BITS; auto x_256 = uint256_t(point.x); auto y_256 = uint256_t(point.y); @@ -578,37 +579,34 @@ ecc_op_tuple UltraCircuitBuilder_::make_ecc_op_tuple(uint32_t op_idx, const auto x_hi = FF(x_256.slice(CHUNK_SIZE, CHUNK_SIZE * 2)); auto y_lo = FF(y_256.slice(0, CHUNK_SIZE)); auto y_hi = FF(y_256.slice(CHUNK_SIZE, CHUNK_SIZE * 2)); - auto x_lo_idx = this->add_variable(x_lo); - auto x_hi_idx = this->add_variable(x_hi); - auto y_lo_idx = this->add_variable(y_lo); - auto y_hi_idx = this->add_variable(y_hi); // Split scalar into 128 bit endomorphism scalars FF z_1 = 0; FF z_2 = 0; - // TODO(luke): do this montgomery conversion here? - // auto converted = scalar.from_montgomery_form(); - // fr::split_into_endomorphism_scalars(converted, z_1, z_2); - // z_1 = z_1.to_montgomery_form(); - // z_2 = z_2.to_montgomery_form(); - FF::split_into_endomorphism_scalars(scalar, z_1, z_2); - auto z_1_idx = this->add_variable(z_1); - auto z_2_idx = this->add_variable(z_2); + auto converted = scalar.from_montgomery_form(); + FF::split_into_endomorphism_scalars(converted, z_1, z_2); + z_1 = z_1.to_montgomery_form(); + z_2 = z_2.to_montgomery_form(); - // Populate ultra ops in OpQueue - // WORKTODO: Need to decide where to put this. It's possible the decompositions should take place in the EccOpQueue - // and the adding of variables and constructing of witnesses should take place in the builder. Decide on the right - // division of labor. Is there a way to have only one know about the wayn in which ops are placed across wires? - op_queue->ultra_ops[0].emplace_back(op_idx); + // Populate ultra ops in OpQueue with the decomposed operands + op_queue->ultra_ops[0].emplace_back(this->variables[op_idx]); op_queue->ultra_ops[1].emplace_back(x_lo); op_queue->ultra_ops[2].emplace_back(x_hi); op_queue->ultra_ops[3].emplace_back(y_lo); - op_queue->ultra_ops[0].emplace_back(op_idx); // TODO(luke): second op val is sort of a dummy. use "op" again? + op_queue->ultra_ops[0].emplace_back(this->variables[op_idx]); op_queue->ultra_ops[1].emplace_back(y_hi); op_queue->ultra_ops[2].emplace_back(z_1); op_queue->ultra_ops[3].emplace_back(z_2); + // Add variables for decomposition and get indices needed for op wires + auto x_lo_idx = this->add_variable(x_lo); + auto x_hi_idx = this->add_variable(x_hi); + auto y_lo_idx = this->add_variable(y_lo); + auto y_hi_idx = this->add_variable(y_hi); + auto z_1_idx = this->add_variable(z_1); + auto z_2_idx = this->add_variable(z_2); + return { op_idx, x_lo_idx, x_hi_idx, y_lo_idx, y_hi_idx, z_1_idx, z_2_idx }; } diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp index 3db0c1d41504..2a72789ab20e 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp @@ -727,7 +727,7 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBase Date: Mon, 11 Sep 2023 23:09:14 +0000 Subject: [PATCH 13/36] fix build error --- .../honk/proof_system/ultra_prover.cpp | 6 ++--- .../honk/proof_system/ultra_prover.hpp | 1 + .../barretenberg/polynomials/polynomial.hpp | 23 ------------------- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index c29de6d2d1f5..bf355776feff 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -299,20 +299,20 @@ template void UltraProver_::execute_op_queue_transc // T_{i-1}(γ) auto polynomial = Polynomial(prev_aggregate_ecc_op_transcript[idx]); auto evaluation = polynomial.evaluate(kappa); - univariate_openings.opening_pairs.emplace_back(kappa, evaluation); + univariate_openings.opening_pairs.emplace_back(OpenPair{kappa, evaluation}); univariate_openings.witnesses.emplace_back(std::move(polynomial)); transcript.send_to_verifier("prev_agg_ecc_op_queue_eval_" + suffix, evaluation); // t_i^{shift}(γ) evaluation = right_shifted_op_wires[idx].evaluate(kappa); - univariate_openings.opening_pairs.emplace_back(kappa, evaluation); + univariate_openings.opening_pairs.emplace_back(OpenPair{kappa, evaluation}); univariate_openings.witnesses.emplace_back(std::move(right_shifted_op_wires[idx])); transcript.send_to_verifier("op_wire_eval_" + suffix, evaluation); // T_i(γ) polynomial = Polynomial(aggregate_ecc_op_transcript[idx]); evaluation = polynomial.evaluate(kappa); - univariate_openings.opening_pairs.emplace_back(kappa, evaluation); + univariate_openings.opening_pairs.emplace_back(OpenPair{kappa, evaluation}); univariate_openings.witnesses.emplace_back(std::move(polynomial)); transcript.send_to_verifier("agg_ecc_op_queue_eval_" + suffix, evaluation); } diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp index c3fa27634c81..798420718108 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp @@ -25,6 +25,7 @@ template class UltraProver_ { using ProverPolynomials = typename Flavor::ProverPolynomials; using CommitmentLabels = typename Flavor::CommitmentLabels; using Curve = typename Flavor::Curve; + using OpenPair = pcs::OpeningPair; public: explicit UltraProver_(std::shared_ptr input_key, std::shared_ptr commitment_key); diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp index b535a5db1d06..8c704b64a3de 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp @@ -184,29 +184,6 @@ template class Polynomial { zero_memory_beyond(size_); } - /** - * @brief Returns the right-shift of self by given magnitude k. - * - * @details Asserts that the last k coefficients of self are zero. - */ - [[nodiscard]] Polynomial get_right_shifted(size_t shift_size = 1) const - { - ASSERT(size_ > 0); - ASSERT(shift_size < size_); - // Ensure that the last k coefficients of the pre-shifted polynomial are zero - for (size_t i = 0; i < shift_size; ++i) { - size_t idx = size_ - shift_size - 1; - ASSERT(coefficients_[(std::ptrdiff_t)idx].is_zero()); - } - // Compute the right-shift-by-k of the polynomial - // Note: first shift_size coefficients of result will be zero - Polynomial right_shifted(size_); - for (size_t idx = 0; idx < size_ - shift_size; ++idx) { - right_shifted.at(idx + shift_size) = coefficients_[(std::ptrdiff_t)idx]; - } - return right_shifted; - } - /** * @brief adds the polynomial q(X) 'other', multiplied by a scaling factor. * From 61cae4a2c9eec2367215c81918dd8ec0a94a1940 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Tue, 12 Sep 2023 21:28:49 +0000 Subject: [PATCH 14/36] splitting goblin builder into its own class --- .../composer/goblin_ultra_composer.test.cpp | 6 +- .../honk/composer/ultra_composer.cpp | 5 +- .../barretenberg/honk/flavor/goblin_ultra.hpp | 4 +- .../honk/flavor/goblin_ultra_recursive.hpp | 434 ++++++++++++++++++ .../barretenberg/honk/pcs/gemini/gemini.hpp | 6 +- .../cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp | 4 +- .../barretenberg/honk/pcs/shplonk/shplonk.hpp | 4 +- .../sumcheck/relation_correctness.test.cpp | 2 +- .../goblin_ultra_circuit_builder.cpp | 163 +++++++ .../goblin_ultra_circuit_builder.hpp | 115 +++++ .../goblin_ultra_circuit_builder.test.cpp | 7 +- .../circuit_builder/ultra_circuit_builder.cpp | 141 ------ .../circuit_builder/ultra_circuit_builder.hpp | 43 +- .../proof_system/flavor/flavor.hpp | 3 +- .../stdlib/primitives/biggroup/biggroup.hpp | 1 - .../biggroup/biggroup_goblin.test.cpp | 5 +- .../primitives/biggroup/biggroup_impl.hpp | 4 +- .../circuit_builders/circuit_builders.hpp | 28 +- .../circuit_builders/circuit_builders_fwd.hpp | 22 +- .../verifier/ultra_recursive_verifier.cpp | 23 +- .../verifier/ultra_recursive_verifier.hpp | 13 +- .../recursion/honk/verifier/verifier.test.cpp | 25 +- 22 files changed, 809 insertions(+), 249 deletions(-) create mode 100644 circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp create mode 100644 circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp create mode 100644 circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp index afda145a755f..3215c146cb72 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp @@ -94,7 +94,7 @@ TEST_F(GoblinUltraHonkComposerTests, SingleCircuit) // Add mock data to op queue to simulate interaction with a previous circuit populate_ecc_op_queue_with_mock_data(op_queue); - auto builder = UltraCircuitBuilder(op_queue); + auto builder = GoblinUltraCircuitBuilder(op_queue); generate_test_circuit(builder); @@ -124,7 +124,7 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuits) // Construct first circuit and its proof { - auto builder = UltraCircuitBuilder(op_queue); + auto builder = GoblinUltraCircuitBuilder(op_queue); generate_test_circuit(builder); expected_op_queue_size += builder.num_ecc_op_gates; @@ -139,7 +139,7 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuits) // Construct second circuit { - auto builder = UltraCircuitBuilder(op_queue); + auto builder = GoblinUltraCircuitBuilder(op_queue); generate_test_circuit(builder); expected_op_queue_size += builder.num_ecc_op_gates; diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp index ca1bc657417d..36b1c490852f 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp @@ -24,7 +24,10 @@ void UltraComposer_::compute_circuit_size_parameters(CircuitBuilder& cir // Get num conventional gates, num public inputs and num Goblin style ECC op gates const size_t num_gates = circuit_constructor.num_gates; num_public_inputs = circuit_constructor.public_inputs.size(); - num_ecc_op_gates = circuit_constructor.num_ecc_op_gates; + num_ecc_op_gates = 0; + if constexpr (IsGoblinFlavor) { + num_ecc_op_gates = circuit_constructor.num_ecc_op_gates; + } // minimum circuit size due to the length of lookups plus tables const size_t minimum_circuit_size_due_to_lookups = tables_size + lookups_size + num_zero_rows; diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp index d5d61175e0d2..a8b6f3326b1a 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp @@ -2,7 +2,7 @@ #include "barretenberg/honk/pcs/kzg/kzg.hpp" #include "barretenberg/honk/transcript/transcript.hpp" #include "barretenberg/polynomials/univariate.hpp" -#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" +#include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp" #include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/proof_system/relations/auxiliary_relation.hpp" #include "barretenberg/proof_system/relations/ecc_op_queue_relation.hpp" @@ -16,7 +16,7 @@ namespace proof_system::honk::flavor { class GoblinUltra { public: - using CircuitBuilder = UltraCircuitBuilder; + using CircuitBuilder = GoblinUltraCircuitBuilder; using Curve = curve::BN254; using PCS = pcs::kzg::KZG; using GroupElement = Curve::Element; diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp new file mode 100644 index 000000000000..c8ea61a33585 --- /dev/null +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp @@ -0,0 +1,434 @@ +#pragma once +#include "barretenberg/ecc/curves/bn254/g1.hpp" +#include "barretenberg/honk/pcs/commitment_key.hpp" +#include "barretenberg/honk/pcs/kzg/kzg.hpp" +#include "barretenberg/polynomials/barycentric.hpp" +#include "barretenberg/polynomials/univariate.hpp" + +#include "barretenberg/honk/transcript/transcript.hpp" +#include "barretenberg/polynomials/evaluation_domain.hpp" +#include "barretenberg/polynomials/polynomial.hpp" +#include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp" +#include "barretenberg/proof_system/flavor/flavor.hpp" +#include "barretenberg/proof_system/relations/auxiliary_relation.hpp" +#include "barretenberg/proof_system/relations/elliptic_relation.hpp" +#include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp" +#include "barretenberg/proof_system/relations/lookup_relation.hpp" +#include "barretenberg/proof_system/relations/permutation_relation.hpp" +#include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" +#include "barretenberg/srs/factories/crs_factory.hpp" +#include +#include +#include +#include +#include +#include + +#include "barretenberg/stdlib/primitives/curves/bn254.hpp" +#include "barretenberg/stdlib/primitives/field/field.hpp" + +namespace proof_system::honk::flavor { + +/** + * @brief The recursive counterpart to the "native" Goblin Ultra flavor. + * @details This flavor can be used to instantiate a recursive Ultra Honk verifier for a proof created using the + * conventional Ultra flavor. It is similar in structure to its native counterpart with two main differences: 1) the + * curve types are stdlib types (e.g. field_t instead of field) and 2) it does not specify any Prover related types + * (e.g. Polynomial, ExtendedEdges, etc.) since we do not emulate prover computation in circuits, i.e. it only makes + * sense to instantiate a Verifier with this flavor. + * + */ +class GoblinUltraRecursive { + public: + using CircuitBuilder = GoblinUltraCircuitBuilder; + using Curve = plonk::stdlib::bn254; + using GroupElement = Curve::Element; + using Commitment = Curve::Element; + using CommitmentHandle = Curve::Element; + using FF = Curve::ScalarField; + + // Note(luke): Eventually this may not be needed at all + using VerifierCommitmentKey = pcs::VerifierCommitmentKey; + + static constexpr size_t NUM_WIRES = CircuitBuilder::NUM_WIRES; + // The number of multivariate polynomials on which a sumcheck prover sumcheck operates (including shifts). We often + // need containers of this size to hold related data, so we choose a name more agnostic than `NUM_POLYNOMIALS`. + // Note: this number does not include the individual sorted list polynomials. + static constexpr size_t NUM_ALL_ENTITIES = 48; // 43 (UH) + 4 op wires + 1 op wire "selector" + // The number of polynomials precomputed to describe a circuit and to aid a prover in constructing a satisfying + // assignment of witnesses. We again choose a neutral name. + static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 26; // 25 (UH) + 1 op wire "selector" + // The total number of witness entities not including shifts. + static constexpr size_t NUM_WITNESS_ENTITIES = 15; // 11 (UH) + 4 op wires + + // define the tuple of Relations that comprise the Sumcheck relation + using Relations = std::tuple, + proof_system::UltraPermutationRelation, + proof_system::LookupRelation, + proof_system::GenPermSortRelation, + proof_system::EllipticRelation, + proof_system::AuxiliaryRelation, + proof_system::EccOpQueueRelation>; + + static constexpr size_t MAX_RELATION_LENGTH = get_max_relation_length(); + + // MAX_RANDOM_RELATION_LENGTH = algebraic degree of sumcheck relation *after* multiplying by the `pow_zeta` random + // polynomial e.g. For \sum(x) [A(x) * B(x) + C(x)] * PowZeta(X), relation length = 2 and random relation length = 3 + static constexpr size_t MAX_RANDOM_RELATION_LENGTH = MAX_RELATION_LENGTH + 1; + static constexpr size_t NUM_RELATIONS = std::tuple_size::value; + + // define the container for storing the univariate contribution from each relation in Sumcheck + using RelationUnivariates = decltype(create_relation_univariates_container()); + using RelationValues = decltype(create_relation_values_container()); + + private: + template + /** + * @brief A base class labelling precomputed entities and (ordered) subsets of interest. + * @details Used to build the proving key and verification key. + */ + class PrecomputedEntities : public PrecomputedEntities_ { + public: + DataType& q_m = std::get<0>(this->_data); + DataType& q_c = std::get<1>(this->_data); + DataType& q_l = std::get<2>(this->_data); + DataType& q_r = std::get<3>(this->_data); + DataType& q_o = std::get<4>(this->_data); + DataType& q_4 = std::get<5>(this->_data); + DataType& q_arith = std::get<6>(this->_data); + DataType& q_sort = std::get<7>(this->_data); + DataType& q_elliptic = std::get<8>(this->_data); + DataType& q_aux = std::get<9>(this->_data); + DataType& q_lookup = std::get<10>(this->_data); + DataType& sigma_1 = std::get<11>(this->_data); + DataType& sigma_2 = std::get<12>(this->_data); + DataType& sigma_3 = std::get<13>(this->_data); + DataType& sigma_4 = std::get<14>(this->_data); + DataType& id_1 = std::get<15>(this->_data); + DataType& id_2 = std::get<16>(this->_data); + DataType& id_3 = std::get<17>(this->_data); + DataType& id_4 = std::get<18>(this->_data); + DataType& table_1 = std::get<19>(this->_data); + DataType& table_2 = std::get<20>(this->_data); + DataType& table_3 = std::get<21>(this->_data); + DataType& table_4 = std::get<22>(this->_data); + DataType& lagrange_first = std::get<23>(this->_data); + DataType& lagrange_last = std::get<24>(this->_data); + DataType& lagrange_ecc_op = std::get<25>(this->_data); // indicator poly for ecc op gates + + static constexpr CircuitType CIRCUIT_TYPE = CircuitBuilder::CIRCUIT_TYPE; + + std::vector get_selectors() override + { + return { q_m, q_c, q_l, q_r, q_o, q_4, q_arith, q_sort, q_elliptic, q_aux, q_lookup }; + }; + std::vector get_sigma_polynomials() override { return { sigma_1, sigma_2, sigma_3, sigma_4 }; }; + std::vector get_id_polynomials() override { return { id_1, id_2, id_3, id_4 }; }; + + std::vector get_table_polynomials() { return { table_1, table_2, table_3, table_4 }; }; + }; + + /** + * @brief Container for all witness polynomials used/constructed by the prover. + * @details Shifts are not included here since they do not occupy their own memory. + */ + template + class WitnessEntities : public WitnessEntities_ { + public: + DataType& w_l = std::get<0>(this->_data); + DataType& w_r = std::get<1>(this->_data); + DataType& w_o = std::get<2>(this->_data); + DataType& w_4 = std::get<3>(this->_data); + DataType& sorted_1 = std::get<4>(this->_data); + DataType& sorted_2 = std::get<5>(this->_data); + DataType& sorted_3 = std::get<6>(this->_data); + DataType& sorted_4 = std::get<7>(this->_data); + DataType& sorted_accum = std::get<8>(this->_data); + DataType& z_perm = std::get<9>(this->_data); + DataType& z_lookup = std::get<10>(this->_data); + DataType& ecc_op_wire_1 = std::get<11>(this->_data); + DataType& ecc_op_wire_2 = std::get<12>(this->_data); + DataType& ecc_op_wire_3 = std::get<13>(this->_data); + DataType& ecc_op_wire_4 = std::get<14>(this->_data); + + std::vector get_wires() override { return { w_l, w_r, w_o, w_4 }; }; + std::vector get_ecc_op_wires() + { + return { ecc_op_wire_1, ecc_op_wire_2, ecc_op_wire_3, ecc_op_wire_4 }; + }; + // The sorted concatenations of table and witness data needed for plookup. + std::vector get_sorted_polynomials() { return { sorted_1, sorted_2, sorted_3, sorted_4 }; }; + }; + + /** + * @brief A base class labelling all entities (for instance, all of the polynomials used by the prover during + * sumcheck) in this Honk variant along with particular subsets of interest + * @details Used to build containers for: the prover's polynomial during sumcheck; the sumcheck's folded + * polynomials; the univariates consturcted during during sumcheck; the evaluations produced by sumcheck. + * + * Symbolically we have: AllEntities = PrecomputedEntities + WitnessEntities + "ShiftedEntities". It could be + * implemented as such, but we have this now. + */ + template + class AllEntities : public AllEntities_ { + public: + DataType& q_c = std::get<0>(this->_data); + DataType& q_l = std::get<1>(this->_data); + DataType& q_r = std::get<2>(this->_data); + DataType& q_o = std::get<3>(this->_data); + DataType& q_4 = std::get<4>(this->_data); + DataType& q_m = std::get<5>(this->_data); + DataType& q_arith = std::get<6>(this->_data); + DataType& q_sort = std::get<7>(this->_data); + DataType& q_elliptic = std::get<8>(this->_data); + DataType& q_aux = std::get<9>(this->_data); + DataType& q_lookup = std::get<10>(this->_data); + DataType& sigma_1 = std::get<11>(this->_data); + DataType& sigma_2 = std::get<12>(this->_data); + DataType& sigma_3 = std::get<13>(this->_data); + DataType& sigma_4 = std::get<14>(this->_data); + DataType& id_1 = std::get<15>(this->_data); + DataType& id_2 = std::get<16>(this->_data); + DataType& id_3 = std::get<17>(this->_data); + DataType& id_4 = std::get<18>(this->_data); + DataType& table_1 = std::get<19>(this->_data); + DataType& table_2 = std::get<20>(this->_data); + DataType& table_3 = std::get<21>(this->_data); + DataType& table_4 = std::get<22>(this->_data); + DataType& lagrange_first = std::get<23>(this->_data); + DataType& lagrange_last = std::get<24>(this->_data); + DataType& lagrange_ecc_op = std::get<25>(this->_data); + DataType& w_l = std::get<26>(this->_data); + DataType& w_r = std::get<27>(this->_data); + DataType& w_o = std::get<28>(this->_data); + DataType& w_4 = std::get<29>(this->_data); + DataType& sorted_accum = std::get<30>(this->_data); + DataType& z_perm = std::get<31>(this->_data); + DataType& z_lookup = std::get<32>(this->_data); + DataType& ecc_op_wire_1 = std::get<33>(this->_data); + DataType& ecc_op_wire_2 = std::get<34>(this->_data); + DataType& ecc_op_wire_3 = std::get<35>(this->_data); + DataType& ecc_op_wire_4 = std::get<36>(this->_data); + DataType& table_1_shift = std::get<37>(this->_data); + DataType& table_2_shift = std::get<38>(this->_data); + DataType& table_3_shift = std::get<39>(this->_data); + DataType& table_4_shift = std::get<40>(this->_data); + DataType& w_l_shift = std::get<41>(this->_data); + DataType& w_r_shift = std::get<42>(this->_data); + DataType& w_o_shift = std::get<43>(this->_data); + DataType& w_4_shift = std::get<44>(this->_data); + DataType& sorted_accum_shift = std::get<45>(this->_data); + DataType& z_perm_shift = std::get<46>(this->_data); + DataType& z_lookup_shift = std::get<47>(this->_data); + + std::vector get_wires() override { return { w_l, w_r, w_o, w_4 }; }; + std::vector get_ecc_op_wires() + { + return { ecc_op_wire_1, ecc_op_wire_2, ecc_op_wire_3, ecc_op_wire_4 }; + }; + // Gemini-specific getters. + std::vector get_unshifted() override + { + return { q_c, q_l, + q_r, q_o, + q_4, q_m, + q_arith, q_sort, + q_elliptic, q_aux, + q_lookup, sigma_1, + sigma_2, sigma_3, + sigma_4, id_1, + id_2, id_3, + id_4, table_1, + table_2, table_3, + table_4, lagrange_first, + lagrange_last, lagrange_ecc_op, + w_l, w_r, + w_o, w_4, + sorted_accum, z_perm, + z_lookup, ecc_op_wire_1, + ecc_op_wire_2, ecc_op_wire_3, + ecc_op_wire_4 }; + }; + std::vector get_to_be_shifted() override + { + return { table_1, table_2, table_3, table_4, w_l, w_r, w_o, w_4, sorted_accum, z_perm, z_lookup }; + }; + std::vector get_shifted() override + { + return { table_1_shift, table_2_shift, table_3_shift, table_4_shift, w_l_shift, w_r_shift, + w_o_shift, w_4_shift, sorted_accum_shift, z_perm_shift, z_lookup_shift }; + }; + + AllEntities() = default; + + AllEntities(const AllEntities& other) + : AllEntities_(other){}; + + AllEntities(AllEntities&& other) + : AllEntities_(other){}; + + AllEntities& operator=(const AllEntities& other) + { + if (this == &other) { + return *this; + } + AllEntities_::operator=(other); + return *this; + } + + AllEntities& operator=(AllEntities&& other) + { + AllEntities_::operator=(other); + return *this; + } + + ~AllEntities() = default; + }; + + public: + /** + * @brief The verification key is responsible for storing the the commitments to the precomputed (non-witnessk) + * polynomials used by the verifier. + * + * @note Note the discrepancy with what sort of data is stored here vs in the proving key. We may want to resolve + * that, and split out separate PrecomputedPolynomials/Commitments data for clarity but also for portability of our + * circuits. + */ + class VerificationKey : public VerificationKey_> { + public: + /** + * @brief Construct a new Verification Key with stdlib types from a provided native verification key + * + * @param builder + * @param native_key Native verification key from which to extract the precomputed commitments + */ + VerificationKey(CircuitBuilder* builder, auto native_key) + : VerificationKey_>(native_key->circuit_size, + native_key->num_public_inputs) + { + q_m = Commitment::from_witness(builder, native_key->q_m); + q_l = Commitment::from_witness(builder, native_key->q_l); + q_r = Commitment::from_witness(builder, native_key->q_r); + q_o = Commitment::from_witness(builder, native_key->q_o); + q_4 = Commitment::from_witness(builder, native_key->q_4); + q_c = Commitment::from_witness(builder, native_key->q_c); + q_arith = Commitment::from_witness(builder, native_key->q_arith); + q_sort = Commitment::from_witness(builder, native_key->q_sort); + q_elliptic = Commitment::from_witness(builder, native_key->q_elliptic); + q_aux = Commitment::from_witness(builder, native_key->q_aux); + q_lookup = Commitment::from_witness(builder, native_key->q_lookup); + sigma_1 = Commitment::from_witness(builder, native_key->sigma_1); + sigma_2 = Commitment::from_witness(builder, native_key->sigma_2); + sigma_3 = Commitment::from_witness(builder, native_key->sigma_3); + sigma_4 = Commitment::from_witness(builder, native_key->sigma_4); + id_1 = Commitment::from_witness(builder, native_key->id_1); + id_2 = Commitment::from_witness(builder, native_key->id_2); + id_3 = Commitment::from_witness(builder, native_key->id_3); + id_4 = Commitment::from_witness(builder, native_key->id_4); + table_1 = Commitment::from_witness(builder, native_key->table_1); + table_2 = Commitment::from_witness(builder, native_key->table_2); + table_3 = Commitment::from_witness(builder, native_key->table_3); + table_4 = Commitment::from_witness(builder, native_key->table_4); + lagrange_first = Commitment::from_witness(builder, native_key->lagrange_first); + lagrange_last = Commitment::from_witness(builder, native_key->lagrange_last); + lagrange_ecc_op = Commitment::from_witness(builder, native_key->lagrange_ecc_op); + }; + }; + + /** + * @brief A container for the polynomials evaluations produced during sumcheck, which are purported to be the + * evaluations of polynomials committed in earlier rounds. + */ + class ClaimedEvaluations : public AllEntities { + public: + using Base = AllEntities; + using Base::Base; + ClaimedEvaluations(std::array _data_in) { this->_data = _data_in; } + }; + + /** + * @brief A container for commitment labels. + * @note It's debatable whether this should inherit from AllEntities. since most entries are not strictly needed. It + * has, however, been useful during debugging to have these labels available. + * + */ + class CommitmentLabels : public AllEntities { + public: + CommitmentLabels() + { + w_l = "W_L"; + w_r = "W_R"; + w_o = "W_O"; + w_4 = "W_4"; + z_perm = "Z_PERM"; + z_lookup = "Z_LOOKUP"; + sorted_accum = "SORTED_ACCUM"; + ecc_op_wire_1 = "ECC_OP_WIRE_1"; + ecc_op_wire_2 = "ECC_OP_WIRE_2"; + ecc_op_wire_3 = "ECC_OP_WIRE_3"; + ecc_op_wire_4 = "ECC_OP_WIRE_4"; + + // The ones beginning with "__" are only used for debugging + q_c = "__Q_C"; + q_l = "__Q_L"; + q_r = "__Q_R"; + q_o = "__Q_O"; + q_4 = "__Q_4"; + q_m = "__Q_M"; + q_arith = "__Q_ARITH"; + q_sort = "__Q_SORT"; + q_elliptic = "__Q_ELLIPTIC"; + q_aux = "__Q_AUX"; + q_lookup = "__Q_LOOKUP"; + sigma_1 = "__SIGMA_1"; + sigma_2 = "__SIGMA_2"; + sigma_3 = "__SIGMA_3"; + sigma_4 = "__SIGMA_4"; + id_1 = "__ID_1"; + id_2 = "__ID_2"; + id_3 = "__ID_3"; + id_4 = "__ID_4"; + table_1 = "__TABLE_1"; + table_2 = "__TABLE_2"; + table_3 = "__TABLE_3"; + table_4 = "__TABLE_4"; + lagrange_first = "__LAGRANGE_FIRST"; + lagrange_last = "__LAGRANGE_LAST"; + }; + }; + + class VerifierCommitments : public AllEntities { + public: + VerifierCommitments(std::shared_ptr verification_key) + { + q_m = verification_key->q_m; + q_l = verification_key->q_l; + q_r = verification_key->q_r; + q_o = verification_key->q_o; + q_4 = verification_key->q_4; + q_c = verification_key->q_c; + q_arith = verification_key->q_arith; + q_sort = verification_key->q_sort; + q_elliptic = verification_key->q_elliptic; + q_aux = verification_key->q_aux; + q_lookup = verification_key->q_lookup; + sigma_1 = verification_key->sigma_1; + sigma_2 = verification_key->sigma_2; + sigma_3 = verification_key->sigma_3; + sigma_4 = verification_key->sigma_4; + id_1 = verification_key->id_1; + id_2 = verification_key->id_2; + id_3 = verification_key->id_3; + id_4 = verification_key->id_4; + table_1 = verification_key->table_1; + table_2 = verification_key->table_2; + table_3 = verification_key->table_3; + table_4 = verification_key->table_4; + lagrange_first = verification_key->lagrange_first; + lagrange_last = verification_key->lagrange_last; + lagrange_ecc_op = verification_key->lagrange_ecc_op; + } + }; +}; + +} // namespace proof_system::honk::flavor diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp index f46d55ae71f2..57754ad16558 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp @@ -111,7 +111,7 @@ template class GeminiProver_ { const Fr& r_challenge); }; // namespace proof_system::honk::pcs::gemini -template class GeminiVerifier_ { +template class GeminiVerifier_ { using Fr = typename Curve::ScalarField; using GroupElement = typename Curve::Element; using Commitment = typename Curve::AffineElement; @@ -247,8 +247,8 @@ template class GeminiVerifier_ { // TODO(#707): these batch muls include the use of 1 as a scalar. This is handled appropriately as a non-mul // (add-accumulate) in the goblin batch_mul but is done inefficiently as a scalar mul in the conventional // emulated batch mul. - C0_r_pos = GroupElement::template batch_mul(commitments, { one, r_inv }); - C0_r_neg = GroupElement::template batch_mul(commitments, { one, -r_inv }); + C0_r_pos = GroupElement::batch_mul(commitments, { one, r_inv }); + C0_r_neg = GroupElement::batch_mul(commitments, { one, -r_inv }); } else { C0_r_pos = batched_f; C0_r_neg = batched_f; diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp index ab2c8d8bb7a2..6bd41ac7befb 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp @@ -11,7 +11,7 @@ namespace proof_system::honk::pcs::kzg { -template class KZG { +template class KZG { using CK = CommitmentKey; using VK = VerifierCommitmentKey; using Fr = typename Curve::ScalarField; @@ -88,7 +88,7 @@ template class KZG { auto one = Fr(builder, 1); std::vector commitments = { claim.commitment, quotient_commitment }; std::vector scalars = { one, claim.opening_pair.challenge }; - P_0 = GroupElement::template batch_mul(commitments, scalars); + P_0 = GroupElement::batch_mul(commitments, scalars); // Note: This implementation assumes the evaluation is zero (as is the case for shplonk). ASSERT(claim.opening_pair.evaluation.get_value() == 0); } else { diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp index 17c452471dcf..784641012e1b 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp @@ -145,7 +145,7 @@ template class ShplonkProver_ { * @brief Shplonk Verifier * */ -template class ShplonkVerifier_ { +template class ShplonkVerifier_ { using Fr = typename Curve::ScalarField; using GroupElement = typename Curve::Element; using Commitment = typename Curve::AffineElement; @@ -231,7 +231,7 @@ template class ShplonkVerifier_ { scalars.emplace_back(G_commitment_constant); // [G] += G₀⋅[1] = [G] + (∑ⱼ ρʲ ⋅ vⱼ / ( r − xⱼ ))⋅[1] - G_commitment = GroupElement::template batch_mul(commitments, scalars); + G_commitment = GroupElement::batch_mul(commitments, scalars); } else { // [G] = [Q] - ∑ⱼ ρʲ / ( r − xⱼ )⋅[fⱼ] + G₀⋅[1] diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp index ea98cc35c461..bd9573754d7b 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp @@ -415,7 +415,7 @@ TEST_F(RelationCorrectnessTests, GoblinUltraRelationCorrectness) // Create a composer and then add an assortment of gates designed to ensure that the constraint(s) represented // by each relation are non-trivially exercised. - auto builder = UltraCircuitBuilder(); + auto builder = GoblinUltraCircuitBuilder(); // Create an assortment of representative gates create_some_add_gates(builder); diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp new file mode 100644 index 000000000000..4fd5679c6fe9 --- /dev/null +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp @@ -0,0 +1,163 @@ +#include "goblin_ultra_circuit_builder.hpp" +#include +#include +#include + +using namespace barretenberg; + +namespace proof_system { + +template void GoblinUltraCircuitBuilder_::finalize_circuit() +{ + UltraCircuitBuilder_::finalize_circuit(); + + // Set internally the current and previous size of the aggregate op queue transcript + op_queue->set_size_data(); +} + +/** + * @brief Ensure all polynomials have at least one non-zero coefficient to avoid commiting to the zero-polynomial + * + * @param in Structure containing variables and witness selectors + */ +// TODO(#423): This function adds valid (but arbitrary) gates to ensure that the circuit which includes +// them will not result in any zero-polynomials. It also ensures that the first coefficient of the wire +// polynomials is zero, which is required for them to be shiftable. +// TODO(luke): Add ECC op gate to ensure op wires are non-zero? +template void GoblinUltraCircuitBuilder_::add_gates_to_ensure_all_polys_are_non_zero() +{ + UltraCircuitBuilder_::add_gates_to_ensure_all_polys_are_non_zero(); +} + +/** + * @brief Add gates for simple point addition without scalar and compute corresponding op natively + * + * @param point + */ +template +ecc_op_tuple GoblinUltraCircuitBuilder_::queue_ecc_add_accum(const barretenberg::g1::affine_element& point) +{ + // Add raw op to queue + op_queue->add_accumulate(point); + + // Decompose operation inputs into width-four form and add ecc op gates + auto op_tuple = decompose_ecc_operands(add_accum_op_idx, point); + populate_ecc_op_wires(op_tuple); + + return op_tuple; +} + +/** + * @brief Add gates for point mul and add and compute corresponding op natively + * + * @tparam FF + * @param point + * @param scalar + * @return ecc_op_tuple encoding the point and scalar inputs to the mul accum + */ +template +ecc_op_tuple GoblinUltraCircuitBuilder_::queue_ecc_mul_accum(const barretenberg::g1::affine_element& point, + const FF& scalar) +{ + // Add raw op to op queue + op_queue->mul_accumulate(point, scalar); + + // Decompose operation inputs into width-four form and add ecc op gates + auto op_tuple = decompose_ecc_operands(mul_accum_op_idx, point, scalar); + populate_ecc_op_wires(op_tuple); + + return op_tuple; +} + +/** + * @brief Add point equality gates + * + * @return ecc_op_tuple encoding the point to which equality has been asserted + */ +template ecc_op_tuple GoblinUltraCircuitBuilder_::queue_ecc_eq() +{ + // Add raw op to op queue + auto point = op_queue->eq(); + + // Decompose operation inputs into width-four form and add ecc op gates + auto op_tuple = decompose_ecc_operands(equality_op_idx, point); + populate_ecc_op_wires(op_tuple); + + return op_tuple; +} + +/** + * @brief Decompose ecc operands into components, add corresponding variables, return ecc op tuple + * + * @param op_idx Index of op code in variables array + * @param point + * @param scalar + * @return ecc_op_tuple Tuple of indices into variables array used to construct pair of ecc op gates + */ +template +ecc_op_tuple GoblinUltraCircuitBuilder_::decompose_ecc_operands(uint32_t op_idx, const g1::affine_element& point, const FF& scalar) +{ + // Decompose point coordinates (Fq) into hi-lo chunks (Fr) + const size_t CHUNK_SIZE = 2 * DEFAULT_NON_NATIVE_FIELD_LIMB_BITS; + auto x_256 = uint256_t(point.x); + auto y_256 = uint256_t(point.y); + auto x_lo = FF(x_256.slice(0, CHUNK_SIZE)); + auto x_hi = FF(x_256.slice(CHUNK_SIZE, CHUNK_SIZE * 2)); + auto y_lo = FF(y_256.slice(0, CHUNK_SIZE)); + auto y_hi = FF(y_256.slice(CHUNK_SIZE, CHUNK_SIZE * 2)); + + // Split scalar into 128 bit endomorphism scalars + FF z_1 = 0; + FF z_2 = 0; + auto converted = scalar.from_montgomery_form(); + FF::split_into_endomorphism_scalars(converted, z_1, z_2); + z_1 = z_1.to_montgomery_form(); + z_2 = z_2.to_montgomery_form(); + + // Populate ultra ops in OpQueue with the decomposed operands + op_queue->ultra_ops[0].emplace_back(this->variables[op_idx]); + op_queue->ultra_ops[1].emplace_back(x_lo); + op_queue->ultra_ops[2].emplace_back(x_hi); + op_queue->ultra_ops[3].emplace_back(y_lo); + + op_queue->ultra_ops[0].emplace_back(this->variables[op_idx]); + op_queue->ultra_ops[1].emplace_back(y_hi); + op_queue->ultra_ops[2].emplace_back(z_1); + op_queue->ultra_ops[3].emplace_back(z_2); + + // Add variables for decomposition and get indices needed for op wires + auto x_lo_idx = this->add_variable(x_lo); + auto x_hi_idx = this->add_variable(x_hi); + auto y_lo_idx = this->add_variable(y_lo); + auto y_hi_idx = this->add_variable(y_hi); + auto z_1_idx = this->add_variable(z_1); + auto z_2_idx = this->add_variable(z_2); + + return { op_idx, x_lo_idx, x_hi_idx, y_lo_idx, y_hi_idx, z_1_idx, z_2_idx }; +} + +/** + * @brief Add ecc operation to queue + * + * @param in Variables array indices corresponding to operation inputs + * @note We dont explicitly set values for the selectors here since their values are fully determined by + * num_ecc_op_gates. E.g. in the composer we can reconstruct q_ecc_op as the indicator on the first num_ecc_op_gates + * indices. All other selectors are simply 0 on this domain. + */ +template void GoblinUltraCircuitBuilder_::populate_ecc_op_wires(const ecc_op_tuple& in) +{ + ecc_op_wire_1.emplace_back(in.op); + ecc_op_wire_2.emplace_back(in.x_lo); + ecc_op_wire_3.emplace_back(in.x_hi); + ecc_op_wire_4.emplace_back(in.y_lo); + + ecc_op_wire_1.emplace_back(in.op); // TODO(luke): second op val is sort of a dummy. use "op" again? + ecc_op_wire_2.emplace_back(in.y_hi); + ecc_op_wire_3.emplace_back(in.z_1); + ecc_op_wire_4.emplace_back(in.z_2); + + num_ecc_op_gates += 2; +}; + +template class GoblinUltraCircuitBuilder_; +} // namespace proof_system \ No newline at end of file diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp new file mode 100644 index 000000000000..8952930ccc48 --- /dev/null +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp @@ -0,0 +1,115 @@ +#pragma once +#include "barretenberg/plonk/proof_system/constants.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/arithmetization/arithmetization.hpp" +#include "barretenberg/proof_system/op_queue/ecc_op_queue.hpp" +#include "barretenberg/proof_system/plookup_tables/plookup_tables.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 "ultra_circuit_builder.hpp" +#include + +namespace proof_system { + +using namespace barretenberg; + +template class GoblinUltraCircuitBuilder_ : public UltraCircuitBuilder_ { + public: + static constexpr std::string_view NAME_STRING = "GoblinUltraArithmetization"; + static constexpr CircuitType CIRCUIT_TYPE = CircuitType::ULTRA; + static constexpr size_t DEFAULT_NON_NATIVE_FIELD_LIMB_BITS = + UltraCircuitBuilder_::DEFAULT_NON_NATIVE_FIELD_LIMB_BITS; + + size_t num_ecc_op_gates = 0; // number of ecc op "gates" (rows); these are placed at the start of the circuit + + // Stores record of ecc operations and performs corresponding native operations internally + std::shared_ptr op_queue; + + // Indices for constant variables corresponding to ECCOpQueue op codes + uint32_t null_op_idx; + uint32_t add_accum_op_idx; + uint32_t mul_accum_op_idx; + uint32_t equality_op_idx; + + using WireVector = std::vector>; + + // Wires storing ecc op queue data; values are indices into the variables array + std::array::NUM_WIRES> ecc_op_wires; + + WireVector& ecc_op_wire_1 = std::get<0>(ecc_op_wires); + WireVector& ecc_op_wire_2 = std::get<1>(ecc_op_wires); + WireVector& ecc_op_wire_3 = std::get<2>(ecc_op_wires); + WireVector& ecc_op_wire_4 = std::get<3>(ecc_op_wires); + + ecc_op_tuple queue_ecc_add_accum(const g1::affine_element& point); + ecc_op_tuple queue_ecc_mul_accum(const g1::affine_element& point, const FF& scalar); + ecc_op_tuple queue_ecc_eq(); + + private: + void populate_ecc_op_wires(const ecc_op_tuple& in); + ecc_op_tuple decompose_ecc_operands(uint32_t op, const g1::affine_element& point, const FF& scalar = FF::zero()); + + public: + + GoblinUltraCircuitBuilder_(const size_t size_hint = 0, std::shared_ptr op_queue_in = std::make_shared()) + : UltraCircuitBuilder_(size_hint) + , op_queue(op_queue_in) + { + // Set indices to constants corresponding to Goblin ECC op codes + null_op_idx = this->zero_idx; + add_accum_op_idx = this->put_constant_variable(FF(EccOpCode::ADD_ACCUM)); + mul_accum_op_idx = this->put_constant_variable(FF(EccOpCode::MUL_ACCUM)); + equality_op_idx = this->put_constant_variable(FF(EccOpCode::EQUALITY)); + }; + GoblinUltraCircuitBuilder_(std::shared_ptr op_queue_in) + : GoblinUltraCircuitBuilder_(0, op_queue_in) {} + + void finalize_circuit(); + void add_gates_to_ensure_all_polys_are_non_zero(); + + size_t get_num_constant_gates() const override { return 0; } + + /** + * @brief Get the final number of gates in a circuit, which consists of the sum of: + * 1) Current number number of actual gates + * 2) Number of public inputs, as we'll need to add a gate for each of them + * 3) Number of Rom array-associated gates + * 4) Number of range-list associated gates + * 5) Number of non-native field multiplication gates. + * + * @return size_t + */ + size_t get_num_gates() const override + { + auto num_ultra_gates = UltraCircuitBuilder_::get_num_gates(); + return num_ultra_gates + num_ecc_op_gates; + } + + /**x + * @brief Print the number and composition of gates in the circuit + * + */ + virtual void print_num_gates() const override + { + size_t count = 0; + size_t rangecount = 0; + size_t romcount = 0; + size_t ramcount = 0; + size_t nnfcount = 0; + UltraCircuitBuilder_::get_num_gates_split_into_components(count, rangecount, romcount, ramcount, nnfcount); + + size_t total = count + romcount + ramcount + rangecount + num_ecc_op_gates; + std::cout << "gates = " << total << " (arith " << count << ", rom " << romcount << ", ram " << ramcount + << ", range " << rangecount << ", non native field gates " << nnfcount << ", goblin ecc op gates " + << num_ecc_op_gates << "), pubinp = " << this->public_inputs.size() << std::endl; + } +}; +extern template class GoblinUltraCircuitBuilder_; +// TODO: template plookup to be able to be able to have UltraCircuitBuilder on Grumpkin +// extern template class UltraCircuitBuilder_; +using GoblinUltraCircuitBuilder = GoblinUltraCircuitBuilder_; +// using UltraGrumpkinCircuitBuilder = UltraCircuitBuilder_; +} // namespace proof_system diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp index 5766736d2585..7715760c1a58 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp @@ -1,5 +1,4 @@ -#include "barretenberg/crypto/generators/generator_data.hpp" -#include "ultra_circuit_builder.hpp" +#include "goblin_ultra_circuit_builder.hpp" #include using namespace barretenberg; @@ -20,7 +19,7 @@ TEST(UltraCircuitBuilder, GoblinSimple) { const size_t CHUNK_SIZE = plonk::NUM_LIMB_BITS_IN_FIELD_SIMULATION * 2; - auto builder = UltraCircuitBuilder(); + auto builder = GoblinUltraCircuitBuilder(); // Compute a simple point accumulation natively auto P1 = g1::affine_element::random_element(); @@ -85,7 +84,7 @@ TEST(UltraCircuitBuilder, GoblinSimple) TEST(UltraCircuitBuilder, GoblinEccOpQueueUltraOps) { // Construct a simple circuit with op gates - auto builder = UltraCircuitBuilder(); + auto builder = GoblinUltraCircuitBuilder(); // Compute a simple point accumulation natively auto P1 = g1::affine_element::random_element(); diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp index 3274c3e6ba8f..fc1d1e6ac369 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp @@ -47,9 +47,6 @@ template void UltraCircuitBuilder_::finalize_circuit() process_RAM_arrays(); process_range_lists(); - // Set internally the current and previous size of the aggregate op queue transcript - op_queue->set_size_data(); - circuit_finalised = true; } } @@ -499,144 +496,6 @@ template uint32_t UltraCircuitBuilder_::put_constant_variable( } } -/** - * ** Goblin Methods ** - */ - -/** - * @brief Add gates for simple point addition without scalar and compute corresponding op natively - * - * @param point - */ -template -ecc_op_tuple UltraCircuitBuilder_::queue_ecc_add_accum(const barretenberg::g1::affine_element& point) -{ - // Add raw op to queue - op_queue->add_accumulate(point); - - // Decompose operation inputs into width-four form and add ecc op gates - auto op_tuple = decompose_ecc_operands(add_accum_op_idx, point); - populate_ecc_op_wires(op_tuple); - - return op_tuple; -} - -/** - * @brief Add gates for point mul and add and compute corresponding op natively - * - * @tparam FF - * @param point - * @param scalar - * @return ecc_op_tuple encoding the point and scalar inputs to the mul accum - */ -template -ecc_op_tuple UltraCircuitBuilder_::queue_ecc_mul_accum(const barretenberg::g1::affine_element& point, - const FF& scalar) -{ - // Add raw op to op queue - op_queue->mul_accumulate(point, scalar); - - // Decompose operation inputs into width-four form and add ecc op gates - auto op_tuple = decompose_ecc_operands(mul_accum_op_idx, point, scalar); - populate_ecc_op_wires(op_tuple); - - return op_tuple; -} - -/** - * @brief Add point equality gates - * - * @return ecc_op_tuple encoding the point to which equality has been asserted - */ -template ecc_op_tuple UltraCircuitBuilder_::queue_ecc_eq() -{ - // Add raw op to op queue - auto point = op_queue->eq(); - - // Decompose operation inputs into width-four form and add ecc op gates - auto op_tuple = decompose_ecc_operands(equality_op_idx, point); - populate_ecc_op_wires(op_tuple); - - return op_tuple; -} - -/** - * @brief Decompose ecc operands into components, add corresponding variables, return ecc op tuple - * - * @param op_idx Index of op code in variables array - * @param point - * @param scalar - * @return ecc_op_tuple Tuple of indices into variables array used to construct pair of ecc op gates - */ -template -ecc_op_tuple UltraCircuitBuilder_::decompose_ecc_operands(uint32_t op_idx, const g1::affine_element& point, const FF& scalar) -{ - // Decompose point coordinates (Fq) into hi-lo chunks (Fr) - const size_t CHUNK_SIZE = 2 * DEFAULT_NON_NATIVE_FIELD_LIMB_BITS; - auto x_256 = uint256_t(point.x); - auto y_256 = uint256_t(point.y); - auto x_lo = FF(x_256.slice(0, CHUNK_SIZE)); - auto x_hi = FF(x_256.slice(CHUNK_SIZE, CHUNK_SIZE * 2)); - auto y_lo = FF(y_256.slice(0, CHUNK_SIZE)); - auto y_hi = FF(y_256.slice(CHUNK_SIZE, CHUNK_SIZE * 2)); - - // Split scalar into 128 bit endomorphism scalars - FF z_1 = 0; - FF z_2 = 0; - auto converted = scalar.from_montgomery_form(); - FF::split_into_endomorphism_scalars(converted, z_1, z_2); - z_1 = z_1.to_montgomery_form(); - z_2 = z_2.to_montgomery_form(); - - // Populate ultra ops in OpQueue with the decomposed operands - op_queue->ultra_ops[0].emplace_back(this->variables[op_idx]); - op_queue->ultra_ops[1].emplace_back(x_lo); - op_queue->ultra_ops[2].emplace_back(x_hi); - op_queue->ultra_ops[3].emplace_back(y_lo); - - op_queue->ultra_ops[0].emplace_back(this->variables[op_idx]); - op_queue->ultra_ops[1].emplace_back(y_hi); - op_queue->ultra_ops[2].emplace_back(z_1); - op_queue->ultra_ops[3].emplace_back(z_2); - - // Add variables for decomposition and get indices needed for op wires - auto x_lo_idx = this->add_variable(x_lo); - auto x_hi_idx = this->add_variable(x_hi); - auto y_lo_idx = this->add_variable(y_lo); - auto y_hi_idx = this->add_variable(y_hi); - auto z_1_idx = this->add_variable(z_1); - auto z_2_idx = this->add_variable(z_2); - - return { op_idx, x_lo_idx, x_hi_idx, y_lo_idx, y_hi_idx, z_1_idx, z_2_idx }; -} - -/** - * @brief Add ecc operation to queue - * - * @param in Variables array indices corresponding to operation inputs - * @note We dont explicitly set values for the selectors here since their values are fully determined by - * num_ecc_op_gates. E.g. in the composer we can reconstruct q_ecc_op as the indicator on the first num_ecc_op_gates - * indices. All other selectors are simply 0 on this domain. - */ -template void UltraCircuitBuilder_::populate_ecc_op_wires(const ecc_op_tuple& in) -{ - ecc_op_wire_1.emplace_back(in.op); - ecc_op_wire_2.emplace_back(in.x_lo); - ecc_op_wire_3.emplace_back(in.x_hi); - ecc_op_wire_4.emplace_back(in.y_lo); - - ecc_op_wire_1.emplace_back(in.op); // TODO(luke): second op val is sort of a dummy. use "op" again? - ecc_op_wire_2.emplace_back(in.y_hi); - ecc_op_wire_3.emplace_back(in.z_1); - ecc_op_wire_4.emplace_back(in.z_2); - - num_ecc_op_gates += 2; -}; - -/** - * End of Goblin Methods - */ - template plookup::BasicTable& UltraCircuitBuilder_::get_table(const plookup::BasicTableId id) { for (plookup::BasicTable& table : lookup_tables) { diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp index 2a72789ab20e..96873b363112 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp @@ -37,11 +37,6 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBase op_queue; - // Indices for constant variables corresponding to ECCOpQueue op codes uint32_t null_op_idx; uint32_t add_accum_op_idx; @@ -545,14 +540,6 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBase(this->wires); WireVector& w_4 = std::get<3>(this->wires); - // Wires storing ecc op queue data; values are indices into the variables array - std::array::NUM_WIRES> ecc_op_wires; - - WireVector& ecc_op_wire_1 = std::get<0>(ecc_op_wires); - WireVector& ecc_op_wire_2 = std::get<1>(ecc_op_wires); - WireVector& ecc_op_wire_3 = std::get<2>(ecc_op_wires); - WireVector& ecc_op_wire_4 = std::get<3>(ecc_op_wires); - SelectorVector& q_m = this->selectors.q_m; SelectorVector& q_c = this->selectors.q_c; SelectorVector& q_1 = this->selectors.q_1; @@ -601,9 +588,8 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBase op_queue_in = std::make_shared()) + UltraCircuitBuilder_(const size_t size_hint = 0) : CircuitBuilderBase>(ultra_selector_names(), size_hint) - , op_queue(op_queue_in) { w_l.reserve(size_hint); w_r.reserve(size_hint); @@ -611,14 +597,7 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBasezero_idx = put_constant_variable(FF::zero()); this->tau.insert({ DUMMY_TAG, DUMMY_TAG }); // TODO(luke): explain this - // Set indices to constants corresponding to Goblin ECC op codes - null_op_idx = this->zero_idx; - add_accum_op_idx = put_constant_variable(FF(EccOpCode::ADD_ACCUM)); - mul_accum_op_idx = put_constant_variable(FF(EccOpCode::MUL_ACCUM)); - equality_op_idx = put_constant_variable(FF(EccOpCode::EQUALITY)); }; - UltraCircuitBuilder_(std::shared_ptr op_queue_in) - : UltraCircuitBuilder_(0, op_queue_in) {} UltraCircuitBuilder_(const UltraCircuitBuilder_& other) = delete; UltraCircuitBuilder_(UltraCircuitBuilder_&& other) : CircuitBuilderBase>(std::move(other)) @@ -717,21 +696,8 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBase class UltraCircuitBuilder_ : public CircuitBuilderBase class UltraCircuitBuilder_ : public CircuitBuilderBase -concept HasPlookup = proof_system::IsAnyOf; +concept HasPlookup = + proof_system::IsAnyOf; + +template +concept IsGoblinBuilder = + proof_system::IsAnyOf; #define INSTANTIATE_STDLIB_METHOD(stdlib_method) \ template stdlib_method(proof_system::StandardCircuitBuilder); \ template stdlib_method(proof_system::TurboCircuitBuilder); \ - template stdlib_method(proof_system::UltraCircuitBuilder); + template stdlib_method(proof_system::UltraCircuitBuilder); \ + template stdlib_method(proof_system::GoblinUltraCircuitBuilder); #define INSTANTIATE_STDLIB_TYPE(stdlib_type) \ template class stdlib_type; \ template class stdlib_type; \ - template class stdlib_type; + template class stdlib_type; \ + template class stdlib_type; #define INSTANTIATE_STDLIB_TYPE_VA(stdlib_type, ...) \ template class stdlib_type; \ template class stdlib_type; \ - template class stdlib_type; + template class stdlib_type; \ + template class stdlib_type; #define INSTANTIATE_STDLIB_BASIC_TYPE(stdlib_type) \ template class stdlib_type; \ @@ -33,9 +42,14 @@ concept HasPlookup = proof_system::IsAnyOf template class stdlib_type; \ template class stdlib_type; -#define INSTANTIATE_STDLIB_ULTRA_METHOD(stdlib_method) template stdlib_method(proof_system::UltraCircuitBuilder); +#define INSTANTIATE_STDLIB_ULTRA_METHOD(stdlib_method) \ + template stdlib_method(proof_system::UltraCircuitBuilder); \ + template stdlib_method(proof_system::GoblinUltraCircuitBuilder); -#define INSTANTIATE_STDLIB_ULTRA_TYPE(stdlib_type) template class stdlib_type; +#define INSTANTIATE_STDLIB_ULTRA_TYPE(stdlib_type) \ + template class stdlib_type; \ + template class stdlib_type; #define INSTANTIATE_STDLIB_ULTRA_TYPE_VA(stdlib_type, ...) \ - template class stdlib_type; + template class stdlib_type; \ + template class stdlib_type; diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp index 52a83dda9a4a..197026406d45 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp @@ -29,22 +29,27 @@ template class TurboCircuitBuilder_; using TurboCircuitBuilder = TurboCircuitBuilder_>; template class UltraCircuitBuilder_; using UltraCircuitBuilder = UltraCircuitBuilder_>; +template class GoblinUltraCircuitBuilder_; +using GoblinUltraCircuitBuilder = GoblinUltraCircuitBuilder_>; } // namespace proof_system #define EXTERN_STDLIB_TYPE(stdlib_type) \ extern template class stdlib_type; \ extern template class stdlib_type; \ - extern template class stdlib_type; + extern template class stdlib_type; \ + extern template class stdlib_type; #define EXTERN_STDLIB_METHOD(stdlib_method) \ extern template stdlib_method(proof_system::StandardCircuitBuilder); \ extern template stdlib_method(proof_system::TurboCircuitBuilder); \ - extern template stdlib_method(proof_system::UltraCircuitBuilder); + extern template stdlib_method(proof_system::UltraCircuitBuilder); \ + extern template stdlib_method(proof_system::GoblinUltraCircuitBuilder); #define EXTERN_STDLIB_TYPE_VA(stdlib_type, ...) \ extern template class stdlib_type; \ extern template class stdlib_type; \ - extern template class stdlib_type; + extern template class stdlib_type; \ + extern template class stdlib_type; #define EXTERN_STDLIB_BASIC_TYPE(stdlib_type) \ extern template class stdlib_type; \ @@ -54,9 +59,14 @@ using UltraCircuitBuilder = UltraCircuitBuilder_; \ extern template class stdlib_type; -#define EXTERN_STDLIB_ULTRA_TYPE(stdlib_type) extern template class stdlib_type; +#define EXTERN_STDLIB_ULTRA_TYPE(stdlib_type) \ + extern template class stdlib_type; \ + extern template class stdlib_type; #define EXTERN_STDLIB_ULTRA_TYPE_VA(stdlib_type, ...) \ - extern template class stdlib_type; + extern template class stdlib_type; \ + extern template class stdlib_type; -#define EXTERN_STDLIB_ULTRA_METHOD(stdlib_method) extern template stdlib_method(proof_system::UltraCircuitBuilder); +#define EXTERN_STDLIB_ULTRA_METHOD(stdlib_method) \ + extern template stdlib_method(proof_system::UltraCircuitBuilder); \ + extern template stdlib_method(proof_system::GoblinUltraCircuitBuilder); diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp index 323b4a2800f9..df812044449d 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp @@ -8,8 +8,8 @@ namespace proof_system::plonk::stdlib::recursion::honk { -template -UltraRecursiveVerifier_::UltraRecursiveVerifier_(Builder* builder, +template +UltraRecursiveVerifier_::UltraRecursiveVerifier_(Builder* builder, std::shared_ptr verifier_key) : key(verifier_key) , builder(builder) @@ -19,15 +19,15 @@ UltraRecursiveVerifier_::UltraRecursiveVerifier_(Builder* b * @brief This function constructs a recursive verifier circuit for an Ultra Honk proof of a given flavor. * */ -template -std::array UltraRecursiveVerifier_::verify_proof( +template +std::array UltraRecursiveVerifier_::verify_proof( const plonk::proof& proof) { using Sumcheck = ::proof_system::honk::sumcheck::SumcheckVerifier; using Curve = typename Flavor::Curve; - using Gemini = ::proof_system::honk::pcs::gemini::GeminiVerifier_; - using Shplonk = ::proof_system::honk::pcs::shplonk::ShplonkVerifier_; - using KZG = ::proof_system::honk::pcs::kzg::KZG; // note: This can only be KZG + using Gemini = ::proof_system::honk::pcs::gemini::GeminiVerifier_; + using Shplonk = ::proof_system::honk::pcs::shplonk::ShplonkVerifier_; + using KZG = ::proof_system::honk::pcs::kzg::KZG; // note: This can only be KZG using VerifierCommitments = typename Flavor::VerifierCommitments; using CommitmentLabels = typename Flavor::CommitmentLabels; using RelationParams = ::proof_system::RelationParameters; @@ -156,7 +156,7 @@ std::array UltraRecursiveVerifier_(commitments.get_unshifted(), scalars_unshifted); + GroupElement::batch_mul(commitments.get_unshifted(), scalars_unshifted); info("Batch mul (unshifted): num gates = ", builder->get_num_gates() - prev_num_gates, @@ -166,7 +166,7 @@ std::array UltraRecursiveVerifier_get_num_gates(); auto batched_commitment_to_be_shifted = - GroupElement::template batch_mul(commitments.get_to_be_shifted(), scalars_to_be_shifted); + GroupElement::batch_mul(commitments.get_to_be_shifted(), scalars_to_be_shifted); info("Batch mul (to-be-shited): num gates = ", builder->get_num_gates() - prev_num_gates, @@ -209,8 +209,7 @@ std::array UltraRecursiveVerifier_; -template class UltraRecursiveVerifier_; +template class UltraRecursiveVerifier_; +template class UltraRecursiveVerifier_; } // namespace proof_system::plonk::stdlib::recursion::honk diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp index dff4ac7ade1b..7ae43c0eb278 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp @@ -3,12 +3,14 @@ #include "barretenberg/honk/flavor/ultra.hpp" #include "barretenberg/honk/flavor/ultra_grumpkin.hpp" #include "barretenberg/honk/flavor/ultra_recursive.hpp" +#include "barretenberg/honk/flavor/goblin_ultra_recursive.hpp" #include "barretenberg/honk/sumcheck/sumcheck.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp" namespace proof_system::plonk::stdlib::recursion::honk { -template class UltraRecursiveVerifier_ { +template class UltraRecursiveVerifier_ { + public: using FF = typename Flavor::FF; using Commitment = typename Flavor::Commitment; using GroupElement = typename Flavor::GroupElement; @@ -17,7 +19,6 @@ template class UltraRecursiveVerifie using Builder = typename Flavor::CircuitBuilder; using PairingPoints = std::array; - public: explicit UltraRecursiveVerifier_(Builder* builder, std::shared_ptr verifier_key = nullptr); UltraRecursiveVerifier_(UltraRecursiveVerifier_&& other) = delete; UltraRecursiveVerifier_(const UltraRecursiveVerifier_& other) = delete; @@ -37,10 +38,10 @@ template class UltraRecursiveVerifie Transcript transcript; }; -extern template class UltraRecursiveVerifier_; -extern template class UltraRecursiveVerifier_; +extern template class UltraRecursiveVerifier_; +extern template class UltraRecursiveVerifier_; -using UltraRecursiveVerifier = - UltraRecursiveVerifier_; +using UltraRecursiveVerifier = UltraRecursiveVerifier_; +using GoblinUltraRecursiveVerifier = UltraRecursiveVerifier_; } // namespace proof_system::plonk::stdlib::recursion::honk diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp index 7bfc45452d17..996d93fc06c1 100644 --- a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp +++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp @@ -20,21 +20,19 @@ namespace proof_system::plonk::stdlib::recursion::honk { * @details Construct and check a recursive verifier circuit for an UltraHonk proof using 1) the conventional Ultra * arithmetization, or 2) a Goblin-style Ultra arithmetization * - * @tparam UseGoblinFlag whether or not to use goblin-style arithmetization for group operations + * @tparam Builder */ -template class RecursiveVerifierTest : public testing::Test { - - static constexpr bool goblin_flag = UseGoblinFlag::value; - +template class RecursiveVerifierTest : public testing::Test { using InnerComposer = ::proof_system::honk::UltraComposer; using InnerBuilder = typename InnerComposer::CircuitBuilder; - using OuterBuilder = ::proof_system::UltraCircuitBuilder; using NativeVerifier = ::proof_system::honk::UltraVerifier_<::proof_system::honk::flavor::Ultra>; - // Arithmetization of group operations in recursive verifier circuit (goblin or not) is determined by goblin_flag - using RecursiveVerifier = UltraRecursiveVerifier_<::proof_system::honk::flavor::UltraRecursive, goblin_flag>; - using VerificationKey = ::proof_system::honk::flavor::UltraRecursive::VerificationKey; + // Arithmetization of group operations in recursive verifier circuit is determined by outer builder + + using RecursiveVerifier = VerifierType; + using OuterBuilder = typename RecursiveVerifier::Builder; + using VerificationKey = typename RecursiveVerifier::VerificationKey; using inner_curve = bn254; using inner_scalar_field_ct = inner_curve::ScalarField; @@ -227,11 +225,12 @@ template class RecursiveVerifierTest : public testing:: } }; -// Run the recursive verifier tests twice, once without using a goblin style arithmetization of group operations and -// once with. -using UseGoblinFlag = testing::Types; +// Run the recursive verifier tests with conventional Ultra builder and Goblin builder +using VerifierTypes = testing::Types; +// using VerifierTypes = testing::Types; +// using BuilderTypes = testing::Types; -TYPED_TEST_SUITE(RecursiveVerifierTest, UseGoblinFlag); +TYPED_TEST_SUITE(RecursiveVerifierTest, VerifierTypes); HEAVY_TYPED_TEST(RecursiveVerifierTest, InnerCircuit) { From 578a646152bb03b799e307e98eef97721f33e996 Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 13 Sep 2023 12:24:20 -0400 Subject: [PATCH 15/36] chore: remove bb symlink --- barretenberg/CHANGELOG.md | 15 --------------- barretenberg/ts/CHANGELOG.md | 15 --------------- 2 files changed, 30 deletions(-) delete mode 100644 barretenberg/CHANGELOG.md delete mode 100644 barretenberg/ts/CHANGELOG.md diff --git a/barretenberg/CHANGELOG.md b/barretenberg/CHANGELOG.md deleted file mode 100644 index f043d40ff406..000000000000 --- a/barretenberg/CHANGELOG.md +++ /dev/null @@ -1,15 +0,0 @@ -# Changelog - -## [0.5.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.5.1...barretenberg-v0.5.2) (2023-09-08) - - -### Miscellaneous - -* **master:** Release 0.6.0 ([#2121](https://github.com/AztecProtocol/aztec-packages/issues/2121)) ([9bc8e11](https://github.com/AztecProtocol/aztec-packages/commit/9bc8e11ec4598c54d2c8f37c9f1a38ad90148f12)) - -## [0.6.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg-v0.5.1...barretenberg-v0.6.0) (2023-09-08) - - -### Miscellaneous - -* **barretenberg:** Synchronize aztec-packages versions diff --git a/barretenberg/ts/CHANGELOG.md b/barretenberg/ts/CHANGELOG.md deleted file mode 100644 index 352f3ac1273f..000000000000 --- a/barretenberg/ts/CHANGELOG.md +++ /dev/null @@ -1,15 +0,0 @@ -# Changelog - -## [0.5.2](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.5.1...barretenberg.js-v0.5.2) (2023-09-08) - - -### Miscellaneous - -* **master:** Release 0.6.0 ([#2121](https://github.com/AztecProtocol/aztec-packages/issues/2121)) ([9bc8e11](https://github.com/AztecProtocol/aztec-packages/commit/9bc8e11ec4598c54d2c8f37c9f1a38ad90148f12)) - -## [0.6.0](https://github.com/AztecProtocol/aztec-packages/compare/barretenberg.js-v0.5.1...barretenberg.js-v0.6.0) (2023-09-08) - - -### Miscellaneous - -* **barretenberg.js:** Synchronize aztec-packages versions From efebc27b4f0bc40d439d2d7e614b922a971ef54e Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 13 Sep 2023 12:24:45 -0400 Subject: [PATCH 16/36] chore: circuits/bb => bb --- .gitmodules | 8 ++++---- .../.circleci/config.yml | 0 .../cpp/barretenberg => barretenberg}/.dockerignore | 0 .../.github/pull_request_template.md | 0 .../.github/workflows/benchmarks.yml | 0 .../.github/workflows/nix.yml | 0 .../.github/workflows/noir.yml | 0 .../.github/workflows/pull-request.yml | 0 .../cpp/barretenberg => barretenberg}/.gitignore | 0 .../cpp/barretenberg => barretenberg}/.gitmodules | 0 .../cpp/barretenberg => barretenberg}/.gitrepo | 0 .../.vscode/c_cpp_properties.json | 0 .../.vscode/settings.json | 0 .../cpp/barretenberg => barretenberg}/CHANGELOG.md | 0 {circuits/cpp/barretenberg => barretenberg}/LICENSE | 0 {circuits/cpp/barretenberg => barretenberg}/PROJECT | 0 .../cpp/barretenberg => barretenberg}/README.md | 0 {circuits/cpp/barretenberg => barretenberg}/VERSION | 0 .../acir_tests/.dockerignore | 0 .../acir_tests/.gitignore | 0 .../acir_tests/Dockerfile.bb | 0 .../acir_tests/Dockerfile.bb.js | 0 .../acir_tests/README.md | 0 .../acir_tests/browser-test-app/package.json | 0 .../acir_tests/browser-test-app/serve.mt.json | 0 .../acir_tests/browser-test-app/src/index.html | 0 .../acir_tests/browser-test-app/src/index.ts | 0 .../acir_tests/browser-test-app/tsconfig.json | 0 .../acir_tests/browser-test-app/webpack.config.js | 0 .../acir_tests/browser-test-app/yarn.lock | 0 .../acir_tests/flows/all_cmds.sh | 0 .../acir_tests/flows/prove_and_verify.sh | 0 .../acir_tests/headless-test/bb.js.browser | 0 .../acir_tests/headless-test/package.json | 0 .../acir_tests/headless-test/src/index.ts | 0 .../acir_tests/headless-test/tsconfig.json | 0 .../acir_tests/headless-test/yarn.lock | 0 .../acir_tests/run_acir_tests.sh | 0 .../acir_tests/run_acir_tests_browser.sh | 0 .../barretenberg-wasm.nix | 0 .../barretenberg.code-workspace | 0 .../barretenberg => barretenberg}/barretenberg.nix | 0 .../cpp/barretenberg => barretenberg}/bootstrap.sh | 0 .../bootstrap_docker.sh | 0 .../cpp/barretenberg => barretenberg}/build-system | 0 .../build_manifest.json | 0 .../barretenberg => barretenberg}/build_manifest.sh | 0 .../cpp/.aztec-packages-commit | 0 .../barretenberg => barretenberg}/cpp/.clang-format | 0 .../cpp/barretenberg => barretenberg}/cpp/.clangd | 0 .../barretenberg => barretenberg}/cpp/.dockerignore | 0 .../barretenberg => barretenberg}/cpp/.gitignore | 0 .../cpp/CMakeLists.txt | 0 .../cpp/CMakePresets.json | 0 .../cpp/bin-test/target/acir.gz | Bin .../cpp/bin-test/target/witness.gz | Bin .../barretenberg => barretenberg}/cpp/bootstrap.sh | 0 .../cpp/cmake/arch.cmake | 0 .../cpp/cmake/barretenberg.pc.in | 0 .../cpp/cmake/benchmark.cmake | 0 .../cpp/cmake/build.cmake | 0 .../cpp/cmake/gtest.cmake | 0 .../cpp/cmake/module.cmake | 0 .../cpp/cmake/threading.cmake | 0 .../cpp/cmake/toolchains/aarch64-darwin.cmake | 0 .../cpp/cmake/toolchains/aarch64-linux.cmake | 0 .../cpp/cmake/toolchains/i386-linux.cmake | 0 .../cpp/cmake/toolchains/wasm32-wasi.cmake | 0 .../cpp/cmake/toolchains/x86_64-darwin.cmake | 0 .../cpp/cmake/toolchains/x86_64-linux.cmake | 0 .../cpp/dockerfiles/Dockerfile.wasm-linux-clang | 0 .../cpp/dockerfiles/Dockerfile.x86_64-linux-clang | 0 .../Dockerfile.x86_64-linux-clang-assert | 0 .../Dockerfile.x86_64-linux-clang-benchmarks | 0 .../Dockerfile.x86_64-linux-clang-fuzzing | 0 .../cpp/dockerfiles/Dockerfile.x86_64-linux-gcc | 0 .../cpp/docs/Fuzzing.md | 0 .../cpp/barretenberg => barretenberg}/cpp/format.sh | 0 .../cpp/notebook.ipynb | 0 .../cpp/scripts/bb-tests.sh | 0 .../cpp/scripts/collect_coverage_information.sh | 0 .../cpp/scripts/install-wasi-sdk.sh | 0 .../cpp/scripts/run_aztec_circuits_tests | 0 .../cpp/scripts/run_tests | 0 .../cpp/scripts/stdlib-tests | 0 .../cpp/scripts/strip-wasm.sh | 0 .../cpp/src/CMakeLists.txt | 0 .../cpp/src/barretenberg/barretenberg.hpp | 0 .../cpp/src/barretenberg/bb/CMakeLists.txt | 0 .../cpp/src/barretenberg/bb/exec_pipe.hpp | 0 .../cpp/src/barretenberg/bb/file_io.hpp | 0 .../cpp/src/barretenberg/bb/get_bytecode.hpp | 0 .../cpp/src/barretenberg/bb/get_crs.hpp | 0 .../cpp/src/barretenberg/bb/get_witness.hpp | 0 .../cpp/src/barretenberg/bb/log.hpp | 0 .../cpp/src/barretenberg/bb/main.cpp | 0 .../cpp/src/barretenberg/bb/readme.md | 0 .../cpp/src/barretenberg/benchmark/CMakeLists.txt | 0 .../benchmark/compare_branch_vs_baseline.sh | 0 .../benchmark/decrypt_bench/CMakeLists.txt | 0 .../barretenberg/benchmark/decrypt_bench/main.cpp | 0 .../benchmark/honk_bench/CMakeLists.txt | 0 .../benchmark/honk_bench/benchmark_utilities.hpp | 0 .../honk_bench/compare_honk_to_plonk_standard.sh | 0 .../honk_bench/compare_honk_to_plonk_ultra.sh | 0 .../benchmark/honk_bench/honk.bench.cpp | 0 .../benchmark/honk_bench/main.bench.cpp | 0 .../benchmark/honk_bench/standard_honk.bench.cpp | 0 .../benchmark/honk_bench/standard_plonk.bench.cpp | 0 .../benchmark/honk_bench/ultra_honk.bench.cpp | 0 .../benchmark/honk_bench/ultra_plonk.bench.cpp | 0 .../benchmark/pippenger_bench/CMakeLists.txt | 0 .../barretenberg/benchmark/pippenger_bench/main.cpp | 0 .../benchmark/plonk_bench/CMakeLists.txt | 0 .../benchmark/plonk_bench/plonk.bench.cpp | 0 .../benchmark/relations_bench/CMakeLists.txt | 0 .../benchmark/relations_bench/barycentric.bench.cpp | 0 .../benchmark/relations_bench/main.bench.cpp | 0 .../benchmark/relations_bench/relations.bench.cpp | 0 .../cpp/src/barretenberg/common/CMakeLists.txt | 0 .../cpp/src/barretenberg/common/assert.hpp | 0 .../cpp/src/barretenberg/common/c_bind.cpp | 0 .../cpp/src/barretenberg/common/c_bind.hpp | 0 .../cpp/src/barretenberg/common/constexpr_utils.hpp | 0 .../cpp/src/barretenberg/common/container.hpp | 0 .../cpp/src/barretenberg/common/fuzzer.hpp | 0 .../src/barretenberg/common/fuzzer_constants.hpp | 0 .../cpp/src/barretenberg/common/inline.hpp | 0 .../cpp/src/barretenberg/common/log.hpp | 0 .../cpp/src/barretenberg/common/map.hpp | 0 .../cpp/src/barretenberg/common/mem.cpp | 0 .../cpp/src/barretenberg/common/mem.hpp | 0 .../common/moody/blockingconcurrentqueue.h | 0 .../src/barretenberg/common/moody/concurrentqueue.h | 0 .../common/moody/lightweightsemaphore.h | 0 .../cpp/src/barretenberg/common/net.hpp | 0 .../common/parallel_for_atomic_pool.cpp | 0 .../src/barretenberg/common/parallel_for_moody.cpp | 0 .../barretenberg/common/parallel_for_mutex_pool.cpp | 0 .../src/barretenberg/common/parallel_for_omp.cpp | 0 .../src/barretenberg/common/parallel_for_queued.cpp | 0 .../barretenberg/common/parallel_for_spawning.cpp | 0 .../cpp/src/barretenberg/common/printf.hpp | 0 .../cpp/src/barretenberg/common/serialize.hpp | 0 .../cpp/src/barretenberg/common/slab_allocator.cpp | 0 .../cpp/src/barretenberg/common/slab_allocator.hpp | 0 .../cpp/src/barretenberg/common/streams.hpp | 0 .../cpp/src/barretenberg/common/test.hpp | 0 .../cpp/src/barretenberg/common/thread.cpp | 0 .../cpp/src/barretenberg/common/thread.hpp | 0 .../cpp/src/barretenberg/common/throw_or_abort.hpp | 0 .../cpp/src/barretenberg/common/timer.hpp | 0 .../cpp/src/barretenberg/common/wasm_export.hpp | 0 .../cpp/src/barretenberg/crypto/CMakeLists.txt | 0 .../src/barretenberg/crypto/aes128/CMakeLists.txt | 0 .../cpp/src/barretenberg/crypto/aes128/aes128.cpp | 0 .../cpp/src/barretenberg/crypto/aes128/aes128.hpp | 0 .../src/barretenberg/crypto/aes128/aes128.test.cpp | 0 .../cpp/src/barretenberg/crypto/aes128/c_bind.cpp | 0 .../src/barretenberg/crypto/blake2s/CMakeLists.txt | 0 .../src/barretenberg/crypto/blake2s/blake2-impl.hpp | 0 .../cpp/src/barretenberg/crypto/blake2s/blake2s.cpp | 0 .../cpp/src/barretenberg/crypto/blake2s/blake2s.hpp | 0 .../barretenberg/crypto/blake2s/blake2s.test.cpp | 0 .../cpp/src/barretenberg/crypto/blake2s/c_bind.cpp | 0 .../cpp/src/barretenberg/crypto/blake2s/c_bind.hpp | 0 .../src/barretenberg/crypto/blake3s/CMakeLists.txt | 0 .../src/barretenberg/crypto/blake3s/blake3-impl.hpp | 0 .../cpp/src/barretenberg/crypto/blake3s/blake3s.cpp | 0 .../cpp/src/barretenberg/crypto/blake3s/blake3s.hpp | 0 .../barretenberg/crypto/blake3s/blake3s.test.cpp | 0 .../cpp/src/barretenberg/crypto/blake3s/c_bind.cpp | 0 .../barretenberg/crypto/blake3s_full/CMakeLists.txt | 0 .../crypto/blake3s_full/blake3-impl.hpp | 0 .../barretenberg/crypto/blake3s_full/blake3s.cpp | 0 .../barretenberg/crypto/blake3s_full/blake3s.hpp | 0 .../crypto/blake3s_full/blake3s.test.cpp | 0 .../src/barretenberg/crypto/ecdsa/CMakeLists.txt | 0 .../cpp/src/barretenberg/crypto/ecdsa/c_bind.cpp | 0 .../cpp/src/barretenberg/crypto/ecdsa/c_bind.h | 0 .../cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp | 0 .../src/barretenberg/crypto/ecdsa/ecdsa.test.cpp | 0 .../src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp | 0 .../barretenberg/crypto/generators/CMakeLists.txt | 0 .../crypto/generators/fixed_base_scalar_mul.hpp | 0 .../crypto/generators/generator_data.cpp | 0 .../crypto/generators/generator_data.hpp | 0 .../crypto/generators/generator_data.test.cpp | 0 .../cpp/src/barretenberg/crypto/hashers/hashers.hpp | 0 .../cpp/src/barretenberg/crypto/hmac/CMakeLists.txt | 0 .../cpp/src/barretenberg/crypto/hmac/hmac.hpp | 0 .../cpp/src/barretenberg/crypto/hmac/hmac.test.cpp | 0 .../src/barretenberg/crypto/keccak/CMakeLists.txt | 0 .../src/barretenberg/crypto/keccak/hash_types.hpp | 0 .../cpp/src/barretenberg/crypto/keccak/keccak.cpp | 0 .../cpp/src/barretenberg/crypto/keccak/keccak.hpp | 0 .../src/barretenberg/crypto/keccak/keccakf1600.cpp | 0 .../crypto/pedersen_commitment/CMakeLists.txt | 0 .../crypto/pedersen_commitment/c_bind.cpp | 0 .../crypto/pedersen_commitment/c_bind.hpp | 0 .../crypto/pedersen_commitment/c_bind_new.cpp | 0 .../crypto/pedersen_commitment/c_bind_new.hpp | 0 .../pedersen_commitment/convert_buffer_to_field.hpp | 0 .../crypto/pedersen_commitment/pedersen.cpp | 0 .../crypto/pedersen_commitment/pedersen.hpp | 0 .../crypto/pedersen_commitment/pedersen_lookup.cpp | 0 .../crypto/pedersen_commitment/pedersen_lookup.hpp | 0 .../pedersen_commitment/pedersen_lookup.test.cpp | 0 .../crypto/pedersen_hash/CMakeLists.txt | 0 .../barretenberg/crypto/pedersen_hash/c_bind.cpp | 0 .../barretenberg/crypto/pedersen_hash/c_bind.hpp | 0 .../crypto/pedersen_hash/c_bind_new.cpp | 0 .../barretenberg/crypto/pedersen_hash/pedersen.cpp | 0 .../barretenberg/crypto/pedersen_hash/pedersen.hpp | 0 .../crypto/pedersen_hash/pedersen_lookup.cpp | 0 .../crypto/pedersen_hash/pedersen_lookup.hpp | 0 .../src/barretenberg/crypto/schnorr/CMakeLists.txt | 0 .../cpp/src/barretenberg/crypto/schnorr/c_bind.cpp | 0 .../cpp/src/barretenberg/crypto/schnorr/c_bind.hpp | 0 .../src/barretenberg/crypto/schnorr/c_bind_new.cpp | 0 .../src/barretenberg/crypto/schnorr/multisig.hpp | 0 .../barretenberg/crypto/schnorr/multisig.test.cpp | 0 .../crypto/schnorr/proof_of_possession.hpp | 0 .../crypto/schnorr/proof_of_possession.test.cpp | 0 .../cpp/src/barretenberg/crypto/schnorr/schnorr.hpp | 0 .../cpp/src/barretenberg/crypto/schnorr/schnorr.tcc | 0 .../barretenberg/crypto/schnorr/schnorr.test.cpp | 0 .../src/barretenberg/crypto/sha256/CMakeLists.txt | 0 .../cpp/src/barretenberg/crypto/sha256/c_bind.cpp | 0 .../cpp/src/barretenberg/crypto/sha256/sha256.cpp | 0 .../cpp/src/barretenberg/crypto/sha256/sha256.hpp | 0 .../src/barretenberg/crypto/sha256/sha256.test.cpp | 0 .../cpp/src/barretenberg/dsl/CMakeLists.txt | 0 .../barretenberg/dsl/acir_format/acir_format.cpp | 0 .../barretenberg/dsl/acir_format/acir_format.hpp | 0 .../dsl/acir_format/acir_format.test.cpp | 0 .../dsl/acir_format/acir_to_constraint_buf.hpp | 0 .../dsl/acir_format/blake2s_constraint.cpp | 0 .../dsl/acir_format/blake2s_constraint.hpp | 0 .../dsl/acir_format/block_constraint.cpp | 0 .../dsl/acir_format/block_constraint.hpp | 0 .../dsl/acir_format/block_constraint.test.cpp | 0 .../dsl/acir_format/ecdsa_secp256k1.cpp | 0 .../dsl/acir_format/ecdsa_secp256k1.hpp | 0 .../dsl/acir_format/ecdsa_secp256k1.test.cpp | 0 .../dsl/acir_format/ecdsa_secp256r1.cpp | 0 .../dsl/acir_format/ecdsa_secp256r1.hpp | 0 .../dsl/acir_format/ecdsa_secp256r1.test.cpp | 0 .../dsl/acir_format/fixed_base_scalar_mul.cpp | 0 .../dsl/acir_format/fixed_base_scalar_mul.hpp | 0 .../dsl/acir_format/fixed_base_scalar_mul.test.cpp | 0 .../barretenberg/dsl/acir_format/hash_to_field.cpp | 0 .../barretenberg/dsl/acir_format/hash_to_field.hpp | 0 .../dsl/acir_format/keccak_constraint.cpp | 0 .../dsl/acir_format/keccak_constraint.hpp | 0 .../dsl/acir_format/logic_constraint.cpp | 0 .../dsl/acir_format/logic_constraint.hpp | 0 .../src/barretenberg/dsl/acir_format/pedersen.cpp | 0 .../src/barretenberg/dsl/acir_format/pedersen.hpp | 0 .../dsl/acir_format/range_constraint.hpp | 0 .../dsl/acir_format/recursion_constraint.cpp | 0 .../dsl/acir_format/recursion_constraint.hpp | 0 .../dsl/acir_format/recursion_constraint.test.cpp | 0 .../cpp/src/barretenberg/dsl/acir_format/round.cpp | 0 .../cpp/src/barretenberg/dsl/acir_format/round.hpp | 0 .../barretenberg/dsl/acir_format/schnorr_verify.cpp | 0 .../barretenberg/dsl/acir_format/schnorr_verify.hpp | 0 .../src/barretenberg/dsl/acir_format/serde/acir.hpp | 0 .../barretenberg/dsl/acir_format/serde/binary.hpp | 0 .../barretenberg/dsl/acir_format/serde/bincode.hpp | 0 .../barretenberg/dsl/acir_format/serde/index.hpp | 0 .../barretenberg/dsl/acir_format/serde/serde.hpp | 0 .../dsl/acir_format/serde/witness_map.hpp | 0 .../dsl/acir_format/sha256_constraint.cpp | 0 .../dsl/acir_format/sha256_constraint.hpp | 0 .../barretenberg/dsl/acir_proofs/acir_composer.cpp | 0 .../barretenberg/dsl/acir_proofs/acir_composer.hpp | 0 .../cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp | 0 .../cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp | 0 .../cpp/src/barretenberg/dsl/types.hpp | 0 .../cpp/src/barretenberg/ecc/CMakeLists.txt | 0 .../cpp/src/barretenberg/ecc/curves/bn254/bn254.hpp | 0 .../cpp/src/barretenberg/ecc/curves/bn254/fq.hpp | 0 .../src/barretenberg/ecc/curves/bn254/fq.test.cpp | 0 .../cpp/src/barretenberg/ecc/curves/bn254/fq12.hpp | 0 .../src/barretenberg/ecc/curves/bn254/fq12.test.cpp | 0 .../cpp/src/barretenberg/ecc/curves/bn254/fq2.hpp | 0 .../src/barretenberg/ecc/curves/bn254/fq2.test.cpp | 0 .../cpp/src/barretenberg/ecc/curves/bn254/fq6.hpp | 0 .../src/barretenberg/ecc/curves/bn254/fq6.test.cpp | 0 .../src/barretenberg/ecc/curves/bn254/fr.bench.cpp | 0 .../cpp/src/barretenberg/ecc/curves/bn254/fr.hpp | 0 .../src/barretenberg/ecc/curves/bn254/fr.test.cpp | 0 .../cpp/src/barretenberg/ecc/curves/bn254/g1.hpp | 0 .../src/barretenberg/ecc/curves/bn254/g1.test.cpp | 0 .../cpp/src/barretenberg/ecc/curves/bn254/g2.hpp | 0 .../src/barretenberg/ecc/curves/bn254/g2.test.cpp | 0 .../src/barretenberg/ecc/curves/bn254/pairing.hpp | 0 .../barretenberg/ecc/curves/bn254/pairing.test.cpp | 0 .../barretenberg/ecc/curves/bn254/pairing_impl.hpp | 0 .../src/barretenberg/ecc/curves/grumpkin/c_bind.cpp | 0 .../barretenberg/ecc/curves/grumpkin/grumpkin.cpp | 0 .../barretenberg/ecc/curves/grumpkin/grumpkin.hpp | 0 .../ecc/curves/grumpkin/grumpkin.test.cpp | 0 .../barretenberg/ecc/curves/secp256k1/c_bind.cpp | 0 .../barretenberg/ecc/curves/secp256k1/c_bind.hpp | 0 .../barretenberg/ecc/curves/secp256k1/secp256k1.cpp | 0 .../barretenberg/ecc/curves/secp256k1/secp256k1.hpp | 0 .../ecc/curves/secp256k1/secp256k1.test.cpp | 0 .../ecc/curves/secp256k1/secp256k1_endo_notes.hpp | 0 .../barretenberg/ecc/curves/secp256r1/secp256r1.cpp | 0 .../barretenberg/ecc/curves/secp256r1/secp256r1.hpp | 0 .../ecc/curves/secp256r1/secp256r1.test.cpp | 0 .../cpp/src/barretenberg/ecc/curves/types.hpp | 0 .../cpp/src/barretenberg/ecc/fields/asm_macros.hpp | 0 .../barretenberg/ecc/fields/extra_flag_solver.py | 0 .../cpp/src/barretenberg/ecc/fields/field.hpp | 0 .../cpp/src/barretenberg/ecc/fields/field12.hpp | 0 .../cpp/src/barretenberg/ecc/fields/field2.hpp | 0 .../barretenberg/ecc/fields/field2_declarations.hpp | 0 .../cpp/src/barretenberg/ecc/fields/field6.hpp | 0 .../barretenberg/ecc/fields/field_declarations.hpp | 0 .../cpp/src/barretenberg/ecc/fields/field_impl.hpp | 0 .../barretenberg/ecc/fields/field_impl_generic.hpp | 0 .../src/barretenberg/ecc/fields/field_impl_x64.hpp | 0 .../src/barretenberg/ecc/fields/macro_scrapbook.hpp | 0 .../src/barretenberg/ecc/groups/affine_element.hpp | 0 .../barretenberg/ecc/groups/affine_element.test.cpp | 0 .../barretenberg/ecc/groups/affine_element_impl.hpp | 0 .../cpp/src/barretenberg/ecc/groups/element.hpp | 0 .../src/barretenberg/ecc/groups/element_impl.hpp | 0 .../cpp/src/barretenberg/ecc/groups/group.hpp | 0 .../src/barretenberg/ecc/groups/group_impl_asm.tcc | 0 .../barretenberg/ecc/groups/group_impl_int128.tcc | 0 .../cpp/src/barretenberg/ecc/groups/wnaf.hpp | 0 .../cpp/src/barretenberg/ecc/groups/wnaf.test.cpp | 0 .../cpp/src/barretenberg/ecc/pippenger.md | 0 .../ecc/scalar_multiplication/point_table.hpp | 0 .../ecc/scalar_multiplication/process_buckets.cpp | 0 .../ecc/scalar_multiplication/process_buckets.hpp | 0 .../ecc/scalar_multiplication/runtime_states.cpp | 0 .../ecc/scalar_multiplication/runtime_states.hpp | 0 .../scalar_multiplication/scalar_multiplication.cpp | 0 .../scalar_multiplication/scalar_multiplication.hpp | 0 .../cpp/src/barretenberg/ecc/serialize.test.cpp | 0 .../cpp/src/barretenberg/env/CMakeLists.txt | 0 .../cpp/src/barretenberg/env/data_store.cpp | 0 .../cpp/src/barretenberg/env/data_store.hpp | 0 .../src/barretenberg/env/hardware_concurrency.cpp | 0 .../src/barretenberg/env/hardware_concurrency.hpp | 0 .../cpp/src/barretenberg/env/logstr.cpp | 0 .../cpp/src/barretenberg/env/logstr.hpp | 0 .../cpp/src/barretenberg/examples/CMakeLists.txt | 0 .../cpp/src/barretenberg/examples/c_bind.cpp | 0 .../cpp/src/barretenberg/examples/c_bind.hpp | 0 .../cpp/src/barretenberg/examples/simple/simple.cpp | 0 .../cpp/src/barretenberg/examples/simple/simple.hpp | 0 .../barretenberg/examples/simple/simple.test.cpp | 0 .../barretenberg/grumpkin_srs_gen/CMakeLists.txt | 0 .../grumpkin_srs_gen/grumpkin_srs_gen.cpp | 0 .../cpp/src/barretenberg/honk/CMakeLists.txt | 0 .../honk/composer/goblin_ultra_composer.test.cpp | 0 .../honk/composer/standard_composer.cpp | 0 .../honk/composer/standard_composer.hpp | 0 .../honk/composer/standard_composer.test.cpp | 0 .../barretenberg/honk/composer/ultra_composer.cpp | 0 .../barretenberg/honk/composer/ultra_composer.hpp | 0 .../honk/composer/ultra_composer.test.cpp | 0 .../src/barretenberg/honk/flavor/flavor.test.cpp | 0 .../src/barretenberg/honk/flavor/goblin_ultra.hpp | 0 .../honk/flavor/goblin_ultra_recursive.hpp | 0 .../cpp/src/barretenberg/honk/flavor/standard.hpp | 0 .../barretenberg/honk/flavor/standard_grumpkin.hpp | 0 .../cpp/src/barretenberg/honk/flavor/ultra.hpp | 0 .../src/barretenberg/honk/flavor/ultra_grumpkin.hpp | 0 .../barretenberg/honk/flavor/ultra_recursive.hpp | 0 .../cpp/src/barretenberg/honk/pcs/claim.hpp | 0 .../src/barretenberg/honk/pcs/commitment_key.hpp | 0 .../barretenberg/honk/pcs/commitment_key.test.hpp | 0 .../cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp | 0 .../cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp | 0 .../barretenberg/honk/pcs/gemini/gemini.test.cpp | 0 .../cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp | 0 .../cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp | 0 .../cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp | 0 .../cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp | 0 .../src/barretenberg/honk/pcs/shplonk/shplonk.hpp | 0 .../barretenberg/honk/pcs/shplonk/shplonk.test.cpp | 0 .../src/barretenberg/honk/pcs/verification_key.hpp | 0 .../cpp/src/barretenberg/honk/pcs/wrapper.hpp | 0 .../barretenberg/honk/proof_system/composer_lib.hpp | 0 .../honk/proof_system/grand_product_library.hpp | 0 .../src/barretenberg/honk/proof_system/prover.cpp | 0 .../src/barretenberg/honk/proof_system/prover.hpp | 0 .../honk/proof_system/prover_library.cpp | 0 .../honk/proof_system/prover_library.hpp | 0 .../honk/proof_system/prover_library.test.cpp | 0 .../barretenberg/honk/proof_system/ultra_prover.cpp | 0 .../barretenberg/honk/proof_system/ultra_prover.hpp | 0 .../honk/proof_system/ultra_verifier.cpp | 0 .../honk/proof_system/ultra_verifier.hpp | 0 .../src/barretenberg/honk/proof_system/verifier.cpp | 0 .../src/barretenberg/honk/proof_system/verifier.hpp | 0 .../barretenberg/honk/proof_system/work_queue.hpp | 0 .../honk/sumcheck/partial_evaluation.test.cpp | 0 .../honk/sumcheck/relation_correctness.test.cpp | 0 .../cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp | 0 .../barretenberg/honk/sumcheck/sumcheck.test.cpp | 0 .../barretenberg/honk/sumcheck/sumcheck_output.hpp | 0 .../barretenberg/honk/sumcheck/sumcheck_round.hpp | 0 .../honk/sumcheck/sumcheck_round.test.cpp | 0 .../src/barretenberg/honk/transcript/transcript.hpp | 0 .../honk/transcript/transcript.test.cpp | 0 .../barretenberg/honk/utils/grand_product_delta.hpp | 0 .../barretenberg/honk/utils/power_polynomial.hpp | 0 .../honk/utils/power_polynomial.test.cpp | 0 .../barretenberg/join_split_example/CMakeLists.txt | 0 .../barretenberg/join_split_example/constants.hpp | 0 .../join_split_example/fixtures/user_context.hpp | 0 .../join_split_example/proofs/CMakeLists.txt | 0 .../proofs/compute_circuit_data.hpp | 0 .../proofs/inner_proof_data/CMakeLists.txt | 0 .../proofs/inner_proof_data/inner_proof_data.cpp | 0 .../proofs/inner_proof_data/inner_proof_data.hpp | 0 .../inner_proof_data/inner_proof_data.test.cpp | 0 .../proofs/join_split/CMakeLists.txt | 0 .../join_split_example/proofs/join_split/c_bind.cpp | 0 .../join_split_example/proofs/join_split/c_bind.h | 0 .../proofs/join_split/compute_circuit_data.cpp | 0 .../proofs/join_split/compute_circuit_data.hpp | 0 .../proofs/join_split/compute_signing_data.cpp | 0 .../proofs/join_split/compute_signing_data.hpp | 0 .../proofs/join_split/create_proof.hpp | 0 .../join_split_example/proofs/join_split/index.hpp | 0 .../proofs/join_split/join_split.cpp | 0 .../proofs/join_split/join_split.hpp | 0 .../proofs/join_split/join_split.test.cpp | 0 .../proofs/join_split/join_split_circuit.cpp | 0 .../proofs/join_split/join_split_circuit.hpp | 0 .../proofs/join_split/join_split_js_parity.test.cpp | 0 .../proofs/join_split/join_split_tx.cpp | 0 .../proofs/join_split/join_split_tx.hpp | 0 .../proofs/join_split/join_split_tx.test.cpp | 0 .../proofs/join_split/sign_join_split_tx.cpp | 0 .../proofs/join_split/sign_join_split_tx.hpp | 0 .../proofs/join_split/verify_signature.hpp | 0 .../join_split_example/proofs/mock/CMakeLists.txt | 0 .../join_split_example/proofs/mock/mock_circuit.hpp | 0 .../proofs/mock/mock_circuit.test.cpp | 0 .../join_split_example/proofs/notes/CMakeLists.txt | 0 .../proofs/notes/circuit/account/account_note.hpp | 0 .../proofs/notes/circuit/account/commit.hpp | 0 .../proofs/notes/circuit/account/index.hpp | 0 .../proofs/notes/circuit/asset_id.cpp | 0 .../proofs/notes/circuit/asset_id.hpp | 0 .../proofs/notes/circuit/bridge_call_data.hpp | 0 .../proofs/notes/circuit/claim/claim_note.hpp | 0 .../circuit/claim/complete_partial_commitment.hpp | 0 .../notes/circuit/claim/compute_nullifier.hpp | 0 .../circuit/claim/create_partial_commitment.hpp | 0 .../proofs/notes/circuit/claim/index.hpp | 0 .../proofs/notes/circuit/claim/witness_data.hpp | 0 .../proofs/notes/circuit/index.hpp | 0 .../proofs/notes/circuit/value/commit.hpp | 0 .../circuit/value/complete_partial_commitment.hpp | 0 .../notes/circuit/value/compute_nullifier.cpp | 0 .../notes/circuit/value/compute_nullifier.hpp | 0 .../notes/circuit/value/compute_nullifier.test.cpp | 0 .../circuit/value/create_partial_commitment.hpp | 0 .../proofs/notes/circuit/value/index.hpp | 0 .../proofs/notes/circuit/value/value_note.hpp | 0 .../proofs/notes/circuit/value/value_note.test.cpp | 0 .../proofs/notes/circuit/value/witness_data.hpp | 0 .../join_split_example/proofs/notes/constants.hpp | 0 .../proofs/notes/native/account/account_note.cpp | 0 .../proofs/notes/native/account/account_note.hpp | 0 .../compute_account_alias_hash_nullifier.hpp | 0 .../compute_account_public_key_nullifier.hpp | 0 .../proofs/notes/native/account/index.hpp | 0 .../proofs/notes/native/asset_id.cpp | 0 .../proofs/notes/native/asset_id.hpp | 0 .../proofs/notes/native/bridge_call_data.hpp | 0 .../proofs/notes/native/claim/claim_note.hpp | 0 .../notes/native/claim/claim_note_tx_data.hpp | 0 .../native/claim/complete_partial_commitment.hpp | 0 .../proofs/notes/native/claim/compute_nullifier.hpp | 0 .../native/claim/create_partial_commitment.hpp | 0 .../proofs/notes/native/claim/index.hpp | 0 .../proofs/notes/native/index.hpp | 0 .../native/value/complete_partial_commitment.hpp | 0 .../proofs/notes/native/value/compute_nullifier.cpp | 0 .../proofs/notes/native/value/compute_nullifier.hpp | 0 .../native/value/create_partial_commitment.hpp | 0 .../proofs/notes/native/value/index.hpp | 0 .../proofs/notes/native/value/value_note.hpp | 0 .../join_split_example/proofs/verify.hpp | 0 .../src/barretenberg/join_split_example/types.hpp | 0 .../cpp/src/barretenberg/numeric/CMakeLists.txt | 0 .../src/barretenberg/numeric/bitop/bitop.bench.cpp | 0 .../numeric/bitop/count_leading_zeros.hpp | 0 .../numeric/bitop/count_leading_zeros.test.cpp | 0 .../cpp/src/barretenberg/numeric/bitop/get_msb.hpp | 0 .../src/barretenberg/numeric/bitop/get_msb.test.cpp | 0 .../src/barretenberg/numeric/bitop/keep_n_lsb.hpp | 0 .../cpp/src/barretenberg/numeric/bitop/pow.hpp | 0 .../cpp/src/barretenberg/numeric/bitop/rotate.hpp | 0 .../src/barretenberg/numeric/bitop/sparse_form.hpp | 0 .../cpp/src/barretenberg/numeric/random/engine.cpp | 0 .../cpp/src/barretenberg/numeric/random/engine.hpp | 0 .../src/barretenberg/numeric/random/engine.test.cpp | 0 .../src/barretenberg/numeric/uint128/uint128.hpp | 0 .../barretenberg/numeric/uint128/uint128.test.cpp | 0 .../barretenberg/numeric/uint128/uint128_impl.hpp | 0 .../src/barretenberg/numeric/uint256/uint256.hpp | 0 .../barretenberg/numeric/uint256/uint256.test.cpp | 0 .../barretenberg/numeric/uint256/uint256_impl.hpp | 0 .../cpp/src/barretenberg/numeric/uintx/uintx.hpp | 0 .../src/barretenberg/numeric/uintx/uintx.test.cpp | 0 .../src/barretenberg/numeric/uintx/uintx_impl.hpp | 0 .../cpp/src/barretenberg/plonk/CMakeLists.txt | 0 .../barretenberg/plonk/composer/composer_lib.cpp | 0 .../barretenberg/plonk/composer/composer_lib.hpp | 0 .../plonk/composer/standard_composer.cpp | 0 .../plonk/composer/standard_composer.hpp | 0 .../plonk/composer/standard_composer.test.cpp | 0 .../barretenberg/plonk/composer/turbo_composer.cpp | 0 .../barretenberg/plonk/composer/turbo_composer.hpp | 0 .../plonk/composer/turbo_composer.test.cpp | 0 .../barretenberg/plonk/composer/ultra_composer.cpp | 0 .../barretenberg/plonk/composer/ultra_composer.hpp | 0 .../plonk/composer/ultra_composer.test.cpp | 0 .../cpp/src/barretenberg/plonk/flavor/flavor.hpp | 0 .../commitment_scheme/commitment_scheme.hpp | 0 .../commitment_scheme/commitment_scheme.test.cpp | 0 .../commitment_scheme/kate_commitment_scheme.cpp | 0 .../commitment_scheme/kate_commitment_scheme.hpp | 0 .../barretenberg/plonk/proof_system/constants.hpp | 0 .../plonk/proof_system/prover/c_bind.cpp | 0 .../plonk/proof_system/prover/prover.cpp | 0 .../plonk/proof_system/prover/prover.hpp | 0 .../plonk/proof_system/prover/prover.test.cpp | 0 .../plonk/proof_system/proving_key/proving_key.cpp | 0 .../plonk/proof_system/proving_key/proving_key.hpp | 0 .../proof_system/proving_key/proving_key.test.cpp | 0 .../plonk/proof_system/proving_key/serialize.hpp | 0 .../proof_system/public_inputs/public_inputs.hpp | 0 .../public_inputs/public_inputs.test.cpp | 0 .../public_inputs/public_inputs_impl.hpp | 0 .../proof_system/types/commitment_open_proof.hpp | 0 .../proof_system/types/polynomial_manifest.hpp | 0 .../plonk/proof_system/types/program_settings.hpp | 0 .../barretenberg/plonk/proof_system/types/proof.hpp | 0 .../plonk/proof_system/types/prover_settings.hpp | 0 .../proof_system/utils/generalized_permutation.hpp | 0 .../plonk/proof_system/utils/kate_verification.hpp | 0 .../plonk/proof_system/utils/permutation.hpp | 0 .../plonk/proof_system/verification_key/sol_gen.hpp | 0 .../verification_key/verification_key.cpp | 0 .../verification_key/verification_key.hpp | 0 .../verification_key/verification_key.test.cpp | 0 .../plonk/proof_system/verifier/verifier.cpp | 0 .../plonk/proof_system/verifier/verifier.hpp | 0 .../plonk/proof_system/verifier/verifier.test.cpp | 0 .../widgets/random_widgets/permutation_widget.hpp | 0 .../random_widgets/permutation_widget_impl.hpp | 0 .../widgets/random_widgets/plookup_widget.hpp | 0 .../widgets/random_widgets/plookup_widget_impl.hpp | 0 .../widgets/random_widgets/random_widget.hpp | 0 .../transition_widgets/arithmetic_widget.hpp | 0 .../widgets/transition_widgets/elliptic_widget.hpp | 0 .../transition_widgets/fixed_base_widget.hpp | 0 .../transition_widgets/genperm_sort_widget.hpp | 0 .../plookup_arithmetic_widget.hpp | 0 .../transition_widgets/plookup_auxiliary_widget.hpp | 0 .../transition_widgets/transition_widget.hpp | 0 .../transition_widgets/turbo_arithmetic_widget.hpp | 0 .../transition_widgets/turbo_logic_widget.hpp | 0 .../transition_widgets/turbo_range_widget.hpp | 0 .../cpp/src/barretenberg/polynomials/CMakeLists.txt | 0 .../src/barretenberg/polynomials/barycentric.hpp | 0 .../barretenberg/polynomials/barycentric.test.cpp | 0 .../barretenberg/polynomials/evaluation_domain.cpp | 0 .../barretenberg/polynomials/evaluation_domain.hpp | 0 .../polynomials/iterate_over_domain.hpp | 0 .../cpp/src/barretenberg/polynomials/polynomial.cpp | 0 .../cpp/src/barretenberg/polynomials/polynomial.hpp | 0 .../polynomials/polynomial_arithmetic.cpp | 0 .../polynomials/polynomial_arithmetic.hpp | 0 .../polynomials/polynomial_arithmetic.test.cpp | 0 .../barretenberg/polynomials/polynomials.bench.cpp | 0 .../cpp/src/barretenberg/polynomials/pow.hpp | 0 .../cpp/src/barretenberg/polynomials/pow.test.cpp | 0 .../cpp/src/barretenberg/polynomials/serialize.hpp | 0 .../cpp/src/barretenberg/polynomials/univariate.hpp | 0 .../barretenberg/polynomials/univariate.test.cpp | 0 .../src/barretenberg/proof_system/CMakeLists.txt | 0 .../arithmetization/arithmetization.hpp | 0 .../proof_system/arithmetization/gate_data.hpp | 0 .../circuit_builder/circuit_builder_base.cpp | 0 .../circuit_builder/circuit_builder_base.hpp | 0 .../goblin_translator_circuit_builder.cpp | 0 .../goblin_translator_circuit_builder.hpp | 0 .../goblin_translator_circuit_builder.test.cpp | 0 .../goblin_translator_mini.fuzzer.cpp | 0 .../goblin_ultra_circuit_builder.cpp | 0 .../goblin_ultra_circuit_builder.hpp | 0 .../goblin_ultra_circuit_builder.test.cpp | 0 .../circuit_builder/standard_circuit_builder.cpp | 0 .../circuit_builder/standard_circuit_builder.hpp | 0 .../standard_circuit_builder.test.cpp | 0 .../circuit_builder/turbo_circuit_builder.cpp | 0 .../circuit_builder/turbo_circuit_builder.hpp | 0 .../circuit_builder/turbo_circuit_builder.test.cpp | 0 .../circuit_builder/ultra_circuit_builder.cpp | 0 .../circuit_builder/ultra_circuit_builder.hpp | 0 .../circuit_builder/ultra_circuit_builder.test.cpp | 0 .../proof_system/composer/composer_lib.hpp | 0 .../proof_system/composer/composer_lib.test.cpp | 0 .../proof_system/composer/permutation_lib.hpp | 0 .../proof_system/composer/permutation_lib.test.cpp | 0 .../src/barretenberg/proof_system/flavor/flavor.hpp | 0 .../proof_system/op_queue/ecc_op_queue.hpp | 0 .../proof_system/op_queue/ecc_op_queue.test.cpp | 0 .../proof_system/plookup_tables/aes128.hpp | 0 .../proof_system/plookup_tables/blake2s.hpp | 0 .../proof_system/plookup_tables/dummy.hpp | 0 .../plookup_tables/keccak/keccak_chi.hpp | 0 .../plookup_tables/keccak/keccak_input.hpp | 0 .../plookup_tables/keccak/keccak_output.hpp | 0 .../plookup_tables/keccak/keccak_rho.hpp | 0 .../plookup_tables/keccak/keccak_theta.hpp | 0 .../plookup_tables/non_native_group_generator.cpp | 0 .../plookup_tables/non_native_group_generator.hpp | 0 .../proof_system/plookup_tables/pedersen.hpp | 0 .../proof_system/plookup_tables/plookup_tables.cpp | 0 .../proof_system/plookup_tables/plookup_tables.hpp | 0 .../proof_system/plookup_tables/sha256.hpp | 0 .../proof_system/plookup_tables/sparse.hpp | 0 .../proof_system/plookup_tables/types.hpp | 0 .../proof_system/plookup_tables/uint.hpp | 0 .../polynomial_store/polynomial_store.cpp | 0 .../polynomial_store/polynomial_store.hpp | 0 .../polynomial_store/polynomial_store.test.cpp | 0 .../polynomial_store/polynomial_store_cache.cpp | 0 .../polynomial_store/polynomial_store_cache.hpp | 0 .../polynomial_store/polynomial_store_wasm.cpp | 0 .../polynomial_store/polynomial_store_wasm.hpp | 0 .../proof_system/relations/arithmetic_relation.hpp | 0 .../proof_system/relations/auxiliary_relation.hpp | 0 .../relations/ecc_op_queue_relation.hpp | 0 .../proof_system/relations/elliptic_relation.hpp | 0 .../relations/gen_perm_sort_relation.hpp | 0 .../proof_system/relations/lookup_relation.hpp | 0 .../proof_system/relations/permutation_relation.hpp | 0 .../proof_system/relations/relation_parameters.hpp | 0 .../proof_system/relations/relation_types.hpp | 0 .../standard_relation_consistency.test.cpp | 0 .../relations/ultra_arithmetic_relation.hpp | 0 .../relations/ultra_relation_consistency.test.cpp | 0 .../proof_system/types/circuit_type.hpp | 0 .../proof_system/types/merkle_hash_type.hpp | 0 .../proof_system/types/pedersen_commitment_type.hpp | 0 .../proof_system/work_queue/work_queue.cpp | 0 .../proof_system/work_queue/work_queue.hpp | 0 .../cpp/src/barretenberg/serialize/CMakeLists.txt | 0 .../cpp/src/barretenberg/serialize/cbind.hpp | 0 .../cpp/src/barretenberg/serialize/cbind_fwd.hpp | 0 .../cpp/src/barretenberg/serialize/msgpack.hpp | 0 .../src/barretenberg/serialize/msgpack_apply.hpp | 0 .../serialize/msgpack_impl/check_memory_span.hpp | 0 .../serialize/msgpack_impl/concepts.hpp | 0 .../serialize/msgpack_impl/drop_keys.hpp | 0 .../serialize/msgpack_impl/func_traits.hpp | 0 .../serialize/msgpack_impl/msgpack_impl.hpp | 0 .../msgpack_impl/name_value_pair_macro.hpp | 0 .../serialize/msgpack_impl/schema_impl.hpp | 0 .../serialize/msgpack_impl/schema_name.hpp | 0 .../serialize/msgpack_impl/struct_map_impl.hpp | 0 .../serialize/msgpack_impl/variant_impl.hpp | 0 .../barretenberg/serialize/msgpack_schema.test.cpp | 0 .../cpp/src/barretenberg/serialize/raw_pointer.hpp | 0 .../cpp/src/barretenberg/serialize/test_helper.hpp | 0 .../barretenberg/smt_verification/CMakeLists.txt | 0 .../cpp/src/barretenberg/smt_verification/README.md | 0 .../smt_verification/circuit/circuit.cpp | 0 .../smt_verification/circuit/circuit.hpp | 0 .../smt_verification/smt_bigfield.test.cpp | 0 .../smt_verification/smt_examples.test.cpp | 0 .../smt_verification/smt_intmod.test.cpp | 0 .../smt_verification/smt_polynomials.test.cpp | 0 .../barretenberg/smt_verification/solver/solver.cpp | 0 .../barretenberg/smt_verification/solver/solver.hpp | 0 .../barretenberg/smt_verification/terms/bool.cpp | 0 .../barretenberg/smt_verification/terms/bool.hpp | 0 .../barretenberg/smt_verification/terms/ffiterm.cpp | 0 .../barretenberg/smt_verification/terms/ffiterm.hpp | 0 .../barretenberg/smt_verification/terms/ffterm.cpp | 0 .../barretenberg/smt_verification/terms/ffterm.hpp | 0 .../barretenberg/solidity_helpers/CMakeLists.txt | 0 .../solidity_helpers/circuits/add_2_circuit.hpp | 0 .../solidity_helpers/circuits/blake_circuit.hpp | 0 .../solidity_helpers/circuits/recursive_circuit.hpp | 0 .../src/barretenberg/solidity_helpers/key_gen.cpp | 0 .../src/barretenberg/solidity_helpers/proof_gen.cpp | 0 .../solidity_helpers/utils/instance_sol_gen.hpp | 0 .../barretenberg/solidity_helpers/utils/utils.hpp | 0 .../cpp/src/barretenberg/srs/CMakeLists.txt | 0 .../cpp/src/barretenberg/srs/c_bind.cpp | 0 .../cpp/src/barretenberg/srs/c_bind.hpp | 0 .../src/barretenberg/srs/factories/crs_factory.hpp | 0 .../barretenberg/srs/factories/file_crs_factory.cpp | 0 .../barretenberg/srs/factories/file_crs_factory.hpp | 0 .../barretenberg/srs/factories/mem_crs_factory.cpp | 0 .../barretenberg/srs/factories/mem_crs_factory.hpp | 0 .../srs/factories/mem_crs_factory.test.cpp | 0 .../cpp/src/barretenberg/srs/global_crs.cpp | 0 .../cpp/src/barretenberg/srs/global_crs.hpp | 0 .../cpp/src/barretenberg/srs/io.hpp | 0 .../cpp/src/barretenberg/srs/io.test.cpp | 0 .../barretenberg/srs/scalar_multiplication.test.cpp | 0 .../cpp/src/barretenberg/stdlib/CMakeLists.txt | 0 .../barretenberg/stdlib/commitment/CMakeLists.txt | 0 .../stdlib/commitment/pedersen/CMakeLists.txt | 0 .../stdlib/commitment/pedersen/pedersen.bench.cpp | 0 .../stdlib/commitment/pedersen/pedersen.cpp | 0 .../stdlib/commitment/pedersen/pedersen.hpp | 0 .../stdlib/commitment/pedersen/pedersen.test.cpp | 0 .../stdlib/commitment/pedersen/pedersen_plookup.cpp | 0 .../stdlib/commitment/pedersen/pedersen_plookup.hpp | 0 .../commitment/pedersen/pedersen_plookup.test.cpp | 0 .../barretenberg/stdlib/encryption/CMakeLists.txt | 0 .../stdlib/encryption/aes128/CMakeLists.txt | 0 .../stdlib/encryption/aes128/aes128.cpp | 0 .../stdlib/encryption/aes128/aes128.hpp | 0 .../stdlib/encryption/aes128/aes128.test.cpp | 0 .../stdlib/encryption/ecdsa/CMakeLists.txt | 0 .../barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp | 0 .../stdlib/encryption/ecdsa/ecdsa.test.cpp | 0 .../stdlib/encryption/ecdsa/ecdsa_impl.hpp | 0 .../stdlib/encryption/schnorr/CMakeLists.txt | 0 .../stdlib/encryption/schnorr/schnorr.cpp | 0 .../stdlib/encryption/schnorr/schnorr.hpp | 0 .../stdlib/encryption/schnorr/schnorr.test.cpp | 0 .../cpp/src/barretenberg/stdlib/hash/CMakeLists.txt | 0 .../stdlib/hash/benchmarks/CMakeLists.txt | 0 .../stdlib/hash/benchmarks/celer/CMakeLists.txt | 0 .../stdlib/hash/benchmarks/celer/sha256.bench.cpp | 0 .../stdlib/hash/benchmarks/external/CMakeLists.txt | 0 .../hash/benchmarks/external/external.bench.cpp | 0 .../stdlib/hash/benchmarks/sha256/CMakeLists.txt | 0 .../stdlib/hash/benchmarks/sha256/sha256.bench.cpp | 0 .../barretenberg/stdlib/hash/blake2s/CMakeLists.txt | 0 .../barretenberg/stdlib/hash/blake2s/blake2s.cpp | 0 .../barretenberg/stdlib/hash/blake2s/blake2s.hpp | 0 .../stdlib/hash/blake2s/blake2s.test.cpp | 0 .../stdlib/hash/blake2s/blake2s_plookup.cpp | 0 .../stdlib/hash/blake2s/blake2s_plookup.hpp | 0 .../barretenberg/stdlib/hash/blake2s/blake_util.hpp | 0 .../barretenberg/stdlib/hash/blake3s/CMakeLists.txt | 0 .../barretenberg/stdlib/hash/blake3s/blake3s.cpp | 0 .../barretenberg/stdlib/hash/blake3s/blake3s.hpp | 0 .../stdlib/hash/blake3s/blake3s.test.cpp | 0 .../stdlib/hash/blake3s/blake3s_plookup.cpp | 0 .../stdlib/hash/blake3s/blake3s_plookup.hpp | 0 .../barretenberg/stdlib/hash/keccak/CMakeLists.txt | 0 .../src/barretenberg/stdlib/hash/keccak/keccak.cpp | 0 .../src/barretenberg/stdlib/hash/keccak/keccak.hpp | 0 .../barretenberg/stdlib/hash/keccak/keccak.test.cpp | 0 .../stdlib/hash/pedersen/CMakeLists.txt | 0 .../barretenberg/stdlib/hash/pedersen/pedersen.cpp | 0 .../barretenberg/stdlib/hash/pedersen/pedersen.hpp | 0 .../stdlib/hash/pedersen/pedersen_gates.hpp | 0 .../stdlib/hash/pedersen/pedersen_plookup.cpp | 0 .../stdlib/hash/pedersen/pedersen_plookup.hpp | 0 .../barretenberg/stdlib/hash/sha256/CMakeLists.txt | 0 .../src/barretenberg/stdlib/hash/sha256/sha256.cpp | 0 .../src/barretenberg/stdlib/hash/sha256/sha256.hpp | 0 .../barretenberg/stdlib/hash/sha256/sha256.test.cpp | 0 .../stdlib/hash/sha256/sha256_plookup.cpp | 0 .../stdlib/hash/sha256/sha256_plookup.hpp | 0 .../barretenberg/stdlib/merkle_tree/CMakeLists.txt | 0 .../src/barretenberg/stdlib/merkle_tree/hash.hpp | 0 .../barretenberg/stdlib/merkle_tree/hash.test.cpp | 0 .../barretenberg/stdlib/merkle_tree/hash_path.hpp | 0 .../src/barretenberg/stdlib/merkle_tree/index.hpp | 0 .../barretenberg/stdlib/merkle_tree/membership.hpp | 0 .../stdlib/merkle_tree/membership.test.cpp | 0 .../stdlib/merkle_tree/memory_store.hpp | 0 .../barretenberg/stdlib/merkle_tree/memory_tree.cpp | 0 .../barretenberg/stdlib/merkle_tree/memory_tree.hpp | 0 .../stdlib/merkle_tree/memory_tree.test.cpp | 0 .../stdlib/merkle_tree/merkle_tree.bench.cpp | 0 .../barretenberg/stdlib/merkle_tree/merkle_tree.cpp | 0 .../barretenberg/stdlib/merkle_tree/merkle_tree.hpp | 0 .../stdlib/merkle_tree/merkle_tree.test.cpp | 0 .../merkle_tree/nullifier_tree/nullifier_leaf.hpp | 0 .../nullifier_tree/nullifier_memory_tree.cpp | 0 .../nullifier_tree/nullifier_memory_tree.hpp | 0 .../nullifier_tree/nullifier_memory_tree.test.cpp | 0 .../merkle_tree/nullifier_tree/nullifier_tree.cpp | 0 .../merkle_tree/nullifier_tree/nullifier_tree.hpp | 0 .../nullifier_tree/nullifier_tree.test.cpp | 0 .../barretenberg/stdlib/primitives/CMakeLists.txt | 0 .../stdlib/primitives/address/address.hpp | 0 .../stdlib/primitives/bigfield/bigfield.fuzzer.hpp | 0 .../stdlib/primitives/bigfield/bigfield.hpp | 0 .../stdlib/primitives/bigfield/bigfield.test.cpp | 0 .../primitives/bigfield/bigfield_all.fuzzer.cpp | 0 .../stdlib/primitives/bigfield/bigfield_impl.hpp | 0 .../bigfield/bigfield_standard.fuzzer.cpp | 0 .../primitives/bigfield/bigfield_turbo.fuzzer.cpp | 0 .../stdlib/primitives/biggroup/biggroup.hpp | 0 .../stdlib/primitives/biggroup/biggroup.test.cpp | 0 .../primitives/biggroup/biggroup_batch_mul.hpp | 0 .../stdlib/primitives/biggroup/biggroup_bn254.hpp | 0 .../stdlib/primitives/biggroup/biggroup_goblin.hpp | 0 .../primitives/biggroup/biggroup_goblin.test.cpp | 0 .../stdlib/primitives/biggroup/biggroup_impl.hpp | 0 .../stdlib/primitives/biggroup/biggroup_nafs.hpp | 0 .../primitives/biggroup/biggroup_secp256k1.hpp | 0 .../stdlib/primitives/biggroup/biggroup_tables.hpp | 0 .../stdlib/primitives/bit_array/bit_array.cpp | 0 .../primitives/bit_array/bit_array.fuzzer.hpp | 0 .../stdlib/primitives/bit_array/bit_array.hpp | 0 .../stdlib/primitives/bit_array/bit_array.test.cpp | 0 .../primitives/bit_array/bit_array_all.fuzzer.cpp | 0 .../bit_array/bit_array_standard.fuzzer.cpp | 0 .../primitives/bit_array/bit_array_turbo.fuzzer.cpp | 0 .../barretenberg/stdlib/primitives/bool/bool.cpp | 0 .../stdlib/primitives/bool/bool.fuzzer.hpp | 0 .../barretenberg/stdlib/primitives/bool/bool.hpp | 0 .../stdlib/primitives/bool/bool.test.cpp | 0 .../stdlib/primitives/bool/bool_all.fuzzer.cpp | 0 .../stdlib/primitives/bool/bool_standard.fuzzer.cpp | 0 .../stdlib/primitives/bool/bool_turbo.fuzzer.cpp | 0 .../stdlib/primitives/byte_array/byte_array.cpp | 0 .../primitives/byte_array/byte_array.fuzzer.hpp | 0 .../stdlib/primitives/byte_array/byte_array.hpp | 0 .../primitives/byte_array/byte_array.test.cpp | 0 .../primitives/byte_array/byte_array_all.fuzzer.cpp | 0 .../byte_array/byte_array_standard.fuzzer.cpp | 0 .../byte_array/byte_array_turbo.fuzzer.cpp | 0 .../circuit_builders/circuit_builders.hpp | 0 .../circuit_builders/circuit_builders_fwd.hpp | 0 .../barretenberg/stdlib/primitives/curves/bn254.hpp | 0 .../stdlib/primitives/curves/secp256k1.hpp | 0 .../stdlib/primitives/curves/secp256r1.hpp | 0 .../barretenberg/stdlib/primitives/field/array.hpp | 0 .../stdlib/primitives/field/array.test.cpp | 0 .../barretenberg/stdlib/primitives/field/field.cpp | 0 .../stdlib/primitives/field/field.fuzzer.hpp | 0 .../barretenberg/stdlib/primitives/field/field.hpp | 0 .../stdlib/primitives/field/field.test.cpp | 0 .../stdlib/primitives/field/field_all.fuzzer.cpp | 0 .../primitives/field/field_standard.fuzzer.cpp | 0 .../stdlib/primitives/field/field_turbo.fuzzer.cpp | 0 .../barretenberg/stdlib/primitives/group/group.hpp | 0 .../stdlib/primitives/group/group.test.cpp | 0 .../barretenberg/stdlib/primitives/logic/logic.cpp | 0 .../barretenberg/stdlib/primitives/logic/logic.hpp | 0 .../stdlib/primitives/logic/logic.test.cpp | 0 .../stdlib/primitives/memory/dynamic_array.cpp | 0 .../stdlib/primitives/memory/dynamic_array.hpp | 0 .../stdlib/primitives/memory/dynamic_array.test.cpp | 0 .../stdlib/primitives/memory/ram_table.cpp | 0 .../stdlib/primitives/memory/ram_table.hpp | 0 .../stdlib/primitives/memory/ram_table.test.cpp | 0 .../stdlib/primitives/memory/rom_table.cpp | 0 .../stdlib/primitives/memory/rom_table.hpp | 0 .../stdlib/primitives/memory/rom_table.test.cpp | 0 .../stdlib/primitives/memory/twin_rom_table.cpp | 0 .../stdlib/primitives/memory/twin_rom_table.hpp | 0 .../packed_byte_array/packed_byte_array.cpp | 0 .../packed_byte_array/packed_byte_array.hpp | 0 .../packed_byte_array/packed_byte_array.test.cpp | 0 .../stdlib/primitives/plookup/plookup.cpp | 0 .../stdlib/primitives/plookup/plookup.hpp | 0 .../stdlib/primitives/plookup/plookup.test.cpp | 0 .../barretenberg/stdlib/primitives/point/point.hpp | 0 .../stdlib/primitives/safe_uint/safe_uint.cpp | 0 .../primitives/safe_uint/safe_uint.fuzzer.hpp | 0 .../stdlib/primitives/safe_uint/safe_uint.hpp | 0 .../stdlib/primitives/safe_uint/safe_uint.test.cpp | 0 .../primitives/safe_uint/safe_uint_all.fuzzer.cpp | 0 .../safe_uint/safe_uint_standard.fuzzer.cpp | 0 .../primitives/safe_uint/safe_uint_turbo.fuzzer.cpp | 0 .../stdlib/primitives/uint/arithmetic.cpp | 0 .../stdlib/primitives/uint/comparison.cpp | 0 .../barretenberg/stdlib/primitives/uint/logic.cpp | 0 .../stdlib/primitives/uint/plookup/arithmetic.cpp | 0 .../stdlib/primitives/uint/plookup/comparison.cpp | 0 .../stdlib/primitives/uint/plookup/logic.cpp | 0 .../stdlib/primitives/uint/plookup/uint.cpp | 0 .../stdlib/primitives/uint/plookup/uint.hpp | 0 .../barretenberg/stdlib/primitives/uint/uint.cpp | 0 .../stdlib/primitives/uint/uint.fuzzer.hpp | 0 .../barretenberg/stdlib/primitives/uint/uint.hpp | 0 .../stdlib/primitives/uint/uint.test.cpp | 0 .../stdlib/primitives/uint/uint_all.fuzzer.cpp | 0 .../stdlib/primitives/uint/uint_standard.fuzzer.cpp | 0 .../stdlib/primitives/uint/uint_turbo.fuzzer.cpp | 0 .../stdlib/primitives/witness/witness.hpp | 0 .../barretenberg/stdlib/recursion/CMakeLists.txt | 0 .../aggregation_state/aggregation_state.hpp | 0 .../aggregation_state/native_aggregation_state.hpp | 0 .../stdlib/recursion/honk/transcript/transcript.hpp | 0 .../recursion/honk/transcript/transcript.test.cpp | 0 .../honk/verifier/ultra_recursive_verifier.cpp | 0 .../honk/verifier/ultra_recursive_verifier.hpp | 0 .../recursion/honk/verifier/verifier.test.cpp | 0 .../stdlib/recursion/transcript/transcript.hpp | 0 .../stdlib/recursion/transcript/transcript.test.cpp | 0 .../recursion/verification_key/verification_key.hpp | 0 .../verification_key/verification_key.test.cpp | 0 .../stdlib/recursion/verifier/program_settings.hpp | 0 .../stdlib/recursion/verifier/verifier.hpp | 0 .../stdlib/recursion/verifier/verifier.test.cpp | 0 .../recursion/verifier/verifier_turbo.test.cpp | 0 .../cpp/src/barretenberg/stdlib/types/turbo.hpp | 0 .../cpp/src/barretenberg/stdlib/types/ultra.hpp | 0 .../cpp/src/barretenberg/stdlib/utility/utility.hpp | 0 .../cpp/src/barretenberg/transcript/CMakeLists.txt | 0 .../cpp/src/barretenberg/transcript/manifest.hpp | 0 .../cpp/src/barretenberg/transcript/transcript.cpp | 0 .../cpp/src/barretenberg/transcript/transcript.hpp | 0 .../src/barretenberg/transcript/transcript.test.cpp | 0 .../barretenberg/transcript/transcript_wrappers.cpp | 0 .../barretenberg/transcript/transcript_wrappers.hpp | 0 .../cpp/src/barretenberg/wasi/CMakeLists.txt | 0 .../cpp/src/barretenberg/wasi/wasi_stubs.cpp | 0 .../cpp/src/barretenberg/wasi/wasm_init.cpp | 0 .../cpp/src/msgpack-c/.clang-format | 0 .../cpp/src/msgpack-c/.github/depends/boost.sh | 0 .../cpp/src/msgpack-c/.github/depends/zlib.sh | 0 .../src/msgpack-c/.github/workflows/coverage.yml | 0 .../cpp/src/msgpack-c/.github/workflows/gha.yml | 0 .../cpp/src/msgpack-c/.gitignore | 0 .../cpp/src/msgpack-c/CHANGELOG.md | 0 .../cpp/src/msgpack-c/CMakeLists.txt | 0 .../cpp/src/msgpack-c/COPYING | 0 .../cpp/src/msgpack-c/Doxyfile | 0 .../cpp/src/msgpack-c/Files.cmake | 0 .../cpp/src/msgpack-c/LICENSE_1_0.txt | 0 .../cpp/src/msgpack-c/NOTICE | 0 .../cpp/src/msgpack-c/QUICKSTART-CPP.md | 0 .../cpp/src/msgpack-c/README.md | 0 .../cpp/src/msgpack-c/appveyor.yml | 0 .../cpp/src/msgpack-c/ci/build_cmake.sh | 0 .../cpp/src/msgpack-c/ci/build_regression.sh | 0 .../cpp/src/msgpack-c/ci/set_gcc_10.sh | 0 .../cpp/src/msgpack-c/cmake/CodeCoverage.cmake | 0 .../cpp/src/msgpack-c/codecov.yml | 0 .../src/msgpack-c/erb/v1/cpp03_define_array.hpp.erb | 0 .../erb/v1/cpp03_define_array_decl.hpp.erb | 0 .../src/msgpack-c/erb/v1/cpp03_define_map.hpp.erb | 0 .../msgpack-c/erb/v1/cpp03_define_map_decl.hpp.erb | 0 .../msgpack-c/erb/v1/cpp03_msgpack_tuple.hpp.erb | 0 .../erb/v1/cpp03_msgpack_tuple_decl.hpp.erb | 0 .../cpp/src/msgpack-c/erb/v1/cpp03_zone.hpp.erb | 0 .../src/msgpack-c/erb/v1/cpp03_zone_decl.hpp.erb | 0 .../cpp/src/msgpack-c/example/CMakeLists.txt | 0 .../cpp/src/msgpack-c/example/boost/CMakeLists.txt | 0 .../src/msgpack-c/example/boost/asio_send_recv.cpp | 0 .../msgpack-c/example/boost/asio_send_recv_zlib.cpp | 0 .../example/boost/msgpack_variant_capitalize.cpp | 0 .../example/boost/msgpack_variant_mapbased.cpp | 0 .../cpp/src/msgpack-c/example/cpp03/CMakeLists.txt | 0 .../src/msgpack-c/example/cpp03/class_intrusive.cpp | 0 .../msgpack-c/example/cpp03/class_intrusive_map.cpp | 0 .../msgpack-c/example/cpp03/class_non_intrusive.cpp | 0 .../cpp/src/msgpack-c/example/cpp03/custom.cpp | 0 .../cpp/src/msgpack-c/example/cpp03/enum.cpp | 0 .../msgpack-c/example/cpp03/map_based_versionup.cpp | 0 .../cpp/src/msgpack-c/example/cpp03/protocol.cpp | 0 .../src/msgpack-c/example/cpp03/protocol_new.cpp | 0 .../cpp/src/msgpack-c/example/cpp03/reuse_zone.cpp | 0 .../cpp/src/msgpack-c/example/cpp03/simple.cpp | 0 .../cpp/src/msgpack-c/example/cpp03/speed_test.cpp | 0 .../example/cpp03/speed_test_nested_array.cpp | 0 .../cpp/src/msgpack-c/example/cpp03/stream.cpp | 0 .../cpp/src/msgpack-c/example/cpp11/CMakeLists.txt | 0 .../cpp/src/msgpack-c/example/cpp11/container.cpp | 0 .../msgpack-c/example/cpp11/non_def_con_class.cpp | 0 .../example/cpp11/socket_stream_example.cpp | 0 .../cpp/src/msgpack-c/example/x3/CMakeLists.txt | 0 .../cpp/src/msgpack-c/example/x3/parse.cpp | 0 .../cpp/src/msgpack-c/example/x3/stream_unpack.cpp | 0 .../cpp/src/msgpack-c/example/x3/unpack.cpp | 0 .../cpp/src/msgpack-c/fuzz/CMakeLists.txt | 0 .../cpp/src/msgpack-c/fuzz/regression_runner.cpp | 0 .../cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer.cpp | 0 ...se-minimized-unpack_pack_fuzzer-5656982724804608 | Bin ...se-minimized-unpack_pack_fuzzer-6022481354686464 | Bin .../fuzz/unpack_pack_fuzzer_seed_corpus/EmptyArray | 0 .../fuzz/unpack_pack_fuzzer_seed_corpus/EmptyObject | 0 .../unpack_pack_fuzzer_seed_corpus/ExcessiveNesting | 0 .../unpack_pack_fuzzer_seed_corpus/OpenWeatherMap | Bin .../WeatherUnderground | Bin .../cpp/src/msgpack-c/include/msgpack.hpp | 0 .../include/msgpack/adaptor/adaptor_base.hpp | 0 .../include/msgpack/adaptor/adaptor_base_decl.hpp | 0 .../msgpack-c/include/msgpack/adaptor/array_ref.hpp | 0 .../include/msgpack/adaptor/array_ref_decl.hpp | 0 .../src/msgpack-c/include/msgpack/adaptor/bool.hpp | 0 .../include/msgpack/adaptor/boost/fusion.hpp | 0 .../msgpack/adaptor/boost/msgpack_variant.hpp | 0 .../msgpack/adaptor/boost/msgpack_variant_decl.hpp | 0 .../include/msgpack/adaptor/boost/optional.hpp | 0 .../include/msgpack/adaptor/boost/string_ref.hpp | 0 .../include/msgpack/adaptor/boost/string_view.hpp | 0 .../msgpack-c/include/msgpack/adaptor/carray.hpp | 0 .../msgpack-c/include/msgpack/adaptor/char_ptr.hpp | 0 .../msgpack/adaptor/check_container_size.hpp | 0 .../msgpack/adaptor/check_container_size_decl.hpp | 0 .../msgpack-c/include/msgpack/adaptor/complex.hpp | 0 .../include/msgpack/adaptor/cpp11/array.hpp | 0 .../include/msgpack/adaptor/cpp11/array_char.hpp | 0 .../msgpack/adaptor/cpp11/array_unsigned_char.hpp | 0 .../include/msgpack/adaptor/cpp11/chrono.hpp | 0 .../include/msgpack/adaptor/cpp11/forward_list.hpp | 0 .../msgpack/adaptor/cpp11/reference_wrapper.hpp | 0 .../include/msgpack/adaptor/cpp11/shared_ptr.hpp | 0 .../include/msgpack/adaptor/cpp11/timespec.hpp | 0 .../include/msgpack/adaptor/cpp11/tuple.hpp | 0 .../include/msgpack/adaptor/cpp11/unique_ptr.hpp | 0 .../include/msgpack/adaptor/cpp11/unordered_map.hpp | 0 .../include/msgpack/adaptor/cpp11/unordered_set.hpp | 0 .../include/msgpack/adaptor/cpp17/array_byte.hpp | 0 .../include/msgpack/adaptor/cpp17/byte.hpp | 0 .../include/msgpack/adaptor/cpp17/carray_byte.hpp | 0 .../include/msgpack/adaptor/cpp17/optional.hpp | 0 .../include/msgpack/adaptor/cpp17/string_view.hpp | 0 .../include/msgpack/adaptor/cpp17/vector_byte.hpp | 0 .../include/msgpack/adaptor/cpp20/span.hpp | 0 .../msgpack-c/include/msgpack/adaptor/define.hpp | 0 .../include/msgpack/adaptor/define_decl.hpp | 0 .../src/msgpack-c/include/msgpack/adaptor/deque.hpp | 0 .../src/msgpack-c/include/msgpack/adaptor/ext.hpp | 0 .../msgpack-c/include/msgpack/adaptor/ext_decl.hpp | 0 .../msgpack-c/include/msgpack/adaptor/fixint.hpp | 0 .../include/msgpack/adaptor/fixint_decl.hpp | 0 .../src/msgpack-c/include/msgpack/adaptor/float.hpp | 0 .../src/msgpack-c/include/msgpack/adaptor/int.hpp | 0 .../msgpack-c/include/msgpack/adaptor/int_decl.hpp | 0 .../src/msgpack-c/include/msgpack/adaptor/list.hpp | 0 .../src/msgpack-c/include/msgpack/adaptor/map.hpp | 0 .../msgpack-c/include/msgpack/adaptor/map_decl.hpp | 0 .../include/msgpack/adaptor/msgpack_tuple.hpp | 0 .../include/msgpack/adaptor/msgpack_tuple_decl.hpp | 0 .../src/msgpack-c/include/msgpack/adaptor/nil.hpp | 0 .../msgpack-c/include/msgpack/adaptor/nil_decl.hpp | 0 .../src/msgpack-c/include/msgpack/adaptor/pair.hpp | 0 .../src/msgpack-c/include/msgpack/adaptor/raw.hpp | 0 .../msgpack-c/include/msgpack/adaptor/raw_decl.hpp | 0 .../src/msgpack-c/include/msgpack/adaptor/set.hpp | 0 .../include/msgpack/adaptor/size_equal_only.hpp | 0 .../msgpack/adaptor/size_equal_only_decl.hpp | 0 .../msgpack-c/include/msgpack/adaptor/string.hpp | 0 .../include/msgpack/adaptor/tr1/unordered_map.hpp | 0 .../include/msgpack/adaptor/tr1/unordered_set.hpp | 0 .../src/msgpack-c/include/msgpack/adaptor/v4raw.hpp | 0 .../include/msgpack/adaptor/v4raw_decl.hpp | 0 .../msgpack-c/include/msgpack/adaptor/vector.hpp | 0 .../include/msgpack/adaptor/vector_bool.hpp | 0 .../include/msgpack/adaptor/vector_char.hpp | 0 .../msgpack/adaptor/vector_unsigned_char.hpp | 0 .../msgpack-c/include/msgpack/adaptor/wstring.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/assert.hpp | 0 .../src/msgpack-c/include/msgpack/cpp_config.hpp | 0 .../msgpack-c/include/msgpack/cpp_config_decl.hpp | 0 .../src/msgpack-c/include/msgpack/cpp_version.hpp | 0 .../include/msgpack/create_object_visitor.hpp | 0 .../include/msgpack/create_object_visitor_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/fbuffer.hpp | 0 .../src/msgpack-c/include/msgpack/fbuffer_decl.hpp | 0 .../src/msgpack-c/include/msgpack/gcc_atomic.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/iterator.hpp | 0 .../src/msgpack-c/include/msgpack/iterator_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/meta.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/meta_decl.hpp | 0 .../src/msgpack-c/include/msgpack/null_visitor.hpp | 0 .../msgpack-c/include/msgpack/null_visitor_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/object.hpp | 0 .../src/msgpack-c/include/msgpack/object_decl.hpp | 0 .../src/msgpack-c/include/msgpack/object_fwd.hpp | 0 .../msgpack-c/include/msgpack/object_fwd_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/pack.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/pack_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/parse.hpp | 0 .../src/msgpack-c/include/msgpack/parse_decl.hpp | 0 .../src/msgpack-c/include/msgpack/parse_return.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/predef.h | 0 .../msgpack-c/include/msgpack/predef/architecture.h | 0 .../include/msgpack/predef/architecture/alpha.h | 0 .../include/msgpack/predef/architecture/arm.h | 0 .../include/msgpack/predef/architecture/blackfin.h | 0 .../include/msgpack/predef/architecture/convex.h | 0 .../include/msgpack/predef/architecture/ia64.h | 0 .../include/msgpack/predef/architecture/m68k.h | 0 .../include/msgpack/predef/architecture/mips.h | 0 .../include/msgpack/predef/architecture/parisc.h | 0 .../include/msgpack/predef/architecture/ppc.h | 0 .../include/msgpack/predef/architecture/ptx.h | 0 .../include/msgpack/predef/architecture/pyramid.h | 0 .../include/msgpack/predef/architecture/rs6k.h | 0 .../include/msgpack/predef/architecture/sparc.h | 0 .../include/msgpack/predef/architecture/superh.h | 0 .../include/msgpack/predef/architecture/sys370.h | 0 .../include/msgpack/predef/architecture/sys390.h | 0 .../include/msgpack/predef/architecture/x86.h | 0 .../include/msgpack/predef/architecture/x86/32.h | 0 .../include/msgpack/predef/architecture/x86/64.h | 0 .../include/msgpack/predef/architecture/z.h | 0 .../src/msgpack-c/include/msgpack/predef/compiler.h | 0 .../include/msgpack/predef/compiler/borland.h | 0 .../include/msgpack/predef/compiler/clang.h | 0 .../include/msgpack/predef/compiler/comeau.h | 0 .../include/msgpack/predef/compiler/compaq.h | 0 .../include/msgpack/predef/compiler/diab.h | 0 .../include/msgpack/predef/compiler/digitalmars.h | 0 .../include/msgpack/predef/compiler/dignus.h | 0 .../msgpack-c/include/msgpack/predef/compiler/edg.h | 0 .../include/msgpack/predef/compiler/ekopath.h | 0 .../msgpack-c/include/msgpack/predef/compiler/gcc.h | 0 .../include/msgpack/predef/compiler/gcc_xml.h | 0 .../include/msgpack/predef/compiler/greenhills.h | 0 .../include/msgpack/predef/compiler/hp_acc.h | 0 .../msgpack-c/include/msgpack/predef/compiler/iar.h | 0 .../msgpack-c/include/msgpack/predef/compiler/ibm.h | 0 .../include/msgpack/predef/compiler/intel.h | 0 .../msgpack-c/include/msgpack/predef/compiler/kai.h | 0 .../include/msgpack/predef/compiler/llvm.h | 0 .../include/msgpack/predef/compiler/metaware.h | 0 .../include/msgpack/predef/compiler/metrowerks.h | 0 .../include/msgpack/predef/compiler/microtec.h | 0 .../msgpack-c/include/msgpack/predef/compiler/mpw.h | 0 .../include/msgpack/predef/compiler/nvcc.h | 0 .../include/msgpack/predef/compiler/palm.h | 0 .../msgpack-c/include/msgpack/predef/compiler/pgi.h | 0 .../include/msgpack/predef/compiler/sgi_mipspro.h | 0 .../include/msgpack/predef/compiler/sunpro.h | 0 .../include/msgpack/predef/compiler/tendra.h | 0 .../include/msgpack/predef/compiler/visualc.h | 0 .../include/msgpack/predef/compiler/watcom.h | 0 .../include/msgpack/predef/detail/_cassert.h | 0 .../include/msgpack/predef/detail/_exception.h | 0 .../include/msgpack/predef/detail/comp_detected.h | 0 .../include/msgpack/predef/detail/endian_compat.h | 0 .../include/msgpack/predef/detail/os_detected.h | 0 .../msgpack/predef/detail/platform_detected.h | 0 .../msgpack-c/include/msgpack/predef/detail/test.h | 0 .../include/msgpack/predef/detail/test_def.h | 0 .../src/msgpack-c/include/msgpack/predef/hardware.h | 0 .../include/msgpack/predef/hardware/simd.h | 0 .../include/msgpack/predef/hardware/simd/arm.h | 0 .../msgpack/predef/hardware/simd/arm/versions.h | 0 .../include/msgpack/predef/hardware/simd/ppc.h | 0 .../msgpack/predef/hardware/simd/ppc/versions.h | 0 .../include/msgpack/predef/hardware/simd/x86.h | 0 .../msgpack/predef/hardware/simd/x86/versions.h | 0 .../include/msgpack/predef/hardware/simd/x86_amd.h | 0 .../msgpack/predef/hardware/simd/x86_amd/versions.h | 0 .../src/msgpack-c/include/msgpack/predef/language.h | 0 .../include/msgpack/predef/language/cuda.h | 0 .../include/msgpack/predef/language/objc.h | 0 .../include/msgpack/predef/language/stdc.h | 0 .../include/msgpack/predef/language/stdcpp.h | 0 .../src/msgpack-c/include/msgpack/predef/library.h | 0 .../msgpack-c/include/msgpack/predef/library/c.h | 0 .../include/msgpack/predef/library/c/_prefix.h | 0 .../include/msgpack/predef/library/c/cloudabi.h | 0 .../include/msgpack/predef/library/c/gnu.h | 0 .../msgpack-c/include/msgpack/predef/library/c/uc.h | 0 .../include/msgpack/predef/library/c/vms.h | 0 .../include/msgpack/predef/library/c/zos.h | 0 .../msgpack-c/include/msgpack/predef/library/std.h | 0 .../include/msgpack/predef/library/std/_prefix.h | 0 .../include/msgpack/predef/library/std/cxx.h | 0 .../include/msgpack/predef/library/std/dinkumware.h | 0 .../include/msgpack/predef/library/std/libcomo.h | 0 .../include/msgpack/predef/library/std/modena.h | 0 .../include/msgpack/predef/library/std/msl.h | 0 .../include/msgpack/predef/library/std/roguewave.h | 0 .../include/msgpack/predef/library/std/sgi.h | 0 .../include/msgpack/predef/library/std/stdcpp3.h | 0 .../include/msgpack/predef/library/std/stlport.h | 0 .../include/msgpack/predef/library/std/vacpp.h | 0 .../cpp/src/msgpack-c/include/msgpack/predef/make.h | 0 .../cpp/src/msgpack-c/include/msgpack/predef/os.h | 0 .../src/msgpack-c/include/msgpack/predef/os/aix.h | 0 .../msgpack-c/include/msgpack/predef/os/amigaos.h | 0 .../msgpack-c/include/msgpack/predef/os/android.h | 0 .../src/msgpack-c/include/msgpack/predef/os/beos.h | 0 .../src/msgpack-c/include/msgpack/predef/os/bsd.h | 0 .../msgpack-c/include/msgpack/predef/os/bsd/bsdi.h | 0 .../include/msgpack/predef/os/bsd/dragonfly.h | 0 .../msgpack-c/include/msgpack/predef/os/bsd/free.h | 0 .../msgpack-c/include/msgpack/predef/os/bsd/net.h | 0 .../msgpack-c/include/msgpack/predef/os/bsd/open.h | 0 .../msgpack-c/include/msgpack/predef/os/cygwin.h | 0 .../src/msgpack-c/include/msgpack/predef/os/haiku.h | 0 .../src/msgpack-c/include/msgpack/predef/os/hpux.h | 0 .../src/msgpack-c/include/msgpack/predef/os/ios.h | 0 .../src/msgpack-c/include/msgpack/predef/os/irix.h | 0 .../src/msgpack-c/include/msgpack/predef/os/linux.h | 0 .../src/msgpack-c/include/msgpack/predef/os/macos.h | 0 .../src/msgpack-c/include/msgpack/predef/os/os400.h | 0 .../msgpack-c/include/msgpack/predef/os/qnxnto.h | 0 .../msgpack-c/include/msgpack/predef/os/solaris.h | 0 .../src/msgpack-c/include/msgpack/predef/os/unix.h | 0 .../src/msgpack-c/include/msgpack/predef/os/vms.h | 0 .../msgpack-c/include/msgpack/predef/os/windows.h | 0 .../src/msgpack-c/include/msgpack/predef/other.h | 0 .../msgpack-c/include/msgpack/predef/other/endian.h | 0 .../include/msgpack/predef/other/workaround.h | 0 .../src/msgpack-c/include/msgpack/predef/platform.h | 0 .../include/msgpack/predef/platform/cloudabi.h | 0 .../msgpack-c/include/msgpack/predef/platform/ios.h | 0 .../include/msgpack/predef/platform/mingw.h | 0 .../include/msgpack/predef/platform/mingw32.h | 0 .../include/msgpack/predef/platform/mingw64.h | 0 .../msgpack/predef/platform/windows_desktop.h | 0 .../include/msgpack/predef/platform/windows_phone.h | 0 .../msgpack/predef/platform/windows_runtime.h | 0 .../msgpack/predef/platform/windows_server.h | 0 .../include/msgpack/predef/platform/windows_store.h | 0 .../msgpack/predef/platform/windows_system.h | 0 .../include/msgpack/predef/platform/windows_uwp.h | 0 .../src/msgpack-c/include/msgpack/predef/version.h | 0 .../include/msgpack/predef/version_number.h | 0 .../src/msgpack-c/include/msgpack/preprocessor.hpp | 0 .../include/msgpack/preprocessor/arithmetic.hpp | 0 .../include/msgpack/preprocessor/arithmetic/add.hpp | 0 .../include/msgpack/preprocessor/arithmetic/dec.hpp | 0 .../preprocessor/arithmetic/detail/div_base.hpp | 0 .../include/msgpack/preprocessor/arithmetic/div.hpp | 0 .../include/msgpack/preprocessor/arithmetic/inc.hpp | 0 .../include/msgpack/preprocessor/arithmetic/mod.hpp | 0 .../include/msgpack/preprocessor/arithmetic/mul.hpp | 0 .../include/msgpack/preprocessor/arithmetic/sub.hpp | 0 .../include/msgpack/preprocessor/array.hpp | 0 .../include/msgpack/preprocessor/array/data.hpp | 0 .../msgpack/preprocessor/array/detail/get_data.hpp | 0 .../include/msgpack/preprocessor/array/elem.hpp | 0 .../include/msgpack/preprocessor/array/enum.hpp | 0 .../include/msgpack/preprocessor/array/insert.hpp | 0 .../include/msgpack/preprocessor/array/pop_back.hpp | 0 .../msgpack/preprocessor/array/pop_front.hpp | 0 .../msgpack/preprocessor/array/push_back.hpp | 0 .../msgpack/preprocessor/array/push_front.hpp | 0 .../include/msgpack/preprocessor/array/remove.hpp | 0 .../include/msgpack/preprocessor/array/replace.hpp | 0 .../include/msgpack/preprocessor/array/reverse.hpp | 0 .../include/msgpack/preprocessor/array/size.hpp | 0 .../include/msgpack/preprocessor/array/to_list.hpp | 0 .../include/msgpack/preprocessor/array/to_seq.hpp | 0 .../include/msgpack/preprocessor/array/to_tuple.hpp | 0 .../include/msgpack/preprocessor/assert_msg.hpp | 0 .../msgpack-c/include/msgpack/preprocessor/cat.hpp | 0 .../include/msgpack/preprocessor/comma.hpp | 0 .../include/msgpack/preprocessor/comma_if.hpp | 0 .../include/msgpack/preprocessor/comparison.hpp | 0 .../msgpack/preprocessor/comparison/equal.hpp | 0 .../msgpack/preprocessor/comparison/greater.hpp | 0 .../preprocessor/comparison/greater_equal.hpp | 0 .../msgpack/preprocessor/comparison/less.hpp | 0 .../msgpack/preprocessor/comparison/less_equal.hpp | 0 .../msgpack/preprocessor/comparison/not_equal.hpp | 0 .../include/msgpack/preprocessor/config/config.hpp | 0 .../include/msgpack/preprocessor/config/limits.hpp | 0 .../include/msgpack/preprocessor/control.hpp | 0 .../msgpack/preprocessor/control/deduce_d.hpp | 0 .../preprocessor/control/detail/dmc/while.hpp | 0 .../preprocessor/control/detail/edg/while.hpp | 0 .../preprocessor/control/detail/msvc/while.hpp | 0 .../msgpack/preprocessor/control/detail/while.hpp | 0 .../msgpack/preprocessor/control/expr_if.hpp | 0 .../msgpack/preprocessor/control/expr_iif.hpp | 0 .../include/msgpack/preprocessor/control/if.hpp | 0 .../include/msgpack/preprocessor/control/iif.hpp | 0 .../include/msgpack/preprocessor/control/while.hpp | 0 .../include/msgpack/preprocessor/debug.hpp | 0 .../include/msgpack/preprocessor/debug/assert.hpp | 0 .../include/msgpack/preprocessor/debug/error.hpp | 0 .../include/msgpack/preprocessor/debug/line.hpp | 0 .../msgpack-c/include/msgpack/preprocessor/dec.hpp | 0 .../msgpack/preprocessor/detail/auto_rec.hpp | 0 .../include/msgpack/preprocessor/detail/check.hpp | 0 .../msgpack/preprocessor/detail/dmc/auto_rec.hpp | 0 .../msgpack/preprocessor/detail/is_binary.hpp | 0 .../msgpack/preprocessor/detail/is_nullary.hpp | 0 .../msgpack/preprocessor/detail/is_unary.hpp | 0 .../include/msgpack/preprocessor/detail/null.hpp | 0 .../include/msgpack/preprocessor/detail/split.hpp | 0 .../include/msgpack/preprocessor/empty.hpp | 0 .../msgpack-c/include/msgpack/preprocessor/enum.hpp | 0 .../include/msgpack/preprocessor/enum_params.hpp | 0 .../preprocessor/enum_params_with_a_default.hpp | 0 .../preprocessor/enum_params_with_defaults.hpp | 0 .../include/msgpack/preprocessor/enum_shifted.hpp | 0 .../msgpack/preprocessor/enum_shifted_params.hpp | 0 .../include/msgpack/preprocessor/expand.hpp | 0 .../include/msgpack/preprocessor/expr_if.hpp | 0 .../include/msgpack/preprocessor/facilities.hpp | 0 .../msgpack/preprocessor/facilities/apply.hpp | 0 .../preprocessor/facilities/detail/is_empty.hpp | 0 .../msgpack/preprocessor/facilities/empty.hpp | 0 .../msgpack/preprocessor/facilities/expand.hpp | 0 .../msgpack/preprocessor/facilities/identity.hpp | 0 .../msgpack/preprocessor/facilities/intercept.hpp | 0 .../msgpack/preprocessor/facilities/is_1.hpp | 0 .../msgpack/preprocessor/facilities/is_empty.hpp | 0 .../preprocessor/facilities/is_empty_or_1.hpp | 0 .../preprocessor/facilities/is_empty_variadic.hpp | 0 .../msgpack/preprocessor/facilities/overload.hpp | 0 .../msgpack-c/include/msgpack/preprocessor/for.hpp | 0 .../include/msgpack/preprocessor/identity.hpp | 0 .../msgpack-c/include/msgpack/preprocessor/if.hpp | 0 .../msgpack-c/include/msgpack/preprocessor/inc.hpp | 0 .../include/msgpack/preprocessor/iterate.hpp | 0 .../include/msgpack/preprocessor/iteration.hpp | 0 .../preprocessor/iteration/detail/bounds/lower1.hpp | 0 .../preprocessor/iteration/detail/bounds/lower2.hpp | 0 .../preprocessor/iteration/detail/bounds/lower3.hpp | 0 .../preprocessor/iteration/detail/bounds/lower4.hpp | 0 .../preprocessor/iteration/detail/bounds/lower5.hpp | 0 .../preprocessor/iteration/detail/bounds/upper1.hpp | 0 .../preprocessor/iteration/detail/bounds/upper2.hpp | 0 .../preprocessor/iteration/detail/bounds/upper3.hpp | 0 .../preprocessor/iteration/detail/bounds/upper4.hpp | 0 .../preprocessor/iteration/detail/bounds/upper5.hpp | 0 .../preprocessor/iteration/detail/finish.hpp | 0 .../preprocessor/iteration/detail/iter/forward1.hpp | 0 .../preprocessor/iteration/detail/iter/forward2.hpp | 0 .../preprocessor/iteration/detail/iter/forward3.hpp | 0 .../preprocessor/iteration/detail/iter/forward4.hpp | 0 .../preprocessor/iteration/detail/iter/forward5.hpp | 0 .../preprocessor/iteration/detail/iter/reverse1.hpp | 0 .../preprocessor/iteration/detail/iter/reverse2.hpp | 0 .../preprocessor/iteration/detail/iter/reverse3.hpp | 0 .../preprocessor/iteration/detail/iter/reverse4.hpp | 0 .../preprocessor/iteration/detail/iter/reverse5.hpp | 0 .../msgpack/preprocessor/iteration/detail/local.hpp | 0 .../preprocessor/iteration/detail/rlocal.hpp | 0 .../msgpack/preprocessor/iteration/detail/self.hpp | 0 .../msgpack/preprocessor/iteration/detail/start.hpp | 0 .../msgpack/preprocessor/iteration/iterate.hpp | 0 .../msgpack/preprocessor/iteration/local.hpp | 0 .../include/msgpack/preprocessor/iteration/self.hpp | 0 .../include/msgpack/preprocessor/library.hpp | 0 .../include/msgpack/preprocessor/limits.hpp | 0 .../msgpack-c/include/msgpack/preprocessor/list.hpp | 0 .../include/msgpack/preprocessor/list/adt.hpp | 0 .../include/msgpack/preprocessor/list/append.hpp | 0 .../include/msgpack/preprocessor/list/at.hpp | 0 .../include/msgpack/preprocessor/list/cat.hpp | 0 .../preprocessor/list/detail/dmc/fold_left.hpp | 0 .../preprocessor/list/detail/edg/fold_left.hpp | 0 .../preprocessor/list/detail/edg/fold_right.hpp | 0 .../msgpack/preprocessor/list/detail/fold_left.hpp | 0 .../msgpack/preprocessor/list/detail/fold_right.hpp | 0 .../include/msgpack/preprocessor/list/enum.hpp | 0 .../include/msgpack/preprocessor/list/filter.hpp | 0 .../include/msgpack/preprocessor/list/first_n.hpp | 0 .../include/msgpack/preprocessor/list/fold_left.hpp | 0 .../msgpack/preprocessor/list/fold_right.hpp | 0 .../include/msgpack/preprocessor/list/for_each.hpp | 0 .../msgpack/preprocessor/list/for_each_i.hpp | 0 .../msgpack/preprocessor/list/for_each_product.hpp | 0 .../include/msgpack/preprocessor/list/rest_n.hpp | 0 .../include/msgpack/preprocessor/list/reverse.hpp | 0 .../include/msgpack/preprocessor/list/size.hpp | 0 .../include/msgpack/preprocessor/list/to_array.hpp | 0 .../include/msgpack/preprocessor/list/to_seq.hpp | 0 .../include/msgpack/preprocessor/list/to_tuple.hpp | 0 .../include/msgpack/preprocessor/list/transform.hpp | 0 .../include/msgpack/preprocessor/logical.hpp | 0 .../include/msgpack/preprocessor/logical/and.hpp | 0 .../include/msgpack/preprocessor/logical/bitand.hpp | 0 .../include/msgpack/preprocessor/logical/bitnor.hpp | 0 .../include/msgpack/preprocessor/logical/bitor.hpp | 0 .../include/msgpack/preprocessor/logical/bitxor.hpp | 0 .../include/msgpack/preprocessor/logical/bool.hpp | 0 .../include/msgpack/preprocessor/logical/compl.hpp | 0 .../include/msgpack/preprocessor/logical/nor.hpp | 0 .../include/msgpack/preprocessor/logical/not.hpp | 0 .../include/msgpack/preprocessor/logical/or.hpp | 0 .../include/msgpack/preprocessor/logical/xor.hpp | 0 .../msgpack-c/include/msgpack/preprocessor/max.hpp | 0 .../msgpack-c/include/msgpack/preprocessor/min.hpp | 0 .../include/msgpack/preprocessor/punctuation.hpp | 0 .../msgpack/preprocessor/punctuation/comma.hpp | 0 .../msgpack/preprocessor/punctuation/comma_if.hpp | 0 .../punctuation/detail/is_begin_parens.hpp | 0 .../preprocessor/punctuation/is_begin_parens.hpp | 0 .../msgpack/preprocessor/punctuation/paren.hpp | 0 .../msgpack/preprocessor/punctuation/paren_if.hpp | 0 .../preprocessor/punctuation/remove_parens.hpp | 0 .../include/msgpack/preprocessor/repeat.hpp | 0 .../include/msgpack/preprocessor/repeat_2nd.hpp | 0 .../include/msgpack/preprocessor/repeat_3rd.hpp | 0 .../include/msgpack/preprocessor/repeat_from_to.hpp | 0 .../msgpack/preprocessor/repeat_from_to_2nd.hpp | 0 .../msgpack/preprocessor/repeat_from_to_3rd.hpp | 0 .../include/msgpack/preprocessor/repetition.hpp | 0 .../msgpack/preprocessor/repetition/deduce_r.hpp | 0 .../msgpack/preprocessor/repetition/deduce_z.hpp | 0 .../preprocessor/repetition/detail/dmc/for.hpp | 0 .../preprocessor/repetition/detail/edg/for.hpp | 0 .../msgpack/preprocessor/repetition/detail/for.hpp | 0 .../preprocessor/repetition/detail/msvc/for.hpp | 0 .../msgpack/preprocessor/repetition/enum.hpp | 0 .../preprocessor/repetition/enum_binary_params.hpp | 0 .../msgpack/preprocessor/repetition/enum_params.hpp | 0 .../repetition/enum_params_with_a_default.hpp | 0 .../repetition/enum_params_with_defaults.hpp | 0 .../preprocessor/repetition/enum_shifted.hpp | 0 .../repetition/enum_shifted_binary_params.hpp | 0 .../preprocessor/repetition/enum_shifted_params.hpp | 0 .../preprocessor/repetition/enum_trailing.hpp | 0 .../repetition/enum_trailing_binary_params.hpp | 0 .../repetition/enum_trailing_params.hpp | 0 .../include/msgpack/preprocessor/repetition/for.hpp | 0 .../msgpack/preprocessor/repetition/repeat.hpp | 0 .../preprocessor/repetition/repeat_from_to.hpp | 0 .../include/msgpack/preprocessor/selection.hpp | 0 .../include/msgpack/preprocessor/selection/max.hpp | 0 .../include/msgpack/preprocessor/selection/min.hpp | 0 .../msgpack-c/include/msgpack/preprocessor/seq.hpp | 0 .../include/msgpack/preprocessor/seq/cat.hpp | 0 .../preprocessor/seq/detail/binary_transform.hpp | 0 .../msgpack/preprocessor/seq/detail/is_empty.hpp | 0 .../msgpack/preprocessor/seq/detail/split.hpp | 0 .../preprocessor/seq/detail/to_list_msvc.hpp | 0 .../include/msgpack/preprocessor/seq/elem.hpp | 0 .../include/msgpack/preprocessor/seq/enum.hpp | 0 .../include/msgpack/preprocessor/seq/filter.hpp | 0 .../include/msgpack/preprocessor/seq/first_n.hpp | 0 .../include/msgpack/preprocessor/seq/fold_left.hpp | 0 .../include/msgpack/preprocessor/seq/fold_right.hpp | 0 .../include/msgpack/preprocessor/seq/for_each.hpp | 0 .../include/msgpack/preprocessor/seq/for_each_i.hpp | 0 .../msgpack/preprocessor/seq/for_each_product.hpp | 0 .../include/msgpack/preprocessor/seq/insert.hpp | 0 .../include/msgpack/preprocessor/seq/pop_back.hpp | 0 .../include/msgpack/preprocessor/seq/pop_front.hpp | 0 .../include/msgpack/preprocessor/seq/push_back.hpp | 0 .../include/msgpack/preprocessor/seq/push_front.hpp | 0 .../include/msgpack/preprocessor/seq/remove.hpp | 0 .../include/msgpack/preprocessor/seq/replace.hpp | 0 .../include/msgpack/preprocessor/seq/rest_n.hpp | 0 .../include/msgpack/preprocessor/seq/reverse.hpp | 0 .../include/msgpack/preprocessor/seq/seq.hpp | 0 .../include/msgpack/preprocessor/seq/size.hpp | 0 .../include/msgpack/preprocessor/seq/subseq.hpp | 0 .../include/msgpack/preprocessor/seq/to_array.hpp | 0 .../include/msgpack/preprocessor/seq/to_list.hpp | 0 .../include/msgpack/preprocessor/seq/to_tuple.hpp | 0 .../include/msgpack/preprocessor/seq/transform.hpp | 0 .../preprocessor/seq/variadic_seq_to_seq.hpp | 0 .../msgpack-c/include/msgpack/preprocessor/slot.hpp | 0 .../include/msgpack/preprocessor/slot/counter.hpp | 0 .../msgpack/preprocessor/slot/detail/counter.hpp | 0 .../msgpack/preprocessor/slot/detail/def.hpp | 0 .../msgpack/preprocessor/slot/detail/shared.hpp | 0 .../msgpack/preprocessor/slot/detail/slot1.hpp | 0 .../msgpack/preprocessor/slot/detail/slot2.hpp | 0 .../msgpack/preprocessor/slot/detail/slot3.hpp | 0 .../msgpack/preprocessor/slot/detail/slot4.hpp | 0 .../msgpack/preprocessor/slot/detail/slot5.hpp | 0 .../include/msgpack/preprocessor/slot/slot.hpp | 0 .../include/msgpack/preprocessor/stringize.hpp | 0 .../include/msgpack/preprocessor/tuple.hpp | 0 .../preprocessor/tuple/detail/is_single_return.hpp | 0 .../include/msgpack/preprocessor/tuple/eat.hpp | 0 .../include/msgpack/preprocessor/tuple/elem.hpp | 0 .../include/msgpack/preprocessor/tuple/enum.hpp | 0 .../include/msgpack/preprocessor/tuple/insert.hpp | 0 .../include/msgpack/preprocessor/tuple/pop_back.hpp | 0 .../msgpack/preprocessor/tuple/pop_front.hpp | 0 .../msgpack/preprocessor/tuple/push_back.hpp | 0 .../msgpack/preprocessor/tuple/push_front.hpp | 0 .../include/msgpack/preprocessor/tuple/rem.hpp | 0 .../include/msgpack/preprocessor/tuple/remove.hpp | 0 .../include/msgpack/preprocessor/tuple/replace.hpp | 0 .../include/msgpack/preprocessor/tuple/reverse.hpp | 0 .../include/msgpack/preprocessor/tuple/size.hpp | 0 .../include/msgpack/preprocessor/tuple/to_array.hpp | 0 .../include/msgpack/preprocessor/tuple/to_list.hpp | 0 .../include/msgpack/preprocessor/tuple/to_seq.hpp | 0 .../include/msgpack/preprocessor/variadic.hpp | 0 .../variadic/detail/is_single_return.hpp | 0 .../include/msgpack/preprocessor/variadic/elem.hpp | 0 .../include/msgpack/preprocessor/variadic/size.hpp | 0 .../msgpack/preprocessor/variadic/to_array.hpp | 0 .../msgpack/preprocessor/variadic/to_list.hpp | 0 .../msgpack/preprocessor/variadic/to_seq.hpp | 0 .../msgpack/preprocessor/variadic/to_tuple.hpp | 0 .../include/msgpack/preprocessor/while.hpp | 0 .../include/msgpack/preprocessor/wstringize.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/sbuffer.hpp | 0 .../src/msgpack-c/include/msgpack/sbuffer_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/sysdep.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/type.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/unpack.hpp | 0 .../src/msgpack-c/include/msgpack/unpack_decl.hpp | 0 .../src/msgpack-c/include/msgpack/unpack_define.hpp | 0 .../msgpack-c/include/msgpack/unpack_exception.hpp | 0 .../include/msgpack/v1/adaptor/adaptor_base.hpp | 0 .../msgpack/v1/adaptor/adaptor_base_decl.hpp | 0 .../include/msgpack/v1/adaptor/array_ref.hpp | 0 .../include/msgpack/v1/adaptor/array_ref_decl.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/bool.hpp | 0 .../include/msgpack/v1/adaptor/boost/fusion.hpp | 0 .../msgpack/v1/adaptor/boost/msgpack_variant.hpp | 0 .../v1/adaptor/boost/msgpack_variant_decl.hpp | 0 .../include/msgpack/v1/adaptor/boost/optional.hpp | 0 .../include/msgpack/v1/adaptor/boost/string_ref.hpp | 0 .../msgpack/v1/adaptor/boost/string_view.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/carray.hpp | 0 .../include/msgpack/v1/adaptor/char_ptr.hpp | 0 .../msgpack/v1/adaptor/check_container_size.hpp | 0 .../v1/adaptor/check_container_size_decl.hpp | 0 .../include/msgpack/v1/adaptor/complex.hpp | 0 .../include/msgpack/v1/adaptor/cpp11/array.hpp | 0 .../include/msgpack/v1/adaptor/cpp11/array_char.hpp | 0 .../v1/adaptor/cpp11/array_unsigned_char.hpp | 0 .../include/msgpack/v1/adaptor/cpp11/chrono.hpp | 0 .../msgpack/v1/adaptor/cpp11/forward_list.hpp | 0 .../msgpack/v1/adaptor/cpp11/reference_wrapper.hpp | 0 .../include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp | 0 .../include/msgpack/v1/adaptor/cpp11/timespec.hpp | 0 .../include/msgpack/v1/adaptor/cpp11/tuple.hpp | 0 .../include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp | 0 .../msgpack/v1/adaptor/cpp11/unordered_map.hpp | 0 .../msgpack/v1/adaptor/cpp11/unordered_set.hpp | 0 .../include/msgpack/v1/adaptor/cpp17/array_byte.hpp | 0 .../include/msgpack/v1/adaptor/cpp17/byte.hpp | 0 .../msgpack/v1/adaptor/cpp17/carray_byte.hpp | 0 .../include/msgpack/v1/adaptor/cpp17/optional.hpp | 0 .../msgpack/v1/adaptor/cpp17/string_view.hpp | 0 .../msgpack/v1/adaptor/cpp17/vector_byte.hpp | 0 .../include/msgpack/v1/adaptor/cpp20/span.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/define.hpp | 0 .../include/msgpack/v1/adaptor/define_decl.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/deque.hpp | 0 .../v1/adaptor/detail/cpp03_define_array.hpp | 0 .../v1/adaptor/detail/cpp03_define_array_decl.hpp | 0 .../msgpack/v1/adaptor/detail/cpp03_define_map.hpp | 0 .../v1/adaptor/detail/cpp03_define_map_decl.hpp | 0 .../v1/adaptor/detail/cpp03_msgpack_tuple.hpp | 0 .../v1/adaptor/detail/cpp03_msgpack_tuple_decl.hpp | 0 .../v1/adaptor/detail/cpp11_convert_helper.hpp | 0 .../v1/adaptor/detail/cpp11_define_array.hpp | 0 .../v1/adaptor/detail/cpp11_define_array_decl.hpp | 0 .../msgpack/v1/adaptor/detail/cpp11_define_map.hpp | 0 .../v1/adaptor/detail/cpp11_define_map_decl.hpp | 0 .../v1/adaptor/detail/cpp11_msgpack_tuple.hpp | 0 .../v1/adaptor/detail/cpp11_msgpack_tuple_decl.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/ext.hpp | 0 .../include/msgpack/v1/adaptor/ext_decl.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/fixint.hpp | 0 .../include/msgpack/v1/adaptor/fixint_decl.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/float.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/int.hpp | 0 .../include/msgpack/v1/adaptor/int_decl.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/list.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/map.hpp | 0 .../include/msgpack/v1/adaptor/map_decl.hpp | 0 .../include/msgpack/v1/adaptor/msgpack_tuple.hpp | 0 .../msgpack/v1/adaptor/msgpack_tuple_decl.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/nil.hpp | 0 .../include/msgpack/v1/adaptor/nil_decl.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/pair.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/raw.hpp | 0 .../include/msgpack/v1/adaptor/raw_decl.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/set.hpp | 0 .../include/msgpack/v1/adaptor/size_equal_only.hpp | 0 .../msgpack/v1/adaptor/size_equal_only_decl.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/string.hpp | 0 .../msgpack/v1/adaptor/tr1/unordered_map.hpp | 0 .../msgpack/v1/adaptor/tr1/unordered_set.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/v4raw.hpp | 0 .../include/msgpack/v1/adaptor/v4raw_decl.hpp | 0 .../msgpack-c/include/msgpack/v1/adaptor/vector.hpp | 0 .../include/msgpack/v1/adaptor/vector_bool.hpp | 0 .../include/msgpack/v1/adaptor/vector_char.hpp | 0 .../msgpack/v1/adaptor/vector_unsigned_char.hpp | 0 .../include/msgpack/v1/adaptor/wstring.hpp | 0 .../src/msgpack-c/include/msgpack/v1/cpp_config.hpp | 0 .../include/msgpack/v1/cpp_config_decl.hpp | 0 .../include/msgpack/v1/detail/cpp03_zone.hpp | 0 .../include/msgpack/v1/detail/cpp03_zone_decl.hpp | 0 .../include/msgpack/v1/detail/cpp11_zone.hpp | 0 .../include/msgpack/v1/detail/cpp11_zone_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v1/fbuffer.hpp | 0 .../msgpack-c/include/msgpack/v1/fbuffer_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v1/iterator.hpp | 0 .../msgpack-c/include/msgpack/v1/iterator_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/v1/meta.hpp | 0 .../src/msgpack-c/include/msgpack/v1/meta_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/v1/object.hpp | 0 .../msgpack-c/include/msgpack/v1/object_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v1/object_fwd.hpp | 0 .../include/msgpack/v1/object_fwd_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/v1/pack.hpp | 0 .../src/msgpack-c/include/msgpack/v1/pack_decl.hpp | 0 .../msgpack-c/include/msgpack/v1/parse_return.hpp | 0 .../src/msgpack-c/include/msgpack/v1/sbuffer.hpp | 0 .../msgpack-c/include/msgpack/v1/sbuffer_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/v1/unpack.hpp | 0 .../msgpack-c/include/msgpack/v1/unpack_decl.hpp | 0 .../include/msgpack/v1/unpack_exception.hpp | 0 .../src/msgpack-c/include/msgpack/v1/version.hpp | 0 .../src/msgpack-c/include/msgpack/v1/versioning.hpp | 0 .../src/msgpack-c/include/msgpack/v1/vrefbuffer.hpp | 0 .../include/msgpack/v1/vrefbuffer_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v1/zbuffer.hpp | 0 .../msgpack-c/include/msgpack/v1/zbuffer_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/v1/zone.hpp | 0 .../src/msgpack-c/include/msgpack/v1/zone_decl.hpp | 0 .../include/msgpack/v2/adaptor/adaptor_base.hpp | 0 .../msgpack/v2/adaptor/adaptor_base_decl.hpp | 0 .../include/msgpack/v2/adaptor/array_ref_decl.hpp | 0 .../v2/adaptor/boost/msgpack_variant_decl.hpp | 0 .../v2/adaptor/check_container_size_decl.hpp | 0 .../include/msgpack/v2/adaptor/define_decl.hpp | 0 .../v2/adaptor/detail/cpp03_define_array_decl.hpp | 0 .../v2/adaptor/detail/cpp03_define_map_decl.hpp | 0 .../v2/adaptor/detail/cpp03_msgpack_tuple_decl.hpp | 0 .../v2/adaptor/detail/cpp11_define_array_decl.hpp | 0 .../v2/adaptor/detail/cpp11_define_map_decl.hpp | 0 .../v2/adaptor/detail/cpp11_msgpack_tuple_decl.hpp | 0 .../include/msgpack/v2/adaptor/ext_decl.hpp | 0 .../include/msgpack/v2/adaptor/fixint_decl.hpp | 0 .../include/msgpack/v2/adaptor/int_decl.hpp | 0 .../include/msgpack/v2/adaptor/map_decl.hpp | 0 .../msgpack/v2/adaptor/msgpack_tuple_decl.hpp | 0 .../include/msgpack/v2/adaptor/nil_decl.hpp | 0 .../include/msgpack/v2/adaptor/raw_decl.hpp | 0 .../msgpack/v2/adaptor/size_equal_only_decl.hpp | 0 .../include/msgpack/v2/adaptor/v4raw_decl.hpp | 0 .../include/msgpack/v2/cpp_config_decl.hpp | 0 .../include/msgpack/v2/create_object_visitor.hpp | 0 .../msgpack/v2/create_object_visitor_decl.hpp | 0 .../include/msgpack/v2/detail/cpp03_zone_decl.hpp | 0 .../include/msgpack/v2/detail/cpp11_zone_decl.hpp | 0 .../msgpack-c/include/msgpack/v2/fbuffer_decl.hpp | 0 .../msgpack-c/include/msgpack/v2/iterator_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v2/meta_decl.hpp | 0 .../msgpack-c/include/msgpack/v2/null_visitor.hpp | 0 .../include/msgpack/v2/null_visitor_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/v2/object.hpp | 0 .../msgpack-c/include/msgpack/v2/object_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v2/object_fwd.hpp | 0 .../include/msgpack/v2/object_fwd_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v2/pack_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/v2/parse.hpp | 0 .../src/msgpack-c/include/msgpack/v2/parse_decl.hpp | 0 .../msgpack-c/include/msgpack/v2/parse_return.hpp | 0 .../msgpack-c/include/msgpack/v2/sbuffer_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/v2/unpack.hpp | 0 .../msgpack-c/include/msgpack/v2/unpack_decl.hpp | 0 .../include/msgpack/v2/vrefbuffer_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v2/x3_parse.hpp | 0 .../msgpack-c/include/msgpack/v2/x3_parse_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v2/x3_unpack.hpp | 0 .../msgpack-c/include/msgpack/v2/x3_unpack_decl.hpp | 0 .../msgpack-c/include/msgpack/v2/zbuffer_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v2/zone_decl.hpp | 0 .../include/msgpack/v3/adaptor/adaptor_base.hpp | 0 .../msgpack/v3/adaptor/adaptor_base_decl.hpp | 0 .../include/msgpack/v3/adaptor/array_ref_decl.hpp | 0 .../v3/adaptor/boost/msgpack_variant_decl.hpp | 0 .../v3/adaptor/check_container_size_decl.hpp | 0 .../include/msgpack/v3/adaptor/define_decl.hpp | 0 .../v3/adaptor/detail/cpp03_define_array_decl.hpp | 0 .../v3/adaptor/detail/cpp03_define_map_decl.hpp | 0 .../v3/adaptor/detail/cpp03_msgpack_tuple_decl.hpp | 0 .../v3/adaptor/detail/cpp11_define_array_decl.hpp | 0 .../v3/adaptor/detail/cpp11_define_map_decl.hpp | 0 .../v3/adaptor/detail/cpp11_msgpack_tuple_decl.hpp | 0 .../include/msgpack/v3/adaptor/ext_decl.hpp | 0 .../include/msgpack/v3/adaptor/fixint_decl.hpp | 0 .../include/msgpack/v3/adaptor/int_decl.hpp | 0 .../include/msgpack/v3/adaptor/map_decl.hpp | 0 .../msgpack/v3/adaptor/msgpack_tuple_decl.hpp | 0 .../include/msgpack/v3/adaptor/nil_decl.hpp | 0 .../include/msgpack/v3/adaptor/raw_decl.hpp | 0 .../msgpack/v3/adaptor/size_equal_only_decl.hpp | 0 .../include/msgpack/v3/adaptor/v4raw_decl.hpp | 0 .../include/msgpack/v3/cpp_config_decl.hpp | 0 .../msgpack/v3/create_object_visitor_decl.hpp | 0 .../include/msgpack/v3/detail/cpp03_zone_decl.hpp | 0 .../include/msgpack/v3/detail/cpp11_zone_decl.hpp | 0 .../msgpack-c/include/msgpack/v3/fbuffer_decl.hpp | 0 .../msgpack-c/include/msgpack/v3/iterator_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v3/meta_decl.hpp | 0 .../include/msgpack/v3/null_visitor_decl.hpp | 0 .../msgpack-c/include/msgpack/v3/object_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v3/object_fwd.hpp | 0 .../include/msgpack/v3/object_fwd_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v3/pack_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/v3/parse.hpp | 0 .../src/msgpack-c/include/msgpack/v3/parse_decl.hpp | 0 .../msgpack-c/include/msgpack/v3/parse_return.hpp | 0 .../msgpack-c/include/msgpack/v3/sbuffer_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/v3/unpack.hpp | 0 .../msgpack-c/include/msgpack/v3/unpack_decl.hpp | 0 .../include/msgpack/v3/vrefbuffer_decl.hpp | 0 .../msgpack-c/include/msgpack/v3/x3_parse_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v3/x3_unpack.hpp | 0 .../msgpack-c/include/msgpack/v3/x3_unpack_decl.hpp | 0 .../msgpack-c/include/msgpack/v3/zbuffer_decl.hpp | 0 .../src/msgpack-c/include/msgpack/v3/zone_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/version.hpp | 0 .../msgpack-c/include/msgpack/version_master.hpp | 0 .../src/msgpack-c/include/msgpack/versioning.hpp | 0 .../src/msgpack-c/include/msgpack/vrefbuffer.hpp | 0 .../msgpack-c/include/msgpack/vrefbuffer_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/x3_parse.hpp | 0 .../src/msgpack-c/include/msgpack/x3_parse_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/x3_unpack.hpp | 0 .../msgpack-c/include/msgpack/x3_unpack_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/zbuffer.hpp | 0 .../src/msgpack-c/include/msgpack/zbuffer_decl.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/zone.hpp | 0 .../cpp/src/msgpack-c/include/msgpack/zone_decl.hpp | 0 .../cpp/src/msgpack-c/make_file_list.sh | 0 .../cpp/src/msgpack-c/makedist.sh | 0 .../cpp/src/msgpack-c/msgpack-cxx-config.cmake.in | 0 .../cpp/src/msgpack-c/preprocess | 0 .../cpp/src/msgpack-c/test-install/CMakeLists.txt | 0 .../cpp/src/msgpack-c/test-install/simple.cpp | 0 .../cpp/src/msgpack-c/test/CMakeLists.txt | 0 .../cpp/src/msgpack-c/test/array_ref.cpp | 0 .../cpp/src/msgpack-c/test/boost_fusion.cpp | 0 .../cpp/src/msgpack-c/test/boost_optional.cpp | 0 .../cpp/src/msgpack-c/test/boost_string_ref.cpp | 0 .../cpp/src/msgpack-c/test/boost_string_view.cpp | 0 .../cpp/src/msgpack-c/test/boost_variant.cpp | 0 .../cpp/src/msgpack-c/test/buffer.cpp | 0 .../cpp/src/msgpack-c/test/buffer_c.cpp | 0 .../cpp/src/msgpack-c/test/carray.cpp | 0 .../cpp/src/msgpack-c/test/cases.cpp | 0 .../cpp/src/msgpack-c/test/cases.mpac | Bin .../cpp/src/msgpack-c/test/cases_compact.mpac | Bin .../cpp/src/msgpack-c/test/convert.cpp | 0 .../cpp/src/msgpack-c/test/fixint.cpp | 0 .../test/fuzz_unpack_pack_fuzzer_cpp11.cpp | 0 .../cpp/src/msgpack-c/test/inc_adaptor_define.cpp | 0 .../cpp/src/msgpack-c/test/iterator_cpp11.cpp | 0 .../cpp/src/msgpack-c/test/json.cpp | 0 .../cpp/src/msgpack-c/test/limit.cpp | 0 .../cpp/src/msgpack-c/test/msgpack_basic.cpp | 0 .../cpp/src/msgpack-c/test/msgpack_container.cpp | 0 .../cpp/src/msgpack-c/test/msgpack_cpp11.cpp | 0 .../cpp/src/msgpack-c/test/msgpack_cpp17.cpp | 0 .../cpp/src/msgpack-c/test/msgpack_cpp20.cpp | 0 .../cpp/src/msgpack-c/test/msgpack_stream.cpp | 0 .../cpp/src/msgpack-c/test/msgpack_tuple.cpp | 0 .../cpp/src/msgpack-c/test/msgpack_vref.cpp | 0 .../cpp/src/msgpack-c/test/msgpack_x3_parse.cpp | 0 .../cpp/src/msgpack-c/test/multi_file1.cpp | 0 .../cpp/src/msgpack-c/test/multi_file2.cpp | 0 .../cpp/src/msgpack-c/test/object.cpp | 0 .../cpp/src/msgpack-c/test/object_with_zone.cpp | 0 .../cpp/src/msgpack-c/test/pack_unpack.cpp | 0 .../cpp/src/msgpack-c/test/raw.cpp | 0 .../cpp/src/msgpack-c/test/reference.cpp | 0 .../cpp/src/msgpack-c/test/reference_cpp11.cpp | 0 .../src/msgpack-c/test/reference_wrapper_cpp11.cpp | 0 .../cpp/src/msgpack-c/test/shared_ptr_cpp11.cpp | 0 .../cpp/src/msgpack-c/test/size_equal_only.cpp | 0 .../cpp/src/msgpack-c/test/streaming.cpp | 0 .../cpp/src/msgpack-c/test/test_allocator.hpp | 0 .../cpp/src/msgpack-c/test/unique_ptr_cpp11.cpp | 0 .../cpp/src/msgpack-c/test/user_class.cpp | 0 .../cpp/src/msgpack-c/test/version.cpp | 0 .../cpp/src/msgpack-c/test/visitor.cpp | 0 .../cpp/src/msgpack-c/test/zone.cpp | 0 .../cpp/src/msgpack-c/update_version.sh | 0 .../cpp/srs_db/download_ignition.sh | 0 .../cpp/srs_db/grumpkin/monomial/README.md | 0 .../cpp/srs_db/ignition/monomial/checksums | 0 .../cpp/srs_db/ignition/monomial/g2.dat | 0 .../cpp/barretenberg => barretenberg}/exports.json | 0 .../cpp/barretenberg => barretenberg}/flake.lock | 0 .../cpp/barretenberg => barretenberg}/flake.nix | 0 .../scripts/bindgen.sh | 0 .../scripts/c_bind_files.txt | 0 .../scripts/decls_json.py | 0 .../barretenberg => barretenberg}/sol/.gitignore | 0 .../barretenberg => barretenberg}/sol/Dockerfile | 0 .../cpp/barretenberg => barretenberg}/sol/README.md | 0 .../barretenberg => barretenberg}/sol/bootstrap.sh | 0 .../sol/figures/verifier.png | Bin .../barretenberg => barretenberg}/sol/foundry.toml | 0 .../barretenberg => barretenberg}/sol/lib/forge-std | 0 .../sol/lib/openzeppelin-contracts | 0 .../sol/lib/solidity-stringutils | 0 .../sol/remappings.txt | 0 .../sol/scripts/init.sh | 0 .../sol/scripts/install_foundry.sh | 0 .../sol/scripts/run_fuzzer.sh | 0 .../sol/src/interfaces/IVerifier.sol | 0 .../sol/src/ultra/BaseUltraVerifier.sol | 0 .../sol/src/ultra/instance/Add2UltraVerifier.sol | 0 .../sol/src/ultra/instance/BlakeUltraVerifier.sol | 0 .../src/ultra/instance/RecursiveUltraVerifier.sol | 0 .../sol/src/ultra/keys/Add2UltraVerificationKey.sol | 0 .../src/ultra/keys/BlakeUltraVerificationKey.sol | 0 .../ultra/keys/RecursiveUltraVerificationKey.sol | 0 .../sol/test/base/DifferentialFuzzer.sol | 0 .../sol/test/base/TestBase.sol | 0 .../sol/test/ultra/Add2.t.sol | 0 .../sol/test/ultra/Blake.t.sol | 0 .../sol/test/ultra/Recursive.t.sol | 0 .../sol/test/ultra/TestBaseUltra.sol | 0 .../barretenberg => barretenberg}/ts/.dockerignore | 0 .../barretenberg => barretenberg}/ts/.eslintrc.cjs | 0 .../cpp/barretenberg => barretenberg}/ts/.gitignore | 0 .../ts/.prettierrc.json | 0 .../ts/.yarn/releases/yarn-berry.cjs | 0 .../barretenberg => barretenberg}/ts/.yarnrc.yml | 0 .../barretenberg => barretenberg}/ts/CHANGELOG.md | 0 .../cpp/barretenberg => barretenberg}/ts/Dockerfile | 0 .../cpp/barretenberg => barretenberg}/ts/README.md | 0 .../cpp/barretenberg => barretenberg}/ts/bb.js-dev | 0 .../ts/bin-test/target/acir.gz | Bin .../ts/bin-test/target/witness.gz | Bin .../ts/cjs-entry/index.cjs | 0 .../ts/cjs-entry/index.d.ts | 0 .../barretenberg => barretenberg}/ts/package.json | 0 .../ts/scripts/run_tests | 0 .../ts/src/async_map/index.ts | 0 .../ts/src/barretenberg-threads.wasm | 0 .../ts/src/barretenberg.wasm | 0 .../ts/src/barretenberg/index.ts | 0 .../ts/src/barretenberg_api/blake2s.test.ts | 0 .../ts/src/barretenberg_api/common.test.ts | 0 .../ts/src/barretenberg_api/index.ts | 0 .../ts/src/barretenberg_api/pedersen.test.ts | 0 .../ts/src/barretenberg_api/schnorr.test.ts | 0 .../ts/src/barretenberg_binder/heap_allocator.ts | 0 .../ts/src/barretenberg_binder/index.ts | 0 .../barretenberg_wasm_base/index.ts | 0 .../barretenberg_wasm_main/factory/browser/index.ts | 0 .../factory/browser/main.worker.ts | 0 .../barretenberg_wasm_main/factory/node/index.ts | 0 .../factory/node/main.worker.ts | 0 .../barretenberg_wasm_main/index.ts | 0 .../factory/browser/index.ts | 0 .../factory/browser/thread.worker.ts | 0 .../barretenberg_wasm_thread/factory/node/index.ts | 0 .../factory/node/thread.worker.ts | 0 .../barretenberg_wasm_thread/index.ts | 0 .../barretenberg_wasm/fetch_code/browser/index.ts | 0 .../fetch_code/browser/wasm-module.d.ts | 0 .../ts/src/barretenberg_wasm/fetch_code/index.ts | 0 .../src/barretenberg_wasm/fetch_code/node/index.ts | 0 .../src/barretenberg_wasm/helpers/browser/index.ts | 0 .../ts/src/barretenberg_wasm/helpers/index.ts | 0 .../ts/src/barretenberg_wasm/helpers/node/index.ts | 0 .../barretenberg_wasm/helpers/node/node_endpoint.ts | 0 .../ts/src/barretenberg_wasm/index.test.ts | 0 .../ts/src/barretenberg_wasm/index.ts | 0 .../ts/src/bigint-array/index.ts | 0 .../ts/src/bindgen/function_declaration.ts | 0 .../ts/src/bindgen/index.ts | 0 .../ts/src/bindgen/mappings.ts | 0 .../ts/src/bindgen/rust.ts | 0 .../ts/src/bindgen/to_camel_case.ts | 0 .../ts/src/bindgen/typescript.ts | 0 .../ts/src/crs/browser/cached_net_crs.ts | 0 .../ts/src/crs/browser/index.ts | 0 .../ts/src/crs/index.ts | 0 .../ts/src/crs/net_crs.ts | 0 .../ts/src/crs/node/ignition_files_crs.ts | 0 .../ts/src/crs/node/index.ts | 0 .../ts/src/examples/simple.rawtest.ts | 0 .../ts/src/examples/simple.test.ts | 0 .../barretenberg => barretenberg}/ts/src/index.html | 0 .../barretenberg => barretenberg}/ts/src/index.ts | 0 .../barretenberg => barretenberg}/ts/src/info.json | 0 .../barretenberg => barretenberg}/ts/src/main.ts | 0 .../ts/src/random/browser/index.ts | 0 .../ts/src/random/index.ts | 0 .../ts/src/random/node/index.ts | 0 .../ts/src/serialize/buffer_reader.ts | 0 .../ts/src/serialize/index.ts | 0 .../ts/src/serialize/output_type.ts | 0 .../ts/src/serialize/serialize.ts | 0 .../ts/src/types/fields.ts | 0 .../ts/src/types/fixed_size_buffer.ts | 0 .../ts/src/types/index.ts | 0 .../ts/src/types/point.ts | 0 .../ts/src/types/ptr.ts | 0 .../ts/src/types/raw_buffer.ts | 0 .../ts/tsconfig.browser.json | 0 .../barretenberg => barretenberg}/ts/tsconfig.json | 0 .../ts/webpack.config.js | 0 .../cpp/barretenberg => barretenberg}/ts/yarn.lock | 0 .../cpp/barretenberg => barretenberg}/wasi-sdk.nix | 0 1904 files changed, 4 insertions(+), 4 deletions(-) rename {circuits/cpp/barretenberg => barretenberg}/.circleci/config.yml (100%) rename {circuits/cpp/barretenberg => barretenberg}/.dockerignore (100%) rename {circuits/cpp/barretenberg => barretenberg}/.github/pull_request_template.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/.github/workflows/benchmarks.yml (100%) rename {circuits/cpp/barretenberg => barretenberg}/.github/workflows/nix.yml (100%) rename {circuits/cpp/barretenberg => barretenberg}/.github/workflows/noir.yml (100%) rename {circuits/cpp/barretenberg => barretenberg}/.github/workflows/pull-request.yml (100%) rename {circuits/cpp/barretenberg => barretenberg}/.gitignore (100%) rename {circuits/cpp/barretenberg => barretenberg}/.gitmodules (100%) rename {circuits/cpp/barretenberg => barretenberg}/.gitrepo (100%) rename {circuits/cpp/barretenberg => barretenberg}/.vscode/c_cpp_properties.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/.vscode/settings.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/CHANGELOG.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/LICENSE (100%) rename {circuits/cpp/barretenberg => barretenberg}/PROJECT (100%) rename {circuits/cpp/barretenberg => barretenberg}/README.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/VERSION (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/.dockerignore (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/.gitignore (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/Dockerfile.bb (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/Dockerfile.bb.js (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/README.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/browser-test-app/package.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/browser-test-app/serve.mt.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/browser-test-app/src/index.html (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/browser-test-app/src/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/browser-test-app/tsconfig.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/browser-test-app/webpack.config.js (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/browser-test-app/yarn.lock (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/flows/all_cmds.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/flows/prove_and_verify.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/headless-test/bb.js.browser (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/headless-test/package.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/headless-test/src/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/headless-test/tsconfig.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/headless-test/yarn.lock (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/run_acir_tests.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/acir_tests/run_acir_tests_browser.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/barretenberg-wasm.nix (100%) rename {circuits/cpp/barretenberg => barretenberg}/barretenberg.code-workspace (100%) rename {circuits/cpp/barretenberg => barretenberg}/barretenberg.nix (100%) rename {circuits/cpp/barretenberg => barretenberg}/bootstrap.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/bootstrap_docker.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/build-system (100%) rename {circuits/cpp/barretenberg => barretenberg}/build_manifest.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/build_manifest.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/.aztec-packages-commit (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/.clang-format (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/.clangd (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/.dockerignore (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/.gitignore (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/CMakePresets.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/bin-test/target/acir.gz (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/bin-test/target/witness.gz (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/bootstrap.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/cmake/arch.cmake (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/cmake/barretenberg.pc.in (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/cmake/benchmark.cmake (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/cmake/build.cmake (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/cmake/gtest.cmake (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/cmake/module.cmake (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/cmake/threading.cmake (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/cmake/toolchains/aarch64-darwin.cmake (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/cmake/toolchains/aarch64-linux.cmake (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/cmake/toolchains/i386-linux.cmake (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/cmake/toolchains/wasm32-wasi.cmake (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/cmake/toolchains/x86_64-darwin.cmake (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/cmake/toolchains/x86_64-linux.cmake (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/dockerfiles/Dockerfile.wasm-linux-clang (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/dockerfiles/Dockerfile.x86_64-linux-clang (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-benchmarks (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/docs/Fuzzing.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/format.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/notebook.ipynb (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/scripts/bb-tests.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/scripts/collect_coverage_information.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/scripts/install-wasi-sdk.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/scripts/run_aztec_circuits_tests (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/scripts/run_tests (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/scripts/stdlib-tests (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/scripts/strip-wasm.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/barretenberg.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/bb/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/bb/exec_pipe.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/bb/file_io.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/bb/get_bytecode.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/bb/get_crs.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/bb/get_witness.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/bb/log.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/bb/main.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/bb/readme.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/compare_branch_vs_baseline.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/decrypt_bench/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_standard.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_ultra.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/honk_bench/main.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/honk_bench/standard_honk.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/honk_bench/standard_plonk.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/honk_bench/ultra_plonk.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/pippenger_bench/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/plonk_bench/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/relations_bench/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/relations_bench/main.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/assert.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/c_bind.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/constexpr_utils.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/container.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/fuzzer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/fuzzer_constants.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/inline.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/log.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/map.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/mem.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/mem.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/moody/blockingconcurrentqueue.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/moody/concurrentqueue.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/moody/lightweightsemaphore.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/net.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/parallel_for_moody.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/parallel_for_omp.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/parallel_for_queued.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/parallel_for_spawning.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/printf.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/serialize.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/slab_allocator.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/slab_allocator.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/streams.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/test.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/thread.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/thread.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/throw_or_abort.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/timer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/common/wasm_export.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/aes128/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/aes128/aes128.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/aes128/aes128.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/aes128/aes128.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/aes128/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake2s/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake2s/blake2-impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake2s/blake2s.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake2s/blake2s.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake3s/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake3s/blake3-impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake3s/blake3s.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake3s/blake3s.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake3s_full/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake3s_full/blake3-impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake3s_full/blake3s.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/blake3s_full/blake3s.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/ecdsa/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/ecdsa/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/ecdsa/c_bind.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/generators/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/generators/fixed_base_scalar_mul.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/generators/generator_data.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/generators/generator_data.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/generators/generator_data.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/hashers/hashers.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/hmac/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/hmac/hmac.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/hmac/hmac.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/keccak/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/keccak/hash_types.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/keccak/keccak.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/keccak/keccak.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/keccak/keccakf1600.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_commitment/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_commitment/convert_buffer_to_field.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_hash/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_hash/c_bind_new.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/schnorr/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/schnorr/c_bind_new.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/schnorr/multisig.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/sha256/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/sha256/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/sha256/sha256.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/sha256/sha256.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/crypto/sha256/sha256.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/hash_to_field.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/hash_to_field.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/round.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/round.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/serde/binary.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/serde/bincode.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/serde/index.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/serde/serde.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/serde/witness_map.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/dsl/types.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/bn254.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/fq.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/fq12.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/fq12.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/fq2.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/fq2.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/fq6.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/fq6.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/fr.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/fr.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/g1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/g1.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/g2.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/pairing.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/bn254/pairing_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/grumpkin/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/curves/types.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/fields/asm_macros.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/fields/extra_flag_solver.py (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/fields/field.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/fields/field12.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/fields/field2.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/fields/field2_declarations.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/fields/field6.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/fields/field_declarations.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/fields/field_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/fields/field_impl_generic.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/fields/field_impl_x64.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/fields/macro_scrapbook.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/groups/affine_element.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/groups/element.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/groups/element_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/groups/group.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/groups/group_impl_asm.tcc (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/groups/group_impl_int128.tcc (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/groups/wnaf.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/pippenger.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/scalar_multiplication/point_table.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/ecc/serialize.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/env/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/env/data_store.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/env/data_store.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/env/hardware_concurrency.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/env/hardware_concurrency.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/env/logstr.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/env/logstr.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/examples/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/examples/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/examples/c_bind.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/examples/simple/simple.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/examples/simple/simple.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/examples/simple/simple.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/grumpkin_srs_gen/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/grumpkin_srs_gen/grumpkin_srs_gen.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/composer/standard_composer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/composer/standard_composer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/composer/ultra_composer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/composer/ultra_composer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/flavor/flavor.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/flavor/standard.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/flavor/ultra.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/pcs/claim.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/pcs/commitment_key.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/pcs/verification_key.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/pcs/wrapper.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/proof_system/composer_lib.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/proof_system/prover.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/proof_system/prover.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/proof_system/prover_library.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/proof_system/prover_library.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/proof_system/verifier.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/proof_system/verifier.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/proof_system/work_queue.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/sumcheck/partial_evaluation.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/sumcheck/sumcheck_output.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/transcript/transcript.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/transcript/transcript.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/utils/grand_product_delta.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/utils/power_polynomial.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/constants.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/mock/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/proofs/verify.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/join_split_example/types.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/bitop/bitop.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/bitop/get_msb.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/bitop/get_msb.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/bitop/keep_n_lsb.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/bitop/pow.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/bitop/rotate.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/random/engine.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/random/engine.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/random/engine.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/uint128/uint128.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/uint128/uint128.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/uint256/uint256.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/uint256/uint256.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/uintx/uintx.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/uintx/uintx.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/composer/composer_lib.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/composer/composer_lib.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/composer/standard_composer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/composer/standard_composer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/composer/turbo_composer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/flavor/flavor.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/constants.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/verification_key/sol_gen.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/barycentric.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/barycentric.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/evaluation_domain.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/evaluation_domain.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/iterate_over_domain.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/polynomial.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/polynomial.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/polynomials.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/pow.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/pow.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/serialize.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/univariate.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/polynomials/univariate.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_mini.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/flavor/flavor.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/aes128.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/blake2s.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/dummy.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_chi.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_input.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_output.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_rho.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_theta.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/pedersen.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/sha256.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/sparse.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/types.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/plookup_tables/uint.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/relations/arithmetic_relation.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/relations/ecc_op_queue_relation.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/relations/elliptic_relation.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/relations/gen_perm_sort_relation.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/relations/lookup_relation.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/relations/relation_parameters.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/relations/relation_types.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/relations/standard_relation_consistency.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/relations/ultra_relation_consistency.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/types/circuit_type.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/types/merkle_hash_type.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/types/pedersen_commitment_type.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/proof_system/work_queue/work_queue.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/cbind.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/cbind_fwd.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/msgpack.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/msgpack_apply.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/msgpack_impl/concepts.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/msgpack_impl/drop_keys.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/msgpack_impl/func_traits.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/msgpack_impl/msgpack_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/msgpack_impl/name_value_pair_macro.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/msgpack_impl/schema_name.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/msgpack_impl/struct_map_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/msgpack_impl/variant_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/msgpack_schema.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/raw_pointer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/serialize/test_helper.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/README.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/smt_intmod.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/solver/solver.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/solver/solver.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/terms/bool.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/terms/bool.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/terms/ffiterm.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/terms/ffiterm.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/terms/ffterm.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/smt_verification/terms/ffterm.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/solidity_helpers/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/solidity_helpers/key_gen.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/solidity_helpers/utils/instance_sol_gen.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/srs/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/srs/c_bind.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/srs/c_bind.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/srs/factories/crs_factory.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/srs/factories/file_crs_factory.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/srs/factories/file_crs_factory.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/srs/factories/mem_crs_factory.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/srs/factories/mem_crs_factory.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/srs/global_crs.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/srs/global_crs.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/srs/io.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/srs/io.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/srs/scalar_multiplication.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/commitment/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/commitment/pedersen/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/encryption/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/encryption/aes128/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/encryption/ecdsa/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/encryption/schnorr/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/benchmarks/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/sha256.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/benchmarks/external/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/blake2s/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/blake3s/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/keccak/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_gates.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/sha256/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/index.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/address/address.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/field/array.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/field/field.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/field/field.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/group/group.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/logic/logic.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/point/point.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/types/turbo.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/types/ultra.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/stdlib/utility/utility.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/transcript/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/transcript/manifest.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/transcript/transcript.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/transcript/transcript.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/transcript/transcript.test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/transcript/transcript_wrappers.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/transcript/transcript_wrappers.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/wasi/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/wasi/wasi_stubs.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/barretenberg/wasi/wasm_init.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/.clang-format (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/.github/depends/boost.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/.github/depends/zlib.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/.github/workflows/coverage.yml (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/.github/workflows/gha.yml (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/.gitignore (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/CHANGELOG.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/COPYING (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/Doxyfile (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/Files.cmake (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/LICENSE_1_0.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/NOTICE (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/QUICKSTART-CPP.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/README.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/appveyor.yml (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/ci/build_cmake.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/ci/build_regression.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/ci/set_gcc_10.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/cmake/CodeCoverage.cmake (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/codecov.yml (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/erb/v1/cpp03_define_array.hpp.erb (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/erb/v1/cpp03_define_array_decl.hpp.erb (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/erb/v1/cpp03_define_map.hpp.erb (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/erb/v1/cpp03_define_map_decl.hpp.erb (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple.hpp.erb (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple_decl.hpp.erb (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/erb/v1/cpp03_zone.hpp.erb (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/erb/v1/cpp03_zone_decl.hpp.erb (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/boost/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/boost/asio_send_recv.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/boost/asio_send_recv_zlib.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/boost/msgpack_variant_capitalize.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/boost/msgpack_variant_mapbased.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp03/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp03/class_intrusive.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp03/class_intrusive_map.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp03/class_non_intrusive.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp03/custom.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp03/enum.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp03/map_based_versionup.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp03/protocol.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp03/protocol_new.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp03/reuse_zone.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp03/simple.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp03/speed_test.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp03/speed_test_nested_array.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp03/stream.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp11/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp11/container.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp11/non_def_con_class.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/cpp11/socket_stream_example.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/x3/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/x3/parse.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/x3/stream_unpack.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/example/x3/unpack.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/fuzz/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/fuzz/regression_runner.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-5656982724804608 (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-6022481354686464 (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyArray (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyObject (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/ExcessiveNesting (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/OpenWeatherMap (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/WeatherUnderground (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/bool.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/boost/fusion.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/boost/optional.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_ref.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_view.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/carray.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/char_ptr.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/complex.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_char.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_unsigned_char.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/chrono.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/forward_list.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/reference_wrapper.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/shared_ptr.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/timespec.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/tuple.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unique_ptr.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_map.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_set.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/array_byte.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/byte.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/carray_byte.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/optional.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/string_view.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/vector_byte.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/cpp20/span.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/define.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/define_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/deque.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/ext.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/ext_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/fixint.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/fixint_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/float.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/int.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/int_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/list.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/map.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/map_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/nil.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/nil_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/pair.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/raw.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/raw_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/set.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/string.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_map.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_set.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/vector.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/vector_bool.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/vector_char.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/vector_unsigned_char.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/adaptor/wstring.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/assert.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/cpp_config.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/cpp_config_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/cpp_version.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/create_object_visitor.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/create_object_visitor_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/fbuffer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/fbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/gcc_atomic.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/iterator.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/iterator_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/meta.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/meta_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/null_visitor.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/null_visitor_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/object.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/object_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/object_fwd.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/object_fwd_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/pack.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/pack_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/parse.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/parse_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/parse_return.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/alpha.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/arm.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/blackfin.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/convex.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/ia64.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/m68k.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/mips.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/parisc.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/ppc.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/ptx.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/pyramid.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/rs6k.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/sparc.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/superh.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys370.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys390.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/32.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/64.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/architecture/z.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/borland.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/clang.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/comeau.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/compaq.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/diab.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/digitalmars.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/dignus.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/edg.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/ekopath.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc_xml.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/greenhills.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/hp_acc.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/iar.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/ibm.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/intel.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/kai.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/llvm.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/metaware.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/metrowerks.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/microtec.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/mpw.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/nvcc.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/palm.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/pgi.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/sgi_mipspro.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/sunpro.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/tendra.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/visualc.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/compiler/watcom.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/detail/_cassert.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/detail/_exception.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/detail/comp_detected.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/detail/endian_compat.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/detail/os_detected.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/detail/platform_detected.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/detail/test.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/detail/test_def.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/hardware.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm/versions.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc/versions.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86/versions.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd/versions.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/language.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/language/cuda.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/language/objc.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/language/stdc.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/language/stdcpp.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/c.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/c/_prefix.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/c/cloudabi.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/c/gnu.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/c/uc.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/c/vms.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/c/zos.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/std.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/std/_prefix.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/std/cxx.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/std/dinkumware.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/std/libcomo.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/std/modena.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/std/msl.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/std/roguewave.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/std/sgi.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/std/stdcpp3.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/std/stlport.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/library/std/vacpp.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/make.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/aix.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/amigaos.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/android.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/beos.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/bsd.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/bsdi.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/dragonfly.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/free.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/net.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/open.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/cygwin.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/haiku.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/hpux.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/ios.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/irix.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/linux.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/macos.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/os400.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/qnxnto.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/solaris.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/unix.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/vms.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/os/windows.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/other.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/other/endian.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/other/workaround.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/platform.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/platform/cloudabi.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/platform/ios.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw32.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw64.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_desktop.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_phone.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_runtime.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_server.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_store.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_system.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_uwp.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/version.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/predef/version_number.h (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/add.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/dec.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/detail/div_base.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/div.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/inc.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mod.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mul.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/sub.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/data.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/detail/get_data.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/elem.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/enum.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/insert.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_back.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_front.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_back.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_front.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/remove.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/replace.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/reverse.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/size.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_list.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_seq.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_tuple.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/assert_msg.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/cat.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/comma.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/comma_if.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/equal.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater_equal.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less_equal.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/not_equal.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/config/config.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/config/limits.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/control.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/control/deduce_d.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/dmc/while.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/edg/while.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/msvc/while.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/while.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_if.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_iif.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/control/if.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/control/iif.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/control/while.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/debug.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/assert.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/error.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/line.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/dec.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/auto_rec.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/check.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/dmc/auto_rec.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_binary.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_nullary.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_unary.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/null.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/split.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/empty.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/enum.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_a_default.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_defaults.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted_params.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/expand.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/expr_if.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/apply.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/detail/is_empty.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/empty.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/expand.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/identity.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/intercept.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_or_1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_variadic.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/overload.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/for.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/identity.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/if.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/inc.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iterate.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower2.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower3.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower4.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower5.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper2.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper3.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper4.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper5.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/finish.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward2.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward3.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward4.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward5.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse2.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse3.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse4.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse5.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/local.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/rlocal.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/self.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/start.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/iterate.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/local.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/self.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/library.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/limits.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/adt.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/append.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/at.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/cat.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/dmc/fold_left.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_left.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_right.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_left.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_right.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/enum.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/filter.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/first_n.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_left.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_right.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_i.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_product.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/rest_n.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/reverse.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/size.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_array.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_seq.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_tuple.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/list/transform.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/logical.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/and.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitand.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitnor.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitor.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitxor.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bool.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/compl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/nor.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/not.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/or.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/xor.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/max.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/min.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma_if.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/detail/is_begin_parens.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/is_begin_parens.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren_if.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/remove_parens.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_2nd.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_3rd.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_2nd.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_3rd.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_r.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_z.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/dmc/for.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/edg/for.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/for.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/msvc/for.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_binary_params.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_a_default.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_defaults.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_binary_params.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_params.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_binary_params.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_params.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/for.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat_from_to.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/selection.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/max.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/min.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/cat.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/binary_transform.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/is_empty.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/split.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/to_list_msvc.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/elem.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/enum.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/filter.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/first_n.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_left.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_right.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_i.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_product.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/insert.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_back.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_front.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_back.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_front.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/remove.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/replace.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/rest_n.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/reverse.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/seq.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/size.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/subseq.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_array.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_list.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_tuple.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/transform.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/variadic_seq_to_seq.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/slot.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/counter.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/counter.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/def.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/shared.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot1.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot2.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot3.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot4.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot5.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/slot.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/stringize.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/detail/is_single_return.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/eat.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/elem.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/enum.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/insert.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_back.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_front.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_back.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_front.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/rem.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/remove.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/replace.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/reverse.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/size.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_array.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_list.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_seq.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/detail/is_single_return.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/elem.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/size.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_array.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_list.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_seq.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_tuple.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/while.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/preprocessor/wstringize.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/sbuffer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/sbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/sysdep.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/type.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/unpack.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/unpack_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/unpack_define.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/unpack_exception.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/bool.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/fusion.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/optional.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_ref.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_view.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/carray.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/char_ptr.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/complex.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_char.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/chrono.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/forward_list.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/timespec.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/tuple.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/array_byte.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/byte.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/carray_byte.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/optional.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/string_view.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/vector_byte.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp20/span.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/deque.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/float.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/list.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/pair.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/set.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/string.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_map.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_set.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_bool.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_char.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_unsigned_char.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/adaptor/wstring.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/cpp_config.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/cpp_config_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/fbuffer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/fbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/iterator.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/iterator_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/meta.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/meta_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/object.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/object_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/object_fwd.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/object_fwd_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/pack.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/pack_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/parse_return.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/sbuffer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/sbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/unpack.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/unpack_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/unpack_exception.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/version.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/versioning.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/zbuffer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/zbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/zone.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v1/zone_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/array_ref_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/boost/msgpack_variant_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/check_container_size_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/define_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_array_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_map_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_msgpack_tuple_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_array_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_map_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_msgpack_tuple_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/ext_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/fixint_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/int_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/map_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/msgpack_tuple_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/nil_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/raw_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/size_equal_only_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/adaptor/v4raw_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/cpp_config_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp03_zone_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp11_zone_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/fbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/iterator_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/meta_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/null_visitor.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/null_visitor_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/object.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/object_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/object_fwd.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/object_fwd_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/pack_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/parse.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/parse_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/parse_return.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/sbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/unpack.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/unpack_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/vrefbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/x3_parse.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/x3_parse_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/zbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v2/zone_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/array_ref_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/boost/msgpack_variant_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/check_container_size_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/define_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_array_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_map_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_msgpack_tuple_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_array_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_map_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_msgpack_tuple_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/ext_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/fixint_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/int_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/map_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/msgpack_tuple_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/nil_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/raw_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/size_equal_only_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/adaptor/v4raw_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/cpp_config_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/create_object_visitor_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp03_zone_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp11_zone_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/fbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/iterator_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/meta_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/null_visitor_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/object_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/object_fwd.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/object_fwd_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/pack_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/parse.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/parse_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/parse_return.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/sbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/unpack.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/unpack_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/vrefbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/x3_parse_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/zbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/v3/zone_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/version.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/version_master.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/versioning.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/vrefbuffer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/vrefbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/x3_parse.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/x3_parse_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/x3_unpack.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/x3_unpack_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/zbuffer.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/zbuffer_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/zone.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/include/msgpack/zone_decl.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/make_file_list.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/makedist.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/msgpack-cxx-config.cmake.in (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/preprocess (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test-install/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test-install/simple.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/CMakeLists.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/array_ref.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/boost_fusion.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/boost_optional.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/boost_string_ref.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/boost_string_view.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/boost_variant.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/buffer.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/buffer_c.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/carray.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/cases.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/cases.mpac (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/cases_compact.mpac (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/convert.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/fixint.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/fuzz_unpack_pack_fuzzer_cpp11.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/inc_adaptor_define.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/iterator_cpp11.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/json.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/limit.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/msgpack_basic.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/msgpack_container.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/msgpack_cpp11.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/msgpack_cpp17.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/msgpack_cpp20.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/msgpack_stream.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/msgpack_tuple.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/msgpack_vref.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/msgpack_x3_parse.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/multi_file1.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/multi_file2.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/object.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/object_with_zone.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/pack_unpack.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/raw.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/reference.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/reference_cpp11.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/reference_wrapper_cpp11.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/shared_ptr_cpp11.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/size_equal_only.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/streaming.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/test_allocator.hpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/unique_ptr_cpp11.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/user_class.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/version.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/visitor.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/test/zone.cpp (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/src/msgpack-c/update_version.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/srs_db/download_ignition.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/srs_db/grumpkin/monomial/README.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/srs_db/ignition/monomial/checksums (100%) rename {circuits/cpp/barretenberg => barretenberg}/cpp/srs_db/ignition/monomial/g2.dat (100%) rename {circuits/cpp/barretenberg => barretenberg}/exports.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/flake.lock (100%) rename {circuits/cpp/barretenberg => barretenberg}/flake.nix (100%) rename {circuits/cpp/barretenberg => barretenberg}/scripts/bindgen.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/scripts/c_bind_files.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/scripts/decls_json.py (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/.gitignore (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/Dockerfile (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/README.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/bootstrap.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/figures/verifier.png (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/foundry.toml (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/lib/forge-std (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/lib/openzeppelin-contracts (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/lib/solidity-stringutils (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/remappings.txt (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/scripts/init.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/scripts/install_foundry.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/scripts/run_fuzzer.sh (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/src/interfaces/IVerifier.sol (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/src/ultra/BaseUltraVerifier.sol (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/src/ultra/instance/Add2UltraVerifier.sol (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/src/ultra/instance/BlakeUltraVerifier.sol (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/src/ultra/instance/RecursiveUltraVerifier.sol (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/src/ultra/keys/Add2UltraVerificationKey.sol (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/src/ultra/keys/BlakeUltraVerificationKey.sol (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/src/ultra/keys/RecursiveUltraVerificationKey.sol (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/test/base/DifferentialFuzzer.sol (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/test/base/TestBase.sol (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/test/ultra/Add2.t.sol (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/test/ultra/Blake.t.sol (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/test/ultra/Recursive.t.sol (100%) rename {circuits/cpp/barretenberg => barretenberg}/sol/test/ultra/TestBaseUltra.sol (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/.dockerignore (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/.eslintrc.cjs (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/.gitignore (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/.prettierrc.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/.yarn/releases/yarn-berry.cjs (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/.yarnrc.yml (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/CHANGELOG.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/Dockerfile (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/README.md (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/bb.js-dev (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/bin-test/target/acir.gz (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/bin-test/target/witness.gz (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/cjs-entry/index.cjs (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/cjs-entry/index.d.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/package.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/scripts/run_tests (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/async_map/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg-threads.wasm (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg.wasm (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_api/blake2s.test.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_api/common.test.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_api/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_api/pedersen.test.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_api/schnorr.test.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_binder/heap_allocator.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_binder/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/barretenberg_wasm_base/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/main.worker.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/main.worker.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/barretenberg_wasm_main/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/thread.worker.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/thread.worker.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/barretenberg_wasm_thread/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/fetch_code/browser/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/fetch_code/browser/wasm-module.d.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/fetch_code/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/fetch_code/node/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/helpers/browser/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/helpers/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/helpers/node/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/helpers/node/node_endpoint.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/index.test.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/barretenberg_wasm/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/bigint-array/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/bindgen/function_declaration.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/bindgen/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/bindgen/mappings.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/bindgen/rust.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/bindgen/to_camel_case.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/bindgen/typescript.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/crs/browser/cached_net_crs.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/crs/browser/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/crs/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/crs/net_crs.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/crs/node/ignition_files_crs.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/crs/node/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/examples/simple.rawtest.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/examples/simple.test.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/index.html (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/info.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/main.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/random/browser/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/random/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/random/node/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/serialize/buffer_reader.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/serialize/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/serialize/output_type.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/serialize/serialize.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/types/fields.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/types/fixed_size_buffer.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/types/index.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/types/point.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/types/ptr.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/src/types/raw_buffer.ts (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/tsconfig.browser.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/tsconfig.json (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/webpack.config.js (100%) rename {circuits/cpp/barretenberg => barretenberg}/ts/yarn.lock (100%) rename {circuits/cpp/barretenberg => barretenberg}/wasi-sdk.nix (100%) diff --git a/.gitmodules b/.gitmodules index 64ffb023e533..67768137586c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ [submodule "legacy-barretenberg-build-system"] - path = circuits/cpp/barretenberg/build-system + path = barretenberg/build-system url = https://github.com/AztecProtocol/build-system [submodule "l1-contracts/lib/openzeppelin-contracts"] path = l1-contracts/lib/openzeppelin-contracts @@ -8,11 +8,11 @@ path = l1-contracts/lib/forge-std url = https://github.com/foundry-rs/forge-std [submodule "circuits/cpp/barretenberg/sol/lib/forge-std"] - path = circuits/cpp/barretenberg/sol/lib/forge-std + path = barretenberg/sol/lib/forge-std url = https://github.com/foundry-rs/forge-std [submodule "circuits/cpp/barretenberg/sol/lib/solidity-stringutils"] - path = circuits/cpp/barretenberg/sol/lib/solidity-stringutils + path = barretenberg/sol/lib/solidity-stringutils url = https://github.com/Arachnid/solidity-stringutils [submodule "circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts"] - path = circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts + path = barretenberg/sol/lib/openzeppelin-contracts url = https://github.com/OpenZeppelin/openzeppelin-contracts diff --git a/circuits/cpp/barretenberg/.circleci/config.yml b/barretenberg/.circleci/config.yml similarity index 100% rename from circuits/cpp/barretenberg/.circleci/config.yml rename to barretenberg/.circleci/config.yml diff --git a/circuits/cpp/barretenberg/.dockerignore b/barretenberg/.dockerignore similarity index 100% rename from circuits/cpp/barretenberg/.dockerignore rename to barretenberg/.dockerignore diff --git a/circuits/cpp/barretenberg/.github/pull_request_template.md b/barretenberg/.github/pull_request_template.md similarity index 100% rename from circuits/cpp/barretenberg/.github/pull_request_template.md rename to barretenberg/.github/pull_request_template.md diff --git a/circuits/cpp/barretenberg/.github/workflows/benchmarks.yml b/barretenberg/.github/workflows/benchmarks.yml similarity index 100% rename from circuits/cpp/barretenberg/.github/workflows/benchmarks.yml rename to barretenberg/.github/workflows/benchmarks.yml diff --git a/circuits/cpp/barretenberg/.github/workflows/nix.yml b/barretenberg/.github/workflows/nix.yml similarity index 100% rename from circuits/cpp/barretenberg/.github/workflows/nix.yml rename to barretenberg/.github/workflows/nix.yml diff --git a/circuits/cpp/barretenberg/.github/workflows/noir.yml b/barretenberg/.github/workflows/noir.yml similarity index 100% rename from circuits/cpp/barretenberg/.github/workflows/noir.yml rename to barretenberg/.github/workflows/noir.yml diff --git a/circuits/cpp/barretenberg/.github/workflows/pull-request.yml b/barretenberg/.github/workflows/pull-request.yml similarity index 100% rename from circuits/cpp/barretenberg/.github/workflows/pull-request.yml rename to barretenberg/.github/workflows/pull-request.yml diff --git a/circuits/cpp/barretenberg/.gitignore b/barretenberg/.gitignore similarity index 100% rename from circuits/cpp/barretenberg/.gitignore rename to barretenberg/.gitignore diff --git a/circuits/cpp/barretenberg/.gitmodules b/barretenberg/.gitmodules similarity index 100% rename from circuits/cpp/barretenberg/.gitmodules rename to barretenberg/.gitmodules diff --git a/circuits/cpp/barretenberg/.gitrepo b/barretenberg/.gitrepo similarity index 100% rename from circuits/cpp/barretenberg/.gitrepo rename to barretenberg/.gitrepo diff --git a/circuits/cpp/barretenberg/.vscode/c_cpp_properties.json b/barretenberg/.vscode/c_cpp_properties.json similarity index 100% rename from circuits/cpp/barretenberg/.vscode/c_cpp_properties.json rename to barretenberg/.vscode/c_cpp_properties.json diff --git a/circuits/cpp/barretenberg/.vscode/settings.json b/barretenberg/.vscode/settings.json similarity index 100% rename from circuits/cpp/barretenberg/.vscode/settings.json rename to barretenberg/.vscode/settings.json diff --git a/circuits/cpp/barretenberg/CHANGELOG.md b/barretenberg/CHANGELOG.md similarity index 100% rename from circuits/cpp/barretenberg/CHANGELOG.md rename to barretenberg/CHANGELOG.md diff --git a/circuits/cpp/barretenberg/LICENSE b/barretenberg/LICENSE similarity index 100% rename from circuits/cpp/barretenberg/LICENSE rename to barretenberg/LICENSE diff --git a/circuits/cpp/barretenberg/PROJECT b/barretenberg/PROJECT similarity index 100% rename from circuits/cpp/barretenberg/PROJECT rename to barretenberg/PROJECT diff --git a/circuits/cpp/barretenberg/README.md b/barretenberg/README.md similarity index 100% rename from circuits/cpp/barretenberg/README.md rename to barretenberg/README.md diff --git a/circuits/cpp/barretenberg/VERSION b/barretenberg/VERSION similarity index 100% rename from circuits/cpp/barretenberg/VERSION rename to barretenberg/VERSION diff --git a/circuits/cpp/barretenberg/acir_tests/.dockerignore b/barretenberg/acir_tests/.dockerignore similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/.dockerignore rename to barretenberg/acir_tests/.dockerignore diff --git a/circuits/cpp/barretenberg/acir_tests/.gitignore b/barretenberg/acir_tests/.gitignore similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/.gitignore rename to barretenberg/acir_tests/.gitignore diff --git a/circuits/cpp/barretenberg/acir_tests/Dockerfile.bb b/barretenberg/acir_tests/Dockerfile.bb similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/Dockerfile.bb rename to barretenberg/acir_tests/Dockerfile.bb diff --git a/circuits/cpp/barretenberg/acir_tests/Dockerfile.bb.js b/barretenberg/acir_tests/Dockerfile.bb.js similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/Dockerfile.bb.js rename to barretenberg/acir_tests/Dockerfile.bb.js diff --git a/circuits/cpp/barretenberg/acir_tests/README.md b/barretenberg/acir_tests/README.md similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/README.md rename to barretenberg/acir_tests/README.md diff --git a/circuits/cpp/barretenberg/acir_tests/browser-test-app/package.json b/barretenberg/acir_tests/browser-test-app/package.json similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/browser-test-app/package.json rename to barretenberg/acir_tests/browser-test-app/package.json diff --git a/circuits/cpp/barretenberg/acir_tests/browser-test-app/serve.mt.json b/barretenberg/acir_tests/browser-test-app/serve.mt.json similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/browser-test-app/serve.mt.json rename to barretenberg/acir_tests/browser-test-app/serve.mt.json diff --git a/circuits/cpp/barretenberg/acir_tests/browser-test-app/src/index.html b/barretenberg/acir_tests/browser-test-app/src/index.html similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/browser-test-app/src/index.html rename to barretenberg/acir_tests/browser-test-app/src/index.html diff --git a/circuits/cpp/barretenberg/acir_tests/browser-test-app/src/index.ts b/barretenberg/acir_tests/browser-test-app/src/index.ts similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/browser-test-app/src/index.ts rename to barretenberg/acir_tests/browser-test-app/src/index.ts diff --git a/circuits/cpp/barretenberg/acir_tests/browser-test-app/tsconfig.json b/barretenberg/acir_tests/browser-test-app/tsconfig.json similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/browser-test-app/tsconfig.json rename to barretenberg/acir_tests/browser-test-app/tsconfig.json diff --git a/circuits/cpp/barretenberg/acir_tests/browser-test-app/webpack.config.js b/barretenberg/acir_tests/browser-test-app/webpack.config.js similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/browser-test-app/webpack.config.js rename to barretenberg/acir_tests/browser-test-app/webpack.config.js diff --git a/circuits/cpp/barretenberg/acir_tests/browser-test-app/yarn.lock b/barretenberg/acir_tests/browser-test-app/yarn.lock similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/browser-test-app/yarn.lock rename to barretenberg/acir_tests/browser-test-app/yarn.lock diff --git a/circuits/cpp/barretenberg/acir_tests/flows/all_cmds.sh b/barretenberg/acir_tests/flows/all_cmds.sh similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/flows/all_cmds.sh rename to barretenberg/acir_tests/flows/all_cmds.sh diff --git a/circuits/cpp/barretenberg/acir_tests/flows/prove_and_verify.sh b/barretenberg/acir_tests/flows/prove_and_verify.sh similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/flows/prove_and_verify.sh rename to barretenberg/acir_tests/flows/prove_and_verify.sh diff --git a/circuits/cpp/barretenberg/acir_tests/headless-test/bb.js.browser b/barretenberg/acir_tests/headless-test/bb.js.browser similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/headless-test/bb.js.browser rename to barretenberg/acir_tests/headless-test/bb.js.browser diff --git a/circuits/cpp/barretenberg/acir_tests/headless-test/package.json b/barretenberg/acir_tests/headless-test/package.json similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/headless-test/package.json rename to barretenberg/acir_tests/headless-test/package.json diff --git a/circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts b/barretenberg/acir_tests/headless-test/src/index.ts similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/headless-test/src/index.ts rename to barretenberg/acir_tests/headless-test/src/index.ts diff --git a/circuits/cpp/barretenberg/acir_tests/headless-test/tsconfig.json b/barretenberg/acir_tests/headless-test/tsconfig.json similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/headless-test/tsconfig.json rename to barretenberg/acir_tests/headless-test/tsconfig.json diff --git a/circuits/cpp/barretenberg/acir_tests/headless-test/yarn.lock b/barretenberg/acir_tests/headless-test/yarn.lock similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/headless-test/yarn.lock rename to barretenberg/acir_tests/headless-test/yarn.lock diff --git a/circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh b/barretenberg/acir_tests/run_acir_tests.sh similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/run_acir_tests.sh rename to barretenberg/acir_tests/run_acir_tests.sh diff --git a/circuits/cpp/barretenberg/acir_tests/run_acir_tests_browser.sh b/barretenberg/acir_tests/run_acir_tests_browser.sh similarity index 100% rename from circuits/cpp/barretenberg/acir_tests/run_acir_tests_browser.sh rename to barretenberg/acir_tests/run_acir_tests_browser.sh diff --git a/circuits/cpp/barretenberg/barretenberg-wasm.nix b/barretenberg/barretenberg-wasm.nix similarity index 100% rename from circuits/cpp/barretenberg/barretenberg-wasm.nix rename to barretenberg/barretenberg-wasm.nix diff --git a/circuits/cpp/barretenberg/barretenberg.code-workspace b/barretenberg/barretenberg.code-workspace similarity index 100% rename from circuits/cpp/barretenberg/barretenberg.code-workspace rename to barretenberg/barretenberg.code-workspace diff --git a/circuits/cpp/barretenberg/barretenberg.nix b/barretenberg/barretenberg.nix similarity index 100% rename from circuits/cpp/barretenberg/barretenberg.nix rename to barretenberg/barretenberg.nix diff --git a/circuits/cpp/barretenberg/bootstrap.sh b/barretenberg/bootstrap.sh similarity index 100% rename from circuits/cpp/barretenberg/bootstrap.sh rename to barretenberg/bootstrap.sh diff --git a/circuits/cpp/barretenberg/bootstrap_docker.sh b/barretenberg/bootstrap_docker.sh similarity index 100% rename from circuits/cpp/barretenberg/bootstrap_docker.sh rename to barretenberg/bootstrap_docker.sh diff --git a/circuits/cpp/barretenberg/build-system b/barretenberg/build-system similarity index 100% rename from circuits/cpp/barretenberg/build-system rename to barretenberg/build-system diff --git a/circuits/cpp/barretenberg/build_manifest.json b/barretenberg/build_manifest.json similarity index 100% rename from circuits/cpp/barretenberg/build_manifest.json rename to barretenberg/build_manifest.json diff --git a/circuits/cpp/barretenberg/build_manifest.sh b/barretenberg/build_manifest.sh similarity index 100% rename from circuits/cpp/barretenberg/build_manifest.sh rename to barretenberg/build_manifest.sh diff --git a/circuits/cpp/barretenberg/cpp/.aztec-packages-commit b/barretenberg/cpp/.aztec-packages-commit similarity index 100% rename from circuits/cpp/barretenberg/cpp/.aztec-packages-commit rename to barretenberg/cpp/.aztec-packages-commit diff --git a/circuits/cpp/barretenberg/cpp/.clang-format b/barretenberg/cpp/.clang-format similarity index 100% rename from circuits/cpp/barretenberg/cpp/.clang-format rename to barretenberg/cpp/.clang-format diff --git a/circuits/cpp/barretenberg/cpp/.clangd b/barretenberg/cpp/.clangd similarity index 100% rename from circuits/cpp/barretenberg/cpp/.clangd rename to barretenberg/cpp/.clangd diff --git a/circuits/cpp/barretenberg/cpp/.dockerignore b/barretenberg/cpp/.dockerignore similarity index 100% rename from circuits/cpp/barretenberg/cpp/.dockerignore rename to barretenberg/cpp/.dockerignore diff --git a/circuits/cpp/barretenberg/cpp/.gitignore b/barretenberg/cpp/.gitignore similarity index 100% rename from circuits/cpp/barretenberg/cpp/.gitignore rename to barretenberg/cpp/.gitignore diff --git a/circuits/cpp/barretenberg/cpp/CMakeLists.txt b/barretenberg/cpp/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/CMakeLists.txt rename to barretenberg/cpp/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/CMakePresets.json b/barretenberg/cpp/CMakePresets.json similarity index 100% rename from circuits/cpp/barretenberg/cpp/CMakePresets.json rename to barretenberg/cpp/CMakePresets.json diff --git a/circuits/cpp/barretenberg/cpp/bin-test/target/acir.gz b/barretenberg/cpp/bin-test/target/acir.gz similarity index 100% rename from circuits/cpp/barretenberg/cpp/bin-test/target/acir.gz rename to barretenberg/cpp/bin-test/target/acir.gz diff --git a/circuits/cpp/barretenberg/cpp/bin-test/target/witness.gz b/barretenberg/cpp/bin-test/target/witness.gz similarity index 100% rename from circuits/cpp/barretenberg/cpp/bin-test/target/witness.gz rename to barretenberg/cpp/bin-test/target/witness.gz diff --git a/circuits/cpp/barretenberg/cpp/bootstrap.sh b/barretenberg/cpp/bootstrap.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/bootstrap.sh rename to barretenberg/cpp/bootstrap.sh diff --git a/circuits/cpp/barretenberg/cpp/cmake/arch.cmake b/barretenberg/cpp/cmake/arch.cmake similarity index 100% rename from circuits/cpp/barretenberg/cpp/cmake/arch.cmake rename to barretenberg/cpp/cmake/arch.cmake diff --git a/circuits/cpp/barretenberg/cpp/cmake/barretenberg.pc.in b/barretenberg/cpp/cmake/barretenberg.pc.in similarity index 100% rename from circuits/cpp/barretenberg/cpp/cmake/barretenberg.pc.in rename to barretenberg/cpp/cmake/barretenberg.pc.in diff --git a/circuits/cpp/barretenberg/cpp/cmake/benchmark.cmake b/barretenberg/cpp/cmake/benchmark.cmake similarity index 100% rename from circuits/cpp/barretenberg/cpp/cmake/benchmark.cmake rename to barretenberg/cpp/cmake/benchmark.cmake diff --git a/circuits/cpp/barretenberg/cpp/cmake/build.cmake b/barretenberg/cpp/cmake/build.cmake similarity index 100% rename from circuits/cpp/barretenberg/cpp/cmake/build.cmake rename to barretenberg/cpp/cmake/build.cmake diff --git a/circuits/cpp/barretenberg/cpp/cmake/gtest.cmake b/barretenberg/cpp/cmake/gtest.cmake similarity index 100% rename from circuits/cpp/barretenberg/cpp/cmake/gtest.cmake rename to barretenberg/cpp/cmake/gtest.cmake diff --git a/circuits/cpp/barretenberg/cpp/cmake/module.cmake b/barretenberg/cpp/cmake/module.cmake similarity index 100% rename from circuits/cpp/barretenberg/cpp/cmake/module.cmake rename to barretenberg/cpp/cmake/module.cmake diff --git a/circuits/cpp/barretenberg/cpp/cmake/threading.cmake b/barretenberg/cpp/cmake/threading.cmake similarity index 100% rename from circuits/cpp/barretenberg/cpp/cmake/threading.cmake rename to barretenberg/cpp/cmake/threading.cmake diff --git a/circuits/cpp/barretenberg/cpp/cmake/toolchains/aarch64-darwin.cmake b/barretenberg/cpp/cmake/toolchains/aarch64-darwin.cmake similarity index 100% rename from circuits/cpp/barretenberg/cpp/cmake/toolchains/aarch64-darwin.cmake rename to barretenberg/cpp/cmake/toolchains/aarch64-darwin.cmake diff --git a/circuits/cpp/barretenberg/cpp/cmake/toolchains/aarch64-linux.cmake b/barretenberg/cpp/cmake/toolchains/aarch64-linux.cmake similarity index 100% rename from circuits/cpp/barretenberg/cpp/cmake/toolchains/aarch64-linux.cmake rename to barretenberg/cpp/cmake/toolchains/aarch64-linux.cmake diff --git a/circuits/cpp/barretenberg/cpp/cmake/toolchains/i386-linux.cmake b/barretenberg/cpp/cmake/toolchains/i386-linux.cmake similarity index 100% rename from circuits/cpp/barretenberg/cpp/cmake/toolchains/i386-linux.cmake rename to barretenberg/cpp/cmake/toolchains/i386-linux.cmake diff --git a/circuits/cpp/barretenberg/cpp/cmake/toolchains/wasm32-wasi.cmake b/barretenberg/cpp/cmake/toolchains/wasm32-wasi.cmake similarity index 100% rename from circuits/cpp/barretenberg/cpp/cmake/toolchains/wasm32-wasi.cmake rename to barretenberg/cpp/cmake/toolchains/wasm32-wasi.cmake diff --git a/circuits/cpp/barretenberg/cpp/cmake/toolchains/x86_64-darwin.cmake b/barretenberg/cpp/cmake/toolchains/x86_64-darwin.cmake similarity index 100% rename from circuits/cpp/barretenberg/cpp/cmake/toolchains/x86_64-darwin.cmake rename to barretenberg/cpp/cmake/toolchains/x86_64-darwin.cmake diff --git a/circuits/cpp/barretenberg/cpp/cmake/toolchains/x86_64-linux.cmake b/barretenberg/cpp/cmake/toolchains/x86_64-linux.cmake similarity index 100% rename from circuits/cpp/barretenberg/cpp/cmake/toolchains/x86_64-linux.cmake rename to barretenberg/cpp/cmake/toolchains/x86_64-linux.cmake diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang b/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang similarity index 100% rename from circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang rename to barretenberg/cpp/dockerfiles/Dockerfile.wasm-linux-clang diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang similarity index 100% rename from circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang rename to barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert similarity index 100% rename from circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert rename to barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-assert diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-benchmarks b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-benchmarks similarity index 100% rename from circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-benchmarks rename to barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-benchmarks diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing similarity index 100% rename from circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing rename to barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-clang-fuzzing diff --git a/circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc b/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc similarity index 100% rename from circuits/cpp/barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc rename to barretenberg/cpp/dockerfiles/Dockerfile.x86_64-linux-gcc diff --git a/circuits/cpp/barretenberg/cpp/docs/Fuzzing.md b/barretenberg/cpp/docs/Fuzzing.md similarity index 100% rename from circuits/cpp/barretenberg/cpp/docs/Fuzzing.md rename to barretenberg/cpp/docs/Fuzzing.md diff --git a/circuits/cpp/barretenberg/cpp/format.sh b/barretenberg/cpp/format.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/format.sh rename to barretenberg/cpp/format.sh diff --git a/circuits/cpp/barretenberg/cpp/notebook.ipynb b/barretenberg/cpp/notebook.ipynb similarity index 100% rename from circuits/cpp/barretenberg/cpp/notebook.ipynb rename to barretenberg/cpp/notebook.ipynb diff --git a/circuits/cpp/barretenberg/cpp/scripts/bb-tests.sh b/barretenberg/cpp/scripts/bb-tests.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/scripts/bb-tests.sh rename to barretenberg/cpp/scripts/bb-tests.sh diff --git a/circuits/cpp/barretenberg/cpp/scripts/collect_coverage_information.sh b/barretenberg/cpp/scripts/collect_coverage_information.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/scripts/collect_coverage_information.sh rename to barretenberg/cpp/scripts/collect_coverage_information.sh diff --git a/circuits/cpp/barretenberg/cpp/scripts/install-wasi-sdk.sh b/barretenberg/cpp/scripts/install-wasi-sdk.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/scripts/install-wasi-sdk.sh rename to barretenberg/cpp/scripts/install-wasi-sdk.sh diff --git a/circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests b/barretenberg/cpp/scripts/run_aztec_circuits_tests similarity index 100% rename from circuits/cpp/barretenberg/cpp/scripts/run_aztec_circuits_tests rename to barretenberg/cpp/scripts/run_aztec_circuits_tests diff --git a/circuits/cpp/barretenberg/cpp/scripts/run_tests b/barretenberg/cpp/scripts/run_tests similarity index 100% rename from circuits/cpp/barretenberg/cpp/scripts/run_tests rename to barretenberg/cpp/scripts/run_tests diff --git a/circuits/cpp/barretenberg/cpp/scripts/stdlib-tests b/barretenberg/cpp/scripts/stdlib-tests similarity index 100% rename from circuits/cpp/barretenberg/cpp/scripts/stdlib-tests rename to barretenberg/cpp/scripts/stdlib-tests diff --git a/circuits/cpp/barretenberg/cpp/scripts/strip-wasm.sh b/barretenberg/cpp/scripts/strip-wasm.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/scripts/strip-wasm.sh rename to barretenberg/cpp/scripts/strip-wasm.sh diff --git a/circuits/cpp/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/CMakeLists.txt rename to barretenberg/cpp/src/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/barretenberg.hpp b/barretenberg/cpp/src/barretenberg/barretenberg.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/barretenberg.hpp rename to barretenberg/cpp/src/barretenberg/barretenberg.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/bb/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/bb/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/exec_pipe.hpp b/barretenberg/cpp/src/barretenberg/bb/exec_pipe.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/exec_pipe.hpp rename to barretenberg/cpp/src/barretenberg/bb/exec_pipe.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/file_io.hpp b/barretenberg/cpp/src/barretenberg/bb/file_io.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/file_io.hpp rename to barretenberg/cpp/src/barretenberg/bb/file_io.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp b/barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp rename to barretenberg/cpp/src/barretenberg/bb/get_bytecode.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_crs.hpp b/barretenberg/cpp/src/barretenberg/bb/get_crs.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_crs.hpp rename to barretenberg/cpp/src/barretenberg/bb/get_crs.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_witness.hpp b/barretenberg/cpp/src/barretenberg/bb/get_witness.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/get_witness.hpp rename to barretenberg/cpp/src/barretenberg/bb/get_witness.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/log.hpp b/barretenberg/cpp/src/barretenberg/bb/log.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/log.hpp rename to barretenberg/cpp/src/barretenberg/bb/log.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/main.cpp b/barretenberg/cpp/src/barretenberg/bb/main.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/main.cpp rename to barretenberg/cpp/src/barretenberg/bb/main.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/bb/readme.md b/barretenberg/cpp/src/barretenberg/bb/readme.md similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/bb/readme.md rename to barretenberg/cpp/src/barretenberg/bb/readme.md diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/benchmark/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/compare_branch_vs_baseline.sh b/barretenberg/cpp/src/barretenberg/benchmark/compare_branch_vs_baseline.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/compare_branch_vs_baseline.sh rename to barretenberg/cpp/src/barretenberg/benchmark/compare_branch_vs_baseline.sh diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp b/barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp rename to barretenberg/cpp/src/barretenberg/benchmark/decrypt_bench/main.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/benchmark_utilities.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_standard.sh b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_standard.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_standard.sh rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_standard.sh diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_ultra.sh b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_ultra.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_ultra.sh rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/compare_honk_to_plonk_ultra.sh diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/honk.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/main.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/main.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/main.bench.cpp rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/main.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_honk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_honk.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_honk.bench.cpp rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_honk.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_plonk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_plonk.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_plonk.bench.cpp rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/standard_plonk.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_honk.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_plonk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_plonk.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_plonk.bench.cpp rename to barretenberg/cpp/src/barretenberg/benchmark/honk_bench/ultra_plonk.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp b/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp rename to barretenberg/cpp/src/barretenberg/benchmark/pippenger_bench/main.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp rename to barretenberg/cpp/src/barretenberg/benchmark/plonk_bench/plonk.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/benchmark/relations_bench/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp rename to barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/main.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/main.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/main.bench.cpp rename to barretenberg/cpp/src/barretenberg/benchmark/relations_bench/main.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp b/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp rename to barretenberg/cpp/src/barretenberg/benchmark/relations_bench/relations.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/common/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/common/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/assert.hpp b/barretenberg/cpp/src/barretenberg/common/assert.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/assert.hpp rename to barretenberg/cpp/src/barretenberg/common/assert.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/c_bind.cpp b/barretenberg/cpp/src/barretenberg/common/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/common/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/c_bind.hpp b/barretenberg/cpp/src/barretenberg/common/c_bind.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/c_bind.hpp rename to barretenberg/cpp/src/barretenberg/common/c_bind.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/constexpr_utils.hpp b/barretenberg/cpp/src/barretenberg/common/constexpr_utils.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/constexpr_utils.hpp rename to barretenberg/cpp/src/barretenberg/common/constexpr_utils.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/container.hpp b/barretenberg/cpp/src/barretenberg/common/container.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/container.hpp rename to barretenberg/cpp/src/barretenberg/common/container.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp b/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/fuzzer.hpp rename to barretenberg/cpp/src/barretenberg/common/fuzzer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/fuzzer_constants.hpp b/barretenberg/cpp/src/barretenberg/common/fuzzer_constants.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/fuzzer_constants.hpp rename to barretenberg/cpp/src/barretenberg/common/fuzzer_constants.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/inline.hpp b/barretenberg/cpp/src/barretenberg/common/inline.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/inline.hpp rename to barretenberg/cpp/src/barretenberg/common/inline.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/log.hpp b/barretenberg/cpp/src/barretenberg/common/log.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/log.hpp rename to barretenberg/cpp/src/barretenberg/common/log.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/map.hpp b/barretenberg/cpp/src/barretenberg/common/map.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/map.hpp rename to barretenberg/cpp/src/barretenberg/common/map.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/mem.cpp b/barretenberg/cpp/src/barretenberg/common/mem.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/mem.cpp rename to barretenberg/cpp/src/barretenberg/common/mem.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/mem.hpp b/barretenberg/cpp/src/barretenberg/common/mem.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/mem.hpp rename to barretenberg/cpp/src/barretenberg/common/mem.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/moody/blockingconcurrentqueue.h b/barretenberg/cpp/src/barretenberg/common/moody/blockingconcurrentqueue.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/moody/blockingconcurrentqueue.h rename to barretenberg/cpp/src/barretenberg/common/moody/blockingconcurrentqueue.h diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/moody/concurrentqueue.h b/barretenberg/cpp/src/barretenberg/common/moody/concurrentqueue.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/moody/concurrentqueue.h rename to barretenberg/cpp/src/barretenberg/common/moody/concurrentqueue.h diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/moody/lightweightsemaphore.h b/barretenberg/cpp/src/barretenberg/common/moody/lightweightsemaphore.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/moody/lightweightsemaphore.h rename to barretenberg/cpp/src/barretenberg/common/moody/lightweightsemaphore.h diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/net.hpp b/barretenberg/cpp/src/barretenberg/common/net.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/net.hpp rename to barretenberg/cpp/src/barretenberg/common/net.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp rename to barretenberg/cpp/src/barretenberg/common/parallel_for_atomic_pool.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_moody.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_moody.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_moody.cpp rename to barretenberg/cpp/src/barretenberg/common/parallel_for_moody.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp rename to barretenberg/cpp/src/barretenberg/common/parallel_for_mutex_pool.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_omp.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_omp.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_omp.cpp rename to barretenberg/cpp/src/barretenberg/common/parallel_for_omp.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_queued.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_queued.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_queued.cpp rename to barretenberg/cpp/src/barretenberg/common/parallel_for_queued.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_spawning.cpp b/barretenberg/cpp/src/barretenberg/common/parallel_for_spawning.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/parallel_for_spawning.cpp rename to barretenberg/cpp/src/barretenberg/common/parallel_for_spawning.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/printf.hpp b/barretenberg/cpp/src/barretenberg/common/printf.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/printf.hpp rename to barretenberg/cpp/src/barretenberg/common/printf.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/serialize.hpp b/barretenberg/cpp/src/barretenberg/common/serialize.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/serialize.hpp rename to barretenberg/cpp/src/barretenberg/common/serialize.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/slab_allocator.cpp b/barretenberg/cpp/src/barretenberg/common/slab_allocator.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/slab_allocator.cpp rename to barretenberg/cpp/src/barretenberg/common/slab_allocator.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/slab_allocator.hpp b/barretenberg/cpp/src/barretenberg/common/slab_allocator.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/slab_allocator.hpp rename to barretenberg/cpp/src/barretenberg/common/slab_allocator.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/streams.hpp b/barretenberg/cpp/src/barretenberg/common/streams.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/streams.hpp rename to barretenberg/cpp/src/barretenberg/common/streams.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/test.hpp b/barretenberg/cpp/src/barretenberg/common/test.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/test.hpp rename to barretenberg/cpp/src/barretenberg/common/test.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/thread.cpp b/barretenberg/cpp/src/barretenberg/common/thread.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/thread.cpp rename to barretenberg/cpp/src/barretenberg/common/thread.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/thread.hpp b/barretenberg/cpp/src/barretenberg/common/thread.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/thread.hpp rename to barretenberg/cpp/src/barretenberg/common/thread.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/throw_or_abort.hpp b/barretenberg/cpp/src/barretenberg/common/throw_or_abort.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/throw_or_abort.hpp rename to barretenberg/cpp/src/barretenberg/common/throw_or_abort.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/timer.hpp b/barretenberg/cpp/src/barretenberg/common/timer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/timer.hpp rename to barretenberg/cpp/src/barretenberg/common/timer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/common/wasm_export.hpp b/barretenberg/cpp/src/barretenberg/common/wasm_export.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/common/wasm_export.hpp rename to barretenberg/cpp/src/barretenberg/common/wasm_export.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/crypto/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/aes128/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/crypto/aes128/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.cpp b/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.cpp rename to barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.hpp b/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.hpp rename to barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.test.cpp rename to barretenberg/cpp/src/barretenberg/crypto/aes128/aes128.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/aes128/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/aes128/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/crypto/aes128/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/blake2s/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/crypto/blake2s/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2-impl.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2-impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2-impl.hpp rename to barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2-impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.cpp rename to barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp rename to barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.test.cpp rename to barretenberg/cpp/src/barretenberg/crypto/blake2s/blake2s.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp rename to barretenberg/cpp/src/barretenberg/crypto/blake2s/c_bind.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/blake3s/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/crypto/blake3s/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3-impl.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3-impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3-impl.hpp rename to barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3-impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.cpp rename to barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.hpp rename to barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp rename to barretenberg/cpp/src/barretenberg/crypto/blake3s/blake3s.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/crypto/blake3s/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/crypto/blake3s_full/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3-impl.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3-impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3-impl.hpp rename to barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3-impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp rename to barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.hpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.hpp rename to barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.test.cpp rename to barretenberg/cpp/src/barretenberg/crypto/blake3s_full/blake3s.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/ecdsa/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/crypto/ecdsa/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.h b/barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.h rename to barretenberg/cpp/src/barretenberg/crypto/ecdsa/c_bind.h diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp b/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp rename to barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp rename to barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp b/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp rename to barretenberg/cpp/src/barretenberg/crypto/ecdsa/ecdsa_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/generators/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/crypto/generators/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/fixed_base_scalar_mul.hpp b/barretenberg/cpp/src/barretenberg/crypto/generators/fixed_base_scalar_mul.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/fixed_base_scalar_mul.hpp rename to barretenberg/cpp/src/barretenberg/crypto/generators/fixed_base_scalar_mul.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.cpp b/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.cpp rename to barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.hpp b/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.hpp rename to barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.test.cpp rename to barretenberg/cpp/src/barretenberg/crypto/generators/generator_data.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hashers/hashers.hpp b/barretenberg/cpp/src/barretenberg/crypto/hashers/hashers.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hashers/hashers.hpp rename to barretenberg/cpp/src/barretenberg/crypto/hashers/hashers.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hmac/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/hmac/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hmac/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/crypto/hmac/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.hpp b/barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.hpp rename to barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.test.cpp rename to barretenberg/cpp/src/barretenberg/crypto/hmac/hmac.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/keccak/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/crypto/keccak/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/hash_types.hpp b/barretenberg/cpp/src/barretenberg/crypto/keccak/hash_types.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/hash_types.hpp rename to barretenberg/cpp/src/barretenberg/crypto/keccak/hash_types.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.cpp b/barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.cpp rename to barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.hpp b/barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.hpp rename to barretenberg/cpp/src/barretenberg/crypto/keccak/keccak.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/keccakf1600.cpp b/barretenberg/cpp/src/barretenberg/crypto/keccak/keccakf1600.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/keccak/keccakf1600.cpp rename to barretenberg/cpp/src/barretenberg/crypto/keccak/keccakf1600.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.cpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.hpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/c_bind_new.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/convert_buffer_to_field.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/convert_buffer_to_field.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/convert_buffer_to_field.hpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/convert_buffer_to_field.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.cpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.hpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.cpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.test.cpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_commitment/pedersen_lookup.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind_new.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind_new.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind_new.cpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/c_bind_new.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.cpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.hpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.cpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.cpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.hpp b/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.hpp rename to barretenberg/cpp/src/barretenberg/crypto/pedersen_hash/pedersen_lookup.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/schnorr/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind_new.cpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind_new.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind_new.cpp rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/c_bind_new.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.hpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.hpp rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/multisig.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/proof_of_possession.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc b/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.tcc diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp rename to barretenberg/cpp/src/barretenberg/crypto/schnorr/schnorr.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/crypto/sha256/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/crypto/sha256/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/c_bind.cpp b/barretenberg/cpp/src/barretenberg/crypto/sha256/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/crypto/sha256/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.cpp b/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.cpp rename to barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.hpp b/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.hpp rename to barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.test.cpp b/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.test.cpp rename to barretenberg/cpp/src/barretenberg/crypto/sha256/sha256.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/dsl/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_format.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/acir_to_constraint_buf.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/blake2s_constraint.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/block_constraint.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256k1.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/ecdsa_secp256r1.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.test.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/fixed_base_scalar_mul.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/hash_to_field.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/keccak_constraint.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/logic_constraint.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/pedersen.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/range_constraint.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/recursion_constraint.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/round.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/round.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/round.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/round.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/round.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/round.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/round.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/round.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/schnorr_verify.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/acir.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/binary.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/binary.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/binary.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/binary.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/bincode.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/bincode.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/bincode.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/bincode.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/index.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/index.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/index.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/index.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/serde.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/serde.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/serde.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/serde.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_map.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_map.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_map.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/serde/witness_map.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_format/sha256_constraint.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_proofs/acir_composer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp b/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp rename to barretenberg/cpp/src/barretenberg/dsl/acir_proofs/c_bind.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/types.hpp b/barretenberg/cpp/src/barretenberg/dsl/types.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/dsl/types.hpp rename to barretenberg/cpp/src/barretenberg/dsl/types.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/ecc/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/ecc/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/bn254.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/bn254.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/bn254.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/bn254.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.test.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq12.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.test.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq2.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.test.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fq6.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.bench.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.bench.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/fr.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.test.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g1.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/g2.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.test.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing_impl.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing_impl.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/bn254/pairing_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/c_bind.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/grumpkin/grumpkin.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/c_bind.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256k1/secp256k1_endo_notes.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/secp256r1/secp256r1.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/types.hpp b/barretenberg/cpp/src/barretenberg/ecc/curves/types.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/curves/types.hpp rename to barretenberg/cpp/src/barretenberg/ecc/curves/types.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/asm_macros.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/asm_macros.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/asm_macros.hpp rename to barretenberg/cpp/src/barretenberg/ecc/fields/asm_macros.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/extra_flag_solver.py b/barretenberg/cpp/src/barretenberg/ecc/fields/extra_flag_solver.py similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/extra_flag_solver.py rename to barretenberg/cpp/src/barretenberg/ecc/fields/extra_flag_solver.py diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field.hpp rename to barretenberg/cpp/src/barretenberg/ecc/fields/field.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field12.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field12.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field12.hpp rename to barretenberg/cpp/src/barretenberg/ecc/fields/field12.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field2.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field2.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field2.hpp rename to barretenberg/cpp/src/barretenberg/ecc/fields/field2.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field2_declarations.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field2_declarations.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field2_declarations.hpp rename to barretenberg/cpp/src/barretenberg/ecc/fields/field2_declarations.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field6.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field6.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field6.hpp rename to barretenberg/cpp/src/barretenberg/ecc/fields/field6.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_declarations.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field_declarations.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_declarations.hpp rename to barretenberg/cpp/src/barretenberg/ecc/fields/field_declarations.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl.hpp rename to barretenberg/cpp/src/barretenberg/ecc/fields/field_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_generic.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_generic.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_generic.hpp rename to barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_generic.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_x64.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_x64.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_x64.hpp rename to barretenberg/cpp/src/barretenberg/ecc/fields/field_impl_x64.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/macro_scrapbook.hpp b/barretenberg/cpp/src/barretenberg/ecc/fields/macro_scrapbook.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/fields/macro_scrapbook.hpp rename to barretenberg/cpp/src/barretenberg/ecc/fields/macro_scrapbook.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp rename to barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp rename to barretenberg/cpp/src/barretenberg/ecc/groups/affine_element.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp rename to barretenberg/cpp/src/barretenberg/ecc/groups/affine_element_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp rename to barretenberg/cpp/src/barretenberg/ecc/groups/element.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/element_impl.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/element_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/element_impl.hpp rename to barretenberg/cpp/src/barretenberg/ecc/groups/element_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/group.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/group.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/group.hpp rename to barretenberg/cpp/src/barretenberg/ecc/groups/group.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_asm.tcc b/barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_asm.tcc similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_asm.tcc rename to barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_asm.tcc diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_int128.tcc b/barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_int128.tcc similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_int128.tcc rename to barretenberg/cpp/src/barretenberg/ecc/groups/group_impl_int128.tcc diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.hpp b/barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.hpp rename to barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp rename to barretenberg/cpp/src/barretenberg/ecc/groups/wnaf.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/pippenger.md b/barretenberg/cpp/src/barretenberg/ecc/pippenger.md similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/pippenger.md rename to barretenberg/cpp/src/barretenberg/ecc/pippenger.md diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/point_table.hpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/point_table.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/point_table.hpp rename to barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/point_table.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.cpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.cpp rename to barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.hpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.hpp rename to barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/process_buckets.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.cpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.cpp rename to barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.hpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.hpp rename to barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/runtime_states.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp rename to barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp b/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp rename to barretenberg/cpp/src/barretenberg/ecc/scalar_multiplication/scalar_multiplication.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/serialize.test.cpp b/barretenberg/cpp/src/barretenberg/ecc/serialize.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/ecc/serialize.test.cpp rename to barretenberg/cpp/src/barretenberg/ecc/serialize.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/env/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/env/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/env/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/data_store.cpp b/barretenberg/cpp/src/barretenberg/env/data_store.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/env/data_store.cpp rename to barretenberg/cpp/src/barretenberg/env/data_store.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/data_store.hpp b/barretenberg/cpp/src/barretenberg/env/data_store.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/env/data_store.hpp rename to barretenberg/cpp/src/barretenberg/env/data_store.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.cpp b/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.cpp rename to barretenberg/cpp/src/barretenberg/env/hardware_concurrency.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.hpp b/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/env/hardware_concurrency.hpp rename to barretenberg/cpp/src/barretenberg/env/hardware_concurrency.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/logstr.cpp b/barretenberg/cpp/src/barretenberg/env/logstr.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/env/logstr.cpp rename to barretenberg/cpp/src/barretenberg/env/logstr.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/env/logstr.hpp b/barretenberg/cpp/src/barretenberg/env/logstr.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/env/logstr.hpp rename to barretenberg/cpp/src/barretenberg/env/logstr.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/examples/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/examples/c_bind.cpp b/barretenberg/cpp/src/barretenberg/examples/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/examples/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/examples/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/examples/c_bind.hpp b/barretenberg/cpp/src/barretenberg/examples/c_bind.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/examples/c_bind.hpp rename to barretenberg/cpp/src/barretenberg/examples/c_bind.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/examples/simple/simple.cpp b/barretenberg/cpp/src/barretenberg/examples/simple/simple.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/examples/simple/simple.cpp rename to barretenberg/cpp/src/barretenberg/examples/simple/simple.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp b/barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp rename to barretenberg/cpp/src/barretenberg/examples/simple/simple.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/examples/simple/simple.test.cpp b/barretenberg/cpp/src/barretenberg/examples/simple/simple.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/examples/simple/simple.test.cpp rename to barretenberg/cpp/src/barretenberg/examples/simple/simple.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/grumpkin_srs_gen.cpp b/barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/grumpkin_srs_gen.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/grumpkin_srs_gen.cpp rename to barretenberg/cpp/src/barretenberg/grumpkin_srs_gen/grumpkin_srs_gen.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/honk/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.cpp rename to barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.hpp b/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.hpp rename to barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp rename to barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp b/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp rename to barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/flavor.test.cpp b/barretenberg/cpp/src/barretenberg/honk/flavor/flavor.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/flavor.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/flavor/flavor.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp rename to barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp rename to barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp rename to barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp rename to barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp rename to barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp rename to barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp rename to barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/claim.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/claim.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/claim.hpp rename to barretenberg/cpp/src/barretenberg/honk/pcs/claim.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.hpp rename to barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp rename to barretenberg/cpp/src/barretenberg/honk/pcs/commitment_key.test.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp b/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp rename to barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp rename to barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp b/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/pcs/gemini/gemini.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp rename to barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp b/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/pcs/ipa/ipa.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp rename to barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp b/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/pcs/kzg/kzg.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp rename to barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp b/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/pcs/shplonk/shplonk.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/verification_key.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/verification_key.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/verification_key.hpp rename to barretenberg/cpp/src/barretenberg/honk/pcs/verification_key.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/wrapper.hpp b/barretenberg/cpp/src/barretenberg/honk/pcs/wrapper.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/pcs/wrapper.hpp rename to barretenberg/cpp/src/barretenberg/honk/pcs/wrapper.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/composer_lib.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/composer_lib.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/composer_lib.hpp rename to barretenberg/cpp/src/barretenberg/honk/proof_system/composer_lib.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp rename to barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/prover.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover.cpp rename to barretenberg/cpp/src/barretenberg/honk/proof_system/prover.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/prover.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover.hpp rename to barretenberg/cpp/src/barretenberg/honk/proof_system/prover.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.cpp rename to barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.hpp rename to barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp rename to barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp rename to barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp rename to barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp rename to barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.cpp rename to barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.hpp rename to barretenberg/cpp/src/barretenberg/honk/proof_system/verifier.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/work_queue.hpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/work_queue.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/work_queue.hpp rename to barretenberg/cpp/src/barretenberg/honk/proof_system/work_queue.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/partial_evaluation.test.cpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/partial_evaluation.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/partial_evaluation.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/sumcheck/partial_evaluation.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp rename to barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_output.hpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_output.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_output.hpp rename to barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_output.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp rename to barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.hpp rename to barretenberg/cpp/src/barretenberg/honk/transcript/transcript.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/utils/grand_product_delta.hpp b/barretenberg/cpp/src/barretenberg/honk/utils/grand_product_delta.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/utils/grand_product_delta.hpp rename to barretenberg/cpp/src/barretenberg/honk/utils/grand_product_delta.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.hpp b/barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.hpp rename to barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp b/barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp rename to barretenberg/cpp/src/barretenberg/honk/utils/power_polynomial.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/join_split_example/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/constants.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/constants.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/constants.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/constants.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/fixtures/user_context.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/compute_circuit_data.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/inner_proof_data/inner_proof_data.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.h b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.h rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/c_bind.h diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_circuit_data.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/compute_signing_data.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/create_proof.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/index.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_circuit.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_js_parity.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/join_split_tx.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/sign_join_split_tx.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/join_split/verify_signature.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/mock/mock_circuit.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/account_note.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/commit.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/account/index.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/asset_id.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/bridge_call_data.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/claim_note.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/complete_partial_commitment.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/compute_nullifier.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/create_partial_commitment.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/index.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/claim/witness_data.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/index.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/commit.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/complete_partial_commitment.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/compute_nullifier.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/create_partial_commitment.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/index.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/value_note.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/circuit/value/witness_data.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/constants.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/account_note.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_alias_hash_nullifier.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/compute_account_public_key_nullifier.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/account/index.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/asset_id.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/bridge_call_data.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/claim_note_tx_data.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/complete_partial_commitment.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/compute_nullifier.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/create_partial_commitment.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/claim/index.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/index.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/complete_partial_commitment.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/compute_nullifier.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/create_partial_commitment.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/index.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/notes/native/value/value_note.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/verify.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/proofs/verify.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/proofs/verify.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/proofs/verify.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp b/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/join_split_example/types.hpp rename to barretenberg/cpp/src/barretenberg/join_split_example/types.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/numeric/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/numeric/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/bitop.bench.cpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/bitop.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/bitop.bench.cpp rename to barretenberg/cpp/src/barretenberg/numeric/bitop/bitop.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.hpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.hpp rename to barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.test.cpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.test.cpp rename to barretenberg/cpp/src/barretenberg/numeric/bitop/count_leading_zeros.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.hpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.hpp rename to barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.test.cpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.test.cpp rename to barretenberg/cpp/src/barretenberg/numeric/bitop/get_msb.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/keep_n_lsb.hpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/keep_n_lsb.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/keep_n_lsb.hpp rename to barretenberg/cpp/src/barretenberg/numeric/bitop/keep_n_lsb.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/pow.hpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/pow.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/pow.hpp rename to barretenberg/cpp/src/barretenberg/numeric/bitop/pow.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/rotate.hpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/rotate.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/rotate.hpp rename to barretenberg/cpp/src/barretenberg/numeric/bitop/rotate.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp b/barretenberg/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp rename to barretenberg/cpp/src/barretenberg/numeric/bitop/sparse_form.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/random/engine.cpp b/barretenberg/cpp/src/barretenberg/numeric/random/engine.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/random/engine.cpp rename to barretenberg/cpp/src/barretenberg/numeric/random/engine.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/random/engine.hpp b/barretenberg/cpp/src/barretenberg/numeric/random/engine.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/random/engine.hpp rename to barretenberg/cpp/src/barretenberg/numeric/random/engine.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/random/engine.test.cpp b/barretenberg/cpp/src/barretenberg/numeric/random/engine.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/random/engine.test.cpp rename to barretenberg/cpp/src/barretenberg/numeric/random/engine.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.hpp b/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.hpp rename to barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.test.cpp b/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.test.cpp rename to barretenberg/cpp/src/barretenberg/numeric/uint128/uint128.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp b/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp rename to barretenberg/cpp/src/barretenberg/numeric/uint128/uint128_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp b/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp rename to barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.test.cpp b/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.test.cpp rename to barretenberg/cpp/src/barretenberg/numeric/uint256/uint256.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp b/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp rename to barretenberg/cpp/src/barretenberg/numeric/uint256/uint256_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.hpp b/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.hpp rename to barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.test.cpp b/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.test.cpp rename to barretenberg/cpp/src/barretenberg/numeric/uintx/uintx.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp b/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp rename to barretenberg/cpp/src/barretenberg/numeric/uintx/uintx_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/plonk/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp rename to barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.hpp b/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.hpp rename to barretenberg/cpp/src/barretenberg/plonk/composer/composer_lib.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.cpp rename to barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp rename to barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp rename to barretenberg/cpp/src/barretenberg/plonk/composer/standard_composer.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp rename to barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.hpp b/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.hpp rename to barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp rename to barretenberg/cpp/src/barretenberg/plonk/composer/turbo_composer.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp rename to barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp rename to barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp rename to barretenberg/cpp/src/barretenberg/plonk/composer/ultra_composer.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/flavor/flavor.hpp b/barretenberg/cpp/src/barretenberg/plonk/flavor/flavor.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/flavor/flavor.hpp rename to barretenberg/cpp/src/barretenberg/plonk/flavor/flavor.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/commitment_scheme.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/commitment_scheme/kate_commitment_scheme.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/constants.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/prover/prover.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/proving_key.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/proving_key/serialize.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/public_inputs/public_inputs_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/types/commitment_open_proof.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/types/polynomial_manifest.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/types/program_settings.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/types/proof.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/types/prover_settings.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/generalized_permutation.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/kate_verification.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/utils/permutation.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/sol_gen.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/sol_gen.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/sol_gen.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/sol_gen.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/verification_key/verification_key.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/verifier/verifier.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/permutation_widget_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/plookup_widget_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/random_widgets/random_widget.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/arithmetic_widget.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/elliptic_widget.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/fixed_base_widget.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/genperm_sort_widget.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_arithmetic_widget.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/plookup_auxiliary_widget.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/transition_widget.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_arithmetic_widget.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_logic_widget.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp b/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp rename to barretenberg/cpp/src/barretenberg/plonk/proof_system/widgets/transition_widgets/turbo_range_widget.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/polynomials/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/polynomials/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.hpp b/barretenberg/cpp/src/barretenberg/polynomials/barycentric.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.hpp rename to barretenberg/cpp/src/barretenberg/polynomials/barycentric.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp b/barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp rename to barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.cpp b/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.cpp rename to barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.hpp b/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.hpp rename to barretenberg/cpp/src/barretenberg/polynomials/evaluation_domain.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/iterate_over_domain.hpp b/barretenberg/cpp/src/barretenberg/polynomials/iterate_over_domain.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/iterate_over_domain.hpp rename to barretenberg/cpp/src/barretenberg/polynomials/iterate_over_domain.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp rename to barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp rename to barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp rename to barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp rename to barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp rename to barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomials.bench.cpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomials.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/polynomials.bench.cpp rename to barretenberg/cpp/src/barretenberg/polynomials/polynomials.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.hpp b/barretenberg/cpp/src/barretenberg/polynomials/pow.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.hpp rename to barretenberg/cpp/src/barretenberg/polynomials/pow.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp b/barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp rename to barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/serialize.hpp b/barretenberg/cpp/src/barretenberg/polynomials/serialize.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/serialize.hpp rename to barretenberg/cpp/src/barretenberg/polynomials/serialize.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp b/barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp rename to barretenberg/cpp/src/barretenberg/polynomials/univariate.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/univariate.test.cpp b/barretenberg/cpp/src/barretenberg/polynomials/univariate.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/univariate.test.cpp rename to barretenberg/cpp/src/barretenberg/polynomials/univariate.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/proof_system/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/proof_system/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp b/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/arithmetization/arithmetization.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp b/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/arithmetization/gate_data.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.test.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_circuit_builder.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_mini.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_mini.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_mini.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_translator_mini.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/standard_circuit_builder.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.test.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/turbo_circuit_builder.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/composer/composer_lib.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp b/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/aes128.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/aes128.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/aes128.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/aes128.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/blake2s.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/blake2s.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/blake2s.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/blake2s.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/dummy.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/dummy.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/dummy.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/dummy.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_chi.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_chi.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_chi.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_chi.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_input.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_input.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_input.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_input.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_output.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_output.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_output.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_output.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_rho.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_rho.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_rho.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_rho.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_theta.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_theta.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_theta.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/keccak/keccak_theta.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.cpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/non_native_group_generator.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/pedersen.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/pedersen.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/pedersen.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/pedersen.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.cpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/plookup_tables.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sha256.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sha256.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sha256.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sha256.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sparse.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sparse.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sparse.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/sparse.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/types.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/types.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/types.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/types.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/uint.hpp b/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/uint.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/uint.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/plookup_tables/uint.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.cpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.hpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.cpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_cache.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.cpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.hpp b/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/polynomial_store/polynomial_store_wasm.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/arithmetic_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/arithmetic_relation.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/arithmetic_relation.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/relations/arithmetic_relation.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_op_queue_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_op_queue_relation.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_op_queue_relation.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/relations/ecc_op_queue_relation.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/elliptic_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/elliptic_relation.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/elliptic_relation.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/relations/elliptic_relation.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/gen_perm_sort_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/gen_perm_sort_relation.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/gen_perm_sort_relation.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/relations/gen_perm_sort_relation.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/lookup_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/lookup_relation.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/lookup_relation.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/relations/lookup_relation.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/relation_parameters.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/relation_parameters.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/relation_parameters.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/relations/relation_parameters.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/relation_types.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/relation_types.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/relation_types.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/relations/relation_types.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/standard_relation_consistency.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/standard_relation_consistency.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/standard_relation_consistency.test.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/relations/standard_relation_consistency.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_relation_consistency.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_relation_consistency.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_relation_consistency.test.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/relations/ultra_relation_consistency.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/types/circuit_type.hpp b/barretenberg/cpp/src/barretenberg/proof_system/types/circuit_type.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/types/circuit_type.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/types/circuit_type.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/types/merkle_hash_type.hpp b/barretenberg/cpp/src/barretenberg/proof_system/types/merkle_hash_type.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/types/merkle_hash_type.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/types/merkle_hash_type.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/types/pedersen_commitment_type.hpp b/barretenberg/cpp/src/barretenberg/proof_system/types/pedersen_commitment_type.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/types/pedersen_commitment_type.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/types/pedersen_commitment_type.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp b/barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp rename to barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.hpp b/barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.hpp rename to barretenberg/cpp/src/barretenberg/proof_system/work_queue/work_queue.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/serialize/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/serialize/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/cbind.hpp b/barretenberg/cpp/src/barretenberg/serialize/cbind.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/cbind.hpp rename to barretenberg/cpp/src/barretenberg/serialize/cbind.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/cbind_fwd.hpp b/barretenberg/cpp/src/barretenberg/serialize/cbind_fwd.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/cbind_fwd.hpp rename to barretenberg/cpp/src/barretenberg/serialize/cbind_fwd.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack.hpp rename to barretenberg/cpp/src/barretenberg/serialize/msgpack.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_apply.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_apply.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_apply.hpp rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_apply.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/check_memory_span.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/concepts.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/concepts.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/concepts.hpp rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/concepts.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/drop_keys.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/drop_keys.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/drop_keys.hpp rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/drop_keys.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/func_traits.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/func_traits.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/func_traits.hpp rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/func_traits.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/msgpack_impl.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/msgpack_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/msgpack_impl.hpp rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/msgpack_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/name_value_pair_macro.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/name_value_pair_macro.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/name_value_pair_macro.hpp rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/name_value_pair_macro.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_name.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_name.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_name.hpp rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/schema_name.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/struct_map_impl.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/struct_map_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/struct_map_impl.hpp rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/struct_map_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/variant_impl.hpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/variant_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/variant_impl.hpp rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_impl/variant_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_schema.test.cpp b/barretenberg/cpp/src/barretenberg/serialize/msgpack_schema.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/msgpack_schema.test.cpp rename to barretenberg/cpp/src/barretenberg/serialize/msgpack_schema.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/raw_pointer.hpp b/barretenberg/cpp/src/barretenberg/serialize/raw_pointer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/raw_pointer.hpp rename to barretenberg/cpp/src/barretenberg/serialize/raw_pointer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/test_helper.hpp b/barretenberg/cpp/src/barretenberg/serialize/test_helper.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/serialize/test_helper.hpp rename to barretenberg/cpp/src/barretenberg/serialize/test_helper.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/smt_verification/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/smt_verification/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/README.md b/barretenberg/cpp/src/barretenberg/smt_verification/README.md similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/README.md rename to barretenberg/cpp/src/barretenberg/smt_verification/README.md diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp rename to barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp rename to barretenberg/cpp/src/barretenberg/smt_verification/circuit/circuit.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp rename to barretenberg/cpp/src/barretenberg/smt_verification/smt_bigfield.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp rename to barretenberg/cpp/src/barretenberg/smt_verification/smt_examples.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_intmod.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_intmod.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_intmod.test.cpp rename to barretenberg/cpp/src/barretenberg/smt_verification/smt_intmod.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp rename to barretenberg/cpp/src/barretenberg/smt_verification/smt_polynomials.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.cpp rename to barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.hpp rename to barretenberg/cpp/src/barretenberg/smt_verification/solver/solver.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.cpp rename to barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.hpp rename to barretenberg/cpp/src/barretenberg/smt_verification/terms/bool.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.cpp rename to barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.hpp rename to barretenberg/cpp/src/barretenberg/smt_verification/terms/ffiterm.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.cpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.cpp rename to barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.hpp b/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.hpp rename to barretenberg/cpp/src/barretenberg/smt_verification/terms/ffterm.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/solidity_helpers/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/solidity_helpers/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp rename to barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/add_2_circuit.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp rename to barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/blake_circuit.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp rename to barretenberg/cpp/src/barretenberg/solidity_helpers/circuits/recursive_circuit.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/key_gen.cpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/key_gen.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/key_gen.cpp rename to barretenberg/cpp/src/barretenberg/solidity_helpers/key_gen.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp rename to barretenberg/cpp/src/barretenberg/solidity_helpers/proof_gen.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/utils/instance_sol_gen.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/utils/instance_sol_gen.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/utils/instance_sol_gen.hpp rename to barretenberg/cpp/src/barretenberg/solidity_helpers/utils/instance_sol_gen.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp b/barretenberg/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp rename to barretenberg/cpp/src/barretenberg/solidity_helpers/utils/utils.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/srs/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/srs/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/c_bind.cpp b/barretenberg/cpp/src/barretenberg/srs/c_bind.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/c_bind.cpp rename to barretenberg/cpp/src/barretenberg/srs/c_bind.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/c_bind.hpp b/barretenberg/cpp/src/barretenberg/srs/c_bind.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/c_bind.hpp rename to barretenberg/cpp/src/barretenberg/srs/c_bind.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/crs_factory.hpp b/barretenberg/cpp/src/barretenberg/srs/factories/crs_factory.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/crs_factory.hpp rename to barretenberg/cpp/src/barretenberg/srs/factories/crs_factory.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.cpp b/barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.cpp rename to barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.hpp b/barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.hpp rename to barretenberg/cpp/src/barretenberg/srs/factories/file_crs_factory.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.cpp b/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.cpp rename to barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.hpp b/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.hpp rename to barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp b/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp rename to barretenberg/cpp/src/barretenberg/srs/factories/mem_crs_factory.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/global_crs.cpp b/barretenberg/cpp/src/barretenberg/srs/global_crs.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/global_crs.cpp rename to barretenberg/cpp/src/barretenberg/srs/global_crs.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/global_crs.hpp b/barretenberg/cpp/src/barretenberg/srs/global_crs.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/global_crs.hpp rename to barretenberg/cpp/src/barretenberg/srs/global_crs.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/io.hpp b/barretenberg/cpp/src/barretenberg/srs/io.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/io.hpp rename to barretenberg/cpp/src/barretenberg/srs/io.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/io.test.cpp b/barretenberg/cpp/src/barretenberg/srs/io.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/io.test.cpp rename to barretenberg/cpp/src/barretenberg/srs/io.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/srs/scalar_multiplication.test.cpp b/barretenberg/cpp/src/barretenberg/srs/scalar_multiplication.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/srs/scalar_multiplication.test.cpp rename to barretenberg/cpp/src/barretenberg/srs/scalar_multiplication.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/commitment/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.bench.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/commitment/pedersen/pedersen_plookup.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/encryption/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/aes128/aes128.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/ecdsa/ecdsa_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/encryption/schnorr/schnorr.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/hash/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/sha256.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/sha256.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/sha256.bench.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/celer/sha256.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/external/external.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/benchmarks/sha256/sha256.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake2s_plookup.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake2s/blake_util.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/blake3s/blake3s_plookup.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/keccak/keccak.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_gates.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_gates.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_gates.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_gates.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/pedersen/pedersen_plookup.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/hash/sha256/sha256_plookup.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/hash_path.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/index.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/index.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/index.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/index.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/membership.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_store.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/memory_tree.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.bench.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/merkle_tree.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_leaf.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_memory_tree.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/merkle_tree/nullifier_tree/nullifier_tree.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/address/address.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.fuzzer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_all.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_standard.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bigfield/bigfield_turbo.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_batch_mul.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_bn254.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_goblin.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_impl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_secp256k1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_tables.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.fuzzer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_all.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_standard.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bit_array/bit_array_turbo.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.fuzzer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_all.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_standard.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/bool/bool_turbo.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.fuzzer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_all.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_standard.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/byte_array/byte_array_turbo.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders_fwd.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/bn254.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256k1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/curves/secp256r1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.fuzzer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_all.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_standard.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/field/field_turbo.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/group/group.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/logic/logic.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/dynamic_array.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/ram_table.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/rom_table.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/memory/twin_rom_table.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/packed_byte_array/packed_byte_array.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/plookup/plookup.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/point/point.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/point/point.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/point/point.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/point/point.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.fuzzer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_all.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_standard.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/safe_uint/safe_uint_turbo.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/arithmetic.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/comparison.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/logic.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/arithmetic.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/comparison.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/logic.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/plookup/uint.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.fuzzer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_all.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_standard.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/uint/uint_turbo.fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/primitives/witness/witness.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/aggregation_state.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/aggregation_state/native_aggregation_state.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/transcript/transcript.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/verification_key/verification_key.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/program_settings.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp rename to barretenberg/cpp/src/barretenberg/stdlib/recursion/verifier/verifier_turbo.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/types/turbo.hpp b/barretenberg/cpp/src/barretenberg/stdlib/types/turbo.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/types/turbo.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/types/turbo.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp b/barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/types/ultra.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp b/barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp rename to barretenberg/cpp/src/barretenberg/stdlib/utility/utility.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/transcript/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/transcript/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/manifest.hpp b/barretenberg/cpp/src/barretenberg/transcript/manifest.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/manifest.hpp rename to barretenberg/cpp/src/barretenberg/transcript/manifest.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript.cpp b/barretenberg/cpp/src/barretenberg/transcript/transcript.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript.cpp rename to barretenberg/cpp/src/barretenberg/transcript/transcript.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript.hpp b/barretenberg/cpp/src/barretenberg/transcript/transcript.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript.hpp rename to barretenberg/cpp/src/barretenberg/transcript/transcript.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp rename to barretenberg/cpp/src/barretenberg/transcript/transcript.test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.cpp b/barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.cpp rename to barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.hpp b/barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.hpp rename to barretenberg/cpp/src/barretenberg/transcript/transcript_wrappers.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/wasi/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/wasi/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/wasi/CMakeLists.txt rename to barretenberg/cpp/src/barretenberg/wasi/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/wasi/wasi_stubs.cpp b/barretenberg/cpp/src/barretenberg/wasi/wasi_stubs.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/wasi/wasi_stubs.cpp rename to barretenberg/cpp/src/barretenberg/wasi/wasi_stubs.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/wasi/wasm_init.cpp b/barretenberg/cpp/src/barretenberg/wasi/wasm_init.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/barretenberg/wasi/wasm_init.cpp rename to barretenberg/cpp/src/barretenberg/wasi/wasm_init.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/.clang-format b/barretenberg/cpp/src/msgpack-c/.clang-format similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/.clang-format rename to barretenberg/cpp/src/msgpack-c/.clang-format diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/depends/boost.sh b/barretenberg/cpp/src/msgpack-c/.github/depends/boost.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/depends/boost.sh rename to barretenberg/cpp/src/msgpack-c/.github/depends/boost.sh diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/depends/zlib.sh b/barretenberg/cpp/src/msgpack-c/.github/depends/zlib.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/depends/zlib.sh rename to barretenberg/cpp/src/msgpack-c/.github/depends/zlib.sh diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/workflows/coverage.yml b/barretenberg/cpp/src/msgpack-c/.github/workflows/coverage.yml similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/workflows/coverage.yml rename to barretenberg/cpp/src/msgpack-c/.github/workflows/coverage.yml diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/workflows/gha.yml b/barretenberg/cpp/src/msgpack-c/.github/workflows/gha.yml similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/.github/workflows/gha.yml rename to barretenberg/cpp/src/msgpack-c/.github/workflows/gha.yml diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/.gitignore b/barretenberg/cpp/src/msgpack-c/.gitignore similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/.gitignore rename to barretenberg/cpp/src/msgpack-c/.gitignore diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/CHANGELOG.md b/barretenberg/cpp/src/msgpack-c/CHANGELOG.md similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/CHANGELOG.md rename to barretenberg/cpp/src/msgpack-c/CHANGELOG.md diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/CMakeLists.txt rename to barretenberg/cpp/src/msgpack-c/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/COPYING b/barretenberg/cpp/src/msgpack-c/COPYING similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/COPYING rename to barretenberg/cpp/src/msgpack-c/COPYING diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/Doxyfile b/barretenberg/cpp/src/msgpack-c/Doxyfile similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/Doxyfile rename to barretenberg/cpp/src/msgpack-c/Doxyfile diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/Files.cmake b/barretenberg/cpp/src/msgpack-c/Files.cmake similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/Files.cmake rename to barretenberg/cpp/src/msgpack-c/Files.cmake diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/LICENSE_1_0.txt b/barretenberg/cpp/src/msgpack-c/LICENSE_1_0.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/LICENSE_1_0.txt rename to barretenberg/cpp/src/msgpack-c/LICENSE_1_0.txt diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/NOTICE b/barretenberg/cpp/src/msgpack-c/NOTICE similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/NOTICE rename to barretenberg/cpp/src/msgpack-c/NOTICE diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/QUICKSTART-CPP.md b/barretenberg/cpp/src/msgpack-c/QUICKSTART-CPP.md similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/QUICKSTART-CPP.md rename to barretenberg/cpp/src/msgpack-c/QUICKSTART-CPP.md diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/README.md b/barretenberg/cpp/src/msgpack-c/README.md similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/README.md rename to barretenberg/cpp/src/msgpack-c/README.md diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/appveyor.yml b/barretenberg/cpp/src/msgpack-c/appveyor.yml similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/appveyor.yml rename to barretenberg/cpp/src/msgpack-c/appveyor.yml diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/ci/build_cmake.sh b/barretenberg/cpp/src/msgpack-c/ci/build_cmake.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/ci/build_cmake.sh rename to barretenberg/cpp/src/msgpack-c/ci/build_cmake.sh diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/ci/build_regression.sh b/barretenberg/cpp/src/msgpack-c/ci/build_regression.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/ci/build_regression.sh rename to barretenberg/cpp/src/msgpack-c/ci/build_regression.sh diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/ci/set_gcc_10.sh b/barretenberg/cpp/src/msgpack-c/ci/set_gcc_10.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/ci/set_gcc_10.sh rename to barretenberg/cpp/src/msgpack-c/ci/set_gcc_10.sh diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/cmake/CodeCoverage.cmake b/barretenberg/cpp/src/msgpack-c/cmake/CodeCoverage.cmake similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/cmake/CodeCoverage.cmake rename to barretenberg/cpp/src/msgpack-c/cmake/CodeCoverage.cmake diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/codecov.yml b/barretenberg/cpp/src/msgpack-c/codecov.yml similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/codecov.yml rename to barretenberg/cpp/src/msgpack-c/codecov.yml diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array.hpp.erb similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array.hpp.erb rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array.hpp.erb diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array_decl.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array_decl.hpp.erb similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array_decl.hpp.erb rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_array_decl.hpp.erb diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map.hpp.erb similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map.hpp.erb rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map.hpp.erb diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map_decl.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map_decl.hpp.erb similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map_decl.hpp.erb rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_define_map_decl.hpp.erb diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple.hpp.erb similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple.hpp.erb rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple.hpp.erb diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple_decl.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple_decl.hpp.erb similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple_decl.hpp.erb rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_msgpack_tuple_decl.hpp.erb diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone.hpp.erb similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone.hpp.erb rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone.hpp.erb diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone_decl.hpp.erb b/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone_decl.hpp.erb similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone_decl.hpp.erb rename to barretenberg/cpp/src/msgpack-c/erb/v1/cpp03_zone_decl.hpp.erb diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/example/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/CMakeLists.txt rename to barretenberg/cpp/src/msgpack-c/example/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/example/boost/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/CMakeLists.txt rename to barretenberg/cpp/src/msgpack-c/example/boost/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv.cpp b/barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv.cpp rename to barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv_zlib.cpp b/barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv_zlib.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv_zlib.cpp rename to barretenberg/cpp/src/msgpack-c/example/boost/asio_send_recv_zlib.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_capitalize.cpp b/barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_capitalize.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_capitalize.cpp rename to barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_capitalize.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_mapbased.cpp b/barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_mapbased.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_mapbased.cpp rename to barretenberg/cpp/src/msgpack-c/example/boost/msgpack_variant_mapbased.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/example/cpp03/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/CMakeLists.txt rename to barretenberg/cpp/src/msgpack-c/example/cpp03/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive_map.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive_map.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive_map.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp03/class_intrusive_map.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/class_non_intrusive.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/class_non_intrusive.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/class_non_intrusive.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp03/class_non_intrusive.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/custom.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/custom.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/custom.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp03/custom.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/enum.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/enum.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/enum.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp03/enum.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/map_based_versionup.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/map_based_versionup.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/map_based_versionup.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp03/map_based_versionup.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/protocol.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/protocol.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/protocol.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp03/protocol.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/protocol_new.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/protocol_new.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/protocol_new.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp03/protocol_new.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/reuse_zone.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/reuse_zone.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/reuse_zone.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp03/reuse_zone.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/simple.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/simple.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/simple.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp03/simple.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test_nested_array.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test_nested_array.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test_nested_array.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp03/speed_test_nested_array.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/stream.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp03/stream.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp03/stream.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp03/stream.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/example/cpp11/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/CMakeLists.txt rename to barretenberg/cpp/src/msgpack-c/example/cpp11/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/container.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp11/container.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/container.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp11/container.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/non_def_con_class.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp11/non_def_con_class.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/non_def_con_class.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp11/non_def_con_class.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/socket_stream_example.cpp b/barretenberg/cpp/src/msgpack-c/example/cpp11/socket_stream_example.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/cpp11/socket_stream_example.cpp rename to barretenberg/cpp/src/msgpack-c/example/cpp11/socket_stream_example.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/example/x3/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/CMakeLists.txt rename to barretenberg/cpp/src/msgpack-c/example/x3/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/parse.cpp b/barretenberg/cpp/src/msgpack-c/example/x3/parse.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/parse.cpp rename to barretenberg/cpp/src/msgpack-c/example/x3/parse.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/stream_unpack.cpp b/barretenberg/cpp/src/msgpack-c/example/x3/stream_unpack.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/stream_unpack.cpp rename to barretenberg/cpp/src/msgpack-c/example/x3/stream_unpack.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/unpack.cpp b/barretenberg/cpp/src/msgpack-c/example/x3/unpack.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/example/x3/unpack.cpp rename to barretenberg/cpp/src/msgpack-c/example/x3/unpack.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/fuzz/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/CMakeLists.txt rename to barretenberg/cpp/src/msgpack-c/fuzz/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/regression_runner.cpp b/barretenberg/cpp/src/msgpack-c/fuzz/regression_runner.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/regression_runner.cpp rename to barretenberg/cpp/src/msgpack-c/fuzz/regression_runner.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer.cpp b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer.cpp rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-5656982724804608 b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-5656982724804608 similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-5656982724804608 rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-5656982724804608 diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-6022481354686464 b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-6022481354686464 similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-6022481354686464 rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_regressions/clusterfuzz-testcase-minimized-unpack_pack_fuzzer-6022481354686464 diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyArray b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyArray similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyArray rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyArray diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyObject b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyObject similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyObject rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/EmptyObject diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/ExcessiveNesting b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/ExcessiveNesting similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/ExcessiveNesting rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/ExcessiveNesting diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/OpenWeatherMap b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/OpenWeatherMap similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/OpenWeatherMap rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/OpenWeatherMap diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/WeatherUnderground b/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/WeatherUnderground similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/WeatherUnderground rename to barretenberg/cpp/src/msgpack-c/fuzz/unpack_pack_fuzzer_seed_corpus/WeatherUnderground diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/adaptor_base_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/array_ref_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/bool.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/bool.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/bool.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/bool.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/fusion.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/fusion.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/fusion.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/fusion.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/msgpack_variant_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/optional.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/optional.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/optional.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/optional.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_ref.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_ref.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_ref.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_ref.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_view.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_view.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_view.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/boost/string_view.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/carray.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/carray.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/carray.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/carray.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/char_ptr.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/char_ptr.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/char_ptr.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/char_ptr.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/check_container_size_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/complex.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/complex.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/complex.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/complex.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_char.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_char.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_char.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_unsigned_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_unsigned_char.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_unsigned_char.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/array_unsigned_char.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/chrono.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/chrono.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/chrono.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/chrono.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/forward_list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/forward_list.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/forward_list.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/forward_list.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/reference_wrapper.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/reference_wrapper.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/reference_wrapper.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/reference_wrapper.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/shared_ptr.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/shared_ptr.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/shared_ptr.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/shared_ptr.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/timespec.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/timespec.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/timespec.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/timespec.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/tuple.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/tuple.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/tuple.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unique_ptr.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unique_ptr.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unique_ptr.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unique_ptr.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_map.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_map.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_map.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_set.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_set.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_set.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp11/unordered_set.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/array_byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/array_byte.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/array_byte.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/array_byte.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/byte.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/byte.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/byte.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/carray_byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/carray_byte.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/carray_byte.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/carray_byte.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/optional.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/optional.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/optional.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/optional.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/string_view.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/string_view.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/string_view.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/string_view.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/vector_byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/vector_byte.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/vector_byte.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp17/vector_byte.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp20/span.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp20/span.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp20/span.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/cpp20/span.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/define_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/deque.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/deque.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/deque.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/deque.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/ext_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/fixint_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/float.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/float.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/float.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/float.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/int_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/list.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/list.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/list.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/map_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/msgpack_tuple_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/nil_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/pair.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/pair.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/pair.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/pair.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/raw_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/set.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/set.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/set.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/set.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/size_equal_only_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/string.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/string.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/string.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/string.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_map.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_map.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_map.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_set.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_set.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_set.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/tr1/unordered_set.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/v4raw_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_bool.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_bool.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_bool.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_bool.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_char.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_char.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_char.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_unsigned_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_unsigned_char.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_unsigned_char.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/vector_unsigned_char.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/wstring.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/wstring.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/wstring.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/adaptor/wstring.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/assert.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/assert.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/assert.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/assert.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_config_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_version.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_version.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_version.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/cpp_version.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/create_object_visitor_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/fbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/gcc_atomic.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/gcc_atomic.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/gcc_atomic.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/gcc_atomic.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/iterator.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/iterator.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/iterator.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/iterator.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/iterator_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/iterator_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/iterator_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/iterator_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/meta.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/meta.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/meta.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/meta.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/meta_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/meta_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/meta_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/meta_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/null_visitor_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/object.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/object.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/object_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/object_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/object_fwd_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/pack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/pack.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/pack.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/pack.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/pack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/pack_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/pack_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/pack_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/parse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/parse.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/parse.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/parse.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/parse_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/parse_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/parse_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/parse_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/parse_return.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/parse_return.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/parse_return.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/parse_return.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/alpha.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/alpha.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/alpha.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/alpha.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/arm.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/arm.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/arm.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/arm.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/blackfin.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/blackfin.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/blackfin.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/blackfin.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/convex.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/convex.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/convex.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/convex.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ia64.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ia64.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ia64.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ia64.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/m68k.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/m68k.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/m68k.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/m68k.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/mips.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/mips.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/mips.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/mips.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/parisc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/parisc.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/parisc.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/parisc.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ppc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ppc.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ppc.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ppc.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ptx.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ptx.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ptx.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/ptx.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/pyramid.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/pyramid.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/pyramid.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/pyramid.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/rs6k.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/rs6k.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/rs6k.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/rs6k.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sparc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sparc.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sparc.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sparc.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/superh.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/superh.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/superh.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/superh.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys370.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys370.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys370.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys370.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys390.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys390.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys390.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/sys390.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/32.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/32.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/32.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/32.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/64.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/64.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/64.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/x86/64.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/z.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/z.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/z.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/architecture/z.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/borland.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/borland.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/borland.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/borland.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/clang.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/clang.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/clang.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/clang.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/comeau.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/comeau.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/comeau.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/comeau.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/compaq.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/compaq.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/compaq.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/compaq.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/diab.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/diab.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/diab.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/diab.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/digitalmars.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/digitalmars.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/digitalmars.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/digitalmars.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/dignus.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/dignus.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/dignus.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/dignus.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/edg.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/edg.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/edg.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/edg.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ekopath.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ekopath.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ekopath.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ekopath.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc_xml.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc_xml.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc_xml.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/gcc_xml.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/greenhills.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/greenhills.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/greenhills.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/greenhills.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/hp_acc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/hp_acc.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/hp_acc.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/hp_acc.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/iar.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/iar.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/iar.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/iar.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ibm.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ibm.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ibm.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/ibm.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/intel.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/intel.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/intel.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/intel.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/kai.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/kai.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/kai.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/kai.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/llvm.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/llvm.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/llvm.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/llvm.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metaware.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metaware.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metaware.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metaware.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metrowerks.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metrowerks.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metrowerks.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/metrowerks.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/microtec.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/microtec.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/microtec.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/microtec.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/mpw.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/mpw.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/mpw.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/mpw.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/nvcc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/nvcc.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/nvcc.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/nvcc.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/palm.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/palm.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/palm.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/palm.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/pgi.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/pgi.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/pgi.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/pgi.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sgi_mipspro.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sgi_mipspro.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sgi_mipspro.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sgi_mipspro.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sunpro.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sunpro.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sunpro.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/sunpro.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/tendra.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/tendra.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/tendra.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/tendra.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/visualc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/visualc.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/visualc.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/visualc.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/watcom.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/watcom.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/watcom.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/compiler/watcom.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_cassert.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_cassert.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_cassert.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_cassert.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_exception.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_exception.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_exception.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/_exception.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/comp_detected.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/comp_detected.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/comp_detected.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/comp_detected.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/endian_compat.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/endian_compat.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/endian_compat.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/endian_compat.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/os_detected.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/os_detected.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/os_detected.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/os_detected.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/platform_detected.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/platform_detected.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/platform_detected.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/platform_detected.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test_def.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test_def.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test_def.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/detail/test_def.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm/versions.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm/versions.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm/versions.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/arm/versions.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc/versions.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc/versions.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc/versions.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/ppc/versions.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86/versions.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86/versions.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86/versions.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86/versions.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd/versions.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd/versions.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd/versions.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/hardware/simd/x86_amd/versions.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/cuda.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/cuda.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/cuda.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/cuda.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/objc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/objc.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/objc.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/objc.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdc.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdc.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdc.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdcpp.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdcpp.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdcpp.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/language/stdcpp.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/_prefix.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/_prefix.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/_prefix.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/_prefix.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/cloudabi.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/cloudabi.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/cloudabi.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/cloudabi.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/gnu.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/gnu.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/gnu.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/gnu.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/uc.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/uc.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/uc.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/uc.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/vms.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/vms.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/vms.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/vms.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/zos.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/zos.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/zos.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/c/zos.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/_prefix.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/_prefix.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/_prefix.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/_prefix.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/cxx.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/cxx.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/cxx.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/cxx.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/dinkumware.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/dinkumware.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/dinkumware.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/dinkumware.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/libcomo.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/libcomo.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/libcomo.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/libcomo.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/modena.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/modena.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/modena.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/modena.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/msl.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/msl.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/msl.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/msl.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/roguewave.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/roguewave.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/roguewave.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/roguewave.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/sgi.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/sgi.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/sgi.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/sgi.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stdcpp3.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stdcpp3.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stdcpp3.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stdcpp3.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stlport.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stlport.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stlport.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/stlport.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/vacpp.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/vacpp.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/vacpp.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/library/std/vacpp.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/make.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/make.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/make.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/make.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/aix.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/aix.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/aix.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/aix.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/amigaos.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/amigaos.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/amigaos.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/amigaos.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/android.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/android.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/android.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/android.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/beos.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/beos.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/beos.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/beos.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/bsdi.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/bsdi.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/bsdi.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/bsdi.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/dragonfly.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/dragonfly.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/dragonfly.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/dragonfly.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/free.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/free.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/free.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/free.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/net.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/net.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/net.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/net.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/open.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/open.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/open.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/bsd/open.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/cygwin.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/cygwin.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/cygwin.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/cygwin.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/haiku.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/haiku.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/haiku.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/haiku.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/hpux.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/hpux.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/hpux.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/hpux.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/ios.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/ios.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/ios.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/ios.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/irix.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/irix.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/irix.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/irix.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/linux.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/linux.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/linux.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/linux.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/macos.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/macos.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/macos.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/macos.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/os400.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/os400.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/os400.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/os400.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/qnxnto.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/qnxnto.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/qnxnto.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/qnxnto.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/solaris.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/solaris.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/solaris.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/solaris.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/unix.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/unix.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/unix.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/unix.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/vms.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/vms.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/vms.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/vms.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/windows.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/windows.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/windows.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/os/windows.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/endian.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/endian.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/endian.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/endian.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/workaround.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/workaround.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/workaround.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/other/workaround.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/cloudabi.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/cloudabi.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/cloudabi.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/cloudabi.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/ios.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/ios.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/ios.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/ios.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw32.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw32.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw32.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw32.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw64.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw64.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw64.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/mingw64.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_desktop.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_desktop.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_desktop.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_desktop.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_phone.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_phone.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_phone.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_phone.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_runtime.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_runtime.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_runtime.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_runtime.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_server.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_server.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_server.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_server.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_store.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_store.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_store.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_store.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_system.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_system.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_system.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_system.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_uwp.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_uwp.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_uwp.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/platform/windows_uwp.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version_number.h b/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version_number.h similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version_number.h rename to barretenberg/cpp/src/msgpack-c/include/msgpack/predef/version_number.h diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/add.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/add.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/add.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/add.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/dec.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/dec.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/dec.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/dec.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/detail/div_base.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/detail/div_base.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/detail/div_base.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/detail/div_base.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/div.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/div.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/div.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/div.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/inc.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/inc.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/inc.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/inc.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mod.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mod.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mod.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mod.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mul.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mul.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mul.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/mul.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/sub.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/sub.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/sub.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/arithmetic/sub.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/data.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/data.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/data.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/data.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/detail/get_data.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/detail/get_data.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/detail/get_data.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/detail/get_data.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/elem.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/elem.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/elem.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/elem.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/enum.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/enum.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/enum.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/enum.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/insert.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/insert.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/insert.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/insert.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_back.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_back.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_back.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_back.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_front.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_front.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_front.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/pop_front.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_back.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_back.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_back.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_back.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_front.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_front.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_front.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/push_front.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/remove.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/remove.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/remove.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/remove.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/replace.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/replace.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/replace.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/replace.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/reverse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/reverse.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/reverse.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/reverse.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/size.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/size.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/size.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/size.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_list.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_list.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_list.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_seq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_seq.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_seq.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_seq.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_tuple.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_tuple.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/array/to_tuple.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/assert_msg.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/assert_msg.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/assert_msg.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/assert_msg.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/cat.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/cat.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/cat.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/cat.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma_if.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma_if.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma_if.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comma_if.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/equal.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/equal.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/equal.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/equal.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater_equal.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater_equal.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater_equal.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/greater_equal.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less_equal.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less_equal.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less_equal.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/less_equal.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/not_equal.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/not_equal.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/not_equal.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/comparison/not_equal.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/config.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/config.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/config.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/config.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/limits.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/limits.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/limits.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/config/limits.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/deduce_d.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/deduce_d.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/deduce_d.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/deduce_d.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/dmc/while.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/dmc/while.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/dmc/while.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/dmc/while.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/edg/while.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/edg/while.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/edg/while.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/edg/while.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/msvc/while.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/msvc/while.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/msvc/while.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/msvc/while.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/while.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/while.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/while.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/detail/while.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_if.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_if.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_if.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_if.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_iif.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_iif.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_iif.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/expr_iif.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/if.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/if.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/if.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/if.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/iif.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/iif.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/iif.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/iif.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/while.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/while.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/while.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/control/while.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/assert.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/assert.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/assert.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/assert.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/error.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/error.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/error.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/error.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/line.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/line.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/line.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/debug/line.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/dec.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/dec.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/dec.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/dec.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/auto_rec.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/auto_rec.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/auto_rec.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/auto_rec.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/check.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/check.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/check.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/check.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/dmc/auto_rec.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/dmc/auto_rec.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/dmc/auto_rec.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/dmc/auto_rec.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_binary.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_binary.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_binary.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_binary.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_nullary.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_nullary.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_nullary.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_nullary.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_unary.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_unary.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_unary.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/is_unary.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/null.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/null.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/null.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/null.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/split.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/split.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/split.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/detail/split.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/empty.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/empty.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/empty.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/empty.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_a_default.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_a_default.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_a_default.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_a_default.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_defaults.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_defaults.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_defaults.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_params_with_defaults.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted_params.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted_params.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/enum_shifted_params.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expand.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expand.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expand.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expand.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expr_if.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expr_if.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expr_if.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/expr_if.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/apply.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/apply.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/apply.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/apply.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/detail/is_empty.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/detail/is_empty.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/detail/is_empty.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/detail/is_empty.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/empty.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/empty.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/empty.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/empty.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/expand.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/expand.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/expand.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/expand.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/identity.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/identity.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/identity.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/identity.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/intercept.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/intercept.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/intercept.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/intercept.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_1.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_1.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_or_1.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_or_1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_or_1.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_or_1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_variadic.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_variadic.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_variadic.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/is_empty_variadic.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/overload.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/overload.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/overload.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/facilities/overload.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/for.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/for.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/for.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/for.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/identity.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/identity.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/identity.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/identity.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/if.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/if.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/if.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/if.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/inc.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/inc.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/inc.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/inc.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iterate.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iterate.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iterate.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iterate.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower1.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower1.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower2.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower2.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower2.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower2.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower3.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower3.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower3.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower3.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower4.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower4.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower4.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower4.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower5.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower5.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower5.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/lower5.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper1.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper1.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper2.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper2.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper2.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper2.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper3.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper3.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper3.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper3.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper4.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper4.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper4.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper4.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper5.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper5.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper5.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/bounds/upper5.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/finish.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/finish.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/finish.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/finish.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward1.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward1.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward2.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward2.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward2.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward2.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward3.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward3.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward3.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward3.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward4.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward4.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward4.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward4.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward5.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward5.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward5.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/forward5.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse1.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse1.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse2.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse2.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse2.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse2.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse3.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse3.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse3.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse3.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse4.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse4.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse4.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse4.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse5.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse5.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse5.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/iter/reverse5.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/local.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/local.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/local.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/local.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/rlocal.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/rlocal.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/rlocal.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/rlocal.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/self.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/self.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/self.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/self.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/start.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/start.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/start.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/detail/start.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/iterate.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/iterate.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/iterate.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/iterate.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/local.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/local.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/local.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/local.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/self.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/self.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/self.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/iteration/self.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/library.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/library.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/library.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/library.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/limits.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/limits.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/limits.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/limits.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/adt.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/adt.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/adt.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/adt.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/append.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/append.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/append.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/append.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/at.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/at.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/at.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/at.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/cat.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/cat.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/cat.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/cat.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/dmc/fold_left.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/dmc/fold_left.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/dmc/fold_left.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/dmc/fold_left.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_left.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_left.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_left.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_left.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_right.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_right.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_right.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/edg/fold_right.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_left.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_left.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_left.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_left.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_right.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_right.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_right.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/detail/fold_right.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/enum.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/enum.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/enum.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/enum.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/filter.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/filter.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/filter.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/filter.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/first_n.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/first_n.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/first_n.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/first_n.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_left.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_left.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_left.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_left.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_right.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_right.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_right.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/fold_right.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_i.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_i.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_i.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_i.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_product.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_product.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_product.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/for_each_product.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/rest_n.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/rest_n.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/rest_n.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/rest_n.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/reverse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/reverse.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/reverse.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/reverse.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/size.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/size.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/size.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/size.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_array.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_array.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_array.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_seq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_seq.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_seq.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_seq.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_tuple.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_tuple.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/to_tuple.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/transform.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/transform.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/transform.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/list/transform.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/and.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/and.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/and.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/and.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitand.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitand.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitand.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitand.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitnor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitnor.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitnor.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitnor.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitor.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitor.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitor.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitxor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitxor.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitxor.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bitxor.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bool.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bool.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bool.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/bool.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/compl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/compl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/compl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/compl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/nor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/nor.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/nor.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/nor.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/not.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/not.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/not.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/not.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/or.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/or.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/or.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/or.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/xor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/xor.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/xor.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/logical/xor.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/max.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/max.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/max.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/max.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/min.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/min.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/min.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/min.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma_if.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma_if.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma_if.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/comma_if.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/detail/is_begin_parens.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/detail/is_begin_parens.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/detail/is_begin_parens.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/detail/is_begin_parens.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/is_begin_parens.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/is_begin_parens.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/is_begin_parens.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/is_begin_parens.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren_if.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren_if.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren_if.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/paren_if.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/remove_parens.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/remove_parens.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/remove_parens.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/punctuation/remove_parens.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_2nd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_2nd.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_2nd.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_2nd.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_3rd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_3rd.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_3rd.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_3rd.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_2nd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_2nd.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_2nd.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_2nd.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_3rd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_3rd.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_3rd.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repeat_from_to_3rd.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_r.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_r.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_r.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_r.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_z.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_z.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_z.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/deduce_z.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/dmc/for.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/dmc/for.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/dmc/for.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/dmc/for.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/edg/for.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/edg/for.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/edg/for.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/edg/for.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/for.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/for.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/for.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/for.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/msvc/for.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/msvc/for.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/msvc/for.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/detail/msvc/for.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_binary_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_binary_params.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_binary_params.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_binary_params.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_a_default.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_a_default.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_a_default.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_a_default.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_defaults.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_defaults.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_defaults.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_params_with_defaults.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_binary_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_binary_params.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_binary_params.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_binary_params.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_params.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_params.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_shifted_params.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_binary_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_binary_params.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_binary_params.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_binary_params.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_params.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_params.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_params.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/enum_trailing_params.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/for.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/for.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/for.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/for.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat_from_to.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat_from_to.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat_from_to.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/repetition/repeat_from_to.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/max.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/max.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/max.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/max.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/min.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/min.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/min.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/selection/min.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/cat.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/cat.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/cat.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/cat.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/binary_transform.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/binary_transform.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/binary_transform.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/binary_transform.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/is_empty.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/is_empty.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/is_empty.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/is_empty.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/split.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/split.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/split.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/split.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/to_list_msvc.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/to_list_msvc.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/to_list_msvc.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/detail/to_list_msvc.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/elem.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/elem.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/elem.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/elem.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/enum.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/enum.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/enum.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/enum.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/filter.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/filter.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/filter.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/filter.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/first_n.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/first_n.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/first_n.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/first_n.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_left.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_left.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_left.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_left.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_right.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_right.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_right.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/fold_right.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_i.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_i.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_i.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_i.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_product.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_product.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_product.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/for_each_product.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/insert.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/insert.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/insert.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/insert.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_back.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_back.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_back.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_back.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_front.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_front.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_front.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/pop_front.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_back.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_back.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_back.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_back.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_front.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_front.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_front.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/push_front.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/remove.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/remove.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/remove.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/remove.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/replace.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/replace.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/replace.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/replace.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/rest_n.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/rest_n.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/rest_n.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/rest_n.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/reverse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/reverse.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/reverse.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/reverse.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/seq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/seq.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/seq.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/seq.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/size.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/size.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/size.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/size.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/subseq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/subseq.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/subseq.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/subseq.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_array.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_array.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_array.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_list.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_list.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_list.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_tuple.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_tuple.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/to_tuple.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/transform.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/transform.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/transform.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/transform.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/variadic_seq_to_seq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/variadic_seq_to_seq.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/variadic_seq_to_seq.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/seq/variadic_seq_to_seq.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/counter.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/counter.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/counter.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/counter.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/counter.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/counter.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/counter.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/counter.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/def.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/def.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/def.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/def.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/shared.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/shared.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/shared.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/shared.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot1.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot1.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot1.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot1.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot2.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot2.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot2.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot2.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot3.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot3.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot3.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot3.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot4.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot4.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot4.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot4.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot5.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot5.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot5.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/detail/slot5.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/slot.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/slot.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/slot.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/slot/slot.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/stringize.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/stringize.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/stringize.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/stringize.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/detail/is_single_return.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/detail/is_single_return.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/detail/is_single_return.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/detail/is_single_return.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/eat.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/eat.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/eat.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/eat.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/elem.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/elem.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/elem.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/elem.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/enum.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/enum.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/enum.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/enum.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/insert.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/insert.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/insert.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/insert.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_back.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_back.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_back.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_back.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_front.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_front.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_front.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/pop_front.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_back.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_back.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_back.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_back.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_front.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_front.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_front.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/push_front.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/rem.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/rem.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/rem.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/rem.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/remove.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/remove.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/remove.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/remove.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/replace.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/replace.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/replace.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/replace.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/reverse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/reverse.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/reverse.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/reverse.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/size.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/size.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/size.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/size.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_array.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_array.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_array.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_list.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_list.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_list.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_seq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_seq.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_seq.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/tuple/to_seq.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/detail/is_single_return.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/detail/is_single_return.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/detail/is_single_return.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/detail/is_single_return.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/elem.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/elem.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/elem.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/elem.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/size.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/size.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/size.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/size.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_array.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_array.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_array.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_list.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_list.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_list.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_seq.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_seq.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_seq.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_seq.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_tuple.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_tuple.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/variadic/to_tuple.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/while.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/while.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/while.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/while.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/wstringize.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/wstringize.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/wstringize.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/preprocessor/wstringize.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/sbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/sysdep.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/sysdep.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/sysdep.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/sysdep.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/type.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/type.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/type.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/type.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/unpack.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_define.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_define.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_define.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_define.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_exception.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_exception.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_exception.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/unpack_exception.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/adaptor_base_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/array_ref_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/bool.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/bool.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/bool.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/bool.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/fusion.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/fusion.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/fusion.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/fusion.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/optional.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/optional.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/optional.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/optional.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_ref.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_ref.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_ref.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_ref.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_view.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_view.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_view.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/boost/string_view.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/carray.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/carray.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/carray.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/carray.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/char_ptr.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/char_ptr.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/char_ptr.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/char_ptr.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/check_container_size_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/complex.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/complex.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/complex.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/complex.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_char.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_char.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_char.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/chrono.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/chrono.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/chrono.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/chrono.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/forward_list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/forward_list.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/forward_list.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/forward_list.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/timespec.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/timespec.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/timespec.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/timespec.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/tuple.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/tuple.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/tuple.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/array_byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/array_byte.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/array_byte.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/array_byte.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/byte.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/byte.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/byte.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/carray_byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/carray_byte.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/carray_byte.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/carray_byte.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/optional.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/optional.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/optional.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/optional.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/string_view.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/string_view.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/string_view.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/string_view.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/vector_byte.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/vector_byte.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/vector_byte.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp17/vector_byte.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp20/span.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp20/span.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp20/span.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/cpp20/span.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/define_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/deque.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/deque.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/deque.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/deque.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_array_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_define_map_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp03_msgpack_tuple_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_convert_helper.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/detail/cpp11_msgpack_tuple_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/ext_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/fixint_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/float.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/float.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/float.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/float.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/int_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/list.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/list.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/list.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/list.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/map_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/msgpack_tuple_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/nil_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/pair.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/pair.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/pair.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/pair.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/raw_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/set.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/set.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/set.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/set.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/size_equal_only_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/string.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/string.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/string.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/string.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_map.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_map.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_map.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_map.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_set.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_set.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_set.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/tr1/unordered_set.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/v4raw_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_bool.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_bool.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_bool.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_bool.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_char.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_char.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_char.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_unsigned_char.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_unsigned_char.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_unsigned_char.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/vector_unsigned_char.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/wstring.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/wstring.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/wstring.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/adaptor/wstring.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/cpp_config_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp03_zone_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/detail/cpp11_zone_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/fbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/iterator_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/meta_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/object_fwd_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/pack_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/parse_return.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/parse_return.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/parse_return.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/parse_return.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/sbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_exception.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_exception.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_exception.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/unpack_exception.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/version.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/version.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/version.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/version.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/versioning.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/versioning.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/versioning.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/versioning.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/vrefbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v1/zone_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/adaptor_base_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/array_ref_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/array_ref_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/array_ref_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/array_ref_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/boost/msgpack_variant_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/boost/msgpack_variant_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/boost/msgpack_variant_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/boost/msgpack_variant_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/check_container_size_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/check_container_size_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/check_container_size_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/check_container_size_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/define_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/define_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/define_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/define_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_array_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_array_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_array_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_array_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_map_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_map_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_define_map_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_msgpack_tuple_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_msgpack_tuple_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp03_msgpack_tuple_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_array_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_array_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_array_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_array_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_map_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_map_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_define_map_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_msgpack_tuple_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_msgpack_tuple_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/detail/cpp11_msgpack_tuple_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/ext_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/ext_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/ext_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/ext_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/fixint_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/fixint_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/fixint_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/fixint_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/int_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/int_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/int_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/int_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/map_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/map_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/map_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/msgpack_tuple_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/msgpack_tuple_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/msgpack_tuple_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/nil_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/nil_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/nil_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/nil_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/raw_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/raw_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/raw_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/size_equal_only_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/size_equal_only_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/size_equal_only_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/size_equal_only_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/v4raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/v4raw_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/v4raw_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/adaptor/v4raw_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/cpp_config_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/cpp_config_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/cpp_config_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/cpp_config_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/create_object_visitor_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp03_zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp03_zone_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp03_zone_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp03_zone_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp11_zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp11_zone_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp11_zone_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/detail/cpp11_zone_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/fbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/fbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/fbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/fbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/iterator_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/iterator_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/iterator_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/iterator_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/meta_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/meta_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/meta_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/meta_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/null_visitor_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/object_fwd_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/pack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/pack_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/pack_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/pack_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_return.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_return.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_return.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/parse_return.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/sbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/sbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/sbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/sbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/unpack_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/vrefbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/vrefbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/vrefbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/vrefbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_parse_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/x3_unpack_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zone_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zone_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v2/zone_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/adaptor_base_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/array_ref_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/array_ref_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/array_ref_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/array_ref_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/boost/msgpack_variant_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/boost/msgpack_variant_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/boost/msgpack_variant_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/boost/msgpack_variant_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/check_container_size_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/check_container_size_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/check_container_size_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/check_container_size_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/define_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/define_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/define_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/define_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_array_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_array_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_array_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_array_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_map_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_map_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_define_map_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_msgpack_tuple_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_msgpack_tuple_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp03_msgpack_tuple_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_array_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_array_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_array_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_array_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_map_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_map_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_define_map_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_msgpack_tuple_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_msgpack_tuple_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/detail/cpp11_msgpack_tuple_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/ext_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/ext_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/ext_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/ext_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/fixint_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/fixint_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/fixint_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/fixint_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/int_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/int_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/int_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/int_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/map_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/map_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/map_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/map_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/msgpack_tuple_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/msgpack_tuple_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/msgpack_tuple_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/msgpack_tuple_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/nil_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/nil_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/nil_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/nil_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/raw_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/raw_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/raw_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/size_equal_only_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/size_equal_only_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/size_equal_only_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/size_equal_only_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/v4raw_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/v4raw_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/v4raw_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/adaptor/v4raw_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/cpp_config_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/cpp_config_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/cpp_config_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/cpp_config_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/create_object_visitor_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/create_object_visitor_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/create_object_visitor_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/create_object_visitor_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp03_zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp03_zone_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp03_zone_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp03_zone_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp11_zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp11_zone_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp11_zone_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/detail/cpp11_zone_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/fbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/fbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/fbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/fbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/iterator_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/iterator_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/iterator_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/iterator_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/meta_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/meta_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/meta_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/meta_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/null_visitor_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/null_visitor_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/null_visitor_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/null_visitor_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/object_fwd_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/pack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/pack_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/pack_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/pack_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_return.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_return.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_return.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/parse_return.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/sbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/sbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/sbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/sbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/unpack_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/vrefbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/vrefbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/vrefbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/vrefbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_parse_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_parse_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_parse_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_parse_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/x3_unpack_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zone_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zone_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/v3/zone_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/version.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/version.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/version.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/version.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/version_master.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/version_master.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/version_master.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/version_master.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/versioning.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/versioning.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/versioning.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/versioning.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/vrefbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/x3_parse_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/x3_unpack_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/zbuffer_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zone.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/zone.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zone.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/zone.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zone_decl.hpp b/barretenberg/cpp/src/msgpack-c/include/msgpack/zone_decl.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/include/msgpack/zone_decl.hpp rename to barretenberg/cpp/src/msgpack-c/include/msgpack/zone_decl.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/make_file_list.sh b/barretenberg/cpp/src/msgpack-c/make_file_list.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/make_file_list.sh rename to barretenberg/cpp/src/msgpack-c/make_file_list.sh diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/makedist.sh b/barretenberg/cpp/src/msgpack-c/makedist.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/makedist.sh rename to barretenberg/cpp/src/msgpack-c/makedist.sh diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/msgpack-cxx-config.cmake.in b/barretenberg/cpp/src/msgpack-c/msgpack-cxx-config.cmake.in similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/msgpack-cxx-config.cmake.in rename to barretenberg/cpp/src/msgpack-c/msgpack-cxx-config.cmake.in diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/preprocess b/barretenberg/cpp/src/msgpack-c/preprocess similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/preprocess rename to barretenberg/cpp/src/msgpack-c/preprocess diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test-install/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/test-install/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test-install/CMakeLists.txt rename to barretenberg/cpp/src/msgpack-c/test-install/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test-install/simple.cpp b/barretenberg/cpp/src/msgpack-c/test-install/simple.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test-install/simple.cpp rename to barretenberg/cpp/src/msgpack-c/test-install/simple.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/CMakeLists.txt b/barretenberg/cpp/src/msgpack-c/test/CMakeLists.txt similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/CMakeLists.txt rename to barretenberg/cpp/src/msgpack-c/test/CMakeLists.txt diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/array_ref.cpp b/barretenberg/cpp/src/msgpack-c/test/array_ref.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/array_ref.cpp rename to barretenberg/cpp/src/msgpack-c/test/array_ref.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_fusion.cpp b/barretenberg/cpp/src/msgpack-c/test/boost_fusion.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_fusion.cpp rename to barretenberg/cpp/src/msgpack-c/test/boost_fusion.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_optional.cpp b/barretenberg/cpp/src/msgpack-c/test/boost_optional.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_optional.cpp rename to barretenberg/cpp/src/msgpack-c/test/boost_optional.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_string_ref.cpp b/barretenberg/cpp/src/msgpack-c/test/boost_string_ref.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_string_ref.cpp rename to barretenberg/cpp/src/msgpack-c/test/boost_string_ref.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_string_view.cpp b/barretenberg/cpp/src/msgpack-c/test/boost_string_view.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_string_view.cpp rename to barretenberg/cpp/src/msgpack-c/test/boost_string_view.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_variant.cpp b/barretenberg/cpp/src/msgpack-c/test/boost_variant.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/boost_variant.cpp rename to barretenberg/cpp/src/msgpack-c/test/boost_variant.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/buffer.cpp b/barretenberg/cpp/src/msgpack-c/test/buffer.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/buffer.cpp rename to barretenberg/cpp/src/msgpack-c/test/buffer.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/buffer_c.cpp b/barretenberg/cpp/src/msgpack-c/test/buffer_c.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/buffer_c.cpp rename to barretenberg/cpp/src/msgpack-c/test/buffer_c.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/carray.cpp b/barretenberg/cpp/src/msgpack-c/test/carray.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/carray.cpp rename to barretenberg/cpp/src/msgpack-c/test/carray.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/cases.cpp b/barretenberg/cpp/src/msgpack-c/test/cases.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/cases.cpp rename to barretenberg/cpp/src/msgpack-c/test/cases.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/cases.mpac b/barretenberg/cpp/src/msgpack-c/test/cases.mpac similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/cases.mpac rename to barretenberg/cpp/src/msgpack-c/test/cases.mpac diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/cases_compact.mpac b/barretenberg/cpp/src/msgpack-c/test/cases_compact.mpac similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/cases_compact.mpac rename to barretenberg/cpp/src/msgpack-c/test/cases_compact.mpac diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/convert.cpp b/barretenberg/cpp/src/msgpack-c/test/convert.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/convert.cpp rename to barretenberg/cpp/src/msgpack-c/test/convert.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/fixint.cpp b/barretenberg/cpp/src/msgpack-c/test/fixint.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/fixint.cpp rename to barretenberg/cpp/src/msgpack-c/test/fixint.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/fuzz_unpack_pack_fuzzer_cpp11.cpp b/barretenberg/cpp/src/msgpack-c/test/fuzz_unpack_pack_fuzzer_cpp11.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/fuzz_unpack_pack_fuzzer_cpp11.cpp rename to barretenberg/cpp/src/msgpack-c/test/fuzz_unpack_pack_fuzzer_cpp11.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/inc_adaptor_define.cpp b/barretenberg/cpp/src/msgpack-c/test/inc_adaptor_define.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/inc_adaptor_define.cpp rename to barretenberg/cpp/src/msgpack-c/test/inc_adaptor_define.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/iterator_cpp11.cpp b/barretenberg/cpp/src/msgpack-c/test/iterator_cpp11.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/iterator_cpp11.cpp rename to barretenberg/cpp/src/msgpack-c/test/iterator_cpp11.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/json.cpp b/barretenberg/cpp/src/msgpack-c/test/json.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/json.cpp rename to barretenberg/cpp/src/msgpack-c/test/json.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/limit.cpp b/barretenberg/cpp/src/msgpack-c/test/limit.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/limit.cpp rename to barretenberg/cpp/src/msgpack-c/test/limit.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_basic.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_basic.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_basic.cpp rename to barretenberg/cpp/src/msgpack-c/test/msgpack_basic.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_container.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_container.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_container.cpp rename to barretenberg/cpp/src/msgpack-c/test/msgpack_container.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp11.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp11.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp11.cpp rename to barretenberg/cpp/src/msgpack-c/test/msgpack_cpp11.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp17.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp17.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp17.cpp rename to barretenberg/cpp/src/msgpack-c/test/msgpack_cpp17.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp20.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp20.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_cpp20.cpp rename to barretenberg/cpp/src/msgpack-c/test/msgpack_cpp20.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_stream.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_stream.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_stream.cpp rename to barretenberg/cpp/src/msgpack-c/test/msgpack_stream.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_tuple.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_tuple.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_tuple.cpp rename to barretenberg/cpp/src/msgpack-c/test/msgpack_tuple.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_vref.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_vref.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_vref.cpp rename to barretenberg/cpp/src/msgpack-c/test/msgpack_vref.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_x3_parse.cpp b/barretenberg/cpp/src/msgpack-c/test/msgpack_x3_parse.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/msgpack_x3_parse.cpp rename to barretenberg/cpp/src/msgpack-c/test/msgpack_x3_parse.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/multi_file1.cpp b/barretenberg/cpp/src/msgpack-c/test/multi_file1.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/multi_file1.cpp rename to barretenberg/cpp/src/msgpack-c/test/multi_file1.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/multi_file2.cpp b/barretenberg/cpp/src/msgpack-c/test/multi_file2.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/multi_file2.cpp rename to barretenberg/cpp/src/msgpack-c/test/multi_file2.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/object.cpp b/barretenberg/cpp/src/msgpack-c/test/object.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/object.cpp rename to barretenberg/cpp/src/msgpack-c/test/object.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/object_with_zone.cpp b/barretenberg/cpp/src/msgpack-c/test/object_with_zone.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/object_with_zone.cpp rename to barretenberg/cpp/src/msgpack-c/test/object_with_zone.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/pack_unpack.cpp b/barretenberg/cpp/src/msgpack-c/test/pack_unpack.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/pack_unpack.cpp rename to barretenberg/cpp/src/msgpack-c/test/pack_unpack.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/raw.cpp b/barretenberg/cpp/src/msgpack-c/test/raw.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/raw.cpp rename to barretenberg/cpp/src/msgpack-c/test/raw.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/reference.cpp b/barretenberg/cpp/src/msgpack-c/test/reference.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/reference.cpp rename to barretenberg/cpp/src/msgpack-c/test/reference.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/reference_cpp11.cpp b/barretenberg/cpp/src/msgpack-c/test/reference_cpp11.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/reference_cpp11.cpp rename to barretenberg/cpp/src/msgpack-c/test/reference_cpp11.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/reference_wrapper_cpp11.cpp b/barretenberg/cpp/src/msgpack-c/test/reference_wrapper_cpp11.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/reference_wrapper_cpp11.cpp rename to barretenberg/cpp/src/msgpack-c/test/reference_wrapper_cpp11.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/shared_ptr_cpp11.cpp b/barretenberg/cpp/src/msgpack-c/test/shared_ptr_cpp11.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/shared_ptr_cpp11.cpp rename to barretenberg/cpp/src/msgpack-c/test/shared_ptr_cpp11.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/size_equal_only.cpp b/barretenberg/cpp/src/msgpack-c/test/size_equal_only.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/size_equal_only.cpp rename to barretenberg/cpp/src/msgpack-c/test/size_equal_only.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/streaming.cpp b/barretenberg/cpp/src/msgpack-c/test/streaming.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/streaming.cpp rename to barretenberg/cpp/src/msgpack-c/test/streaming.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/test_allocator.hpp b/barretenberg/cpp/src/msgpack-c/test/test_allocator.hpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/test_allocator.hpp rename to barretenberg/cpp/src/msgpack-c/test/test_allocator.hpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/unique_ptr_cpp11.cpp b/barretenberg/cpp/src/msgpack-c/test/unique_ptr_cpp11.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/unique_ptr_cpp11.cpp rename to barretenberg/cpp/src/msgpack-c/test/unique_ptr_cpp11.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/user_class.cpp b/barretenberg/cpp/src/msgpack-c/test/user_class.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/user_class.cpp rename to barretenberg/cpp/src/msgpack-c/test/user_class.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/version.cpp b/barretenberg/cpp/src/msgpack-c/test/version.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/version.cpp rename to barretenberg/cpp/src/msgpack-c/test/version.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/visitor.cpp b/barretenberg/cpp/src/msgpack-c/test/visitor.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/visitor.cpp rename to barretenberg/cpp/src/msgpack-c/test/visitor.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/test/zone.cpp b/barretenberg/cpp/src/msgpack-c/test/zone.cpp similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/test/zone.cpp rename to barretenberg/cpp/src/msgpack-c/test/zone.cpp diff --git a/circuits/cpp/barretenberg/cpp/src/msgpack-c/update_version.sh b/barretenberg/cpp/src/msgpack-c/update_version.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/src/msgpack-c/update_version.sh rename to barretenberg/cpp/src/msgpack-c/update_version.sh diff --git a/circuits/cpp/barretenberg/cpp/srs_db/download_ignition.sh b/barretenberg/cpp/srs_db/download_ignition.sh similarity index 100% rename from circuits/cpp/barretenberg/cpp/srs_db/download_ignition.sh rename to barretenberg/cpp/srs_db/download_ignition.sh diff --git a/circuits/cpp/barretenberg/cpp/srs_db/grumpkin/monomial/README.md b/barretenberg/cpp/srs_db/grumpkin/monomial/README.md similarity index 100% rename from circuits/cpp/barretenberg/cpp/srs_db/grumpkin/monomial/README.md rename to barretenberg/cpp/srs_db/grumpkin/monomial/README.md diff --git a/circuits/cpp/barretenberg/cpp/srs_db/ignition/monomial/checksums b/barretenberg/cpp/srs_db/ignition/monomial/checksums similarity index 100% rename from circuits/cpp/barretenberg/cpp/srs_db/ignition/monomial/checksums rename to barretenberg/cpp/srs_db/ignition/monomial/checksums diff --git a/circuits/cpp/barretenberg/cpp/srs_db/ignition/monomial/g2.dat b/barretenberg/cpp/srs_db/ignition/monomial/g2.dat similarity index 100% rename from circuits/cpp/barretenberg/cpp/srs_db/ignition/monomial/g2.dat rename to barretenberg/cpp/srs_db/ignition/monomial/g2.dat diff --git a/circuits/cpp/barretenberg/exports.json b/barretenberg/exports.json similarity index 100% rename from circuits/cpp/barretenberg/exports.json rename to barretenberg/exports.json diff --git a/circuits/cpp/barretenberg/flake.lock b/barretenberg/flake.lock similarity index 100% rename from circuits/cpp/barretenberg/flake.lock rename to barretenberg/flake.lock diff --git a/circuits/cpp/barretenberg/flake.nix b/barretenberg/flake.nix similarity index 100% rename from circuits/cpp/barretenberg/flake.nix rename to barretenberg/flake.nix diff --git a/circuits/cpp/barretenberg/scripts/bindgen.sh b/barretenberg/scripts/bindgen.sh similarity index 100% rename from circuits/cpp/barretenberg/scripts/bindgen.sh rename to barretenberg/scripts/bindgen.sh diff --git a/circuits/cpp/barretenberg/scripts/c_bind_files.txt b/barretenberg/scripts/c_bind_files.txt similarity index 100% rename from circuits/cpp/barretenberg/scripts/c_bind_files.txt rename to barretenberg/scripts/c_bind_files.txt diff --git a/circuits/cpp/barretenberg/scripts/decls_json.py b/barretenberg/scripts/decls_json.py similarity index 100% rename from circuits/cpp/barretenberg/scripts/decls_json.py rename to barretenberg/scripts/decls_json.py diff --git a/circuits/cpp/barretenberg/sol/.gitignore b/barretenberg/sol/.gitignore similarity index 100% rename from circuits/cpp/barretenberg/sol/.gitignore rename to barretenberg/sol/.gitignore diff --git a/circuits/cpp/barretenberg/sol/Dockerfile b/barretenberg/sol/Dockerfile similarity index 100% rename from circuits/cpp/barretenberg/sol/Dockerfile rename to barretenberg/sol/Dockerfile diff --git a/circuits/cpp/barretenberg/sol/README.md b/barretenberg/sol/README.md similarity index 100% rename from circuits/cpp/barretenberg/sol/README.md rename to barretenberg/sol/README.md diff --git a/circuits/cpp/barretenberg/sol/bootstrap.sh b/barretenberg/sol/bootstrap.sh similarity index 100% rename from circuits/cpp/barretenberg/sol/bootstrap.sh rename to barretenberg/sol/bootstrap.sh diff --git a/circuits/cpp/barretenberg/sol/figures/verifier.png b/barretenberg/sol/figures/verifier.png similarity index 100% rename from circuits/cpp/barretenberg/sol/figures/verifier.png rename to barretenberg/sol/figures/verifier.png diff --git a/circuits/cpp/barretenberg/sol/foundry.toml b/barretenberg/sol/foundry.toml similarity index 100% rename from circuits/cpp/barretenberg/sol/foundry.toml rename to barretenberg/sol/foundry.toml diff --git a/circuits/cpp/barretenberg/sol/lib/forge-std b/barretenberg/sol/lib/forge-std similarity index 100% rename from circuits/cpp/barretenberg/sol/lib/forge-std rename to barretenberg/sol/lib/forge-std diff --git a/circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts b/barretenberg/sol/lib/openzeppelin-contracts similarity index 100% rename from circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts rename to barretenberg/sol/lib/openzeppelin-contracts diff --git a/circuits/cpp/barretenberg/sol/lib/solidity-stringutils b/barretenberg/sol/lib/solidity-stringutils similarity index 100% rename from circuits/cpp/barretenberg/sol/lib/solidity-stringutils rename to barretenberg/sol/lib/solidity-stringutils diff --git a/circuits/cpp/barretenberg/sol/remappings.txt b/barretenberg/sol/remappings.txt similarity index 100% rename from circuits/cpp/barretenberg/sol/remappings.txt rename to barretenberg/sol/remappings.txt diff --git a/circuits/cpp/barretenberg/sol/scripts/init.sh b/barretenberg/sol/scripts/init.sh similarity index 100% rename from circuits/cpp/barretenberg/sol/scripts/init.sh rename to barretenberg/sol/scripts/init.sh diff --git a/circuits/cpp/barretenberg/sol/scripts/install_foundry.sh b/barretenberg/sol/scripts/install_foundry.sh similarity index 100% rename from circuits/cpp/barretenberg/sol/scripts/install_foundry.sh rename to barretenberg/sol/scripts/install_foundry.sh diff --git a/circuits/cpp/barretenberg/sol/scripts/run_fuzzer.sh b/barretenberg/sol/scripts/run_fuzzer.sh similarity index 100% rename from circuits/cpp/barretenberg/sol/scripts/run_fuzzer.sh rename to barretenberg/sol/scripts/run_fuzzer.sh diff --git a/circuits/cpp/barretenberg/sol/src/interfaces/IVerifier.sol b/barretenberg/sol/src/interfaces/IVerifier.sol similarity index 100% rename from circuits/cpp/barretenberg/sol/src/interfaces/IVerifier.sol rename to barretenberg/sol/src/interfaces/IVerifier.sol diff --git a/circuits/cpp/barretenberg/sol/src/ultra/BaseUltraVerifier.sol b/barretenberg/sol/src/ultra/BaseUltraVerifier.sol similarity index 100% rename from circuits/cpp/barretenberg/sol/src/ultra/BaseUltraVerifier.sol rename to barretenberg/sol/src/ultra/BaseUltraVerifier.sol diff --git a/circuits/cpp/barretenberg/sol/src/ultra/instance/Add2UltraVerifier.sol b/barretenberg/sol/src/ultra/instance/Add2UltraVerifier.sol similarity index 100% rename from circuits/cpp/barretenberg/sol/src/ultra/instance/Add2UltraVerifier.sol rename to barretenberg/sol/src/ultra/instance/Add2UltraVerifier.sol diff --git a/circuits/cpp/barretenberg/sol/src/ultra/instance/BlakeUltraVerifier.sol b/barretenberg/sol/src/ultra/instance/BlakeUltraVerifier.sol similarity index 100% rename from circuits/cpp/barretenberg/sol/src/ultra/instance/BlakeUltraVerifier.sol rename to barretenberg/sol/src/ultra/instance/BlakeUltraVerifier.sol diff --git a/circuits/cpp/barretenberg/sol/src/ultra/instance/RecursiveUltraVerifier.sol b/barretenberg/sol/src/ultra/instance/RecursiveUltraVerifier.sol similarity index 100% rename from circuits/cpp/barretenberg/sol/src/ultra/instance/RecursiveUltraVerifier.sol rename to barretenberg/sol/src/ultra/instance/RecursiveUltraVerifier.sol diff --git a/circuits/cpp/barretenberg/sol/src/ultra/keys/Add2UltraVerificationKey.sol b/barretenberg/sol/src/ultra/keys/Add2UltraVerificationKey.sol similarity index 100% rename from circuits/cpp/barretenberg/sol/src/ultra/keys/Add2UltraVerificationKey.sol rename to barretenberg/sol/src/ultra/keys/Add2UltraVerificationKey.sol diff --git a/circuits/cpp/barretenberg/sol/src/ultra/keys/BlakeUltraVerificationKey.sol b/barretenberg/sol/src/ultra/keys/BlakeUltraVerificationKey.sol similarity index 100% rename from circuits/cpp/barretenberg/sol/src/ultra/keys/BlakeUltraVerificationKey.sol rename to barretenberg/sol/src/ultra/keys/BlakeUltraVerificationKey.sol diff --git a/circuits/cpp/barretenberg/sol/src/ultra/keys/RecursiveUltraVerificationKey.sol b/barretenberg/sol/src/ultra/keys/RecursiveUltraVerificationKey.sol similarity index 100% rename from circuits/cpp/barretenberg/sol/src/ultra/keys/RecursiveUltraVerificationKey.sol rename to barretenberg/sol/src/ultra/keys/RecursiveUltraVerificationKey.sol diff --git a/circuits/cpp/barretenberg/sol/test/base/DifferentialFuzzer.sol b/barretenberg/sol/test/base/DifferentialFuzzer.sol similarity index 100% rename from circuits/cpp/barretenberg/sol/test/base/DifferentialFuzzer.sol rename to barretenberg/sol/test/base/DifferentialFuzzer.sol diff --git a/circuits/cpp/barretenberg/sol/test/base/TestBase.sol b/barretenberg/sol/test/base/TestBase.sol similarity index 100% rename from circuits/cpp/barretenberg/sol/test/base/TestBase.sol rename to barretenberg/sol/test/base/TestBase.sol diff --git a/circuits/cpp/barretenberg/sol/test/ultra/Add2.t.sol b/barretenberg/sol/test/ultra/Add2.t.sol similarity index 100% rename from circuits/cpp/barretenberg/sol/test/ultra/Add2.t.sol rename to barretenberg/sol/test/ultra/Add2.t.sol diff --git a/circuits/cpp/barretenberg/sol/test/ultra/Blake.t.sol b/barretenberg/sol/test/ultra/Blake.t.sol similarity index 100% rename from circuits/cpp/barretenberg/sol/test/ultra/Blake.t.sol rename to barretenberg/sol/test/ultra/Blake.t.sol diff --git a/circuits/cpp/barretenberg/sol/test/ultra/Recursive.t.sol b/barretenberg/sol/test/ultra/Recursive.t.sol similarity index 100% rename from circuits/cpp/barretenberg/sol/test/ultra/Recursive.t.sol rename to barretenberg/sol/test/ultra/Recursive.t.sol diff --git a/circuits/cpp/barretenberg/sol/test/ultra/TestBaseUltra.sol b/barretenberg/sol/test/ultra/TestBaseUltra.sol similarity index 100% rename from circuits/cpp/barretenberg/sol/test/ultra/TestBaseUltra.sol rename to barretenberg/sol/test/ultra/TestBaseUltra.sol diff --git a/circuits/cpp/barretenberg/ts/.dockerignore b/barretenberg/ts/.dockerignore similarity index 100% rename from circuits/cpp/barretenberg/ts/.dockerignore rename to barretenberg/ts/.dockerignore diff --git a/circuits/cpp/barretenberg/ts/.eslintrc.cjs b/barretenberg/ts/.eslintrc.cjs similarity index 100% rename from circuits/cpp/barretenberg/ts/.eslintrc.cjs rename to barretenberg/ts/.eslintrc.cjs diff --git a/circuits/cpp/barretenberg/ts/.gitignore b/barretenberg/ts/.gitignore similarity index 100% rename from circuits/cpp/barretenberg/ts/.gitignore rename to barretenberg/ts/.gitignore diff --git a/circuits/cpp/barretenberg/ts/.prettierrc.json b/barretenberg/ts/.prettierrc.json similarity index 100% rename from circuits/cpp/barretenberg/ts/.prettierrc.json rename to barretenberg/ts/.prettierrc.json diff --git a/circuits/cpp/barretenberg/ts/.yarn/releases/yarn-berry.cjs b/barretenberg/ts/.yarn/releases/yarn-berry.cjs similarity index 100% rename from circuits/cpp/barretenberg/ts/.yarn/releases/yarn-berry.cjs rename to barretenberg/ts/.yarn/releases/yarn-berry.cjs diff --git a/circuits/cpp/barretenberg/ts/.yarnrc.yml b/barretenberg/ts/.yarnrc.yml similarity index 100% rename from circuits/cpp/barretenberg/ts/.yarnrc.yml rename to barretenberg/ts/.yarnrc.yml diff --git a/circuits/cpp/barretenberg/ts/CHANGELOG.md b/barretenberg/ts/CHANGELOG.md similarity index 100% rename from circuits/cpp/barretenberg/ts/CHANGELOG.md rename to barretenberg/ts/CHANGELOG.md diff --git a/circuits/cpp/barretenberg/ts/Dockerfile b/barretenberg/ts/Dockerfile similarity index 100% rename from circuits/cpp/barretenberg/ts/Dockerfile rename to barretenberg/ts/Dockerfile diff --git a/circuits/cpp/barretenberg/ts/README.md b/barretenberg/ts/README.md similarity index 100% rename from circuits/cpp/barretenberg/ts/README.md rename to barretenberg/ts/README.md diff --git a/circuits/cpp/barretenberg/ts/bb.js-dev b/barretenberg/ts/bb.js-dev similarity index 100% rename from circuits/cpp/barretenberg/ts/bb.js-dev rename to barretenberg/ts/bb.js-dev diff --git a/circuits/cpp/barretenberg/ts/bin-test/target/acir.gz b/barretenberg/ts/bin-test/target/acir.gz similarity index 100% rename from circuits/cpp/barretenberg/ts/bin-test/target/acir.gz rename to barretenberg/ts/bin-test/target/acir.gz diff --git a/circuits/cpp/barretenberg/ts/bin-test/target/witness.gz b/barretenberg/ts/bin-test/target/witness.gz similarity index 100% rename from circuits/cpp/barretenberg/ts/bin-test/target/witness.gz rename to barretenberg/ts/bin-test/target/witness.gz diff --git a/circuits/cpp/barretenberg/ts/cjs-entry/index.cjs b/barretenberg/ts/cjs-entry/index.cjs similarity index 100% rename from circuits/cpp/barretenberg/ts/cjs-entry/index.cjs rename to barretenberg/ts/cjs-entry/index.cjs diff --git a/circuits/cpp/barretenberg/ts/cjs-entry/index.d.ts b/barretenberg/ts/cjs-entry/index.d.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/cjs-entry/index.d.ts rename to barretenberg/ts/cjs-entry/index.d.ts diff --git a/circuits/cpp/barretenberg/ts/package.json b/barretenberg/ts/package.json similarity index 100% rename from circuits/cpp/barretenberg/ts/package.json rename to barretenberg/ts/package.json diff --git a/circuits/cpp/barretenberg/ts/scripts/run_tests b/barretenberg/ts/scripts/run_tests similarity index 100% rename from circuits/cpp/barretenberg/ts/scripts/run_tests rename to barretenberg/ts/scripts/run_tests diff --git a/circuits/cpp/barretenberg/ts/src/async_map/index.ts b/barretenberg/ts/src/async_map/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/async_map/index.ts rename to barretenberg/ts/src/async_map/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg-threads.wasm b/barretenberg/ts/src/barretenberg-threads.wasm similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg-threads.wasm rename to barretenberg/ts/src/barretenberg-threads.wasm diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg.wasm b/barretenberg/ts/src/barretenberg.wasm similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg.wasm rename to barretenberg/ts/src/barretenberg.wasm diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg/index.ts b/barretenberg/ts/src/barretenberg/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg/index.ts rename to barretenberg/ts/src/barretenberg/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_api/blake2s.test.ts b/barretenberg/ts/src/barretenberg_api/blake2s.test.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_api/blake2s.test.ts rename to barretenberg/ts/src/barretenberg_api/blake2s.test.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_api/common.test.ts b/barretenberg/ts/src/barretenberg_api/common.test.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_api/common.test.ts rename to barretenberg/ts/src/barretenberg_api/common.test.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_api/index.ts b/barretenberg/ts/src/barretenberg_api/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_api/index.ts rename to barretenberg/ts/src/barretenberg_api/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_api/pedersen.test.ts b/barretenberg/ts/src/barretenberg_api/pedersen.test.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_api/pedersen.test.ts rename to barretenberg/ts/src/barretenberg_api/pedersen.test.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_api/schnorr.test.ts b/barretenberg/ts/src/barretenberg_api/schnorr.test.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_api/schnorr.test.ts rename to barretenberg/ts/src/barretenberg_api/schnorr.test.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_binder/heap_allocator.ts b/barretenberg/ts/src/barretenberg_binder/heap_allocator.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_binder/heap_allocator.ts rename to barretenberg/ts/src/barretenberg_binder/heap_allocator.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_binder/index.ts b/barretenberg/ts/src/barretenberg_binder/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_binder/index.ts rename to barretenberg/ts/src/barretenberg_binder/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_base/index.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_base/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_base/index.ts rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_base/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/index.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/index.ts rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/main.worker.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/main.worker.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/main.worker.ts rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/browser/main.worker.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/index.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/index.ts rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/main.worker.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/main.worker.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/main.worker.ts rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/factory/node/main.worker.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/index.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/index.ts rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_main/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/index.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/index.ts rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/thread.worker.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/thread.worker.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/thread.worker.ts rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/thread.worker.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/index.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/index.ts rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/thread.worker.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/thread.worker.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/thread.worker.ts rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/factory/node/thread.worker.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/index.ts b/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/index.ts rename to barretenberg/ts/src/barretenberg_wasm/barretenberg_wasm_thread/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/index.ts b/barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/index.ts rename to barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/wasm-module.d.ts b/barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/wasm-module.d.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/wasm-module.d.ts rename to barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/wasm-module.d.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/index.ts b/barretenberg/ts/src/barretenberg_wasm/fetch_code/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/index.ts rename to barretenberg/ts/src/barretenberg_wasm/fetch_code/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/node/index.ts b/barretenberg/ts/src/barretenberg_wasm/fetch_code/node/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/fetch_code/node/index.ts rename to barretenberg/ts/src/barretenberg_wasm/fetch_code/node/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/browser/index.ts b/barretenberg/ts/src/barretenberg_wasm/helpers/browser/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/browser/index.ts rename to barretenberg/ts/src/barretenberg_wasm/helpers/browser/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/index.ts b/barretenberg/ts/src/barretenberg_wasm/helpers/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/index.ts rename to barretenberg/ts/src/barretenberg_wasm/helpers/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/node/index.ts b/barretenberg/ts/src/barretenberg_wasm/helpers/node/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/node/index.ts rename to barretenberg/ts/src/barretenberg_wasm/helpers/node/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/node/node_endpoint.ts b/barretenberg/ts/src/barretenberg_wasm/helpers/node/node_endpoint.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/helpers/node/node_endpoint.ts rename to barretenberg/ts/src/barretenberg_wasm/helpers/node/node_endpoint.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/index.test.ts b/barretenberg/ts/src/barretenberg_wasm/index.test.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/index.test.ts rename to barretenberg/ts/src/barretenberg_wasm/index.test.ts diff --git a/circuits/cpp/barretenberg/ts/src/barretenberg_wasm/index.ts b/barretenberg/ts/src/barretenberg_wasm/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/barretenberg_wasm/index.ts rename to barretenberg/ts/src/barretenberg_wasm/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/bigint-array/index.ts b/barretenberg/ts/src/bigint-array/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/bigint-array/index.ts rename to barretenberg/ts/src/bigint-array/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/bindgen/function_declaration.ts b/barretenberg/ts/src/bindgen/function_declaration.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/bindgen/function_declaration.ts rename to barretenberg/ts/src/bindgen/function_declaration.ts diff --git a/circuits/cpp/barretenberg/ts/src/bindgen/index.ts b/barretenberg/ts/src/bindgen/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/bindgen/index.ts rename to barretenberg/ts/src/bindgen/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/bindgen/mappings.ts b/barretenberg/ts/src/bindgen/mappings.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/bindgen/mappings.ts rename to barretenberg/ts/src/bindgen/mappings.ts diff --git a/circuits/cpp/barretenberg/ts/src/bindgen/rust.ts b/barretenberg/ts/src/bindgen/rust.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/bindgen/rust.ts rename to barretenberg/ts/src/bindgen/rust.ts diff --git a/circuits/cpp/barretenberg/ts/src/bindgen/to_camel_case.ts b/barretenberg/ts/src/bindgen/to_camel_case.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/bindgen/to_camel_case.ts rename to barretenberg/ts/src/bindgen/to_camel_case.ts diff --git a/circuits/cpp/barretenberg/ts/src/bindgen/typescript.ts b/barretenberg/ts/src/bindgen/typescript.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/bindgen/typescript.ts rename to barretenberg/ts/src/bindgen/typescript.ts diff --git a/circuits/cpp/barretenberg/ts/src/crs/browser/cached_net_crs.ts b/barretenberg/ts/src/crs/browser/cached_net_crs.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/crs/browser/cached_net_crs.ts rename to barretenberg/ts/src/crs/browser/cached_net_crs.ts diff --git a/circuits/cpp/barretenberg/ts/src/crs/browser/index.ts b/barretenberg/ts/src/crs/browser/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/crs/browser/index.ts rename to barretenberg/ts/src/crs/browser/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/crs/index.ts b/barretenberg/ts/src/crs/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/crs/index.ts rename to barretenberg/ts/src/crs/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/crs/net_crs.ts b/barretenberg/ts/src/crs/net_crs.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/crs/net_crs.ts rename to barretenberg/ts/src/crs/net_crs.ts diff --git a/circuits/cpp/barretenberg/ts/src/crs/node/ignition_files_crs.ts b/barretenberg/ts/src/crs/node/ignition_files_crs.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/crs/node/ignition_files_crs.ts rename to barretenberg/ts/src/crs/node/ignition_files_crs.ts diff --git a/circuits/cpp/barretenberg/ts/src/crs/node/index.ts b/barretenberg/ts/src/crs/node/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/crs/node/index.ts rename to barretenberg/ts/src/crs/node/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/examples/simple.rawtest.ts b/barretenberg/ts/src/examples/simple.rawtest.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/examples/simple.rawtest.ts rename to barretenberg/ts/src/examples/simple.rawtest.ts diff --git a/circuits/cpp/barretenberg/ts/src/examples/simple.test.ts b/barretenberg/ts/src/examples/simple.test.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/examples/simple.test.ts rename to barretenberg/ts/src/examples/simple.test.ts diff --git a/circuits/cpp/barretenberg/ts/src/index.html b/barretenberg/ts/src/index.html similarity index 100% rename from circuits/cpp/barretenberg/ts/src/index.html rename to barretenberg/ts/src/index.html diff --git a/circuits/cpp/barretenberg/ts/src/index.ts b/barretenberg/ts/src/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/index.ts rename to barretenberg/ts/src/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/info.json b/barretenberg/ts/src/info.json similarity index 100% rename from circuits/cpp/barretenberg/ts/src/info.json rename to barretenberg/ts/src/info.json diff --git a/circuits/cpp/barretenberg/ts/src/main.ts b/barretenberg/ts/src/main.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/main.ts rename to barretenberg/ts/src/main.ts diff --git a/circuits/cpp/barretenberg/ts/src/random/browser/index.ts b/barretenberg/ts/src/random/browser/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/random/browser/index.ts rename to barretenberg/ts/src/random/browser/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/random/index.ts b/barretenberg/ts/src/random/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/random/index.ts rename to barretenberg/ts/src/random/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/random/node/index.ts b/barretenberg/ts/src/random/node/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/random/node/index.ts rename to barretenberg/ts/src/random/node/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/serialize/buffer_reader.ts b/barretenberg/ts/src/serialize/buffer_reader.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/serialize/buffer_reader.ts rename to barretenberg/ts/src/serialize/buffer_reader.ts diff --git a/circuits/cpp/barretenberg/ts/src/serialize/index.ts b/barretenberg/ts/src/serialize/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/serialize/index.ts rename to barretenberg/ts/src/serialize/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/serialize/output_type.ts b/barretenberg/ts/src/serialize/output_type.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/serialize/output_type.ts rename to barretenberg/ts/src/serialize/output_type.ts diff --git a/circuits/cpp/barretenberg/ts/src/serialize/serialize.ts b/barretenberg/ts/src/serialize/serialize.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/serialize/serialize.ts rename to barretenberg/ts/src/serialize/serialize.ts diff --git a/circuits/cpp/barretenberg/ts/src/types/fields.ts b/barretenberg/ts/src/types/fields.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/types/fields.ts rename to barretenberg/ts/src/types/fields.ts diff --git a/circuits/cpp/barretenberg/ts/src/types/fixed_size_buffer.ts b/barretenberg/ts/src/types/fixed_size_buffer.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/types/fixed_size_buffer.ts rename to barretenberg/ts/src/types/fixed_size_buffer.ts diff --git a/circuits/cpp/barretenberg/ts/src/types/index.ts b/barretenberg/ts/src/types/index.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/types/index.ts rename to barretenberg/ts/src/types/index.ts diff --git a/circuits/cpp/barretenberg/ts/src/types/point.ts b/barretenberg/ts/src/types/point.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/types/point.ts rename to barretenberg/ts/src/types/point.ts diff --git a/circuits/cpp/barretenberg/ts/src/types/ptr.ts b/barretenberg/ts/src/types/ptr.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/types/ptr.ts rename to barretenberg/ts/src/types/ptr.ts diff --git a/circuits/cpp/barretenberg/ts/src/types/raw_buffer.ts b/barretenberg/ts/src/types/raw_buffer.ts similarity index 100% rename from circuits/cpp/barretenberg/ts/src/types/raw_buffer.ts rename to barretenberg/ts/src/types/raw_buffer.ts diff --git a/circuits/cpp/barretenberg/ts/tsconfig.browser.json b/barretenberg/ts/tsconfig.browser.json similarity index 100% rename from circuits/cpp/barretenberg/ts/tsconfig.browser.json rename to barretenberg/ts/tsconfig.browser.json diff --git a/circuits/cpp/barretenberg/ts/tsconfig.json b/barretenberg/ts/tsconfig.json similarity index 100% rename from circuits/cpp/barretenberg/ts/tsconfig.json rename to barretenberg/ts/tsconfig.json diff --git a/circuits/cpp/barretenberg/ts/webpack.config.js b/barretenberg/ts/webpack.config.js similarity index 100% rename from circuits/cpp/barretenberg/ts/webpack.config.js rename to barretenberg/ts/webpack.config.js diff --git a/circuits/cpp/barretenberg/ts/yarn.lock b/barretenberg/ts/yarn.lock similarity index 100% rename from circuits/cpp/barretenberg/ts/yarn.lock rename to barretenberg/ts/yarn.lock diff --git a/circuits/cpp/barretenberg/wasi-sdk.nix b/barretenberg/wasi-sdk.nix similarity index 100% rename from circuits/cpp/barretenberg/wasi-sdk.nix rename to barretenberg/wasi-sdk.nix From 11a3ae6f5f8619369ce40b106599a80a2939a36e Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 13 Sep 2023 12:25:06 -0400 Subject: [PATCH 17/36] chore: Prepare for build system changes --- .gitmodules | 3 --- barretenberg/build-system | 1 - 2 files changed, 4 deletions(-) delete mode 160000 barretenberg/build-system diff --git a/.gitmodules b/.gitmodules index 67768137586c..50266c6282eb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "legacy-barretenberg-build-system"] - path = barretenberg/build-system - url = https://github.com/AztecProtocol/build-system [submodule "l1-contracts/lib/openzeppelin-contracts"] path = l1-contracts/lib/openzeppelin-contracts url = https://github.com/openzeppelin/openzeppelin-contracts diff --git a/barretenberg/build-system b/barretenberg/build-system deleted file mode 160000 index a109f3aef28c..000000000000 --- a/barretenberg/build-system +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a109f3aef28cea4a50481cdf2d74fc3909212c0b From 0f595461fcc221447975bc66069643af5d319e61 Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 13 Sep 2023 12:31:53 -0400 Subject: [PATCH 18/36] Merge fixup --- .../composer/goblin_ultra_composer.test.cpp | 153 +++++++++++++++--- 1 file changed, 129 insertions(+), 24 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp index ff4249f37b10..3215c146cb72 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp @@ -18,41 +18,85 @@ auto& engine = numeric::random::get_debug_engine(); class GoblinUltraHonkComposerTests : public ::testing::Test { protected: static void SetUpTestSuite() { barretenberg::srs::init_crs_factory("../srs_db/ignition"); } + + using Curve = curve::BN254; + using FF = Curve::ScalarField; + using Commitment = Curve::AffineElement; + using CommitmentKey = pcs::CommitmentKey; + + /** + * @brief Generate a simple test circuit with some ECC op gates and conventional arithmetic gates + * + * @param builder + */ + void generate_test_circuit(auto& builder) + { + // Add some ecc op gates + for (size_t i = 0; i < 3; ++i) { + auto point = g1::affine_one * FF::random_element(); + auto scalar = FF::random_element(); + builder.queue_ecc_mul_accum(point, scalar); + } + builder.queue_ecc_eq(); + + // Add some conventional gates that utilize public inputs + for (size_t i = 0; i < 10; ++i) { + FF a = FF::random_element(); + FF b = FF::random_element(); + FF c = FF::random_element(); + FF d = a + b + c; + uint32_t a_idx = builder.add_public_variable(a); + uint32_t b_idx = builder.add_variable(b); + uint32_t c_idx = builder.add_variable(c); + uint32_t d_idx = builder.add_variable(d); + + builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, FF(1), FF(1), FF(1), FF(-1), FF(0) }); + } + } + + /** + * @brief Populate ECC op queue with mock data as stand in for "previous circuit" in tests + * @details We currently cannot support Goblin proofs (specifically, transcript aggregation) if there is not + * existing data in the ECC op queue (since this leads to zero-commitment issues). This method populates the op + * queue with mock data so that the prover of an arbitrary 'first' circuit can behave as if it were not the prover + * over the first circuit in the stack. + * + * @param op_queue + */ + static void populate_ecc_op_queue_with_mock_data(std::shared_ptr& op_queue) + { + // Add a single row of data to the op queue and commit to each column as [1] * FF(data) + std::array mock_op_queue_commitments; + size_t idx = 0; + for (auto& entry : op_queue->ultra_ops) { + auto mock_data = FF::random_element(); + entry.emplace_back(mock_data); + mock_op_queue_commitments[idx++] = Commitment::one() * mock_data; + } + // Set some internal data based on the size of the op queue data + op_queue->set_size_data(); + // Add the commitments to the op queue data for use by the next circuit + op_queue->set_commitment_data(mock_op_queue_commitments); + } }; /** * @brief Test proof construction/verification for a circuit with ECC op gates, public inputs, and basic arithmetic * gates + * @note We simulate op queue interactions with a previous circuit so the actual circuit under test utilizes an op queue + * with non-empty 'previous' data. This avoid complications with zero-commitments etc. * */ -TEST_F(GoblinUltraHonkComposerTests, SimpleCircuit) +TEST_F(GoblinUltraHonkComposerTests, SingleCircuit) { - auto builder = UltraCircuitBuilder(); + auto op_queue = std::make_shared(); - // Define an arbitrary number of operations/gates - size_t num_ecc_ops = 3; - size_t num_conventional_gates = 10; + // Add mock data to op queue to simulate interaction with a previous circuit + populate_ecc_op_queue_with_mock_data(op_queue); - // Add some ecc op gates - for (size_t i = 0; i < num_ecc_ops; ++i) { - auto point = g1::affine_one * fr::random_element(); - auto scalar = fr::random_element(); - builder.queue_ecc_mul_accum(point, scalar); - } + auto builder = GoblinUltraCircuitBuilder(op_queue); - // Add some conventional gates that utlize public inputs - for (size_t i = 0; i < num_conventional_gates; ++i) { - fr a = fr::random_element(); - fr b = fr::random_element(); - fr c = fr::random_element(); - fr d = a + b + c; - uint32_t a_idx = builder.add_public_variable(a); - uint32_t b_idx = builder.add_variable(b); - uint32_t c_idx = builder.add_variable(c); - uint32_t d_idx = builder.add_variable(d); - - builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, fr(1), fr(1), fr(1), fr(-1), fr(0) }); - } + generate_test_circuit(builder); auto composer = GoblinUltraComposer(); auto prover = composer.create_prover(builder); @@ -62,4 +106,65 @@ TEST_F(GoblinUltraHonkComposerTests, SimpleCircuit) EXPECT_EQ(verified, true); } +/** + * @brief Test proof construction/verification for a circuit with ECC op gates, public inputs, and basic arithmetic + * gates + * + */ +TEST_F(GoblinUltraHonkComposerTests, MultipleCircuits) +{ + // Instantiate EccOpQueue. This will be shared across all circuits in the series + auto op_queue = std::make_shared(); + + // Add mock data to op queue to simulate interaction with a previous circuit + populate_ecc_op_queue_with_mock_data(op_queue); + + // Track the expected size of the op queue transcript + size_t expected_op_queue_size = 1; // +1 from mock data + + // Construct first circuit and its proof + { + auto builder = GoblinUltraCircuitBuilder(op_queue); + + generate_test_circuit(builder); + expected_op_queue_size += builder.num_ecc_op_gates; + + auto composer = GoblinUltraComposer(); + auto prover = composer.create_prover(builder); + auto verifier = composer.create_verifier(builder); + auto proof = prover.construct_proof(); + bool verified = verifier.verify_proof(proof); + EXPECT_EQ(verified, true); + } + + // Construct second circuit + { + auto builder = GoblinUltraCircuitBuilder(op_queue); + + generate_test_circuit(builder); + expected_op_queue_size += builder.num_ecc_op_gates; + + auto composer = GoblinUltraComposer(); + auto prover = composer.create_prover(builder); + auto verifier = composer.create_verifier(builder); + auto proof = prover.construct_proof(); + bool verified = verifier.verify_proof(proof); + EXPECT_EQ(verified, true); + } + + // Check that the op queue contains the expected number of entries + size_t aggregate_op_queue_size = op_queue->current_ultra_ops_size; + EXPECT_EQ(expected_op_queue_size, aggregate_op_queue_size); + + // Compute the commitments to the aggregate op queue directly and check that they match those that were computed + // iteratively during transcript aggregation by the provers and stored in the op queue. + auto crs_factory = std::make_shared>("../srs_db/ignition"); + auto commitment_key = std::make_shared(aggregate_op_queue_size, crs_factory); + size_t idx = 0; + for (auto& result : op_queue->ultra_ops_commitments) { + auto expected = commitment_key->commit(op_queue->ultra_ops[idx++]); + EXPECT_EQ(result, expected); + } +} + } // namespace test_ultra_honk_composer From e281742644611ec1eafbf430a21c0a6eb086d7a9 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Wed, 13 Sep 2023 17:27:43 +0000 Subject: [PATCH 19/36] formatting --- .../honk/proof_system/ultra_prover.cpp | 6 +-- .../honk/proof_system/ultra_verifier.cpp | 40 +++++++++++-------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index bf355776feff..9b7bbcbef28b 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -299,20 +299,20 @@ template void UltraProver_::execute_op_queue_transc // T_{i-1}(γ) auto polynomial = Polynomial(prev_aggregate_ecc_op_transcript[idx]); auto evaluation = polynomial.evaluate(kappa); - univariate_openings.opening_pairs.emplace_back(OpenPair{kappa, evaluation}); + univariate_openings.opening_pairs.emplace_back(OpenPair{ kappa, evaluation }); univariate_openings.witnesses.emplace_back(std::move(polynomial)); transcript.send_to_verifier("prev_agg_ecc_op_queue_eval_" + suffix, evaluation); // t_i^{shift}(γ) evaluation = right_shifted_op_wires[idx].evaluate(kappa); - univariate_openings.opening_pairs.emplace_back(OpenPair{kappa, evaluation}); + univariate_openings.opening_pairs.emplace_back(OpenPair{ kappa, evaluation }); univariate_openings.witnesses.emplace_back(std::move(right_shifted_op_wires[idx])); transcript.send_to_verifier("op_wire_eval_" + suffix, evaluation); // T_i(γ) polynomial = Polynomial(aggregate_ecc_op_transcript[idx]); evaluation = polynomial.evaluate(kappa); - univariate_openings.opening_pairs.emplace_back(OpenPair{kappa, evaluation}); + univariate_openings.opening_pairs.emplace_back(OpenPair{ kappa, evaluation }); univariate_openings.witnesses.emplace_back(std::move(polynomial)); transcript.send_to_verifier("agg_ecc_op_queue_eval_" + suffix, evaluation); } diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp index 017f89cb9d13..463c6029c91c 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp @@ -1,9 +1,9 @@ #include "./ultra_verifier.hpp" #include "barretenberg/honk/flavor/standard.hpp" +#include "barretenberg/honk/pcs/claim.hpp" #include "barretenberg/honk/transcript/transcript.hpp" #include "barretenberg/honk/utils/power_polynomial.hpp" #include "barretenberg/numeric/bitop/get_msb.hpp" -#include "barretenberg/honk/pcs/claim.hpp" using namespace barretenberg; using namespace proof_system::honk::sumcheck; @@ -160,11 +160,10 @@ template bool UltraVerifier_::verify_proof(const plonk // - d+1 commitments [Fold_{r}^(0)], [Fold_{-r}^(0)], and [Fold^(l)], l = 1:d-1 // - d+1 evaluations a_0_pos, and a_l, l = 0:d-1 auto univariate_opening_claims = Gemini::reduce_verification(multivariate_challenge, - batched_evaluation, - batched_commitment_unshifted, - batched_commitment_to_be_shifted, - transcript); - + batched_evaluation, + batched_commitment_unshifted, + batched_commitment_to_be_shifted, + transcript); // Perform ECC op queue transcript aggregation protocol if constexpr (IsGoblinFlavor) { @@ -173,9 +172,12 @@ template bool UltraVerifier_::verify_proof(const plonk std::array prev_agg_op_queue_commitments; std::array agg_op_queue_commitments; for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - shifted_op_wire_commitments[idx] = transcript.template receive_from_prover("SHIFTED_ECC_OP_WIRE_" + std::to_string(idx + 1)); - prev_agg_op_queue_commitments[idx] = transcript.template receive_from_prover("PREV_AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); - agg_op_queue_commitments[idx] = transcript.template receive_from_prover("AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); + shifted_op_wire_commitments[idx] = + transcript.template receive_from_prover("SHIFTED_ECC_OP_WIRE_" + std::to_string(idx + 1)); + prev_agg_op_queue_commitments[idx] = + transcript.template receive_from_prover("PREV_AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); + agg_op_queue_commitments[idx] = + transcript.template receive_from_prover("AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); } // Receive transcript poly evaluations @@ -184,13 +186,19 @@ template bool UltraVerifier_::verify_proof(const plonk std::array prev_agg_op_queue_evals; std::array agg_op_queue_evals; for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - shifted_op_wire_evals[idx] = transcript.template receive_from_prover("op_wire_eval_" + std::to_string(idx + 1)); - prev_agg_op_queue_evals[idx] = transcript.template receive_from_prover("prev_agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); - agg_op_queue_evals[idx] = transcript.template receive_from_prover("agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); - - univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, shifted_op_wire_evals[idx]}, shifted_op_wire_commitments[idx] }); - univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, prev_agg_op_queue_evals[idx]}, prev_agg_op_queue_commitments[idx] }); - univariate_opening_claims.emplace_back(pcs::OpeningClaim{ {kappa, agg_op_queue_evals[idx]}, agg_op_queue_commitments[idx] }); + shifted_op_wire_evals[idx] = + transcript.template receive_from_prover("op_wire_eval_" + std::to_string(idx + 1)); + prev_agg_op_queue_evals[idx] = + transcript.template receive_from_prover("prev_agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); + agg_op_queue_evals[idx] = + transcript.template receive_from_prover("agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); + + univariate_opening_claims.emplace_back( + pcs::OpeningClaim{ { kappa, shifted_op_wire_evals[idx] }, shifted_op_wire_commitments[idx] }); + univariate_opening_claims.emplace_back(pcs::OpeningClaim{ { kappa, prev_agg_op_queue_evals[idx] }, + prev_agg_op_queue_commitments[idx] }); + univariate_opening_claims.emplace_back( + pcs::OpeningClaim{ { kappa, agg_op_queue_evals[idx] }, agg_op_queue_commitments[idx] }); } // Check the identity T_i(γ) = T_{i-1}(γ) + t_i^{shift}(γ). If it fails, return false From 51964dd9cfa8e5175129122cbc7541db082d24c7 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Wed, 13 Sep 2023 21:10:01 +0000 Subject: [PATCH 20/36] recursive flavor is templated by builder --- .../honk/flavor/ultra_recursive.hpp | 177 +++++++++--------- .../proof_system/flavor/flavor.hpp | 4 +- .../circuit_builders/circuit_builders.hpp | 3 +- .../honk/transcript/transcript.test.cpp | 2 +- .../verifier/ultra_recursive_verifier.cpp | 11 +- .../verifier/ultra_recursive_verifier.hpp | 8 +- .../recursion/honk/verifier/verifier.test.cpp | 14 +- 7 files changed, 107 insertions(+), 112 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp index 9d98f4a1c256..4683005afb3e 100644 --- a/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp @@ -38,14 +38,15 @@ namespace proof_system::honk::flavor { * sense to instantiate a Verifier with this flavor. * */ -class UltraRecursive { + +template class UltraRecursive_ { public: - using CircuitBuilder = UltraCircuitBuilder; + using CircuitBuilder = BuilderType; using Curve = plonk::stdlib::bn254; - using GroupElement = Curve::Element; - using Commitment = Curve::Element; - using CommitmentHandle = Curve::Element; - using FF = Curve::ScalarField; + using GroupElement = typename Curve::Element; + using Commitment = typename Curve::Element; + using CommitmentHandle = typename Curve::Element; + using FF = typename Curve::ScalarField; // Note(luke): Eventually this may not be needed at all using VerifierCommitmentKey = pcs::VerifierCommitmentKey; @@ -274,31 +275,31 @@ class UltraRecursive { : VerificationKey_>(native_key->circuit_size, native_key->num_public_inputs) { - q_m = Commitment::from_witness(builder, native_key->q_m); - q_l = Commitment::from_witness(builder, native_key->q_l); - q_r = Commitment::from_witness(builder, native_key->q_r); - q_o = Commitment::from_witness(builder, native_key->q_o); - q_4 = Commitment::from_witness(builder, native_key->q_4); - q_c = Commitment::from_witness(builder, native_key->q_c); - q_arith = Commitment::from_witness(builder, native_key->q_arith); - q_sort = Commitment::from_witness(builder, native_key->q_sort); - q_elliptic = Commitment::from_witness(builder, native_key->q_elliptic); - q_aux = Commitment::from_witness(builder, native_key->q_aux); - q_lookup = Commitment::from_witness(builder, native_key->q_lookup); - sigma_1 = Commitment::from_witness(builder, native_key->sigma_1); - sigma_2 = Commitment::from_witness(builder, native_key->sigma_2); - sigma_3 = Commitment::from_witness(builder, native_key->sigma_3); - sigma_4 = Commitment::from_witness(builder, native_key->sigma_4); - id_1 = Commitment::from_witness(builder, native_key->id_1); - id_2 = Commitment::from_witness(builder, native_key->id_2); - id_3 = Commitment::from_witness(builder, native_key->id_3); - id_4 = Commitment::from_witness(builder, native_key->id_4); - table_1 = Commitment::from_witness(builder, native_key->table_1); - table_2 = Commitment::from_witness(builder, native_key->table_2); - table_3 = Commitment::from_witness(builder, native_key->table_3); - table_4 = Commitment::from_witness(builder, native_key->table_4); - lagrange_first = Commitment::from_witness(builder, native_key->lagrange_first); - lagrange_last = Commitment::from_witness(builder, native_key->lagrange_last); + this->q_m = Commitment::from_witness(builder, native_key->q_m); + this->q_l = Commitment::from_witness(builder, native_key->q_l); + this->q_r = Commitment::from_witness(builder, native_key->q_r); + this->q_o = Commitment::from_witness(builder, native_key->q_o); + this->q_4 = Commitment::from_witness(builder, native_key->q_4); + this->q_c = Commitment::from_witness(builder, native_key->q_c); + this->q_arith = Commitment::from_witness(builder, native_key->q_arith); + this->q_sort = Commitment::from_witness(builder, native_key->q_sort); + this->q_elliptic = Commitment::from_witness(builder, native_key->q_elliptic); + this->q_aux = Commitment::from_witness(builder, native_key->q_aux); + this->q_lookup = Commitment::from_witness(builder, native_key->q_lookup); + this->sigma_1 = Commitment::from_witness(builder, native_key->sigma_1); + this->sigma_2 = Commitment::from_witness(builder, native_key->sigma_2); + this->sigma_3 = Commitment::from_witness(builder, native_key->sigma_3); + this->sigma_4 = Commitment::from_witness(builder, native_key->sigma_4); + this->id_1 = Commitment::from_witness(builder, native_key->id_1); + this->id_2 = Commitment::from_witness(builder, native_key->id_2); + this->id_3 = Commitment::from_witness(builder, native_key->id_3); + this->id_4 = Commitment::from_witness(builder, native_key->id_4); + this->table_1 = Commitment::from_witness(builder, native_key->table_1); + this->table_2 = Commitment::from_witness(builder, native_key->table_2); + this->table_3 = Commitment::from_witness(builder, native_key->table_3); + this->table_4 = Commitment::from_witness(builder, native_key->table_4); + this->lagrange_first = Commitment::from_witness(builder, native_key->lagrange_first); + this->lagrange_last = Commitment::from_witness(builder, native_key->lagrange_last); }; }; @@ -323,40 +324,40 @@ class UltraRecursive { public: CommitmentLabels() { - w_l = "W_L"; - w_r = "W_R"; - w_o = "W_O"; - w_4 = "W_4"; - z_perm = "Z_PERM"; - z_lookup = "Z_LOOKUP"; - sorted_accum = "SORTED_ACCUM"; + this->w_l = "W_L"; + this->w_r = "W_R"; + this->w_o = "W_O"; + this->w_4 = "W_4"; + this->z_perm = "Z_PERM"; + this->z_lookup = "Z_LOOKUP"; + this->sorted_accum = "SORTED_ACCUM"; // The ones beginning with "__" are only used for debugging - q_c = "__Q_C"; - q_l = "__Q_L"; - q_r = "__Q_R"; - q_o = "__Q_O"; - q_4 = "__Q_4"; - q_m = "__Q_M"; - q_arith = "__Q_ARITH"; - q_sort = "__Q_SORT"; - q_elliptic = "__Q_ELLIPTIC"; - q_aux = "__Q_AUX"; - q_lookup = "__Q_LOOKUP"; - sigma_1 = "__SIGMA_1"; - sigma_2 = "__SIGMA_2"; - sigma_3 = "__SIGMA_3"; - sigma_4 = "__SIGMA_4"; - id_1 = "__ID_1"; - id_2 = "__ID_2"; - id_3 = "__ID_3"; - id_4 = "__ID_4"; - table_1 = "__TABLE_1"; - table_2 = "__TABLE_2"; - table_3 = "__TABLE_3"; - table_4 = "__TABLE_4"; - lagrange_first = "__LAGRANGE_FIRST"; - lagrange_last = "__LAGRANGE_LAST"; + this->q_c = "__Q_C"; + this->q_l = "__Q_L"; + this->q_r = "__Q_R"; + this->q_o = "__Q_O"; + this->q_4 = "__Q_4"; + this->q_m = "__Q_M"; + this->q_arith = "__Q_ARITH"; + this->q_sort = "__Q_SORT"; + this->q_elliptic = "__Q_ELLIPTIC"; + this->q_aux = "__Q_AUX"; + this->q_lookup = "__Q_LOOKUP"; + this->sigma_1 = "__SIGMA_1"; + this->sigma_2 = "__SIGMA_2"; + this->sigma_3 = "__SIGMA_3"; + this->sigma_4 = "__SIGMA_4"; + this->id_1 = "__ID_1"; + this->id_2 = "__ID_2"; + this->id_3 = "__ID_3"; + this->id_4 = "__ID_4"; + this->table_1 = "__TABLE_1"; + this->table_2 = "__TABLE_2"; + this->table_3 = "__TABLE_3"; + this->table_4 = "__TABLE_4"; + this->lagrange_first = "__LAGRANGE_FIRST"; + this->lagrange_last = "__LAGRANGE_LAST"; }; }; @@ -364,31 +365,31 @@ class UltraRecursive { public: VerifierCommitments(std::shared_ptr verification_key) { - q_m = verification_key->q_m; - q_l = verification_key->q_l; - q_r = verification_key->q_r; - q_o = verification_key->q_o; - q_4 = verification_key->q_4; - q_c = verification_key->q_c; - q_arith = verification_key->q_arith; - q_sort = verification_key->q_sort; - q_elliptic = verification_key->q_elliptic; - q_aux = verification_key->q_aux; - q_lookup = verification_key->q_lookup; - sigma_1 = verification_key->sigma_1; - sigma_2 = verification_key->sigma_2; - sigma_3 = verification_key->sigma_3; - sigma_4 = verification_key->sigma_4; - id_1 = verification_key->id_1; - id_2 = verification_key->id_2; - id_3 = verification_key->id_3; - id_4 = verification_key->id_4; - table_1 = verification_key->table_1; - table_2 = verification_key->table_2; - table_3 = verification_key->table_3; - table_4 = verification_key->table_4; - lagrange_first = verification_key->lagrange_first; - lagrange_last = verification_key->lagrange_last; + this->q_m = verification_key->q_m; + this->q_l = verification_key->q_l; + this->q_r = verification_key->q_r; + this->q_o = verification_key->q_o; + this->q_4 = verification_key->q_4; + this->q_c = verification_key->q_c; + this->q_arith = verification_key->q_arith; + this->q_sort = verification_key->q_sort; + this->q_elliptic = verification_key->q_elliptic; + this->q_aux = verification_key->q_aux; + this->q_lookup = verification_key->q_lookup; + this->sigma_1 = verification_key->sigma_1; + this->sigma_2 = verification_key->sigma_2; + this->sigma_3 = verification_key->sigma_3; + this->sigma_4 = verification_key->sigma_4; + this->id_1 = verification_key->id_1; + this->id_2 = verification_key->id_2; + this->id_3 = verification_key->id_3; + this->id_4 = verification_key->id_4; + this->table_1 = verification_key->table_1; + this->table_2 = verification_key->table_2; + this->table_3 = verification_key->table_3; + this->table_4 = verification_key->table_4; + this->lagrange_first = verification_key->lagrange_first; + this->lagrange_last = verification_key->lagrange_last; } }; }; diff --git a/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp b/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp index 3b07ed8d727f..4340c06500bf 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp @@ -257,7 +257,7 @@ class StandardGrumpkin; class Ultra; class UltraGrumpkin; class GoblinUltra; -class UltraRecursive; +template class UltraRecursive_; class GoblinUltraRecursive; } // namespace proof_system::honk::flavor @@ -291,7 +291,7 @@ template concept IsGoblinFlavor = IsAnyOf; template -concept IsRecursiveFlavor = IsAnyOf; +concept IsRecursiveFlavor = IsAnyOf, honk::flavor::UltraRecursive_, honk::flavor::GoblinUltraRecursive>; template concept IsGrumpkinFlavor = IsAnyOf; diff --git a/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp index 40bd33cfaa15..d12df90869fe 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/primitives/circuit_builders/circuit_builders.hpp @@ -13,8 +13,7 @@ concept HasPlookup = proof_system::IsAnyOf; template -concept IsGoblinBuilder = - proof_system::IsAnyOf; +concept IsGoblinBuilder = proof_system::IsAnyOf; #define INSTANTIATE_STDLIB_METHOD(stdlib_method) \ template stdlib_method(proof_system::StandardCircuitBuilder); \ diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp index 9611368117ce..b91139f7fbf0 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/transcript/transcript.test.cpp @@ -12,7 +12,7 @@ namespace proof_system::plonk::stdlib::recursion::honk { using Builder = UltraCircuitBuilder; using UltraFlavor = ::proof_system::honk::flavor::Ultra; -using UltraRecursiveFlavor = ::proof_system::honk::flavor::UltraRecursive; +using UltraRecursiveFlavor = ::proof_system::honk::flavor::UltraRecursive_; using FF = barretenberg::fr; using ProverTranscript = ::proof_system::honk::ProverTranscript; using VerifierTranscript = ::proof_system::honk::VerifierTranscript; diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp index df812044449d..8b813e959ba0 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp @@ -10,7 +10,7 @@ namespace proof_system::plonk::stdlib::recursion::honk { template UltraRecursiveVerifier_::UltraRecursiveVerifier_(Builder* builder, - std::shared_ptr verifier_key) + std::shared_ptr verifier_key) : key(verifier_key) , builder(builder) {} @@ -20,8 +20,7 @@ UltraRecursiveVerifier_::UltraRecursiveVerifier_(Builder* builder, * */ template -std::array UltraRecursiveVerifier_::verify_proof( - const plonk::proof& proof) +std::array UltraRecursiveVerifier_::verify_proof(const plonk::proof& proof) { using Sumcheck = ::proof_system::honk::sumcheck::SumcheckVerifier; using Curve = typename Flavor::Curve; @@ -155,8 +154,7 @@ std::array UltraRecursiveVerifier_::ve scalars_unshifted[0] = FF::from_witness(builder, 1); // Batch the commitments to the unshifted and to-be-shifted polynomials using powers of rho - auto batched_commitment_unshifted = - GroupElement::batch_mul(commitments.get_unshifted(), scalars_unshifted); + auto batched_commitment_unshifted = GroupElement::batch_mul(commitments.get_unshifted(), scalars_unshifted); info("Batch mul (unshifted): num gates = ", builder->get_num_gates() - prev_num_gates, @@ -209,7 +207,8 @@ std::array UltraRecursiveVerifier_::ve return pairing_points; } -template class UltraRecursiveVerifier_; +template class UltraRecursiveVerifier_>; +template class UltraRecursiveVerifier_>; template class UltraRecursiveVerifier_; } // namespace proof_system::plonk::stdlib::recursion::honk diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp index 7ae43c0eb278..8c974f920e51 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp @@ -1,9 +1,9 @@ #pragma once #include "barretenberg/honk/flavor/goblin_ultra.hpp" +#include "barretenberg/honk/flavor/goblin_ultra_recursive.hpp" #include "barretenberg/honk/flavor/ultra.hpp" #include "barretenberg/honk/flavor/ultra_grumpkin.hpp" #include "barretenberg/honk/flavor/ultra_recursive.hpp" -#include "barretenberg/honk/flavor/goblin_ultra_recursive.hpp" #include "barretenberg/honk/sumcheck/sumcheck.hpp" #include "barretenberg/plonk/proof_system/types/proof.hpp" #include "barretenberg/stdlib/recursion/honk/transcript/transcript.hpp" @@ -38,10 +38,8 @@ template class UltraRecursiveVerifier_ { Transcript transcript; }; -extern template class UltraRecursiveVerifier_; +extern template class UltraRecursiveVerifier_>; +extern template class UltraRecursiveVerifier_>; extern template class UltraRecursiveVerifier_; -using UltraRecursiveVerifier = UltraRecursiveVerifier_; -using GoblinUltraRecursiveVerifier = UltraRecursiveVerifier_; - } // namespace proof_system::plonk::stdlib::recursion::honk diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp index 996d93fc06c1..d5641e05b7b1 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp @@ -22,16 +22,16 @@ namespace proof_system::plonk::stdlib::recursion::honk { * * @tparam Builder */ -template class RecursiveVerifierTest : public testing::Test { +template class RecursiveVerifierTest : public testing::Test { using InnerComposer = ::proof_system::honk::UltraComposer; using InnerBuilder = typename InnerComposer::CircuitBuilder; - using NativeVerifier = ::proof_system::honk::UltraVerifier_<::proof_system::honk::flavor::Ultra>; // Arithmetization of group operations in recursive verifier circuit is determined by outer builder - using RecursiveVerifier = VerifierType; - using OuterBuilder = typename RecursiveVerifier::Builder; + using Flavor = ::proof_system::honk::flavor::UltraRecursive_; + using RecursiveVerifier = UltraRecursiveVerifier_; + using OuterBuilder = BuilderType; using VerificationKey = typename RecursiveVerifier::VerificationKey; using inner_curve = bn254; @@ -226,11 +226,9 @@ template class RecursiveVerifierTest : public testing::T }; // Run the recursive verifier tests with conventional Ultra builder and Goblin builder -using VerifierTypes = testing::Types; -// using VerifierTypes = testing::Types; -// using BuilderTypes = testing::Types; +using BuilderTypes = testing::Types; -TYPED_TEST_SUITE(RecursiveVerifierTest, VerifierTypes); +TYPED_TEST_SUITE(RecursiveVerifierTest, BuilderTypes); HEAVY_TYPED_TEST(RecursiveVerifierTest, InnerCircuit) { From d04a51807fa82824a9d72fd1c95978852abe852c Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Wed, 13 Sep 2023 21:27:12 +0000 Subject: [PATCH 21/36] more formatting --- .../circuit_builder/goblin_ultra_circuit_builder.cpp | 8 +++++--- .../circuit_builder/goblin_ultra_circuit_builder.hpp | 7 ++++--- .../circuit_builder/ultra_circuit_builder.hpp | 3 ++- .../barretenberg/proof_system/op_queue/ecc_op_queue.hpp | 3 ++- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp index 4fd5679c6fe9..f9db7e77d980 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp @@ -10,7 +10,7 @@ namespace proof_system { template void GoblinUltraCircuitBuilder_::finalize_circuit() { UltraCircuitBuilder_::finalize_circuit(); - + // Set internally the current and previous size of the aggregate op queue transcript op_queue->set_size_data(); } @@ -57,7 +57,7 @@ ecc_op_tuple GoblinUltraCircuitBuilder_::queue_ecc_add_accum(const barretenb */ template ecc_op_tuple GoblinUltraCircuitBuilder_::queue_ecc_mul_accum(const barretenberg::g1::affine_element& point, - const FF& scalar) + const FF& scalar) { // Add raw op to op queue op_queue->mul_accumulate(point, scalar); @@ -95,7 +95,9 @@ template ecc_op_tuple GoblinUltraCircuitBuilder_::queue_ecc_eq * @return ecc_op_tuple Tuple of indices into variables array used to construct pair of ecc op gates */ template -ecc_op_tuple GoblinUltraCircuitBuilder_::decompose_ecc_operands(uint32_t op_idx, const g1::affine_element& point, const FF& scalar) +ecc_op_tuple GoblinUltraCircuitBuilder_::decompose_ecc_operands(uint32_t op_idx, + const g1::affine_element& point, + const FF& scalar) { // Decompose point coordinates (Fq) into hi-lo chunks (Fr) const size_t CHUNK_SIZE = 2 * DEFAULT_NON_NATIVE_FIELD_LIMB_BITS; diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp index 8952930ccc48..36b9837906e5 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp @@ -53,8 +53,8 @@ template class GoblinUltraCircuitBuilder_ : public UltraCircuitBui ecc_op_tuple decompose_ecc_operands(uint32_t op, const g1::affine_element& point, const FF& scalar = FF::zero()); public: - - GoblinUltraCircuitBuilder_(const size_t size_hint = 0, std::shared_ptr op_queue_in = std::make_shared()) + GoblinUltraCircuitBuilder_(const size_t size_hint = 0, + std::shared_ptr op_queue_in = std::make_shared()) : UltraCircuitBuilder_(size_hint) , op_queue(op_queue_in) { @@ -65,7 +65,8 @@ template class GoblinUltraCircuitBuilder_ : public UltraCircuitBui equality_op_idx = this->put_constant_variable(FF(EccOpCode::EQUALITY)); }; GoblinUltraCircuitBuilder_(std::shared_ptr op_queue_in) - : GoblinUltraCircuitBuilder_(0, op_queue_in) {} + : GoblinUltraCircuitBuilder_(0, op_queue_in) + {} void finalize_circuit(); void add_gates_to_ensure_all_polys_are_non_zero(); diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp index 96873b363112..9296e4a39ad5 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp @@ -854,7 +854,8 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBase class RecursiveVerifierTest : public testing::Test { - using InnerComposer = ::proof_system::honk::UltraComposer; - using InnerBuilder = typename InnerComposer::CircuitBuilder; + // Define types relevant for inner circuit + using Flavor = ::proof_system::honk::flavor::Ultra; + using InnerComposer = ::proof_system::honk::UltraComposer_; + using InnerBuilder = typename InnerComposer::CircuitBuilder; using NativeVerifier = ::proof_system::honk::UltraVerifier_<::proof_system::honk::flavor::Ultra>; - // Arithmetization of group operations in recursive verifier circuit is determined by outer builder + using InnerCurve = bn254; - using Flavor = ::proof_system::honk::flavor::UltraRecursive_; - using RecursiveVerifier = UltraRecursiveVerifier_; + // Types for recursive verifier circuit + using RecursiveFlavor = ::proof_system::honk::flavor::UltraRecursive_; + using RecursiveVerifier = UltraRecursiveVerifier_; using OuterBuilder = BuilderType; using VerificationKey = typename RecursiveVerifier::VerificationKey; - using inner_curve = bn254; - using inner_scalar_field_ct = inner_curve::ScalarField; - using inner_ground_field_ct = inner_curve::BaseField; - using public_witness_ct = inner_curve::public_witness_ct; - using witness_ct = inner_curve::witness_ct; - using byte_array_ct = inner_curve::byte_array_ct; - - using inner_scalar_field = typename inner_curve::ScalarFieldNative; - /** - * @brief Create an inner circuit, the proof of which will be recursively verified + * @brief Create a non-trivial arbitrary inner circuit, the proof of which will be recursively verified * * @param builder * @param public_inputs * @param log_num_gates */ - static void create_inner_circuit(InnerBuilder& builder, - const std::vector& public_inputs, - size_t log_num_gates = 10) + static void create_inner_circuit(InnerBuilder& builder, size_t log_num_gates = 10) { + using fr_ct = InnerCurve::ScalarField; + using fq_ct = InnerCurve::BaseField; + using public_witness_ct = InnerCurve::public_witness_ct; + using witness_ct = InnerCurve::witness_ct; + using byte_array_ct = InnerCurve::byte_array_ct; + using fr = typename InnerCurve::ScalarFieldNative; + // Create 2^log_n many add gates based on input log num gates const size_t num_gates = 1 << log_num_gates; for (size_t i = 0; i < num_gates; ++i) { @@ -70,10 +63,10 @@ template class RecursiveVerifierTest : public testing::Te builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, fr(1), fr(1), fr(1), fr(-1), fr(0) }); } - // Create some additional "circuity" gates as an example - inner_scalar_field_ct a(public_witness_ct(&builder, public_inputs[0])); - inner_scalar_field_ct b(public_witness_ct(&builder, public_inputs[1])); - inner_scalar_field_ct c(public_witness_ct(&builder, public_inputs[2])); + // Define some additional non-trivial but arbitrary circuit logic + fr_ct a(public_witness_ct(&builder, fr::random_element())); + fr_ct b(public_witness_ct(&builder, fr::random_element())); + fr_ct c(public_witness_ct(&builder, fr::random_element())); for (size_t i = 0; i < 32; ++i) { a = (a * b) + b + a; @@ -83,69 +76,16 @@ template class RecursiveVerifierTest : public testing::Te byte_array_ct to_hash(&builder, "nonsense test data"); blake3s(to_hash); - inner_scalar_field bigfield_data = fr::random_element(); - inner_scalar_field bigfield_data_a{ bigfield_data.data[0], bigfield_data.data[1], 0, 0 }; - inner_scalar_field bigfield_data_b{ bigfield_data.data[2], bigfield_data.data[3], 0, 0 }; + fr bigfield_data = fr::random_element(); + fr bigfield_data_a{ bigfield_data.data[0], bigfield_data.data[1], 0, 0 }; + fr bigfield_data_b{ bigfield_data.data[2], bigfield_data.data[3], 0, 0 }; - inner_ground_field_ct big_a(inner_scalar_field_ct(witness_ct(&builder, bigfield_data_a.to_montgomery_form())), - inner_scalar_field_ct(witness_ct(&builder, 0))); - inner_ground_field_ct big_b(inner_scalar_field_ct(witness_ct(&builder, bigfield_data_b.to_montgomery_form())), - inner_scalar_field_ct(witness_ct(&builder, 0))); + fq_ct big_a(fr_ct(witness_ct(&builder, bigfield_data_a.to_montgomery_form())), fr_ct(witness_ct(&builder, 0))); + fq_ct big_b(fr_ct(witness_ct(&builder, bigfield_data_b.to_montgomery_form())), fr_ct(witness_ct(&builder, 0))); big_a* big_b; }; - /** - * @brief Create a recursive verifier circuit and perform some native consistency checks - * @details Given an arbitrary inner circuit, construct a proof then consturct a recursive verifier circuit for that - * proof using the provided outer circuit builder. - * @note: The output of recursive verification is the two points which could be used in a pairing to do final - * verification. As a consistency check, we check that the outcome of performing this pairing (natively, no - * constraints) matches the outcome of running the full native verifier. - * - * @param inner_circuit Builder of the circuit for which a proof is recursively verified - * @param outer_builder Builder for the recursive verifier circuit - */ - static void create_outer_circuit(InnerBuilder& inner_circuit, OuterBuilder& outer_builder) - { - // Create proof of inner circuit - InnerComposer inner_composer; - auto prover = inner_composer.create_prover(inner_circuit); - auto proof_to_recursively_verify = prover.construct_proof(); - - info("Inner circuit size = ", prover.key->circuit_size); - - // Compute native verification key - const auto native_verification_key = inner_composer.compute_verification_key(inner_circuit); - - // Instantiate the recursive verification key from the native verification key - auto verification_key = std::make_shared(&outer_builder, native_verification_key); - - // Instantiate the recursive verifier and construct the recusive verification circuit - RecursiveVerifier verifier(&outer_builder, verification_key); - auto pairing_points = verifier.verify_proof(proof_to_recursively_verify); - - // For testing purposes only, perform native verification and compare the result - auto native_verifier = inner_composer.create_verifier(inner_circuit); - auto native_result = native_verifier.verify_proof(proof_to_recursively_verify); - - // Extract the pairing points from the recursive verifier output and perform the pairing natively. The result - // should match that of native verification. - auto lhs = pairing_points[0].get_value(); - auto rhs = pairing_points[1].get_value(); - auto recursive_result = native_verifier.pcs_verification_key->pairing_check(lhs, rhs); - EXPECT_EQ(recursive_result, native_result); - - // Confirm that the manifests produced by the recursive and native verifiers agree - auto recursive_manifest = verifier.transcript.get_manifest(); - auto native_manifest = native_verifier.transcript.get_manifest(); - // recursive_manifest.print(); - // native_manifest.print(); - for (size_t i = 0; i < recursive_manifest.size(); ++i) { - EXPECT_EQ(recursive_manifest[i], native_manifest[i]); - } - }; - public: static void SetUpTestSuite() { barretenberg::srs::init_crs_factory("../srs_db/ignition"); } @@ -156,11 +96,8 @@ template class RecursiveVerifierTest : public testing::Te static void test_inner_circuit() { InnerBuilder builder; - std::vector inputs{ inner_scalar_field::random_element(), - inner_scalar_field::random_element(), - inner_scalar_field::random_element() }; - create_inner_circuit(builder, inputs); + create_inner_circuit(builder); bool result = builder.check_circuit(); EXPECT_EQ(result, true); @@ -176,12 +113,8 @@ template class RecursiveVerifierTest : public testing::Te InnerBuilder inner_circuit; OuterBuilder outer_circuit; - std::vector inner_public_inputs{ inner_scalar_field::random_element(), - inner_scalar_field::random_element(), - inner_scalar_field::random_element() }; - // Create an arbitrary inner circuit - create_inner_circuit(inner_circuit, inner_public_inputs); + create_inner_circuit(inner_circuit); // Compute native verification key InnerComposer inner_composer; @@ -205,23 +138,45 @@ template class RecursiveVerifierTest : public testing::Te * @brief Construct a recursive verification circuit for the proof of an inner circuit then call check_circuit on it * */ - static void test_recursive_proof_composition() + static void test_recursive_verification() { + // Create an arbitrary inner circuit InnerBuilder inner_circuit; - OuterBuilder outer_circuit; + create_inner_circuit(inner_circuit); - std::vector inner_public_inputs{ inner_scalar_field::random_element(), - inner_scalar_field::random_element(), - inner_scalar_field::random_element() }; - - // Create an arbitrary inner circuit - create_inner_circuit(inner_circuit, inner_public_inputs); + // Generate a proof over the inner circuit + InnerComposer inner_composer; + auto inner_prover = inner_composer.create_prover(inner_circuit); + auto inner_proof = inner_prover.construct_proof(); + const auto native_verification_key = inner_composer.compute_verification_key(inner_circuit); // Create a recursive verification circuit for the proof of the inner circuit - create_outer_circuit(inner_circuit, outer_circuit); + OuterBuilder outer_circuit; + auto verification_key = std::make_shared(&outer_circuit, native_verification_key); + RecursiveVerifier verifier(&outer_circuit, verification_key); + auto pairing_points = verifier.verify_proof(inner_proof); + // Check the recursive verifier circuit EXPECT_EQ(outer_circuit.failed(), false) << outer_circuit.err(); EXPECT_TRUE(outer_circuit.check_circuit()); + + // Additional check 1: Perform native verification then perform the pairing on the outputs of the recursive + // verifier and check that the result agrees. + auto native_verifier = inner_composer.create_verifier(inner_circuit); + auto native_result = native_verifier.verify_proof(inner_proof); + auto recursive_result = native_verifier.pcs_verification_key->pairing_check(pairing_points[0].get_value(), + pairing_points[1].get_value()); + EXPECT_EQ(recursive_result, native_result); + + // Additional check 2: Ensure that the underlying native and recursive verification algorithms agree by ensuring + // the manifests produced by each agree. + auto recursive_manifest = verifier.transcript.get_manifest(); + auto native_manifest = native_verifier.transcript.get_manifest(); + // recursive_manifest.print(); + // native_manifest.print(); + for (size_t i = 0; i < recursive_manifest.size(); ++i) { + EXPECT_EQ(recursive_manifest[i], native_manifest[i]); + } } }; @@ -242,7 +197,7 @@ HEAVY_TYPED_TEST(RecursiveVerifierTest, RecursiveVerificationKey) HEAVY_TYPED_TEST(RecursiveVerifierTest, RecursiveProofComposition) { - TestFixture::test_recursive_proof_composition(); + TestFixture::test_recursive_verification(); }; } // namespace proof_system::plonk::stdlib::recursion::honk \ No newline at end of file From d15c6fb09caeb7b0a6f64c9da0f8da1d06f470d7 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Fri, 15 Sep 2023 16:55:26 +0000 Subject: [PATCH 24/36] all 4 recursive vers working w op queue agg --- .../composer/goblin_ultra_composer.test.cpp | 30 +-- .../honk/flavor/goblin_ultra_recursive.hpp | 190 +++++++-------- .../honk/proof_system/ultra_prover.cpp | 55 +++-- .../honk/proof_system/ultra_verifier.cpp | 40 ++-- .../honk/sumcheck/sumcheck_round.hpp | 1 + .../proof_system/flavor/flavor.hpp | 11 +- .../proof_system/op_queue/ecc_op_queue.hpp | 25 ++ .../honk/verifier/goblin_verifier.test.cpp | 219 ++++++++++++++++++ .../verifier/ultra_recursive_verifier.cpp | 65 +++++- .../verifier/ultra_recursive_verifier.hpp | 3 +- .../recursion/honk/verifier/verifier.test.cpp | 2 +- 11 files changed, 469 insertions(+), 172 deletions(-) create mode 100644 barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp index 3215c146cb72..2076c6473734 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp @@ -21,7 +21,6 @@ class GoblinUltraHonkComposerTests : public ::testing::Test { using Curve = curve::BN254; using FF = Curve::ScalarField; - using Commitment = Curve::AffineElement; using CommitmentKey = pcs::CommitmentKey; /** @@ -53,31 +52,6 @@ class GoblinUltraHonkComposerTests : public ::testing::Test { builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, FF(1), FF(1), FF(1), FF(-1), FF(0) }); } } - - /** - * @brief Populate ECC op queue with mock data as stand in for "previous circuit" in tests - * @details We currently cannot support Goblin proofs (specifically, transcript aggregation) if there is not - * existing data in the ECC op queue (since this leads to zero-commitment issues). This method populates the op - * queue with mock data so that the prover of an arbitrary 'first' circuit can behave as if it were not the prover - * over the first circuit in the stack. - * - * @param op_queue - */ - static void populate_ecc_op_queue_with_mock_data(std::shared_ptr& op_queue) - { - // Add a single row of data to the op queue and commit to each column as [1] * FF(data) - std::array mock_op_queue_commitments; - size_t idx = 0; - for (auto& entry : op_queue->ultra_ops) { - auto mock_data = FF::random_element(); - entry.emplace_back(mock_data); - mock_op_queue_commitments[idx++] = Commitment::one() * mock_data; - } - // Set some internal data based on the size of the op queue data - op_queue->set_size_data(); - // Add the commitments to the op queue data for use by the next circuit - op_queue->set_commitment_data(mock_op_queue_commitments); - } }; /** @@ -92,7 +66,7 @@ TEST_F(GoblinUltraHonkComposerTests, SingleCircuit) auto op_queue = std::make_shared(); // Add mock data to op queue to simulate interaction with a previous circuit - populate_ecc_op_queue_with_mock_data(op_queue); + op_queue->populate_with_mock_initital_data(); auto builder = GoblinUltraCircuitBuilder(op_queue); @@ -117,7 +91,7 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuits) auto op_queue = std::make_shared(); // Add mock data to op queue to simulate interaction with a previous circuit - populate_ecc_op_queue_with_mock_data(op_queue); + op_queue->populate_with_mock_initital_data(); // Track the expected size of the op queue transcript size_t expected_op_queue_size = 1; // +1 from mock data diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp index c8ea61a33585..def3171288ea 100644 --- a/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp @@ -11,6 +11,7 @@ #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp" #include "barretenberg/proof_system/flavor/flavor.hpp" #include "barretenberg/proof_system/relations/auxiliary_relation.hpp" +#include "barretenberg/proof_system/relations/ecc_op_queue_relation.hpp" #include "barretenberg/proof_system/relations/elliptic_relation.hpp" #include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp" #include "barretenberg/proof_system/relations/lookup_relation.hpp" @@ -38,14 +39,14 @@ namespace proof_system::honk::flavor { * sense to instantiate a Verifier with this flavor. * */ -class GoblinUltraRecursive { +template class GoblinUltraRecursive_ { public: - using CircuitBuilder = GoblinUltraCircuitBuilder; + using CircuitBuilder = BuilderType; using Curve = plonk::stdlib::bn254; - using GroupElement = Curve::Element; - using Commitment = Curve::Element; - using CommitmentHandle = Curve::Element; - using FF = Curve::ScalarField; + using GroupElement = typename Curve::Element; + using Commitment = typename Curve::Element; + using CommitmentHandle = typename Curve::Element; + using FF = typename Curve::ScalarField; // Note(luke): Eventually this may not be needed at all using VerifierCommitmentKey = pcs::VerifierCommitmentKey; @@ -306,32 +307,32 @@ class GoblinUltraRecursive { : VerificationKey_>(native_key->circuit_size, native_key->num_public_inputs) { - q_m = Commitment::from_witness(builder, native_key->q_m); - q_l = Commitment::from_witness(builder, native_key->q_l); - q_r = Commitment::from_witness(builder, native_key->q_r); - q_o = Commitment::from_witness(builder, native_key->q_o); - q_4 = Commitment::from_witness(builder, native_key->q_4); - q_c = Commitment::from_witness(builder, native_key->q_c); - q_arith = Commitment::from_witness(builder, native_key->q_arith); - q_sort = Commitment::from_witness(builder, native_key->q_sort); - q_elliptic = Commitment::from_witness(builder, native_key->q_elliptic); - q_aux = Commitment::from_witness(builder, native_key->q_aux); - q_lookup = Commitment::from_witness(builder, native_key->q_lookup); - sigma_1 = Commitment::from_witness(builder, native_key->sigma_1); - sigma_2 = Commitment::from_witness(builder, native_key->sigma_2); - sigma_3 = Commitment::from_witness(builder, native_key->sigma_3); - sigma_4 = Commitment::from_witness(builder, native_key->sigma_4); - id_1 = Commitment::from_witness(builder, native_key->id_1); - id_2 = Commitment::from_witness(builder, native_key->id_2); - id_3 = Commitment::from_witness(builder, native_key->id_3); - id_4 = Commitment::from_witness(builder, native_key->id_4); - table_1 = Commitment::from_witness(builder, native_key->table_1); - table_2 = Commitment::from_witness(builder, native_key->table_2); - table_3 = Commitment::from_witness(builder, native_key->table_3); - table_4 = Commitment::from_witness(builder, native_key->table_4); - lagrange_first = Commitment::from_witness(builder, native_key->lagrange_first); - lagrange_last = Commitment::from_witness(builder, native_key->lagrange_last); - lagrange_ecc_op = Commitment::from_witness(builder, native_key->lagrange_ecc_op); + this->q_m = Commitment::from_witness(builder, native_key->q_m); + this->q_l = Commitment::from_witness(builder, native_key->q_l); + this->q_r = Commitment::from_witness(builder, native_key->q_r); + this->q_o = Commitment::from_witness(builder, native_key->q_o); + this->q_4 = Commitment::from_witness(builder, native_key->q_4); + this->q_c = Commitment::from_witness(builder, native_key->q_c); + this->q_arith = Commitment::from_witness(builder, native_key->q_arith); + this->q_sort = Commitment::from_witness(builder, native_key->q_sort); + this->q_elliptic = Commitment::from_witness(builder, native_key->q_elliptic); + this->q_aux = Commitment::from_witness(builder, native_key->q_aux); + this->q_lookup = Commitment::from_witness(builder, native_key->q_lookup); + this->sigma_1 = Commitment::from_witness(builder, native_key->sigma_1); + this->sigma_2 = Commitment::from_witness(builder, native_key->sigma_2); + this->sigma_3 = Commitment::from_witness(builder, native_key->sigma_3); + this->sigma_4 = Commitment::from_witness(builder, native_key->sigma_4); + this->id_1 = Commitment::from_witness(builder, native_key->id_1); + this->id_2 = Commitment::from_witness(builder, native_key->id_2); + this->id_3 = Commitment::from_witness(builder, native_key->id_3); + this->id_4 = Commitment::from_witness(builder, native_key->id_4); + this->table_1 = Commitment::from_witness(builder, native_key->table_1); + this->table_2 = Commitment::from_witness(builder, native_key->table_2); + this->table_3 = Commitment::from_witness(builder, native_key->table_3); + this->table_4 = Commitment::from_witness(builder, native_key->table_4); + this->lagrange_first = Commitment::from_witness(builder, native_key->lagrange_first); + this->lagrange_last = Commitment::from_witness(builder, native_key->lagrange_last); + this->lagrange_ecc_op = Commitment::from_witness(builder, native_key->lagrange_ecc_op); }; }; @@ -356,44 +357,45 @@ class GoblinUltraRecursive { public: CommitmentLabels() { - w_l = "W_L"; - w_r = "W_R"; - w_o = "W_O"; - w_4 = "W_4"; - z_perm = "Z_PERM"; - z_lookup = "Z_LOOKUP"; - sorted_accum = "SORTED_ACCUM"; - ecc_op_wire_1 = "ECC_OP_WIRE_1"; - ecc_op_wire_2 = "ECC_OP_WIRE_2"; - ecc_op_wire_3 = "ECC_OP_WIRE_3"; - ecc_op_wire_4 = "ECC_OP_WIRE_4"; + this->w_l = "W_L"; + this->w_r = "W_R"; + this->w_o = "W_O"; + this->w_4 = "W_4"; + this->z_perm = "Z_PERM"; + this->z_lookup = "Z_LOOKUP"; + this->sorted_accum = "SORTED_ACCUM"; + this->ecc_op_wire_1 = "ECC_OP_WIRE_1"; + this->ecc_op_wire_2 = "ECC_OP_WIRE_2"; + this->ecc_op_wire_3 = "ECC_OP_WIRE_3"; + this->ecc_op_wire_4 = "ECC_OP_WIRE_4"; // The ones beginning with "__" are only used for debugging - q_c = "__Q_C"; - q_l = "__Q_L"; - q_r = "__Q_R"; - q_o = "__Q_O"; - q_4 = "__Q_4"; - q_m = "__Q_M"; - q_arith = "__Q_ARITH"; - q_sort = "__Q_SORT"; - q_elliptic = "__Q_ELLIPTIC"; - q_aux = "__Q_AUX"; - q_lookup = "__Q_LOOKUP"; - sigma_1 = "__SIGMA_1"; - sigma_2 = "__SIGMA_2"; - sigma_3 = "__SIGMA_3"; - sigma_4 = "__SIGMA_4"; - id_1 = "__ID_1"; - id_2 = "__ID_2"; - id_3 = "__ID_3"; - id_4 = "__ID_4"; - table_1 = "__TABLE_1"; - table_2 = "__TABLE_2"; - table_3 = "__TABLE_3"; - table_4 = "__TABLE_4"; - lagrange_first = "__LAGRANGE_FIRST"; - lagrange_last = "__LAGRANGE_LAST"; + this->q_c = "__Q_C"; + this->q_l = "__Q_L"; + this->q_r = "__Q_R"; + this->q_o = "__Q_O"; + this->q_4 = "__Q_4"; + this->q_m = "__Q_M"; + this->q_arith = "__Q_ARITH"; + this->q_sort = "__Q_SORT"; + this->q_elliptic = "__Q_ELLIPTIC"; + this->q_aux = "__Q_AUX"; + this->q_lookup = "__Q_LOOKUP"; + this->sigma_1 = "__SIGMA_1"; + this->sigma_2 = "__SIGMA_2"; + this->sigma_3 = "__SIGMA_3"; + this->sigma_4 = "__SIGMA_4"; + this->id_1 = "__ID_1"; + this->id_2 = "__ID_2"; + this->id_3 = "__ID_3"; + this->id_4 = "__ID_4"; + this->table_1 = "__TABLE_1"; + this->table_2 = "__TABLE_2"; + this->table_3 = "__TABLE_3"; + this->table_4 = "__TABLE_4"; + this->lagrange_first = "__LAGRANGE_FIRST"; + this->lagrange_last = "__LAGRANGE_LAST"; + this->lagrange_ecc_op = "__Q_ECC_OP_QUEUE"; }; }; @@ -401,32 +403,32 @@ class GoblinUltraRecursive { public: VerifierCommitments(std::shared_ptr verification_key) { - q_m = verification_key->q_m; - q_l = verification_key->q_l; - q_r = verification_key->q_r; - q_o = verification_key->q_o; - q_4 = verification_key->q_4; - q_c = verification_key->q_c; - q_arith = verification_key->q_arith; - q_sort = verification_key->q_sort; - q_elliptic = verification_key->q_elliptic; - q_aux = verification_key->q_aux; - q_lookup = verification_key->q_lookup; - sigma_1 = verification_key->sigma_1; - sigma_2 = verification_key->sigma_2; - sigma_3 = verification_key->sigma_3; - sigma_4 = verification_key->sigma_4; - id_1 = verification_key->id_1; - id_2 = verification_key->id_2; - id_3 = verification_key->id_3; - id_4 = verification_key->id_4; - table_1 = verification_key->table_1; - table_2 = verification_key->table_2; - table_3 = verification_key->table_3; - table_4 = verification_key->table_4; - lagrange_first = verification_key->lagrange_first; - lagrange_last = verification_key->lagrange_last; - lagrange_ecc_op = verification_key->lagrange_ecc_op; + this->q_m = verification_key->q_m; + this->q_l = verification_key->q_l; + this->q_r = verification_key->q_r; + this->q_o = verification_key->q_o; + this->q_4 = verification_key->q_4; + this->q_c = verification_key->q_c; + this->q_arith = verification_key->q_arith; + this->q_sort = verification_key->q_sort; + this->q_elliptic = verification_key->q_elliptic; + this->q_aux = verification_key->q_aux; + this->q_lookup = verification_key->q_lookup; + this->sigma_1 = verification_key->sigma_1; + this->sigma_2 = verification_key->sigma_2; + this->sigma_3 = verification_key->sigma_3; + this->sigma_4 = verification_key->sigma_4; + this->id_1 = verification_key->id_1; + this->id_2 = verification_key->id_2; + this->id_3 = verification_key->id_3; + this->id_4 = verification_key->id_4; + this->table_1 = verification_key->table_1; + this->table_2 = verification_key->table_2; + this->table_3 = verification_key->table_3; + this->table_4 = verification_key->table_4; + this->lagrange_first = verification_key->lagrange_first; + this->lagrange_last = verification_key->lagrange_last; + this->lagrange_ecc_op = verification_key->lagrange_ecc_op; } }; }; diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index 9b7bbcbef28b..bc66bf380945 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -269,19 +269,22 @@ template void UltraProver_::execute_op_queue_transc } // Compute/get commitments [t_i^{shift}], [T_{i-1}], and [T_i] and add to transcript + std::array shifted_op_wire_commitments; + std::array prev_aggregate_op_queue_commitments; std::array aggregate_op_queue_commitments; for (size_t idx = 0; idx < right_shifted_op_wires.size(); ++idx) { // Get previous transcript commitment [T_{i-1}] from op queue - auto prev_aggregate_op_queue_commitment = key->op_queue->ultra_ops_commitments[idx]; + prev_aggregate_op_queue_commitments[idx] = key->op_queue->ultra_ops_commitments[idx]; // Compute commitment [t_i^{shift}] directly - auto shifted_op_wire_commitment = pcs_commitment_key->commit(right_shifted_op_wires[idx]); + shifted_op_wire_commitments[idx] = pcs_commitment_key->commit(right_shifted_op_wires[idx]); // Compute updated aggregate transcript commitmen as [T_i] = [T_{i-1}] + [t_i^{shift}] - aggregate_op_queue_commitments[idx] = prev_aggregate_op_queue_commitment + shifted_op_wire_commitment; + aggregate_op_queue_commitments[idx] = + prev_aggregate_op_queue_commitments[idx] + shifted_op_wire_commitments[idx]; std::string suffix = std::to_string(idx + 1); - transcript.send_to_verifier("PREV_AGG_ECC_OP_QUEUE_" + suffix, prev_aggregate_op_queue_commitment); - transcript.send_to_verifier("SHIFTED_ECC_OP_WIRE_" + suffix, shifted_op_wire_commitment); - transcript.send_to_verifier("AGG_ECC_OP_QUEUE_" + suffix, aggregate_op_queue_commitments[idx]); + transcript.send_to_verifier("PREV_AGG_OP_QUEUE_" + suffix, prev_aggregate_op_queue_commitments[idx]); + transcript.send_to_verifier("SHIFTED_OP_WIRE_" + suffix, shifted_op_wire_commitments[idx]); + transcript.send_to_verifier("AGG_OP_QUEUE_" + suffix, aggregate_op_queue_commitments[idx]); } // Store the commitments [T_{i}] (to be used later in subsequent iterations as [T_{i-1}]). @@ -293,28 +296,40 @@ template void UltraProver_::execute_op_queue_transc auto kappa = transcript.get_challenge("kappa"); auto prev_aggregate_ecc_op_transcript = key->op_queue->get_previous_aggregate_transcript(); auto aggregate_ecc_op_transcript = key->op_queue->get_aggregate_transcript(); + std::array prev_agg_op_queue_evals; + std::array right_shifted_op_wire_evals; + std::array agg_op_queue_evals; + std::array prev_agg_op_queue_polynomials; + std::array agg_op_queue_polynomials; for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { std::string suffix = std::to_string(idx + 1); // T_{i-1}(γ) - auto polynomial = Polynomial(prev_aggregate_ecc_op_transcript[idx]); - auto evaluation = polynomial.evaluate(kappa); - univariate_openings.opening_pairs.emplace_back(OpenPair{ kappa, evaluation }); - univariate_openings.witnesses.emplace_back(std::move(polynomial)); - transcript.send_to_verifier("prev_agg_ecc_op_queue_eval_" + suffix, evaluation); + prev_agg_op_queue_polynomials[idx] = Polynomial(prev_aggregate_ecc_op_transcript[idx]); + prev_agg_op_queue_evals[idx] = prev_agg_op_queue_polynomials[idx].evaluate(kappa); + transcript.send_to_verifier("prev_agg_op_queue_eval_" + suffix, prev_agg_op_queue_evals[idx]); // t_i^{shift}(γ) - evaluation = right_shifted_op_wires[idx].evaluate(kappa); - univariate_openings.opening_pairs.emplace_back(OpenPair{ kappa, evaluation }); - univariate_openings.witnesses.emplace_back(std::move(right_shifted_op_wires[idx])); - transcript.send_to_verifier("op_wire_eval_" + suffix, evaluation); + right_shifted_op_wire_evals[idx] = right_shifted_op_wires[idx].evaluate(kappa); + transcript.send_to_verifier("op_wire_eval_" + suffix, right_shifted_op_wire_evals[idx]); // T_i(γ) - polynomial = Polynomial(aggregate_ecc_op_transcript[idx]); - evaluation = polynomial.evaluate(kappa); - univariate_openings.opening_pairs.emplace_back(OpenPair{ kappa, evaluation }); - univariate_openings.witnesses.emplace_back(std::move(polynomial)); - transcript.send_to_verifier("agg_ecc_op_queue_eval_" + suffix, evaluation); + agg_op_queue_polynomials[idx] = Polynomial(aggregate_ecc_op_transcript[idx]); + agg_op_queue_evals[idx] = agg_op_queue_polynomials[idx].evaluate(kappa); + transcript.send_to_verifier("agg_op_queue_eval_" + suffix, agg_op_queue_evals[idx]); + } + + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + univariate_openings.opening_pairs.emplace_back(OpenPair{ kappa, prev_agg_op_queue_evals[idx] }); + univariate_openings.witnesses.emplace_back(std::move(prev_agg_op_queue_polynomials[idx])); + } + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + univariate_openings.opening_pairs.emplace_back(OpenPair{ kappa, right_shifted_op_wire_evals[idx] }); + univariate_openings.witnesses.emplace_back(std::move(right_shifted_op_wires[idx])); + } + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + univariate_openings.opening_pairs.emplace_back(OpenPair{ kappa, agg_op_queue_evals[idx] }); + univariate_openings.witnesses.emplace_back(std::move(agg_op_queue_polynomials[idx])); } } } diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp index 463c6029c91c..8b00c4d19e51 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp @@ -168,51 +168,55 @@ template bool UltraVerifier_::verify_proof(const plonk // Perform ECC op queue transcript aggregation protocol if constexpr (IsGoblinFlavor) { // Receive commitments [t_i^{shift}], [T_{i-1}], and [T_i] - std::array shifted_op_wire_commitments; std::array prev_agg_op_queue_commitments; + std::array shifted_op_wire_commitments; std::array agg_op_queue_commitments; for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - shifted_op_wire_commitments[idx] = - transcript.template receive_from_prover("SHIFTED_ECC_OP_WIRE_" + std::to_string(idx + 1)); prev_agg_op_queue_commitments[idx] = - transcript.template receive_from_prover("PREV_AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); + transcript.template receive_from_prover("PREV_AGG_OP_QUEUE_" + std::to_string(idx + 1)); + shifted_op_wire_commitments[idx] = + transcript.template receive_from_prover("SHIFTED_OP_WIRE_" + std::to_string(idx + 1)); agg_op_queue_commitments[idx] = - transcript.template receive_from_prover("AGG_ECC_OP_QUEUE_" + std::to_string(idx + 1)); + transcript.template receive_from_prover("AGG_OP_QUEUE_" + std::to_string(idx + 1)); } // Receive transcript poly evaluations FF kappa = transcript.get_challenge("kappa"); - std::array shifted_op_wire_evals; std::array prev_agg_op_queue_evals; + std::array shifted_op_wire_evals; std::array agg_op_queue_evals; for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + prev_agg_op_queue_evals[idx] = + transcript.template receive_from_prover("prev_agg_op_queue_eval_" + std::to_string(idx + 1)); shifted_op_wire_evals[idx] = transcript.template receive_from_prover("op_wire_eval_" + std::to_string(idx + 1)); - prev_agg_op_queue_evals[idx] = - transcript.template receive_from_prover("prev_agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); agg_op_queue_evals[idx] = - transcript.template receive_from_prover("agg_ecc_op_queue_eval_" + std::to_string(idx + 1)); + transcript.template receive_from_prover("agg_op_queue_eval_" + std::to_string(idx + 1)); - univariate_opening_claims.emplace_back( - pcs::OpeningClaim{ { kappa, shifted_op_wire_evals[idx] }, shifted_op_wire_commitments[idx] }); + // Check the identity T_i(γ) = T_{i-1}(γ) + t_i^{shift}(γ). If it fails, return false + if (agg_op_queue_evals[idx] != prev_agg_op_queue_evals[idx] + shifted_op_wire_evals[idx]) { + return false; + } + } + + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { univariate_opening_claims.emplace_back(pcs::OpeningClaim{ { kappa, prev_agg_op_queue_evals[idx] }, prev_agg_op_queue_commitments[idx] }); + } + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { univariate_opening_claims.emplace_back( - pcs::OpeningClaim{ { kappa, agg_op_queue_evals[idx] }, agg_op_queue_commitments[idx] }); + pcs::OpeningClaim{ { kappa, shifted_op_wire_evals[idx] }, shifted_op_wire_commitments[idx] }); } - - // Check the identity T_i(γ) = T_{i-1}(γ) + t_i^{shift}(γ). If it fails, return false for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { - if (agg_op_queue_evals[idx] != prev_agg_op_queue_evals[idx] + shifted_op_wire_evals[idx]) { - return false; - } + univariate_opening_claims.emplace_back( + pcs::OpeningClaim{ { kappa, agg_op_queue_evals[idx] }, agg_op_queue_commitments[idx] }); } } // Produce a Shplonk claim: commitment [Q] - [Q_z], evaluation zero (at random challenge z) auto shplonk_claim = Shplonk::reduce_verification(pcs_verification_key, univariate_opening_claims, transcript); - transcript.print(); + // transcript.print(); // Verify the Shplonk claim with KZG or IPA return PCS::verify(pcs_verification_key, shplonk_claim, transcript); diff --git a/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp index 1847771a49cb..492b4805386b 100644 --- a/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp @@ -419,6 +419,7 @@ template class SumcheckVerifierRound { { // S^{l}(0) = ( (1−0) + 0⋅ζ^{ 2^l } ) ⋅ T^{l}(0) = T^{l}(0) // S^{l}(1) = ( (1−1) + 1⋅ζ^{ 2^l } ) ⋅ T^{l}(1) = ζ^{ 2^l } ⋅ T^{l}(1) + // WORKTODO: Need to actually assert this equality! FF total_sum = univariate.value_at(0) + univariate.value_at(1); // target_total_sum = sigma_{l} = // TODO(#673): Conditionals like this can go away once native verification is is just recursive verification diff --git a/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp b/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp index 4340c06500bf..bd72fbcdb42d 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp @@ -258,7 +258,7 @@ class Ultra; class UltraGrumpkin; class GoblinUltra; template class UltraRecursive_; -class GoblinUltraRecursive; +template class GoblinUltraRecursive_; } // namespace proof_system::honk::flavor // Forward declare plonk flavors @@ -288,10 +288,15 @@ template concept IsUltraFlavor = IsAnyOf; template -concept IsGoblinFlavor = IsAnyOf; +concept IsGoblinFlavor = IsAnyOf, + honk::flavor::GoblinUltraRecursive_>; template -concept IsRecursiveFlavor = IsAnyOf, honk::flavor::UltraRecursive_, honk::flavor::GoblinUltraRecursive>; +concept IsRecursiveFlavor = IsAnyOf, + honk::flavor::UltraRecursive_, + honk::flavor::GoblinUltraRecursive_, + honk::flavor::GoblinUltraRecursive_>; template concept IsGrumpkinFlavor = IsAnyOf; diff --git a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp index cc3d9053ae73..c6abe196ff37 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp @@ -117,6 +117,31 @@ class ECCOpQueue { return result; } + /** + * @brief TESTING PURPOSES ONLY: Populate ECC op queue with mock data as stand in for "previous circuit" in tests + * @details (Issue #723) We currently cannot support Goblin proofs (specifically, transcript aggregation) if there + * is not existing data in the ECC op queue (since this leads to zero-commitment issues). This method populates the + * op queue with mock data so that the prover of an arbitrary 'first' circuit can behave as if it were not the + * prover over the first circuit in the stack. + * + * @param op_queue + */ + void populate_with_mock_initital_data() + { + // Add a single row of data to the op queue and commit to each column as [1] * FF(data) + std::array mock_op_queue_commitments; + size_t idx = 0; + for (auto& entry : this->ultra_ops) { + auto mock_data = Fr::random_element(); + entry.emplace_back(mock_data); + mock_op_queue_commitments[idx++] = Point::one() * mock_data; + } + // Set some internal data based on the size of the op queue data + this->set_size_data(); + // Add the commitments to the op queue data for use by the next circuit + this->set_commitment_data(mock_op_queue_commitments); + } + /** * @brief Write point addition op to queue and natively perform addition * diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp new file mode 100644 index 000000000000..7fb105969fdc --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/goblin_verifier.test.cpp @@ -0,0 +1,219 @@ +#include "barretenberg/common/test.hpp" +#include "barretenberg/honk/composer/ultra_composer.hpp" +#include "barretenberg/honk/flavor/ultra_recursive.hpp" +#include "barretenberg/honk/proof_system/ultra_verifier.hpp" +#include "barretenberg/stdlib/commitment/pedersen/pedersen.hpp" +#include "barretenberg/stdlib/hash/blake3s/blake3s.hpp" +#include "barretenberg/stdlib/primitives/curves/bn254.hpp" +#include "barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp" + +namespace proof_system::plonk::stdlib::recursion::honk { + +/** + * @brief Test suite for recursive verification of conventional Ultra Honk proofs + * @details The recursive verification circuit is arithmetized in two different ways: 1) using the conventional Ultra + * arithmetization (UltraCircuitBuilder), or 2) a Goblin-style Ultra arithmetization (GoblinUltraCircuitBuilder). + * + * @tparam Builder Circuit builder for the recursive verifier circuit + */ +template class GoblinRecursiveVerifierTest : public testing::Test { + + // Define types relevant for inner circuit + using Flavor = ::proof_system::honk::flavor::GoblinUltra; + using InnerComposer = ::proof_system::honk::UltraComposer_; + using InnerBuilder = typename InnerComposer::CircuitBuilder; + using NativeVerifier = ::proof_system::honk::UltraVerifier_<::proof_system::honk::flavor::Ultra>; + using InnerCurve = bn254; + + // Types for recursive verifier circuit + using RecursiveFlavor = ::proof_system::honk::flavor::GoblinUltraRecursive_; + using RecursiveVerifier = UltraRecursiveVerifier_; + using OuterBuilder = BuilderType; + using VerificationKey = typename RecursiveVerifier::VerificationKey; + + /** + * @brief Create a non-trivial arbitrary inner circuit, the proof of which will be recursively verified + * + * @param builder + * @param public_inputs + * @param log_num_gates + */ + static InnerBuilder create_inner_circuit(size_t log_num_gates = 10) + { + using fr_ct = InnerCurve::ScalarField; + using fq_ct = InnerCurve::BaseField; + using point_ct = InnerCurve::AffineElement; + using public_witness_ct = InnerCurve::public_witness_ct; + using witness_ct = InnerCurve::witness_ct; + using byte_array_ct = InnerCurve::byte_array_ct; + using fr = typename InnerCurve::ScalarFieldNative; + using point = typename InnerCurve::GroupNative::affine_element; + + // Instantiate ECC op queue and add mock data to simulate interaction with a previous circuit + auto op_queue = std::make_shared(); + op_queue->populate_with_mock_initital_data(); + + InnerBuilder builder(op_queue); + + // Create 2^log_n many add gates based on input log num gates + const size_t num_gates = 1 << log_num_gates; + for (size_t i = 0; i < num_gates; ++i) { + fr a = fr::random_element(); + uint32_t a_idx = builder.add_variable(a); + + fr b = fr::random_element(); + fr c = fr::random_element(); + fr d = a + b + c; + uint32_t b_idx = builder.add_variable(b); + uint32_t c_idx = builder.add_variable(c); + uint32_t d_idx = builder.add_variable(d); + + builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, fr(1), fr(1), fr(1), fr(-1), fr(0) }); + } + + // Add some arbitrary goblin-style ECC op gates via a batch mul + size_t num_points = 5; + std::vector circuit_points; + std::vector circuit_scalars; + for (size_t i = 0; i < num_points; ++i) { + circuit_points.push_back(point_ct::from_witness(&builder, point::random_element())); + circuit_scalars.push_back(fr_ct::from_witness(&builder, fr::random_element())); + } + point_ct::batch_mul(circuit_points, circuit_scalars); + + // Define some additional arbitrary convetional circuit logic + fr_ct a(public_witness_ct(&builder, fr::random_element())); + fr_ct b(public_witness_ct(&builder, fr::random_element())); + fr_ct c(public_witness_ct(&builder, fr::random_element())); + + for (size_t i = 0; i < 32; ++i) { + a = (a * b) + b + a; + a = a.madd(b, c); + } + pedersen_commitment::compress(a, b); + byte_array_ct to_hash(&builder, "nonsense test data"); + blake3s(to_hash); + + fr bigfield_data = fr::random_element(); + fr bigfield_data_a{ bigfield_data.data[0], bigfield_data.data[1], 0, 0 }; + fr bigfield_data_b{ bigfield_data.data[2], bigfield_data.data[3], 0, 0 }; + + fq_ct big_a(fr_ct(witness_ct(&builder, bigfield_data_a.to_montgomery_form())), fr_ct(witness_ct(&builder, 0))); + fq_ct big_b(fr_ct(witness_ct(&builder, bigfield_data_b.to_montgomery_form())), fr_ct(witness_ct(&builder, 0))); + + big_a* big_b; + + return builder; + }; + + public: + static void SetUpTestSuite() { barretenberg::srs::init_crs_factory("../srs_db/ignition"); } + + /** + * @brief Create inner circuit and call check_circuit on it + * + */ + static void test_inner_circuit() + { + auto inner_circuit = create_inner_circuit(); + + bool result = inner_circuit.check_circuit(); + EXPECT_EQ(result, true); + } + + /** + * @brief Instantiate a recursive verification key from the native verification key produced by the inner cicuit + * builder. Check consistency beteen the native and stdlib types. + * + */ + static void test_recursive_verification_key_creation() + { + // Create an arbitrary inner circuit + auto inner_circuit = create_inner_circuit(); + + // Compute native verification key + InnerComposer inner_composer; + auto prover = inner_composer.create_prover(inner_circuit); // A prerequisite for computing VK + const auto native_verification_key = inner_composer.compute_verification_key(inner_circuit); + + // Instantiate the recursive verification key from the native verification key + OuterBuilder outer_circuit; + auto verification_key = std::make_shared(&outer_circuit, native_verification_key); + + // Spot check some values in the recursive VK to ensure it was constructed correctly + EXPECT_EQ(verification_key->circuit_size, native_verification_key->circuit_size); + EXPECT_EQ(verification_key->log_circuit_size, native_verification_key->log_circuit_size); + EXPECT_EQ(verification_key->num_public_inputs, native_verification_key->num_public_inputs); + EXPECT_EQ(verification_key->q_m.get_value(), native_verification_key->q_m); + EXPECT_EQ(verification_key->q_r.get_value(), native_verification_key->q_r); + EXPECT_EQ(verification_key->sigma_1.get_value(), native_verification_key->sigma_1); + EXPECT_EQ(verification_key->id_3.get_value(), native_verification_key->id_3); + EXPECT_EQ(verification_key->lagrange_ecc_op.get_value(), native_verification_key->lagrange_ecc_op); + } + + /** + * @brief Construct a recursive verification circuit for the proof of an inner circuit then call check_circuit on it + * + */ + static void test_recursive_verification() + { + // Create an arbitrary inner circuit + auto inner_circuit = create_inner_circuit(); + + // Generate a proof over the inner circuit + InnerComposer inner_composer; + auto inner_prover = inner_composer.create_prover(inner_circuit); + auto inner_proof = inner_prover.construct_proof(); + const auto native_verification_key = inner_composer.compute_verification_key(inner_circuit); + + // Create a recursive verification circuit for the proof of the inner circuit + OuterBuilder outer_circuit; + auto verification_key = std::make_shared(&outer_circuit, native_verification_key); + RecursiveVerifier verifier(&outer_circuit, verification_key); + auto pairing_points = verifier.verify_proof(inner_proof); + + // Check the recursive verifier circuit + EXPECT_EQ(outer_circuit.failed(), false) << outer_circuit.err(); + EXPECT_TRUE(outer_circuit.check_circuit()); + + // Additional check 1: Perform native verification then perform the pairing on the outputs of the recursive + // verifier and check that the result agrees. + auto native_verifier = inner_composer.create_verifier(inner_circuit); + auto native_result = native_verifier.verify_proof(inner_proof); + auto recursive_result = native_verifier.pcs_verification_key->pairing_check(pairing_points[0].get_value(), + pairing_points[1].get_value()); + EXPECT_EQ(recursive_result, native_result); + + // Additional check 2: Ensure that the underlying native and recursive verification algorithms agree by ensuring + // the manifests produced by each agree. + auto recursive_manifest = verifier.transcript.get_manifest(); + auto native_manifest = native_verifier.transcript.get_manifest(); + // recursive_manifest.print(); + // native_manifest.print(); + for (size_t i = 0; i < recursive_manifest.size(); ++i) { + EXPECT_EQ(recursive_manifest[i], native_manifest[i]); + } + } +}; + +// Run the recursive verifier tests with conventional Ultra builder and Goblin builder +using BuilderTypes = testing::Types; + +TYPED_TEST_SUITE(GoblinRecursiveVerifierTest, BuilderTypes); + +HEAVY_TYPED_TEST(GoblinRecursiveVerifierTest, InnerCircuit) +{ + TestFixture::test_inner_circuit(); +} + +HEAVY_TYPED_TEST(GoblinRecursiveVerifierTest, RecursiveVerificationKey) +{ + TestFixture::test_recursive_verification_key_creation(); +} + +HEAVY_TYPED_TEST(GoblinRecursiveVerifierTest, SingleRecursiveVerification) +{ + TestFixture::test_recursive_verification(); +}; + +} // namespace proof_system::plonk::stdlib::recursion::honk \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp index 8b813e959ba0..8682f0a3e169 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.cpp @@ -30,6 +30,7 @@ std::array UltraRecursiveVerifier_::ve using VerifierCommitments = typename Flavor::VerifierCommitments; using CommitmentLabels = typename Flavor::CommitmentLabels; using RelationParams = ::proof_system::RelationParameters; + using UnivariateClaim = ::proof_system::honk::pcs::OpeningClaim; RelationParams relation_parameters; @@ -176,11 +177,11 @@ std::array UltraRecursiveVerifier_::ve // Produce a Gemini claim consisting of: // - d+1 commitments [Fold_{r}^(0)], [Fold_{-r}^(0)], and [Fold^(l)], l = 1:d-1 // - d+1 evaluations a_0_pos, and a_l, l = 0:d-1 - auto gemini_claim = Gemini::reduce_verification(multivariate_challenge, - batched_evaluation, - batched_commitment_unshifted, - batched_commitment_to_be_shifted, - transcript); + auto univariate_opening_claims = Gemini::reduce_verification(multivariate_challenge, + batched_evaluation, + batched_commitment_unshifted, + batched_commitment_to_be_shifted, + transcript); info("Gemini: num gates = ", builder->get_num_gates() - prev_num_gates, @@ -189,8 +190,57 @@ std::array UltraRecursiveVerifier_::ve ")"); prev_num_gates = builder->get_num_gates(); + // Perform ECC op queue transcript aggregation protocol + if constexpr (IsGoblinFlavor) { + // Receive commitments [t_i^{shift}], [T_{i-1}], and [T_i] + std::array prev_agg_op_queue_commitments; + std::array shifted_op_wire_commitments; + std::array agg_op_queue_commitments; + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + std::string suffix = std::to_string(idx + 1); + prev_agg_op_queue_commitments[idx] = + transcript.template receive_from_prover("PREV_AGG_OP_QUEUE_" + suffix); + shifted_op_wire_commitments[idx] = + transcript.template receive_from_prover("SHIFTED_OP_WIRE_" + suffix); + agg_op_queue_commitments[idx] = + transcript.template receive_from_prover("AGG_OP_QUEUE_" + suffix); + } + + // Receive claimed evaluations of t_i^{shift}, T_{i-1}, and T_i + FF kappa = transcript.get_challenge("kappa"); + std::array prev_agg_op_queue_evals; + std::array shifted_op_wire_evals; + std::array agg_op_queue_evals; + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + std::string suffix = std::to_string(idx + 1); + prev_agg_op_queue_evals[idx] = + transcript.template receive_from_prover("prev_agg_op_queue_eval_" + suffix); + shifted_op_wire_evals[idx] = transcript.template receive_from_prover("op_wire_eval_" + suffix); + agg_op_queue_evals[idx] = transcript.template receive_from_prover("agg_op_queue_eval_" + suffix); + + ASSERT(agg_op_queue_evals[idx].get_value() == + prev_agg_op_queue_evals[idx].get_value() + shifted_op_wire_evals[idx].get_value()); + + // Check the identity T_i(γ) = T_{i-1}(γ) + t_i^{shift}(γ). + agg_op_queue_evals[idx].assert_equal(prev_agg_op_queue_evals[idx] + shifted_op_wire_evals[idx]); + } + + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + univariate_opening_claims.emplace_back( + UnivariateClaim{ { kappa, prev_agg_op_queue_evals[idx] }, prev_agg_op_queue_commitments[idx] }); + } + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + univariate_opening_claims.emplace_back( + UnivariateClaim{ { kappa, shifted_op_wire_evals[idx] }, shifted_op_wire_commitments[idx] }); + } + for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { + univariate_opening_claims.emplace_back( + UnivariateClaim{ { kappa, agg_op_queue_evals[idx] }, agg_op_queue_commitments[idx] }); + } + } + // Produce a Shplonk claim: commitment [Q] - [Q_z], evaluation zero (at random challenge z) - auto shplonk_claim = Shplonk::reduce_verification(pcs_verification_key, gemini_claim, transcript); + auto shplonk_claim = Shplonk::reduce_verification(pcs_verification_key, univariate_opening_claims, transcript); info("Shplonk: num gates = ", builder->get_num_gates() - prev_num_gates, @@ -209,6 +259,7 @@ std::array UltraRecursiveVerifier_::ve template class UltraRecursiveVerifier_>; template class UltraRecursiveVerifier_>; -template class UltraRecursiveVerifier_; +template class UltraRecursiveVerifier_>; +template class UltraRecursiveVerifier_>; } // namespace proof_system::plonk::stdlib::recursion::honk diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp index 8c974f920e51..d58287ee044f 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp @@ -40,6 +40,7 @@ template class UltraRecursiveVerifier_ { extern template class UltraRecursiveVerifier_>; extern template class UltraRecursiveVerifier_>; -extern template class UltraRecursiveVerifier_; +extern template class UltraRecursiveVerifier_>; +extern template class UltraRecursiveVerifier_>; } // namespace proof_system::plonk::stdlib::recursion::honk diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp index fb873c606259..100e4be88d70 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/verifier.test.cpp @@ -195,7 +195,7 @@ HEAVY_TYPED_TEST(RecursiveVerifierTest, RecursiveVerificationKey) TestFixture::test_recursive_verification_key_creation(); } -HEAVY_TYPED_TEST(RecursiveVerifierTest, RecursiveProofComposition) +HEAVY_TYPED_TEST(RecursiveVerifierTest, SingleRecursiveVerification) { TestFixture::test_recursive_verification(); }; From ebac0cc9ef36b7175f79dcedd74c482868766941 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Fri, 15 Sep 2023 17:03:46 +0000 Subject: [PATCH 25/36] fix ECCVM build error --- barretenberg/cpp/src/barretenberg/honk/flavor/ecc_vm.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/ecc_vm.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/ecc_vm.hpp index c03b1e5dded7..7cceb23abbab 100644 --- a/barretenberg/cpp/src/barretenberg/honk/flavor/ecc_vm.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/flavor/ecc_vm.hpp @@ -816,7 +816,7 @@ template class ECCVMBa }; }; -class ECCVM : public ECCVMBase> {}; +class ECCVM : public ECCVMBase> {}; class ECCVMGrumpkin : public ECCVMBase> {}; // NOLINTEND(cppcoreguidelines-avoid-const-or-ref-data-members) From 9e42d7eb5d1ab801f78f48b7cd8672dc68cf7aaf Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Fri, 15 Sep 2023 17:10:24 +0000 Subject: [PATCH 26/36] format --- .../recursion/honk/verifier/ultra_recursive_verifier.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp index d58287ee044f..8140312a1ffe 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp @@ -41,6 +41,7 @@ template class UltraRecursiveVerifier_ { extern template class UltraRecursiveVerifier_>; extern template class UltraRecursiveVerifier_>; extern template class UltraRecursiveVerifier_>; -extern template class UltraRecursiveVerifier_>; +extern template class UltraRecursiveVerifier_< + proof_system::honk::flavor::GoblinUltraRecursive_>; } // namespace proof_system::plonk::stdlib::recursion::honk From b1f18a42173a611a16a6808bd4434915d11c3db0 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Fri, 15 Sep 2023 23:26:24 +0000 Subject: [PATCH 27/36] comments and cleanup --- .../composer/goblin_ultra_composer.test.cpp | 70 +++++++------------ .../honk/flavor/goblin_ultra_recursive.hpp | 12 +++- .../honk/flavor/ultra_recursive.hpp | 14 ++-- .../honk/proof_system/ultra_prover.cpp | 26 ++++--- .../honk/proof_system/ultra_verifier.cpp | 5 +- .../goblin_ultra_circuit_builder.hpp | 3 - .../circuit_builder/ultra_circuit_builder.cpp | 1 - .../circuit_builder/ultra_circuit_builder.hpp | 10 +-- .../verifier/ultra_recursive_verifier.cpp | 3 +- .../verifier/ultra_recursive_verifier.hpp | 2 + 10 files changed, 73 insertions(+), 73 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp index 2076c6473734..aecae44cd9f0 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp @@ -52,6 +52,26 @@ class GoblinUltraHonkComposerTests : public ::testing::Test { builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, FF(1), FF(1), FF(1), FF(-1), FF(0) }); } } + + /** + * @brief Construct a goblin ultra circuit then generate a verify its proof + * + * @param op_queue + * @return auto + */ + bool construct_test_circuit_then_generate_and_verify_proof(auto& op_queue) { + auto builder = GoblinUltraCircuitBuilder(op_queue); + + generate_test_circuit(builder); + + auto composer = GoblinUltraComposer(); + auto prover = composer.create_prover(builder); + auto verifier = composer.create_verifier(builder); + auto proof = prover.construct_proof(); + bool verified = verifier.verify_proof(proof); + + return verified; + } }; /** @@ -68,15 +88,9 @@ TEST_F(GoblinUltraHonkComposerTests, SingleCircuit) // Add mock data to op queue to simulate interaction with a previous circuit op_queue->populate_with_mock_initital_data(); - auto builder = GoblinUltraCircuitBuilder(op_queue); + // Construct a test circuit then generate and verify its proof + auto verified = construct_test_circuit_then_generate_and_verify_proof(op_queue); - generate_test_circuit(builder); - - auto composer = GoblinUltraComposer(); - auto prover = composer.create_prover(builder); - auto verifier = composer.create_verifier(builder); - auto proof = prover.construct_proof(); - bool verified = verifier.verify_proof(proof); EXPECT_EQ(verified, true); } @@ -93,45 +107,15 @@ TEST_F(GoblinUltraHonkComposerTests, MultipleCircuits) // Add mock data to op queue to simulate interaction with a previous circuit op_queue->populate_with_mock_initital_data(); - // Track the expected size of the op queue transcript - size_t expected_op_queue_size = 1; // +1 from mock data - - // Construct first circuit and its proof - { - auto builder = GoblinUltraCircuitBuilder(op_queue); - - generate_test_circuit(builder); - expected_op_queue_size += builder.num_ecc_op_gates; - - auto composer = GoblinUltraComposer(); - auto prover = composer.create_prover(builder); - auto verifier = composer.create_verifier(builder); - auto proof = prover.construct_proof(); - bool verified = verifier.verify_proof(proof); - EXPECT_EQ(verified, true); - } - - // Construct second circuit - { - auto builder = GoblinUltraCircuitBuilder(op_queue); - - generate_test_circuit(builder); - expected_op_queue_size += builder.num_ecc_op_gates; - - auto composer = GoblinUltraComposer(); - auto prover = composer.create_prover(builder); - auto verifier = composer.create_verifier(builder); - auto proof = prover.construct_proof(); - bool verified = verifier.verify_proof(proof); - EXPECT_EQ(verified, true); + // Construct multiple test circuits that share an ECC op queue. Generate and verify a proof for each. + size_t NUM_CIRCUITS = 3; + for (size_t i = 0; i < NUM_CIRCUITS; ++i) { + construct_test_circuit_then_generate_and_verify_proof(op_queue); } - // Check that the op queue contains the expected number of entries - size_t aggregate_op_queue_size = op_queue->current_ultra_ops_size; - EXPECT_EQ(expected_op_queue_size, aggregate_op_queue_size); - // Compute the commitments to the aggregate op queue directly and check that they match those that were computed // iteratively during transcript aggregation by the provers and stored in the op queue. + size_t aggregate_op_queue_size = op_queue->current_ultra_ops_size; auto crs_factory = std::make_shared>("../srs_db/ignition"); auto commitment_key = std::make_shared(aggregate_op_queue_size, crs_factory); size_t idx = 0; diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp index def3171288ea..fe842885626a 100644 --- a/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp @@ -18,6 +18,7 @@ #include "barretenberg/proof_system/relations/permutation_relation.hpp" #include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" +#include "barretenberg/honk/flavor/goblin_ultra.hpp" #include #include #include @@ -33,15 +34,20 @@ namespace proof_system::honk::flavor { /** * @brief The recursive counterpart to the "native" Goblin Ultra flavor. * @details This flavor can be used to instantiate a recursive Ultra Honk verifier for a proof created using the - * conventional Ultra flavor. It is similar in structure to its native counterpart with two main differences: 1) the + * GoblinUltra flavor. It is similar in structure to its native counterpart with two main differences: 1) the * curve types are stdlib types (e.g. field_t instead of field) and 2) it does not specify any Prover related types * (e.g. Polynomial, ExtendedEdges, etc.) since we do not emulate prover computation in circuits, i.e. it only makes * sense to instantiate a Verifier with this flavor. * + * @note Unlike conventional flavors, "recursive" flavors are templated by a builder (much like native vs stdlib types). + * This is because the flavor itself determines the details of the underlying verifier algorithm (i.e. the set of + * relations), while the Builder determines the arithmetization of that algorithm into a circuit. + * + * @tparam BuilderType Determines the arithmetization of the verifier circuit defined based on this flavor. */ template class GoblinUltraRecursive_ { public: - using CircuitBuilder = BuilderType; + using CircuitBuilder = BuilderType; // Determines arithmetization of circuit instantiated with this flavor using Curve = plonk::stdlib::bn254; using GroupElement = typename Curve::Element; using Commitment = typename Curve::Element; @@ -51,7 +57,7 @@ template class GoblinUltraRecursive_ { // Note(luke): Eventually this may not be needed at all using VerifierCommitmentKey = pcs::VerifierCommitmentKey; - static constexpr size_t NUM_WIRES = CircuitBuilder::NUM_WIRES; + static constexpr size_t NUM_WIRES = flavor::GoblinUltra::NUM_WIRES; // The number of multivariate polynomials on which a sumcheck prover sumcheck operates (including shifts). We often // need containers of this size to hold related data, so we choose a name more agnostic than `NUM_POLYNOMIALS`. // Note: this number does not include the individual sorted list polynomials. diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp index 4683005afb3e..b4bfdf38d3dd 100644 --- a/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp @@ -17,6 +17,8 @@ #include "barretenberg/proof_system/relations/permutation_relation.hpp" #include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" +#include "barretenberg/honk/flavor/ultra.hpp" + #include #include #include @@ -37,11 +39,15 @@ namespace proof_system::honk::flavor { * (e.g. Polynomial, ExtendedEdges, etc.) since we do not emulate prover computation in circuits, i.e. it only makes * sense to instantiate a Verifier with this flavor. * + * @note Unlike conventional flavors, "recursive" flavors are templated by a builder (much like native vs stdlib types). + * This is because the flavor itself determines the details of the underlying verifier algorithm (i.e. the set of + * relations), while the Builder determines the arithmetization of that algorithm into a circuit. + * + * @tparam BuilderType Determines the arithmetization of the verifier circuit defined based on this flavor. */ - template class UltraRecursive_ { public: - using CircuitBuilder = BuilderType; + using CircuitBuilder = BuilderType; // Determines arithmetization of circuit instantiated with this flavor using Curve = plonk::stdlib::bn254; using GroupElement = typename Curve::Element; using Commitment = typename Curve::Element; @@ -51,7 +57,7 @@ template class UltraRecursive_ { // Note(luke): Eventually this may not be needed at all using VerifierCommitmentKey = pcs::VerifierCommitmentKey; - static constexpr size_t NUM_WIRES = CircuitBuilder::NUM_WIRES; + static constexpr size_t NUM_WIRES = flavor::Ultra::NUM_WIRES; // The number of multivariate polynomials on which a sumcheck prover sumcheck operates (including shifts). We often // need containers of this size to hold related data, so we choose a name more agnostic than `NUM_POLYNOMIALS`. // Note: this number does not include the individual sorted list polynomials. @@ -115,8 +121,6 @@ template class UltraRecursive_ { DataType& lagrange_first = std::get<23>(this->_data); DataType& lagrange_last = std::get<24>(this->_data); - static constexpr CircuitType CIRCUIT_TYPE = CircuitBuilder::CIRCUIT_TYPE; - std::vector get_selectors() override { return { q_m, q_c, q_l, q_r, q_o, q_4, q_arith, q_sort, q_elliptic, q_aux, q_lookup }; diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index bc66bf380945..0229a32b0c91 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -242,6 +242,15 @@ template void UltraProver_::execute_pcs_evaluation_ } } +/** + * @brief Prove proper construction of the aggregate Goblin ECC op queue polynomials T_i^(j), j = 1,2,3,4. + * @details Let T_i^(j) be the jth column of the aggregate op queue after incorporating the contribution from the + * present circuit. T_{i-1}^(j) corresponds to the aggregate op queue at the previous stage and $t_i^(j)$ represents + * the contribution from the present circuit only. For each j, we have the relationship T_i = T_{i-1} + right_shift(t_i, + * M_{i-1}), where the shift magnitude M_{i-1} is the length of T_{i-1}. This stage of the protocol demonstrates that + * the aggregate op queue has been constructed correctly. + * + */ template void UltraProver_::execute_op_queue_transcript_aggregation_round() { if constexpr (IsGoblinFlavor) { @@ -269,8 +278,8 @@ template void UltraProver_::execute_op_queue_transc } // Compute/get commitments [t_i^{shift}], [T_{i-1}], and [T_i] and add to transcript - std::array shifted_op_wire_commitments; std::array prev_aggregate_op_queue_commitments; + std::array shifted_op_wire_commitments; std::array aggregate_op_queue_commitments; for (size_t idx = 0; idx < right_shifted_op_wires.size(); ++idx) { // Get previous transcript commitment [T_{i-1}] from op queue @@ -290,9 +299,9 @@ template void UltraProver_::execute_op_queue_transc // Store the commitments [T_{i}] (to be used later in subsequent iterations as [T_{i-1}]). key->op_queue->set_commitment_data(aggregate_op_queue_commitments); - // Compute evaluations T_i(γ), T_{i-1}(γ), t_i^{shift}(γ), add to transcript. For each polynomial we add a - // univariate opening claim {(γ, p(γ)), p(X)} to the set of claims to be combined in the batch univariate - // polynomial Q in Shplonk. (The other univariate claims come from the output of Gemini). + // Compute evaluations T_i(\kappa), T_{i-1}(\kappa), t_i^{shift}(\kappa), add to transcript. For each polynomial + // we add a univariate opening claim {(\kappa, p(\kappa)), p(X)} to the set of claims to be combined in the + // batch univariate polynomial Q in Shplonk. (The other univariate claims come from the output of Gemini). auto kappa = transcript.get_challenge("kappa"); auto prev_aggregate_ecc_op_transcript = key->op_queue->get_previous_aggregate_transcript(); auto aggregate_ecc_op_transcript = key->op_queue->get_aggregate_transcript(); @@ -304,21 +313,22 @@ template void UltraProver_::execute_op_queue_transc for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { std::string suffix = std::to_string(idx + 1); - // T_{i-1}(γ) + // Compute evaluation T_{i-1}(\kappa) prev_agg_op_queue_polynomials[idx] = Polynomial(prev_aggregate_ecc_op_transcript[idx]); prev_agg_op_queue_evals[idx] = prev_agg_op_queue_polynomials[idx].evaluate(kappa); transcript.send_to_verifier("prev_agg_op_queue_eval_" + suffix, prev_agg_op_queue_evals[idx]); - // t_i^{shift}(γ) + // Compute evaluation t_i^{shift}(\kappa) right_shifted_op_wire_evals[idx] = right_shifted_op_wires[idx].evaluate(kappa); transcript.send_to_verifier("op_wire_eval_" + suffix, right_shifted_op_wire_evals[idx]); - // T_i(γ) + // Compute evaluation T_i(\kappa) agg_op_queue_polynomials[idx] = Polynomial(aggregate_ecc_op_transcript[idx]); agg_op_queue_evals[idx] = agg_op_queue_polynomials[idx].evaluate(kappa); transcript.send_to_verifier("agg_op_queue_eval_" + suffix, agg_op_queue_evals[idx]); } + // Add univariate opening claims for each polynomial. for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { univariate_openings.opening_pairs.emplace_back(OpenPair{ kappa, prev_agg_op_queue_evals[idx] }); univariate_openings.witnesses.emplace_back(std::move(prev_agg_op_queue_polynomials[idx])); @@ -427,8 +437,6 @@ template plonk::proof& UltraProver_::construct_proo // Compute PCS opening proof (either KZG quotient commitment or IPA opening proof) execute_final_pcs_round(); - transcript.print(); - return export_proof(); } diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp index 8b00c4d19e51..147c1d236e9b 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_verifier.cpp @@ -193,12 +193,13 @@ template bool UltraVerifier_::verify_proof(const plonk agg_op_queue_evals[idx] = transcript.template receive_from_prover("agg_op_queue_eval_" + std::to_string(idx + 1)); - // Check the identity T_i(γ) = T_{i-1}(γ) + t_i^{shift}(γ). If it fails, return false + // Check the identity T_i(\kappa) = T_{i-1}(\kappa) + t_i^{shift}(\kappa). If it fails, return false if (agg_op_queue_evals[idx] != prev_agg_op_queue_evals[idx] + shifted_op_wire_evals[idx]) { return false; } } + // Add corresponding univariate opening claims {(\kappa, p(\kappa), [p(X)]} for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { univariate_opening_claims.emplace_back(pcs::OpeningClaim{ { kappa, prev_agg_op_queue_evals[idx] }, prev_agg_op_queue_commitments[idx] }); @@ -216,8 +217,6 @@ template bool UltraVerifier_::verify_proof(const plonk // Produce a Shplonk claim: commitment [Q] - [Q_z], evaluation zero (at random challenge z) auto shplonk_claim = Shplonk::reduce_verification(pcs_verification_key, univariate_opening_claims, transcript); - // transcript.print(); - // Verify the Shplonk claim with KZG or IPA return PCS::verify(pcs_verification_key, shplonk_claim, transcript); } diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp index 36b9837906e5..b5b154f5fe7a 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp @@ -109,8 +109,5 @@ template class GoblinUltraCircuitBuilder_ : public UltraCircuitBui } }; extern template class GoblinUltraCircuitBuilder_; -// TODO: template plookup to be able to be able to have UltraCircuitBuilder on Grumpkin -// extern template class UltraCircuitBuilder_; using GoblinUltraCircuitBuilder = GoblinUltraCircuitBuilder_; -// using UltraGrumpkinCircuitBuilder = UltraCircuitBuilder_; } // namespace proof_system diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp index fc1d1e6ac369..d88a3c010493 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.cpp @@ -46,7 +46,6 @@ template void UltraCircuitBuilder_::finalize_circuit() process_ROM_arrays(); process_RAM_arrays(); process_range_lists(); - circuit_finalised = true; } } diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp index 9296e4a39ad5..0d3a2cd70d61 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp @@ -37,11 +37,11 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBase UltraRecursiveVerifier_::ve ASSERT(agg_op_queue_evals[idx].get_value() == prev_agg_op_queue_evals[idx].get_value() + shifted_op_wire_evals[idx].get_value()); - // Check the identity T_i(γ) = T_{i-1}(γ) + t_i^{shift}(γ). + // Check the identity T_i(\kappa) = T_{i-1}(\kappa) + t_i^{shift}(\kappa). agg_op_queue_evals[idx].assert_equal(prev_agg_op_queue_evals[idx] + shifted_op_wire_evals[idx]); } + // Add corresponding univariate opening claims {(\kappa, p(\kappa), [p(X)]} for (size_t idx = 0; idx < Flavor::NUM_WIRES; ++idx) { univariate_opening_claims.emplace_back( UnivariateClaim{ { kappa, prev_agg_op_queue_evals[idx] }, prev_agg_op_queue_commitments[idx] }); diff --git a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp index 8140312a1ffe..9d7a378cbe1b 100644 --- a/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp +++ b/barretenberg/cpp/src/barretenberg/stdlib/recursion/honk/verifier/ultra_recursive_verifier.hpp @@ -38,6 +38,8 @@ template class UltraRecursiveVerifier_ { Transcript transcript; }; +// Instance declarations for Ultra and Goblin-Ultra verifier circuits with both conventional Ultra and Goblin-Ultra +// arithmetization. extern template class UltraRecursiveVerifier_>; extern template class UltraRecursiveVerifier_>; extern template class UltraRecursiveVerifier_>; From 18857dd4974488a9da798d480cd17b3ad7344c5e Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Sun, 17 Sep 2023 21:47:15 +0000 Subject: [PATCH 28/36] format --- .../cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp index fe842885626a..12f96ff105cf 100644 --- a/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra_recursive.hpp @@ -5,6 +5,7 @@ #include "barretenberg/polynomials/barycentric.hpp" #include "barretenberg/polynomials/univariate.hpp" +#include "barretenberg/honk/flavor/goblin_ultra.hpp" #include "barretenberg/honk/transcript/transcript.hpp" #include "barretenberg/polynomials/evaluation_domain.hpp" #include "barretenberg/polynomials/polynomial.hpp" @@ -18,7 +19,6 @@ #include "barretenberg/proof_system/relations/permutation_relation.hpp" #include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" -#include "barretenberg/honk/flavor/goblin_ultra.hpp" #include #include #include From 98042d08ee515329afb6d52577525ee13b4d6fb9 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Sun, 17 Sep 2023 21:53:30 +0000 Subject: [PATCH 29/36] fpormatt --- .../cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp index b4bfdf38d3dd..5168265cc089 100644 --- a/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp @@ -5,6 +5,7 @@ #include "barretenberg/polynomials/barycentric.hpp" #include "barretenberg/polynomials/univariate.hpp" +#include "barretenberg/honk/flavor/ultra.hpp" #include "barretenberg/honk/transcript/transcript.hpp" #include "barretenberg/polynomials/evaluation_domain.hpp" #include "barretenberg/polynomials/polynomial.hpp" @@ -17,7 +18,6 @@ #include "barretenberg/proof_system/relations/permutation_relation.hpp" #include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp" #include "barretenberg/srs/factories/crs_factory.hpp" -#include "barretenberg/honk/flavor/ultra.hpp" #include #include From 9ad0e48dcf91405baf63819858ae721130752a0b Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Sun, 17 Sep 2023 21:56:28 +0000 Subject: [PATCH 30/36] formewnt --- .../honk/composer/goblin_ultra_composer.test.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp index 5e4bca95333b..5d33532eb1bd 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/composer/goblin_ultra_composer.test.cpp @@ -5,8 +5,8 @@ #include "barretenberg/common/log.hpp" #include "barretenberg/honk/composer/ultra_composer.hpp" #include "barretenberg/honk/proof_system/ultra_prover.hpp" -#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" #include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp" +#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" using namespace proof_system::honk; @@ -57,11 +57,12 @@ class GoblinUltraHonkComposerTests : public ::testing::Test { /** * @brief Construct a goblin ultra circuit then generate a verify its proof - * - * @param op_queue - * @return auto + * + * @param op_queue + * @return auto */ - bool construct_test_circuit_then_generate_and_verify_proof(auto& op_queue) { + bool construct_test_circuit_then_generate_and_verify_proof(auto& op_queue) + { auto builder = proof_system::GoblinUltraCircuitBuilder(op_queue); generate_test_circuit(builder); From dd780a06ec64abd1db5b0e6be56ef603224e2c2a Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Mon, 18 Sep 2023 14:48:20 +0000 Subject: [PATCH 31/36] add todo for sumcheck --- barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp | 1 + .../cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp index e3702752e406..7723864f4b03 100644 --- a/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp @@ -206,6 +206,7 @@ template class SumcheckVerifier { round.compute_next_target_sum(round_univariate, round_challenge); pow_univariate.partially_evaluate(round_challenge); + // TODO(#726): Properly handle this in the recursive setting. if (!verified) { return std::nullopt; } diff --git a/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp index 492b4805386b..ae2dfc36ac79 100644 --- a/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp +++ b/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp @@ -419,13 +419,14 @@ template class SumcheckVerifierRound { { // S^{l}(0) = ( (1−0) + 0⋅ζ^{ 2^l } ) ⋅ T^{l}(0) = T^{l}(0) // S^{l}(1) = ( (1−1) + 1⋅ζ^{ 2^l } ) ⋅ T^{l}(1) = ζ^{ 2^l } ⋅ T^{l}(1) - // WORKTODO: Need to actually assert this equality! FF total_sum = univariate.value_at(0) + univariate.value_at(1); // target_total_sum = sigma_{l} = // TODO(#673): Conditionals like this can go away once native verification is is just recursive verification // with a simulated builder. bool sumcheck_round_failed(false); if constexpr (IsRecursiveFlavor) { + // TODO(#726): Need to constrain this equality and update the native optional return value mechanism for the + // recursive setting. sumcheck_round_failed = (target_total_sum != total_sum).get_value(); } else { sumcheck_round_failed = (target_total_sum != total_sum); From e35d19a3192a4a9500302bfa560edf2e042c6127 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Mon, 18 Sep 2023 17:05:30 +0000 Subject: [PATCH 32/36] cleanup --- .../src/barretenberg/honk/instance/prover_instance.test.cpp | 1 - .../proof_system/circuit_builder/ultra_circuit_builder.hpp | 6 ------ 2 files changed, 7 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/honk/instance/prover_instance.test.cpp b/barretenberg/cpp/src/barretenberg/honk/instance/prover_instance.test.cpp index 309fd483a5b4..593a166b885f 100644 --- a/barretenberg/cpp/src/barretenberg/honk/instance/prover_instance.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/instance/prover_instance.test.cpp @@ -88,7 +88,6 @@ template class InstanceTests : public testing::Test { }; }; -// using FlavorTypes = testing::Types; using FlavorTypes = testing::Types; TYPED_TEST_SUITE(InstanceTests, FlavorTypes); diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp index 0d3a2cd70d61..454621c17b02 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp @@ -37,12 +37,6 @@ template class UltraCircuitBuilder_ : public CircuitBuilderBase Date: Tue, 19 Sep 2023 18:17:44 +0000 Subject: [PATCH 33/36] initial version of simple full goblin test --- .../goblin/full_goblin_composer.test.cpp | 152 ++++++++++++++++++ .../eccvm/eccvm_circuit_builder.hpp | 6 + .../proof_system/op_queue/ecc_op_queue.hpp | 79 +++------ 3 files changed, 184 insertions(+), 53 deletions(-) create mode 100644 barretenberg/cpp/src/barretenberg/honk/composer/goblin/full_goblin_composer.test.cpp diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/goblin/full_goblin_composer.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/goblin/full_goblin_composer.test.cpp new file mode 100644 index 000000000000..18fe9f549488 --- /dev/null +++ b/barretenberg/cpp/src/barretenberg/honk/composer/goblin/full_goblin_composer.test.cpp @@ -0,0 +1,152 @@ +#include +#include +#include + +#include "barretenberg/common/log.hpp" +#include "barretenberg/honk/composer/eccvm_composer.hpp" +#include "barretenberg/honk/composer/ultra_composer.hpp" +#include "barretenberg/honk/proof_system/ultra_prover.hpp" +#include "barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp" +#include "barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp" +#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp" + +namespace test_full_goblin_composer { + +namespace { +auto& engine = numeric::random::get_debug_engine(); +} + +class FullGoblinComposerTests : public ::testing::Test { + protected: + static void SetUpTestSuite() + { + barretenberg::srs::init_crs_factory("../srs_db/ignition"); + barretenberg::srs::init_grumpkin_crs_factory("../srs_db/grumpkin"); + } + + using Curve = curve::BN254; + using FF = Curve::ScalarField; + using Point = Curve::AffineElement; + using CommitmentKey = proof_system::honk::pcs::CommitmentKey; + using GoblinUltraBuilder = proof_system::GoblinUltraCircuitBuilder; + using GoblinUltraComposer = proof_system::honk::GoblinUltraComposer; + using ECCVMFlavor = proof_system::honk::flavor::ECCVMGrumpkin; + using ECCVMBuilder = proof_system::ECCVMCircuitBuilder; + using ECCVMComposer = proof_system::honk::ECCVMComposer_; + using VMOp = proof_system_eccvm::VMOperation; + + /** + * @brief Generate a simple test circuit with some ECC op gates and conventional arithmetic gates + * + * @param builder + */ + void generate_test_circuit(auto& builder) + { + // Add some arbitrary ecc op gates + for (size_t i = 0; i < 3; ++i) { + auto point = Point::one() * FF::random_element(); + auto scalar = FF::random_element(); + builder.queue_ecc_add_accum(point); + builder.queue_ecc_mul_accum(point, scalar); + } + builder.queue_ecc_eq(); + + // Add some conventional gates that utilize public inputs + for (size_t i = 0; i < 10; ++i) { + FF a = FF::random_element(); + FF b = FF::random_element(); + FF c = FF::random_element(); + FF d = a + b + c; + uint32_t a_idx = builder.add_public_variable(a); + uint32_t b_idx = builder.add_variable(b); + uint32_t c_idx = builder.add_variable(c); + uint32_t d_idx = builder.add_variable(d); + + builder.create_big_add_gate({ a_idx, b_idx, c_idx, d_idx, FF(1), FF(1), FF(1), FF(-1), FF(0) }); + } + } + + /** + * @brief Mock the interactions of a simple curcuit with the op_queue + * @details The transcript aggregation protocol in the Goblin proof system can not yet support an empty "previous + * transcript" (see issue #723). This function mocks the interactions with the op queue of a fictional "first" + * circuit. This way, when we go to generate a proof over our first "real" circuit, the transcript aggregation + * protocol can proceed nominally. The mock data is valid in the sense that it can be processed by all stages of + * Goblin as if it came from a genuine circuit. + * + * @param op_queue + */ + static void perform_op_queue_interactions_for_mock_first_circuit( + std::shared_ptr& op_queue) + { + auto builder = GoblinUltraBuilder(op_queue); + + // Add a mul accum op and an equality op + auto point = Point::one() * FF::random_element(); + auto scalar = FF::random_element(); + builder.queue_ecc_mul_accum(point, scalar); + builder.queue_ecc_eq(); + + op_queue->set_size_data(); + + // Manually compute the op queue transcript commitments (which would normally be done by the prover) + auto crs_factory_ = barretenberg::srs::get_crs_factory(); + auto commitment_key = CommitmentKey(op_queue->get_current_size(), crs_factory_); + std::array op_queue_commitments; + size_t idx = 0; + for (auto& entry : op_queue->get_aggregate_transcript()) { + op_queue_commitments[idx++] = commitment_key.commit(entry); + } + // Store the commitment data for use by the prover of the next circuit + op_queue->set_commitment_data(op_queue_commitments); + } +}; + +/** + * @brief Test proof construction/verification for a circuit with ECC op gates, public inputs, and basic arithmetic + * gates + * @note We simulate op queue interactions with a previous circuit so the actual circuit under test utilizes an op queue + * with non-empty 'previous' data. This avoid complications with zero-commitments etc. + * + */ +TEST_F(FullGoblinComposerTests, SimpleCircuit) +{ + auto op_queue = std::make_shared(); + + // Add mock data to op queue to simulate interaction with a "first" circuit + perform_op_queue_interactions_for_mock_first_circuit(op_queue); + + // Construct a series of simple Goblin circuits; generate and verify their proofs + size_t NUM_CIRCUITS = 3; + for (size_t circuit_idx = 0; circuit_idx < NUM_CIRCUITS; ++circuit_idx) { + auto builder = GoblinUltraBuilder(op_queue); + + generate_test_circuit(builder); + + auto composer = GoblinUltraComposer(); + auto instance = composer.create_instance(builder); + auto prover = composer.create_prover(instance); + auto verifier = composer.create_verifier(instance); + auto proof = prover.construct_proof(); + bool verified = verifier.verify_proof(proof); + EXPECT_EQ(verified, true); + } + + // Construct an ECCVM circuit then generate and verify its proof + { + // Instantiate an ECCVM builder with the vm ops stored in the op queue + auto builder = ECCVMBuilder(op_queue->raw_ops); + + // // Can fiddle with one of the operands to trigger a failure + // builder.vm_operations[0].z1 *= 2; + + auto composer = ECCVMComposer(); + auto prover = composer.create_prover(builder); + auto proof = prover.construct_proof(); + auto verifier = composer.create_verifier(builder); + bool verified = verifier.verify_proof(proof); + ASSERT_TRUE(verified); + } +} + +} // namespace test_full_goblin_composer diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp index feeee82f4f6a..119b84100403 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/eccvm/eccvm_circuit_builder.hpp @@ -38,6 +38,12 @@ template class ECCVMCircuitBuilder { using ScalarMul = proof_system_eccvm::ScalarMul; using RawPolynomials = typename Flavor::RawPolynomials; using Polynomial = barretenberg::Polynomial; + + ECCVMCircuitBuilder() = default; + + ECCVMCircuitBuilder(std::vector vm_operations) + : vm_operations(vm_operations){}; + [[nodiscard]] uint32_t get_number_of_muls() const { uint32_t num_muls = 0; diff --git a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp index c6abe196ff37..5d04df50320c 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp @@ -1,25 +1,12 @@ #pragma once #include "barretenberg/ecc/curves/bn254/bn254.hpp" +#include "barretenberg/proof_system/circuit_builder/eccvm/eccvm_builder_types.hpp" namespace proof_system { enum EccOpCode { NULL_OP, ADD_ACCUM, MUL_ACCUM, EQUALITY }; -/** - * @brief Raw description of an ECC operation used to produce equivalent descriptions over different curves. - */ -struct ECCOp { - const bool add = false; - const bool mul = false; - const bool eq = false; - const bool reset = false; - const barretenberg::g1::affine_element base_point = barretenberg::g1::affine_element{ 0, 0 }; - const uint256_t scalar_1 = 0; - const uint256_t scalar_2 = 0; - const barretenberg::fr mul_scalar_full = 0; -}; - /** * @brief Used to construct execution trace representations of elliptic curve operations. * @@ -29,18 +16,19 @@ struct ECCOp { * ultra (resp. eccvm) ops members of this class (rather than in the builder's variables array). */ class ECCOpQueue { - using Point = curve::BN254::AffineElement; - Point point_at_infinity = curve::BN254::Group::affine_point_at_infinity; - using Fr = curve::BN254::ScalarField; - using Fq = curve::BN254::BaseField; // Grumpkin's scalar field + using Curve = curve::BN254; + using Point = Curve::AffineElement; + using Fr = Curve::ScalarField; + using Fq = Curve::BaseField; // Grumpkin's scalar field + using ECCVMOperation = proof_system_eccvm::VMOperation; + Point point_at_infinity = Point::infinity(); // The operations written to the queue are also performed natively; the result is stored in accumulator Point accumulator = point_at_infinity; public: - std::vector raw_ops; + std::vector raw_ops; std::array, 4> ultra_ops; // ops encoded in the width-4 Ultra format - std::vector> eccvm_ops; size_t current_ultra_ops_size = 0; // M_i size_t previous_ultra_ops_size = 0; // M_{i-1} @@ -48,22 +36,6 @@ class ECCOpQueue { std::array ultra_ops_commitments; std::array previous_ultra_ops_commitments; - uint32_t get_number_of_muls() - { - uint32_t num_muls = 0; - for (auto& op : raw_ops) { - if (op.mul) { - if (op.scalar_1 != 0) { - num_muls++; - } - if (op.scalar_2 != 0) { - num_muls++; - } - } - } - return num_muls; - } - Point get_accumulator() { return accumulator; } /** @@ -79,6 +51,7 @@ class ECCOpQueue { } [[nodiscard]] size_t get_previous_size() const { return previous_ultra_ops_size; } + [[nodiscard]] size_t get_current_size() const { return current_ultra_ops_size; } void set_commitment_data(std::array& commitments) { @@ -153,14 +126,14 @@ class ECCOpQueue { accumulator = accumulator + to_add; // Store the operation - raw_ops.emplace_back(ECCOp{ + raw_ops.emplace_back(ECCVMOperation{ .add = true, .mul = false, .eq = false, .reset = false, .base_point = to_add, - .scalar_1 = 0, - .scalar_2 = 0, + .z1 = 0, + .z2 = 0, .mul_scalar_full = 0, }); } @@ -176,20 +149,20 @@ class ECCOpQueue { accumulator = accumulator + to_mul * scalar; // Store the operation - Fr scalar_1 = 0; - Fr scalar_2 = 0; + Fr z1 = 0; + Fr z2 = 0; auto converted = scalar.from_montgomery_form(); - Fr::split_into_endomorphism_scalars(converted, scalar_1, scalar_2); - scalar_1 = scalar_1.to_montgomery_form(); - scalar_2 = scalar_2.to_montgomery_form(); - raw_ops.emplace_back(ECCOp{ + Fr::split_into_endomorphism_scalars(converted, z1, z2); + z1 = z1.to_montgomery_form(); + z2 = z2.to_montgomery_form(); + raw_ops.emplace_back(ECCVMOperation{ .add = false, .mul = true, .eq = false, .reset = false, .base_point = to_mul, - .scalar_1 = scalar_1, - .scalar_2 = scalar_2, + .z1 = z1, + .z2 = z2, .mul_scalar_full = scalar, }); } @@ -204,14 +177,14 @@ class ECCOpQueue { auto expected = accumulator; accumulator.self_set_infinity(); // TODO(luke): is this always desired? - raw_ops.emplace_back(ECCOp{ + raw_ops.emplace_back(ECCVMOperation{ .add = false, .mul = false, .eq = true, .reset = true, .base_point = expected, - .scalar_1 = 0, - .scalar_2 = 0, + .z1 = 0, + .z2 = 0, .mul_scalar_full = 0, }); @@ -224,14 +197,14 @@ class ECCOpQueue { */ void empty_row() { - raw_ops.emplace_back(ECCOp{ + raw_ops.emplace_back(ECCVMOperation{ .add = false, .mul = false, .eq = false, .reset = false, .base_point = point_at_infinity, - .scalar_1 = 0, - .scalar_2 = 0, + .z1 = 0, + .z2 = 0, .mul_scalar_full = 0, }); } From 1e2d734f2056c506b8993279e9769474458061c6 Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Tue, 19 Sep 2023 18:25:49 +0000 Subject: [PATCH 34/36] fix --- .../cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp index 5d04df50320c..ce3e93951c56 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp @@ -21,7 +21,7 @@ class ECCOpQueue { using Fr = Curve::ScalarField; using Fq = Curve::BaseField; // Grumpkin's scalar field using ECCVMOperation = proof_system_eccvm::VMOperation; - Point point_at_infinity = Point::infinity(); + Point point_at_infinity = Curve::Group::affine_point_at_infinity; // The operations written to the queue are also performed natively; the result is stored in accumulator Point accumulator = point_at_infinity; From 9cfbaf9b88a9779120149280e48b825df6a2549d Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Thu, 21 Sep 2023 19:04:04 +0000 Subject: [PATCH 35/36] Updates based on Keshas comments --- .../goblin/full_goblin_composer.test.cpp | 49 ++++++++++++++++++- .../barretenberg/polynomials/polynomial.cpp | 5 +- .../barretenberg/polynomials/polynomial.hpp | 6 ++- .../polynomial_arithmetic.test.cpp | 6 +-- .../goblin_ultra_circuit_builder.cpp | 16 +++--- .../goblin_ultra_circuit_builder.hpp | 1 + .../goblin_ultra_circuit_builder.test.cpp | 2 - .../proof_system/composer/permutation_lib.hpp | 2 +- .../proof_system/op_queue/ecc_op_queue.hpp | 4 +- 9 files changed, 70 insertions(+), 21 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/honk/composer/goblin/full_goblin_composer.test.cpp b/barretenberg/cpp/src/barretenberg/honk/composer/goblin/full_goblin_composer.test.cpp index 18fe9f549488..e5d1995fb892 100644 --- a/barretenberg/cpp/src/barretenberg/honk/composer/goblin/full_goblin_composer.test.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/composer/goblin/full_goblin_composer.test.cpp @@ -34,6 +34,7 @@ class FullGoblinComposerTests : public ::testing::Test { using ECCVMBuilder = proof_system::ECCVMCircuitBuilder; using ECCVMComposer = proof_system::honk::ECCVMComposer_; using VMOp = proof_system_eccvm::VMOperation; + static constexpr size_t NUM_OP_QUEUE_COLUMNS = proof_system::honk::flavor::GoblinUltra::NUM_WIRES; /** * @brief Generate a simple test circuit with some ECC op gates and conventional arithmetic gates @@ -44,7 +45,7 @@ class FullGoblinComposerTests : public ::testing::Test { { // Add some arbitrary ecc op gates for (size_t i = 0; i < 3; ++i) { - auto point = Point::one() * FF::random_element(); + auto point = Point::random_element(); auto scalar = FF::random_element(); builder.queue_ecc_add_accum(point); builder.queue_ecc_mul_accum(point, scalar); @@ -92,7 +93,7 @@ class FullGoblinComposerTests : public ::testing::Test { // Manually compute the op queue transcript commitments (which would normally be done by the prover) auto crs_factory_ = barretenberg::srs::get_crs_factory(); auto commitment_key = CommitmentKey(op_queue->get_current_size(), crs_factory_); - std::array op_queue_commitments; + std::array op_queue_commitments; size_t idx = 0; for (auto& entry : op_queue->get_aggregate_transcript()) { op_queue_commitments[idx++] = commitment_key.commit(entry); @@ -149,4 +150,48 @@ TEST_F(FullGoblinComposerTests, SimpleCircuit) } } +/** + * @brief Check that ECCVM verification fails if ECC op queue operands are tampered with + * + */ +TEST_F(FullGoblinComposerTests, SimpleCircuitFailureCase) +{ + auto op_queue = std::make_shared(); + + // Add mock data to op queue to simulate interaction with a "first" circuit + perform_op_queue_interactions_for_mock_first_circuit(op_queue); + + // Construct a series of simple Goblin circuits; generate and verify their proofs + size_t NUM_CIRCUITS = 3; + for (size_t circuit_idx = 0; circuit_idx < NUM_CIRCUITS; ++circuit_idx) { + auto builder = GoblinUltraBuilder(op_queue); + + generate_test_circuit(builder); + + auto composer = GoblinUltraComposer(); + auto instance = composer.create_instance(builder); + auto prover = composer.create_prover(instance); + auto verifier = composer.create_verifier(instance); + auto proof = prover.construct_proof(); + bool verified = verifier.verify_proof(proof); + EXPECT_EQ(verified, true); + } + + // Construct an ECCVM circuit then generate and verify its proof + { + // Instantiate an ECCVM builder with the vm ops stored in the op queue + auto builder = ECCVMBuilder(op_queue->raw_ops); + + // Fiddle with one of the operands to trigger a failure + builder.vm_operations[0].z1 += 1; + + auto composer = ECCVMComposer(); + auto prover = composer.create_prover(builder); + auto proof = prover.construct_proof(); + auto verifier = composer.create_verifier(builder); + bool verified = verifier.verify_proof(proof); + EXPECT_EQ(verified, false); + } +} + } // namespace test_full_goblin_composer diff --git a/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp index 4c4b6ba21b7b..c644b778d310 100644 --- a/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp +++ b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.cpp @@ -268,6 +268,9 @@ Fr Polynomial::evaluate_from_fft(const EvaluationDomain& large_domain, return polynomial_arithmetic::evaluate_from_fft(coefficients_.get(), large_domain, z, small_domain); } +// TODO(#723): This method is used for the transcript aggregation protocol. For convenience we currently enforce that +// the shift is the same size as the input but this does not need to be the case. Revisit the logic/assertions in this +// method when that issue is addressed. template void Polynomial::set_to_right_shifted(std::span coeffs_in, size_t shift_size) { // Ensure we're not trying to shift self @@ -275,9 +278,9 @@ template void Polynomial::set_to_right_shifted(std::span c auto size_in = coeffs_in.size(); ASSERT(size_in > 0); - ASSERT(shift_size < size_in); // Ensure that the last shift_size-many input coefficients are zero to ensure no information is lost in the shift. + ASSERT(shift_size <= size_in); for (size_t i = 0; i < shift_size; ++i) { size_t idx = size_in - shift_size - 1; ASSERT(coeffs_in[idx].is_zero()); diff --git a/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp index c0a81ad45728..f26ac1e69f9f 100644 --- a/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp +++ b/barretenberg/cpp/src/barretenberg/polynomials/polynomial.hpp @@ -151,8 +151,10 @@ template class Polynomial { /** * @brief Set self to the right shift of input coefficients - * @details Set the size of self to match the input then set coefficients equal to right shift of input, assuming - * last shift-size many inputs are zero. + * @details Set the size of self to match the input then set coefficients equal to right shift of input. Note: The + * shifted result is constructed with its first shift-many coefficients equal to zero, so we assert that the last + * shift-size many input coefficients are equal to zero to ensure that the relationship f(X) = f_{shift}(X)/X^m + * holds. This is analagous to asserting the first coefficient is 0 in our left-shift-by-one method. * * @param coeffs_in * @param shift_size diff --git a/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp b/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp index 3d4c060748eb..e462c1d2ca16 100644 --- a/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp +++ b/barretenberg/cpp/src/barretenberg/polynomials/polynomial_arithmetic.test.cpp @@ -1263,8 +1263,8 @@ TYPED_TEST(PolynomialTests, RightShift) right_shifted_poly.set_to_right_shifted(poly, shift_magnitude); auto shifted_evaluation = right_shifted_poly.evaluate(evaluation_point); - // reconstruct the unshifted evaluation using that p^{shift}(X)/X^m = p(X), where m is the shift magnitude - auto unshifted_eval_reconstructed = shifted_evaluation / evaluation_point.pow(shift_magnitude); + // reconstruct the unshifted evaluation using that p^{shift}(X) = p(X)*X^m, where m is the shift magnitude + auto shifted_eval_reconstructed = unshifted_evaluation * evaluation_point.pow(shift_magnitude); - EXPECT_EQ(unshifted_evaluation, unshifted_eval_reconstructed); + EXPECT_EQ(shifted_evaluation, shifted_eval_reconstructed); } diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp index f9db7e77d980..58da2674ec54 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.cpp @@ -23,16 +23,15 @@ template void GoblinUltraCircuitBuilder_::finalize_circuit() // TODO(#423): This function adds valid (but arbitrary) gates to ensure that the circuit which includes // them will not result in any zero-polynomials. It also ensures that the first coefficient of the wire // polynomials is zero, which is required for them to be shiftable. -// TODO(luke): Add ECC op gate to ensure op wires are non-zero? template void GoblinUltraCircuitBuilder_::add_gates_to_ensure_all_polys_are_non_zero() { UltraCircuitBuilder_::add_gates_to_ensure_all_polys_are_non_zero(); } /** - * @brief Add gates for simple point addition without scalar and compute corresponding op natively + * @brief Add gates for simple point addition (no mul) and add the raw operation data to the op queue * - * @param point + * @param point Point to be added into the accumulator */ template ecc_op_tuple GoblinUltraCircuitBuilder_::queue_ecc_add_accum(const barretenberg::g1::affine_element& point) @@ -48,11 +47,11 @@ ecc_op_tuple GoblinUltraCircuitBuilder_::queue_ecc_add_accum(const barretenb } /** - * @brief Add gates for point mul and add and compute corresponding op natively + * @brief Add gates for point mul-then-accumulate and add the raw operation data to the op queue * * @tparam FF * @param point - * @param scalar + * @param scalar The scalar by which point is multiplied prior to being accumulated * @return ecc_op_tuple encoding the point and scalar inputs to the mul accum */ template @@ -70,7 +69,8 @@ ecc_op_tuple GoblinUltraCircuitBuilder_::queue_ecc_mul_accum(const barretenb } /** - * @brief Add point equality gates + * @brief Add point equality gates based on the current value of the accumulator internal to the op queue and add the + * raw operation data to the op queue * * @return ecc_op_tuple encoding the point to which equality has been asserted */ @@ -122,7 +122,7 @@ ecc_op_tuple GoblinUltraCircuitBuilder_::decompose_ecc_operands(uint32_t op_ op_queue->ultra_ops[2].emplace_back(x_hi); op_queue->ultra_ops[3].emplace_back(y_lo); - op_queue->ultra_ops[0].emplace_back(this->variables[op_idx]); + op_queue->ultra_ops[0].emplace_back(this->zero_idx); op_queue->ultra_ops[1].emplace_back(y_hi); op_queue->ultra_ops[2].emplace_back(z_1); op_queue->ultra_ops[3].emplace_back(z_2); @@ -153,7 +153,7 @@ template void GoblinUltraCircuitBuilder_::populate_ecc_op_wire ecc_op_wire_3.emplace_back(in.x_hi); ecc_op_wire_4.emplace_back(in.y_lo); - ecc_op_wire_1.emplace_back(in.op); // TODO(luke): second op val is sort of a dummy. use "op" again? + ecc_op_wire_1.emplace_back(this->zero_idx); ecc_op_wire_2.emplace_back(in.y_hi); ecc_op_wire_3.emplace_back(in.z_1); ecc_op_wire_4.emplace_back(in.z_2); diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp index b5b154f5fe7a..7982af217e54 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.hpp @@ -44,6 +44,7 @@ template class GoblinUltraCircuitBuilder_ : public UltraCircuitBui WireVector& ecc_op_wire_3 = std::get<2>(ecc_op_wires); WireVector& ecc_op_wire_4 = std::get<3>(ecc_op_wires); + // Functions for adding ECC op queue "gates" ecc_op_tuple queue_ecc_add_accum(const g1::affine_element& point); ecc_op_tuple queue_ecc_mul_accum(const g1::affine_element& point, const FF& scalar); ecc_op_tuple queue_ecc_eq(); diff --git a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp index 7715760c1a58..5d95b57e39a0 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/circuit_builder/goblin_ultra_circuit_builder.test.cpp @@ -102,8 +102,6 @@ TEST(UltraCircuitBuilder, GoblinEccOpQueueUltraOps) for (size_t j = 0; j < builder.num_ecc_op_gates; ++j) { auto op_wire_val = builder.variables[builder.ecc_op_wires[i][j]]; auto ultra_op_val = ultra_ops[i][j]; - info("op_wire_val = ", op_wire_val); - info("ultra_op_val = ", ultra_op_val); ASSERT_EQ(op_wire_val, ultra_op_val); } } diff --git a/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp index d9cfd3835e90..bf2e4e5676ca 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/composer/permutation_lib.hpp @@ -112,7 +112,7 @@ std::vector compute_wire_copy_cycles(const typename Flavor::C const auto& op_wires = circuit_constructor.ecc_op_wires; // Iterate over all variables of the ecc op gates, and add a corresponding node to the cycle for that variable for (size_t i = 0; i < num_ecc_op_gates; ++i) { - for (size_t op_wire_idx = 0; op_wire_idx < 4; ++op_wire_idx) { + for (size_t op_wire_idx = 0; op_wire_idx < Flavor::NUM_WIRES; ++op_wire_idx) { const uint32_t var_index = circuit_constructor.real_variable_index[op_wires[op_wire_idx][i]]; const auto wire_index = static_cast(op_wire_idx); const auto gate_idx = static_cast(i + op_gates_offset); diff --git a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp index ce3e93951c56..2bd01127b5eb 100644 --- a/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp +++ b/barretenberg/cpp/src/barretenberg/proof_system/op_queue/ecc_op_queue.hpp @@ -92,10 +92,10 @@ class ECCOpQueue { /** * @brief TESTING PURPOSES ONLY: Populate ECC op queue with mock data as stand in for "previous circuit" in tests - * @details (Issue #723) We currently cannot support Goblin proofs (specifically, transcript aggregation) if there + * @details TODO(#723): We currently cannot support Goblin proofs (specifically, transcript aggregation) if there * is not existing data in the ECC op queue (since this leads to zero-commitment issues). This method populates the * op queue with mock data so that the prover of an arbitrary 'first' circuit can behave as if it were not the - * prover over the first circuit in the stack. + * prover over the first circuit in the stack. This method should be removed entirely once this is resolved. * * @param op_queue */ From 2b476a1f2ce1f7b79872384c0f677d17827f9eeb Mon Sep 17 00:00:00 2001 From: ledwards2225 Date: Thu, 21 Sep 2023 22:25:28 +0000 Subject: [PATCH 36/36] add todo with issue for avoiding new challenge --- .../cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp index 084033a1745a..393e896059ca 100644 --- a/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp +++ b/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.cpp @@ -226,6 +226,7 @@ template void UltraProver_::execute_op_queue_transc // Compute evaluations T_i(\kappa), T_{i-1}(\kappa), t_i^{shift}(\kappa), add to transcript. For each polynomial // we add a univariate opening claim {(\kappa, p(\kappa)), p(X)} to the set of claims to be combined in the // batch univariate polynomial Q in Shplonk. (The other univariate claims come from the output of Gemini). + // TODO(#729): It should be possible to reuse the opening challenge from Gemini rather than generate a new one. auto kappa = transcript.get_challenge("kappa"); auto prev_aggregate_ecc_op_transcript = instance->proving_key->op_queue->get_previous_aggregate_transcript(); auto aggregate_ecc_op_transcript = instance->proving_key->op_queue->get_aggregate_transcript();