chore: add a Nargo workspace in `noir-contracts` #2083

TomAFrench · 2023-09-06T21:59:12Z

This PR creates a Nargo workspace for the noir-contracts package. This is useful for a mystery project.

Checklist:

Remove the checklist to signal you've completed it. Enable auto-merge if the PR is ready to merge.

If the pull request requires a cryptography review (e.g. cryptographic algorithm implementations) I have added the 'crypto' tag.
I have reviewed my diff in github, line by line and removed unexpected formatting changes, testing logs, or commented-out code.
Every change is related to the PR description.
I have linked this pull request to relevant issues (if any exist).

TomAFrench · 2023-09-06T22:29:49Z

Hmm, these were getting generated properly locally. A problem for tomorrow...

TomAFrench · 2023-09-07T20:46:37Z

~~This should be good to go now.~~ Let me know if you want me to move the target directory so that we can avoid the extra copy.

Blocked by noir-lang/noir#2606 or adding parallel compilation to Nargo natively.

TomAFrench · 2023-09-08T13:46:01Z

noir-lang/noir#2612 unblocks this PR.

* master: (104 commits) git subrepo push --branch=main docs feat(docs): Updated docs explaining Sandbox accounts (#2235) git subrepo push --branch=master build-system fix: reinstate v stripping in build (#2220) chore(circuits): merge and root rollup cbind msgpack (#2192) git subrepo push --branch=master circuits/cpp/barretenberg fix: Add cjs-entry to bbjs package files (#2237) git subrepo push --branch=master circuits/cpp/barretenberg fix(build): Update ubuntu version used in Docker builds (#2236) chore(noir-contracts): 1655 - rename functions to make hack clearer for publicly created notes (#2230) git subrepo push --branch=master circuits/cpp/barretenberg fix: msgpack blowup with bigger objects (#2207) git subrepo push --branch=master circuits/cpp/barretenberg chore: update url for acir artifacts (#2231) fix: return partial witnesses based on the content of read requests. (#2164) feat: Remove entrypoint collection (#2148) git subrepo push --branch=main docs fix: Add link to example contracts in the monorepo (#2219) git subrepo push --branch=master circuits/cpp/barretenberg chore: add debugging to run_tests (#2212) ...

TomAFrench · 2023-09-12T14:15:07Z

I think we can merge this PR like this tbh. It doesn't affect the current workflow but unblocks the project I'm working on.

noir-contracts currently takes silly amounts of ram to compile due to spinning up so many copies of bb at once. I'd recommend switching the shell scripts to just run nargo compile once noir-lang/noir#2612 lands as compilation just takes ~8 seconds on my machine whereas yarn noir:build:all just ends up crashing.

Maddiaa0

lgtm

sirasistant

Thanks!!

🤖 I have created a release *beep* *boop* --- <details><summary>aztec-packages: 0.7.0</summary> ## [0.7.0](aztec-packages-v0.6.7...aztec-packages-v0.7.0) (2023-09-13) ### ⚠ BREAKING CHANGES * **aztec-noir:** rename noir-aztec to aztec-noir ([#2071](#2071)) ### Features * **build:** Use LTS version of ubuntu ([#2239](#2239)) ([ce6671e](ce6671e)) * **ci:** Run nargo test in ci on all packages ([#2197](#2197)) ([cca55f2](cca55f2)) * **cli:** Add commands for generating ts and nr interfaces ([#2241](#2241)) ([c11b70d](c11b70d)), closes [#2183](#2183) * **cli:** Inspect contract command ([#2248](#2248)) ([381706e](381706e)), closes [#2180](#2180) * Define specific Sandbox version when running docker-compose up ([#2238](#2238)) ([71da236](71da236)) * **docs:** Updated docs explaining Sandbox accounts ([#2235](#2235)) ([f560066](f560066)) * Optimise sandbox startup time by only initialising the BB solver once. ([#2240](#2240)) ([e9cac9c](e9cac9c)) * Remove entrypoint collection ([#2148](#2148)) ([e97c94d](e97c94d)) * Validate nargo version against expected one ([#2254](#2254)) ([011c0b7](011c0b7)) ### Bug Fixes * Add cjs-entry to bbjs package files ([#2237](#2237)) ([ae16193](ae16193)) * Add link to example contracts in the monorepo ([#2219](#2219)) ([8aede54](8aede54)) * **build:** Update ubuntu version used in Docker builds ([#2236](#2236)) ([dbe80b7](dbe80b7)) * **docs:** Use code snippet macros in bridge docs ([#2205](#2205)) ([0c3a627](0c3a627)) * Format barretenberg ([#2209](#2209)) ([0801372](0801372)) * Msgpack blowup with bigger objects ([#2207](#2207)) ([b909937](b909937)) * Refactor constraints in scalar mul to use the high limb ([#2161](#2161)) ([1d0e25d](1d0e25d)) * Reinstate v stripping in build ([#2220](#2220)) ([13d34f5](13d34f5)) * Return partial witnesses based on the content of read requests. ([#2164](#2164)) ([a2125f7](a2125f7)) * Try e2e cli timeout bump ([#2210](#2210)) ([a039fdd](a039fdd)) * Try workaround sample dapp ci timeout ([#2208](#2208)) ([e39f6bf](e39f6bf)) ### Miscellaneous * Add a Nargo workspace in `noir-contracts` ([#2083](#2083)) ([728a79c](728a79c)) * Add debugging to run_tests ([#2212](#2212)) ([1c5e78a](1c5e78a)) * **aztec-noir:** Rename noir-aztec to aztec-noir ([#2071](#2071)) ([e1e14d2](e1e14d2)) * **circuits:** Merge and root rollup cbind msgpack ([#2192](#2192)) ([4f3ecee](4f3ecee)) * **noir-contracts:** 1655 - rename functions to make hack clearer for publicly created notes ([#2230](#2230)) ([707bc09](707bc09)) * Run the test for zero division with mul div up ([#2206](#2206)) ([747de6a](747de6a)) * Update url for acir artifacts ([#2231](#2231)) ([5e0abd3](5e0abd3)) * Use workspace build with `nargo compile --workspace` ([#2266](#2266)) ([9ab66a0](9ab66a0)) ### Documentation * Dapp tutorial ([#2109](#2109)) ([573dbc2](573dbc2)), closes [#2051](#2051) * Minor fixes to dapp tutorial ([#2203](#2203)) ([dcc927c](dcc927c)) </details> <details><summary>barretenberg.js: 0.7.0</summary> ## [0.7.0](barretenberg.js-v0.6.7...barretenberg.js-v0.7.0) (2023-09-13) ### Bug Fixes * Add cjs-entry to bbjs package files ([#2237](#2237)) ([ae16193](ae16193)) ### Miscellaneous * Add debugging to run_tests ([#2212](#2212)) ([1c5e78a](1c5e78a)) </details> <details><summary>barretenberg: 0.7.0</summary> ## [0.7.0](barretenberg-v0.6.7...barretenberg-v0.7.0) (2023-09-13) ### ⚠ BREAKING CHANGES * **aztec-noir:** rename noir-aztec to aztec-noir ([#2071](#2071)) ### Features * **build:** Use LTS version of ubuntu ([#2239](#2239)) ([ce6671e](ce6671e)) ### Bug Fixes * **build:** Update ubuntu version used in Docker builds ([#2236](#2236)) ([dbe80b7](dbe80b7)) * Format barretenberg ([#2209](#2209)) ([0801372](0801372)) * Msgpack blowup with bigger objects ([#2207](#2207)) ([b909937](b909937)) * Refactor constraints in scalar mul to use the high limb ([#2161](#2161)) ([1d0e25d](1d0e25d)) ### Miscellaneous * Add debugging to run_tests ([#2212](#2212)) ([1c5e78a](1c5e78a)) * **aztec-noir:** Rename noir-aztec to aztec-noir ([#2071](#2071)) ([e1e14d2](e1e14d2)) * Update url for acir artifacts ([#2231](#2231)) ([5e0abd3](5e0abd3)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

🤖 I have created a release *beep* *boop* --- <details><summary>aztec-packages: 0.7.0</summary> ## [0.7.0](AztecProtocol/aztec-packages@aztec-packages-v0.6.7...aztec-packages-v0.7.0) (2023-09-13) ### ⚠ BREAKING CHANGES * **aztec-noir:** rename noir-aztec to aztec-noir ([#2071](AztecProtocol/aztec-packages#2071)) ### Features * **build:** Use LTS version of ubuntu ([#2239](AztecProtocol/aztec-packages#2239)) ([ce6671e](AztecProtocol/aztec-packages@ce6671e)) * **ci:** Run nargo test in ci on all packages ([#2197](AztecProtocol/aztec-packages#2197)) ([cca55f2](AztecProtocol/aztec-packages@cca55f2)) * **cli:** Add commands for generating ts and nr interfaces ([#2241](AztecProtocol/aztec-packages#2241)) ([c11b70d](AztecProtocol/aztec-packages@c11b70d)), closes [#2183](AztecProtocol/aztec-packages#2183) * **cli:** Inspect contract command ([#2248](AztecProtocol/aztec-packages#2248)) ([381706e](AztecProtocol/aztec-packages@381706e)), closes [#2180](AztecProtocol/aztec-packages#2180) * Define specific Sandbox version when running docker-compose up ([#2238](AztecProtocol/aztec-packages#2238)) ([71da236](AztecProtocol/aztec-packages@71da236)) * **docs:** Updated docs explaining Sandbox accounts ([#2235](AztecProtocol/aztec-packages#2235)) ([f560066](AztecProtocol/aztec-packages@f560066)) * Optimise sandbox startup time by only initialising the BB solver once. ([#2240](AztecProtocol/aztec-packages#2240)) ([e9cac9c](AztecProtocol/aztec-packages@e9cac9c)) * Remove entrypoint collection ([#2148](AztecProtocol/aztec-packages#2148)) ([e97c94d](AztecProtocol/aztec-packages@e97c94d)) * Validate nargo version against expected one ([#2254](AztecProtocol/aztec-packages#2254)) ([011c0b7](AztecProtocol/aztec-packages@011c0b7)) ### Bug Fixes * Add cjs-entry to bbjs package files ([#2237](AztecProtocol/aztec-packages#2237)) ([ae16193](AztecProtocol/aztec-packages@ae16193)) * Add link to example contracts in the monorepo ([#2219](AztecProtocol/aztec-packages#2219)) ([8aede54](AztecProtocol/aztec-packages@8aede54)) * **build:** Update ubuntu version used in Docker builds ([#2236](AztecProtocol/aztec-packages#2236)) ([dbe80b7](AztecProtocol/aztec-packages@dbe80b7)) * **docs:** Use code snippet macros in bridge docs ([#2205](AztecProtocol/aztec-packages#2205)) ([0c3a627](AztecProtocol/aztec-packages@0c3a627)) * Format barretenberg ([#2209](AztecProtocol/aztec-packages#2209)) ([0801372](AztecProtocol/aztec-packages@0801372)) * Msgpack blowup with bigger objects ([#2207](AztecProtocol/aztec-packages#2207)) ([b909937](AztecProtocol/aztec-packages@b909937)) * Refactor constraints in scalar mul to use the high limb ([#2161](AztecProtocol/aztec-packages#2161)) ([1d0e25d](AztecProtocol/aztec-packages@1d0e25d)) * Reinstate v stripping in build ([#2220](AztecProtocol/aztec-packages#2220)) ([13d34f5](AztecProtocol/aztec-packages@13d34f5)) * Return partial witnesses based on the content of read requests. ([#2164](AztecProtocol/aztec-packages#2164)) ([a2125f7](AztecProtocol/aztec-packages@a2125f7)) * Try e2e cli timeout bump ([#2210](AztecProtocol/aztec-packages#2210)) ([a039fdd](AztecProtocol/aztec-packages@a039fdd)) * Try workaround sample dapp ci timeout ([#2208](AztecProtocol/aztec-packages#2208)) ([e39f6bf](AztecProtocol/aztec-packages@e39f6bf)) ### Miscellaneous * Add a Nargo workspace in `noir-contracts` ([#2083](AztecProtocol/aztec-packages#2083)) ([728a79c](AztecProtocol/aztec-packages@728a79c)) * Add debugging to run_tests ([#2212](AztecProtocol/aztec-packages#2212)) ([1c5e78a](AztecProtocol/aztec-packages@1c5e78a)) * **aztec-noir:** Rename noir-aztec to aztec-noir ([#2071](AztecProtocol/aztec-packages#2071)) ([e1e14d2](AztecProtocol/aztec-packages@e1e14d2)) * **circuits:** Merge and root rollup cbind msgpack ([#2192](AztecProtocol/aztec-packages#2192)) ([4f3ecee](AztecProtocol/aztec-packages@4f3ecee)) * **noir-contracts:** 1655 - rename functions to make hack clearer for publicly created notes ([#2230](AztecProtocol/aztec-packages#2230)) ([707bc09](AztecProtocol/aztec-packages@707bc09)) * Run the test for zero division with mul div up ([#2206](AztecProtocol/aztec-packages#2206)) ([747de6a](AztecProtocol/aztec-packages@747de6a)) * Update url for acir artifacts ([#2231](AztecProtocol/aztec-packages#2231)) ([5e0abd3](AztecProtocol/aztec-packages@5e0abd3)) * Use workspace build with `nargo compile --workspace` ([#2266](AztecProtocol/aztec-packages#2266)) ([9ab66a0](AztecProtocol/aztec-packages@9ab66a0)) ### Documentation * Dapp tutorial ([#2109](AztecProtocol/aztec-packages#2109)) ([573dbc2](AztecProtocol/aztec-packages@573dbc2)), closes [#2051](AztecProtocol/aztec-packages#2051) * Minor fixes to dapp tutorial ([#2203](AztecProtocol/aztec-packages#2203)) ([dcc927c](AztecProtocol/aztec-packages@dcc927c)) </details> <details><summary>barretenberg.js: 0.7.0</summary> ## [0.7.0](AztecProtocol/aztec-packages@barretenberg.js-v0.6.7...barretenberg.js-v0.7.0) (2023-09-13) ### Bug Fixes * Add cjs-entry to bbjs package files ([#2237](AztecProtocol/aztec-packages#2237)) ([ae16193](AztecProtocol/aztec-packages@ae16193)) ### Miscellaneous * Add debugging to run_tests ([#2212](AztecProtocol/aztec-packages#2212)) ([1c5e78a](AztecProtocol/aztec-packages@1c5e78a)) </details> <details><summary>barretenberg: 0.7.0</summary> ## [0.7.0](AztecProtocol/aztec-packages@barretenberg-v0.6.7...barretenberg-v0.7.0) (2023-09-13) ### ⚠ BREAKING CHANGES * **aztec-noir:** rename noir-aztec to aztec-noir ([#2071](AztecProtocol/aztec-packages#2071)) ### Features * **build:** Use LTS version of ubuntu ([#2239](AztecProtocol/aztec-packages#2239)) ([ce6671e](AztecProtocol/aztec-packages@ce6671e)) ### Bug Fixes * **build:** Update ubuntu version used in Docker builds ([#2236](AztecProtocol/aztec-packages#2236)) ([dbe80b7](AztecProtocol/aztec-packages@dbe80b7)) * Format barretenberg ([#2209](AztecProtocol/aztec-packages#2209)) ([0801372](AztecProtocol/aztec-packages@0801372)) * Msgpack blowup with bigger objects ([#2207](AztecProtocol/aztec-packages#2207)) ([b909937](AztecProtocol/aztec-packages@b909937)) * Refactor constraints in scalar mul to use the high limb ([#2161](AztecProtocol/aztec-packages#2161)) ([1d0e25d](AztecProtocol/aztec-packages@1d0e25d)) ### Miscellaneous * Add debugging to run_tests ([#2212](AztecProtocol/aztec-packages#2212)) ([1c5e78a](AztecProtocol/aztec-packages@1c5e78a)) * **aztec-noir:** Rename noir-aztec to aztec-noir ([#2071](AztecProtocol/aztec-packages#2071)) ([e1e14d2](AztecProtocol/aztec-packages@e1e14d2)) * Update url for acir artifacts ([#2231](AztecProtocol/aztec-packages#2231)) ([5e0abd3](AztecProtocol/aztec-packages@5e0abd3)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).

TomAFrench force-pushed the contract-workspace branch from 71428d6 to eed8782 Compare September 6, 2023 21:59

chore: add a noir workspace in noir-contracts

a3b1ae1

TomAFrench force-pushed the contract-workspace branch from eed8782 to a3b1ae1 Compare September 6, 2023 22:00

TomAFrench requested review from kevaundray and sirasistant September 6, 2023 22:01

TomAFrench changed the title ~~chore: add a noir workspace in noir-contracts~~ chore: add a Noir workspace in noir-contracts Sep 6, 2023

TomAFrench changed the title ~~chore: add a Noir workspace in noir-contracts~~ chore: add a Nargo workspace in noir-contracts Sep 6, 2023

TomAFrench marked this pull request as draft September 6, 2023 22:29

TomAFrench and others added 3 commits September 7, 2023 20:41

Merge branch 'master' into contract-workspace

edb1d0b

chore: add schnorr_auth_witness_account to workspace

5d2ba65

chore: copy out target directory in CI

23f125c

TomAFrench marked this pull request as ready for review September 7, 2023 20:45

TomAFrench mentioned this pull request Sep 8, 2023

Compile workspace packages in parallel noir-lang/noir#2613

Closed

TomAFrench added 3 commits September 12, 2023 14:27

chore: update workspace members

064acba

chore: update compile script

aa1a6ae

TomAFrench force-pushed the contract-workspace branch from bf5785e to aa1a6ae Compare September 12, 2023 14:04

Merge branch 'master' into contract-workspace

24198d4

iAmMichaelConnor mentioned this pull request Sep 12, 2023

Compile noir-contracts with nargo compile #2258

Closed

TomAFrench self-assigned this Sep 13, 2023

Maddiaa0 approved these changes Sep 13, 2023

View reviewed changes

sirasistant approved these changes Sep 13, 2023

View reviewed changes

Maddiaa0 merged commit 728a79c into master Sep 13, 2023
2 checks passed

Maddiaa0 deleted the contract-workspace branch September 13, 2023 09:45

AztecBot mentioned this pull request Sep 13, 2023

chore(master): Release 0.7.0 #2200

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: add a Nargo workspace in `noir-contracts` #2083

chore: add a Nargo workspace in `noir-contracts` #2083

TomAFrench commented Sep 6, 2023

TomAFrench commented Sep 6, 2023

TomAFrench commented Sep 7, 2023 •

edited

Loading

TomAFrench commented Sep 8, 2023

TomAFrench commented Sep 12, 2023

Maddiaa0 left a comment

sirasistant left a comment

chore: add a Nargo workspace in noir-contracts #2083

chore: add a Nargo workspace in noir-contracts #2083

Conversation

TomAFrench commented Sep 6, 2023

Checklist:

TomAFrench commented Sep 6, 2023

TomAFrench commented Sep 7, 2023 • edited Loading

TomAFrench commented Sep 8, 2023

TomAFrench commented Sep 12, 2023

Maddiaa0 left a comment

Choose a reason for hiding this comment

sirasistant left a comment

Choose a reason for hiding this comment

chore: add a Nargo workspace in `noir-contracts` #2083

chore: add a Nargo workspace in `noir-contracts` #2083

TomAFrench commented Sep 7, 2023 •

edited

Loading