Skip to content

Commit 4af2626

Browse files
committed
fix(bb): unbreak fuzzing/asan/smt/format builds blocking merge-train
These four barretenberg C++ breaks arrived via next (git log origin/next..HEAD shows 0 train commits touching them) and abort the full CI build before the e2e suite runs, blocking merge-train #23253: - common/fuzzer.hpp: add <cstring> for std::memcpy (bb-cpp-fuzzing) - commitment_schemes_recursion/shplemini.test.cpp: include flavor/ultra_flavor.hpp for complete bb::UltraFlavor (bb-cpp-asan) - smt_verification/util/smt_util.cpp: include stdlib_circuit_builders/ultra_circuit_builder.hpp for the full UltraCircuitBuilder_ template (bb-cpp-smt) - api/api_chonk.cpp: clang-format-20 (bb-cpp-format-check) Folded into the spartan train to unblock it per operator direction.
1 parent 7b32aa7 commit 4af2626

4 files changed

Lines changed: 7 additions & 4 deletions

File tree

barretenberg/cpp/src/barretenberg/api/api_chonk.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@ namespace { // anonymous namespace
3333
*/
3434
void write_chonk_vk(std::vector<uint8_t> bytecode, const std::filesystem::path& output_path, const API::Flags& flags)
3535
{
36-
auto response =
37-
bbapi::ChonkComputeVk{ .circuit = { .name = "", .bytecode = std::move(bytecode) },
38-
.use_zk_flavor = flags.use_zk_flavor }
39-
.execute();
36+
auto response = bbapi::ChonkComputeVk{ .circuit = { .name = "", .bytecode = std::move(bytecode) },
37+
.use_zk_flavor = flags.use_zk_flavor }
38+
.execute();
4039

4140
const bool is_stdout = output_path == "-";
4241
if (is_stdout) {

barretenberg/cpp/src/barretenberg/commitment_schemes_recursion/shplemini.test.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include "barretenberg/commitment_schemes/pcs_test_utils.hpp"
55
#include "barretenberg/commitment_schemes/utils/mock_witness_generator.hpp"
66
#include "barretenberg/eccvm/eccvm_prover.hpp"
7+
#include "barretenberg/flavor/ultra_flavor.hpp"
78
#include "barretenberg/srs/global_crs.hpp"
89
#include "barretenberg/stdlib/primitives/curves/bn254.hpp"
910
#include "barretenberg/stdlib/primitives/pairing_points.hpp"

barretenberg/cpp/src/barretenberg/common/fuzzer.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#include "barretenberg/circuit_checker/circuit_checker.hpp"
33
#include "barretenberg/common/assert.hpp"
44
#include "barretenberg/numeric/uint256/uint256.hpp"
5+
#include <cstring>
56

67
// NOLINTBEGIN(cppcoreguidelines-macro-usage, google-runtime-int)
78
#define PARENS ()

barretenberg/cpp/src/barretenberg/smt_verification/util/smt_util.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "smt_util.hpp"
22

3+
#include "barretenberg/stdlib_circuit_builders/ultra_circuit_builder.hpp"
4+
35
/**
46
* @brief Converts a string of an arbitrary base to fr.
57
* Note: there should be no prefix

0 commit comments

Comments
 (0)