chore: Move barretenberg to top of repo. Make circuits build off barretenberg build. by charlielye · Pull Request #2221 · AztecProtocol/aztec-packages

charlielye · 2023-09-11T18:29:45Z

This moves barretenberg out of circuits project, to the top level of the repo, and cleans up a lot of build-system stuff.

BB and Circuits

Circuits expects barretenberg to still be where it was before (root of its repo), but it has a symlink now to the top level.
Docker scoping is handled by ingesting barretenberg from prior build, which outputs both the source code, and libraries needed for circuits (libbarretenberg, libenv, libwasi).
Circuits not longer builds barretenberg itself.
barretenberg now does a formatting check over it's code as part of build. ./format.sh check
Remove some refs to openmp in containers as we're phasing it out....
Remove some cmake around installing barretenberg, as this isn't needed anymore.

Build System

Remove hacks around e2e running locally. Use now official cond_run_script script.
Remove superfluous scripts and normalise around the cond_spot_run_script and remote_runner script.
cond_spot_run_build and cond_spot_run_test both implemented in terms of above.
Now test runs are handled by remote_runner they perform a full checkout of code and fit in the general pattern of the build system. No more hacky arbitrary script folder to remote copies.
Added yarn-project-base as dep in build-manifest.json to all TS projects so rebuilds are correctly computed.
Improved performance of dependencies command in query_manifest and also rebuildPatterns.
query_manifest outputs absolute paths by default, meaning can remove various assumptions in other scripts as to current working directory.

ludamad · 2023-09-11T18:33:13Z

fyi there's lots of conflicts but that's just Palla (Santiago) doing the format so you can probably just redo that

…dependency computation.

ludamad · 2023-09-13T12:43:14Z

barretenberg/cpp/format.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eu
+set -e


nit: I'd prefer to just change the $1 to ${1:-} but not a big deal

ludamad · 2023-09-13T12:45:59Z

circuits/cpp/CMakePresets.json

@@ -139,8 +123,7 @@
      "inherits": "default",
      "binaryDir": "build-fuzzing",
      "cacheVariables": {
-        "FUZZING": "ON",
-        "CMAKE_BBERG_PRESET": "fuzzing"


CMAKE_BBERG_PRESET no longer neded?

ludamad

I'm good with a merge, but there's a lot here. If stuff goes wrong it'll be a bit hard for people to go back to this PR as it struggles to load. It'd be nice to split the concerns in the future

Good though to move forward and see how things are.

ludamad · 2023-09-13T13:03:19Z

Looks like vscode follows git blame, which is I think the most high profile git history use case, so that's working nicely

dbanks12

Late on this, but LGTM!

🤖 I have created a release *beep* *boop* --- <details><summary>aztec-packages: 0.7.1</summary> ## [0.7.1](aztec-packages-v0.7.0...aztec-packages-v0.7.1) (2023-09-14) ### Features * Build system handles dynamic deps first class. ([#2283](#2283)) ([f66077a](f66077a)) * Build_manifest default tweaks. ([#2287](#2287)) ([c8a5cfb](c8a5cfb)) * **build:** Build multi-architecture docker images for aztec-sandbox ([#2305](#2305)) ([8ee61b8](8ee61b8)) * Cli "unbox" command ([#2029](#2029)) ([26ab88f](26ab88f)) * Creating an SMT verification module ([#1932](#1932)) ([4642b61](4642b61)) * Token standard ([#2069](#2069)) ([5e8fbf2](5e8fbf2)) ### Bug Fixes * Ensure_note_hash_exists ([#2256](#2256)) ([271b060](271b060)) * Msgpack stack blowups on schema gen ([#2259](#2259)) ([1afc566](1afc566)) * Noir bootstrap ([#2274](#2274)) ([f85db49](f85db49)) * Workaround sequencer timeout ([#2269](#2269)) ([9fc3f3d](9fc3f3d)) ### Miscellaneous * Bump nargo to 0.11.1-aztec.0 ([#2298](#2298)) ([8b76a12](8b76a12)) * **ci:** Mirror Aztec-nr ([#2270](#2270)) ([c57f027](c57f027)) * **circuits:** Base rollup cbind msgpack ([#2263](#2263)) ([0d4c707](0d4c707)) * **circuits:** Clean up of some superfluous header includes ([#2302](#2302)) ([5e53345](5e53345)) * **circuits:** Removing assertMemberLength on Tuple objects ([#2296](#2296)) ([0247b85](0247b85)) * Consolidate mirror repos on a nightly schedule ([#1994](#1994)) ([1a586c4](1a586c4)) * **docs:** Rename to aztec.nr ([#1943](#1943)) ([a91db48](a91db48)) * Move barretenberg to top of repo. Make circuits build off barretenberg build. ([#2221](#2221)) ([404ec34](404ec34)) * Replace native token in lending contract ([#2276](#2276)) ([c46b3c8](c46b3c8)) * **subrepo:** Push aztec-nr, update default branches ([#2300](#2300)) ([80c9b77](80c9b77)) * Updated `acvm_js` ([#2272](#2272)) ([9f1a3a5](9f1a3a5)) </details> <details><summary>barretenberg.js: 0.7.1</summary> ## [0.7.1](barretenberg.js-v0.7.0...barretenberg.js-v0.7.1) (2023-09-14) ### Miscellaneous * Move barretenberg to top of repo. Make circuits build off barretenberg build. ([#2221](#2221)) ([404ec34](404ec34)) </details> <details><summary>barretenberg: 0.7.1</summary> ## [0.7.1](barretenberg-v0.7.0...barretenberg-v0.7.1) (2023-09-14) ### Miscellaneous * Move barretenberg to top of repo. Make circuits build off barretenberg build. ([#2221](#2221)) ([404ec34](404ec34)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

charlielye added 3 commits September 11, 2023 09:59

rm bb

bc151fd

Move bb.

966c611

Make circuits build from bb build.

d865ed1

charlielye added 26 commits September 11, 2023 18:39

Merge remote-tracking branch 'origin/master' into cl/move_bb

5940b40

fix

65d5f3a

rename paths.

f8034bc

Attempt to cleanup graph.

eaf704e

handle scratch image

2fc0f1a

Fix formatting

afda584

fix

5921253

fixes.

d33637b

Allow rebuild_patterns to be in a file.

4d03606

Absolute paths.

fcb152e

Copy all to remote.

e0c18cb

Effort to santise cond/spot/local/runner scripts.

647b078

wip

82d9b4b

wip

79f0c97

wip

a66c383

wip

a768658

wip

ee5bf9a

Merge remote-tracking branch 'origin/master' into cl/move_bb

9c85e52

wip

9ebbafc

wip

fd8d106

wip

782a75e

wip

3b6c9c8

wip

5cf8302

wip

9b8814e

Merge remote-tracking branch 'origin/master' into cl/move_bb

4c3814a

Add yarn-project-base to all ts project deps, improve performance of …

d00e95b

…dependency computation.

Merge remote-tracking branch 'origin/master' into cl/move_bb

6a46efa

charlielye requested a review from ludamad September 13, 2023 10:29

Merge remote-tracking branch 'origin/master' into cl/move_bb

fa9d147

charlielye requested a review from spalladino September 13, 2023 11:11

charlielye added 3 commits September 13, 2023 11:24

No more build manifest stuff in docker.

e3dc1f7

Merge remote-tracking branch 'origin/master' into cl/move_bb

1289076

Still check other things.

911624d

ludamad reviewed Sep 13, 2023

View reviewed changes

ludamad approved these changes Sep 13, 2023

View reviewed changes

charlielye added 3 commits September 13, 2023 13:21

Merge remote-tracking branch 'origin/master' into cl/move_bb

9418428

Root script handles git hooks

e4d666c

Merge remote-tracking branch 'origin/master' into cl/move_bb

795c209

charlielye merged commit 404ec34 into master Sep 13, 2023

charlielye deleted the cl/move_bb branch September 13, 2023 14:16

AztecBot mentioned this pull request Sep 13, 2023

chore(master): Release 0.7.1 #2268

Merged

dbanks12 reviewed Sep 13, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Move barretenberg to top of repo. Make circuits build off barretenberg build.#2221

chore: Move barretenberg to top of repo. Make circuits build off barretenberg build.#2221
charlielye merged 37 commits intomasterfrom
cl/move_bb

charlielye commented Sep 11, 2023 •

edited

Loading

Uh oh!

ludamad commented Sep 11, 2023

Uh oh!

ludamad Sep 13, 2023 •

edited

Loading

Uh oh!

ludamad Sep 13, 2023

Uh oh!

ludamad left a comment •

edited

Loading

Uh oh!

ludamad commented Sep 13, 2023

Uh oh!

dbanks12 left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

charlielye commented Sep 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

BB and Circuits

Build System

Uh oh!

ludamad commented Sep 11, 2023

Uh oh!

ludamad Sep 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ludamad Sep 13, 2023

Choose a reason for hiding this comment

Uh oh!

ludamad left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ludamad commented Sep 13, 2023

Uh oh!

dbanks12 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

charlielye commented Sep 11, 2023 •

edited

Loading

ludamad Sep 13, 2023 •

edited

Loading

ludamad left a comment •

edited

Loading