chore: resolve merge conflict in merge-train/barretenberg#21211
Closed
AztecBot wants to merge 20 commits intomerge-train/barretenbergfrom
Closed
chore: resolve merge conflict in merge-train/barretenberg#21211AztecBot wants to merge 20 commits intomerge-train/barretenbergfrom
AztecBot wants to merge 20 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
wasn't properly dispatching
wasn't properly dispatching
…conflict # Conflicts: # barretenberg/cpp/CMakePresets.json
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.
Resolves merge conflict between
merge-train/barretenbergandnextinbarretenberg/cpp/CMakePresets.json.The conflict was between:
-g0CFLAGS/CXXFLAGS to eliminate 11GB debug info bloat (fix: add -g0 to zig presets to eliminate 11GB debug info bloat #21071)zig-cc.sh/zig-c++.shwrapper scripts for macOS compatibilityResolution: Use the wrapper scripts from
next(for macOS compat) AND keep the-g0flags (to prevent debug info bloat).ClaudeBox log: http://ci.aztec-labs.com/f7af6ea9e082205c-1