Skip to content

chore: restore bb --version #12542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ludamad merged 2 commits into from
Mar 6, 2025
Merged

chore: restore bb --version #12542

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5babe44
chore: restore bb --version
ludamad Mar 6, 2025
4436496
Update main.cpp
ludamad Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions barretenberg/cpp/src/barretenberg/bb/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@

using namespace bb;

const char* BB_VERSION_PLACEHOLDER = "00000000.00000000.00000000";
// This is updated in-place by sed during the release process. This prevents
// the version string from needing to be present at build-time, simplifying e.g. caching.
const char* const BB_VERSION_PLACEHOLDER = "00000000.00000000.00000000";

// TODO(https://github.com/AztecProtocol/barretenberg/issues/1257): Remove unused/seemingly unnecessary flags.
// TODO(https://github.com/AztecProtocol/barretenberg/issues/1258): Improve defaults.
Expand All @@ -19,7 +21,7 @@ const char* BB_VERSION_PLACEHOLDER = "00000000.00000000.00000000";
void print_active_subcommands(const CLI::App& app, const std::string& prefix = "bb command: ")
{
// get_subcommands() returns a vector of pointers to subcommands
for (auto subcmd : app.get_subcommands()) {
for (auto* subcmd : app.get_subcommands()) {
// Check if this subcommand was activated (nonzero count)
if (subcmd->count() > 0) {
vinfo(prefix, subcmd->get_name());
Expand Down Expand Up @@ -231,9 +233,9 @@ int main(int argc, char* argv[])
add_crs_path_option(&app);

/***************************************************************************************************************
* Subcommand: version
* Builtin flag: --version
***************************************************************************************************************/
CLI::App* version = app.add_subcommand("version", "Print the version string.");
app.set_version_flag("--version", BB_VERSION_PLACEHOLDER, "Print the version string.");

/***************************************************************************************************************
* Subcommand: check
Expand Down Expand Up @@ -690,14 +692,8 @@ int main(int argc, char* argv[])
};

try {
if (version->parsed()) {
// Placeholder that we replace inside the binary as a pre-release step.
// Compared to the prevs CMake injection strategy, this avoids full rebuilds.
std::cout << BB_VERSION_PLACEHOLDER << std::endl;
return 0;
}
// ULTRA PLONK
else if (OLD_API_gates->parsed()) {
if (OLD_API_gates->parsed()) {
gate_count<UltraCircuitBuilder>(bytecode_path, flags.recursive, flags.honk_recursion, true);
} else if (OLD_API_prove->parsed()) {
prove_ultra_plonk(bytecode_path, witness_path, plonk_prove_output_path, flags.recursive);
Expand Down Expand Up @@ -780,4 +776,5 @@ int main(int argc, char* argv[])
std::cerr << err.what() << std::endl;
return 1;
}
return 0;
}