fix: resolve merge-train conflict with next (zig wrapper scripts + -g0)#21201
Merged
johnathan79717 merged 17 commits intomerge-train/barretenbergfrom Mar 6, 2026
Merged
fix: resolve merge-train conflict with next (zig wrapper scripts + -g0)#21201johnathan79717 merged 17 commits intomerge-train/barretenbergfrom
johnathan79717 merged 17 commits intomerge-train/barretenbergfrom
Conversation
Tweaks and builds upon gregos #19379. You can install dependencies prior to bootstrapping with. ``` ./bootstrap.sh install_deps ``` You can then: ``` ./bootstrap.sh gentle ``` To trigger a makefile build with 1 job at a time, and cmake will target nproc parallelism -2, and a MEMSUSPEND at 1g. Tested on fresh macos 15/26 install + brew. Didn't build on macos 14. Looks hairy, not important. --------- Co-authored-by: Jonathan Hao <jonathan@aztec-labs.com>
…ges into merge-train/ci
Found while backporting (#20563) to v4
Minor inconsistency spotted by @nchamo.
Originally requested by @xorsal and @zkfrov. This simply adds a new `deploy_opts` function which takes `DeployOptions`, via which custom salt and secret can be speficied. In the future we might be able to allow specifying more things. The bigger change is that the deployment oraacle now supports salt, secret (and deployer, currently hardcoded), so we should not need to break this API in the near future. Closes #16656 --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Martin Verzilli <martin@aztec-labs.com>
BEGIN_COMMIT_OVERRIDE chore: Support for building aztec-packages on mac. (#20581) END_COMMIT_OVERRIDE
BEGIN_COMMIT_OVERRIDE fix: empty undefined offchain messages for batch calls (#21157) feat: add aztecaddress::is_valid (#21072) feat: add ergonomic conversions for Noir's `Option<T>` (#21107) chore: use returns `true` for boolean fns (#21186) feat: add salt and secret params to env.deploy (#21183) END_COMMIT_OVERRIDE
BEGIN_COMMIT_OVERRIDE docs: clarifying Noir fields vs struct fields in event metadata (#21172) END_COMMIT_OVERRIDE
# Conflicts: # barretenberg/cpp/CMakePresets.json
johnathan79717
requested review from
IlyasRidhuan,
LeilaWang,
charlielye,
fcarreiro,
jeanmon and
nventuro
as code owners
johnathan79717
removed request for
IlyasRidhuan,
LeilaWang,
charlielye,
fcarreiro,
jeanmon and
nventuro
johnathan79717
changed the title
johnathan79717
changed the title
johnathan79717
requested review from
federicobarbacovi and
notnotraju
and removed request for
federicobarbacovi
johnathan79717
force-pushed
the
jh/fix-merge-train-conflict
branch
from
7293de8 to
a7f7255
Compare
notnotraju
approved these changes
Mar 6, 2026
johnathan79717
merged commit 652ca4b
into
merge-train/barretenberg
14 of 18 checks passed
github-merge-queue bot
pushed a commit
that referenced
this pull request
Mar 6, 2026
BEGIN_COMMIT_OVERRIDE fix: add -g0 to zig presets to eliminate 11GB debug info bloat (#21071) fix: resolve flaky p2p_client test race condition on ARM64 (#21088) chore: remove domain iteration macros and address backing memory race (#20988) fix: [ECCVM] added domain separation for the multiset equality check. (#20352) feat: hybrid CRS hash verification — 8MB chunks, parallel, span-based (#21113) chore: unify splitting scalars interface (#20805) chore: add a unique id to each origin tag (#20924) chore: Native curve audit (#20936) chore: Update bootstrap in test vk haven't changed script (#21153) fix: use reduced form in WASM FromMontgomeryForm test (#21164) chore: erase ephemeral secrets from memory in schnorr and aes (#21106) chore: suppress clangd target triple version diagnostic (#21180) feat: Optimise new claim calculation (#21179) docs: add Quick Start build instructions to barretenberg README (#20951) feat: batched chonk verification (#21083) fix: link libc++ instead of libstdc++ for Rust FFI on Linux (#21203) fix: [ECCVM] in the transcript table, no-ops force the next accumulator to be 0. (#20849) fix: resolve merge-train conflict with next (zig wrapper scripts + -g0) (#21201) fix: [ECCVM] rare edge case completeness issue when `z1 == 0` but `z2 != 0` (#20858) fix: use actual data extent for CommitmentKey in HypernovaDeciderProver (#21206) END_COMMIT_OVERRIDE
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
barretenberg/cpp/CMakePresets.jsonbetween merge-train/barretenberg and nextzig-cc.sh/zig-c++.sh) for cross-platform support-g0CFLAGS/CXXFLAGS to eliminate debug info bloat