Merge branch 'master' into pw/multi-platform-docker

.github/workflows/mirror_barretenberg_repo.yml

@@ -5,8 +5,8 @@ on:
     branches:
       - master
     paths:
-      - 'circuits/cpp/barretenberg/**'
-      - '!circuits/cpp/barretenberg/.gitrepo'
+      - "barretenberg/**"
+      - "!barretenberg/.gitrepo"
 
 jobs:
   build:
@@ -23,7 +23,7 @@ jobs:
         run: |
           # we push using git subrepo (https://github.com/ingydotnet/git-subrepo)
           # with some logic to recover from squashed parent commits
-          SUBREPO_PATH=circuits/cpp/barretenberg
+          SUBREPO_PATH=barretenberg
           # identify ourselves, needed to commit
           git config --global user.name AztecBot
           git config --global user.email tech@aztecprotocol.com

.github/workflows/publish-bb.yml

@@ -49,21 +49,21 @@ jobs:
 
       - name: Compile Barretenberg
         run: |
-          cd circuits/cpp/barretenberg/cpp
+          cd barretenberg/cpp
 
           cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert
           cmake --build --preset default --target bb
 
       - name: Tar and GZip bb Binary (Ubuntu)
-        working-directory: circuits/cpp/barretenberg/cpp/build/bin
+        working-directory: barretenberg/cpp/build/bin
         run: tar -cvzf barretenberg-x86_64-linux-gnu.tar.gz bb
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v2
         with:
           name: release-linux
           path: |
-            ./circuits/cpp/barretenberg/cpp/build/bin/barretenberg-x86_64-linux-gnu.tar.gz
+            ./barretenberg/cpp/build/bin/barretenberg-x86_64-linux-gnu.tar.gz
 
   build-wasm-ts:
     name: Build WASM and deploy to TS
@@ -100,21 +100,21 @@ jobs:
           sudo apt -y update && sudo apt -y install yarn
       - name: Install WASI-SDK
         run: |
-          cd circuits/cpp/barretenberg/cpp
+          cd barretenberg/cpp
 
           ./scripts/install-wasi-sdk.sh
 
       - name: Compile Typescript
         run: |
-          cd circuits/cpp/barretenberg/ts
+          cd barretenberg/ts
           yarn install && yarn && yarn build
 
       - name: Tar and GZip barretenberg.wasm
-        working-directory: circuits/cpp/barretenberg/cpp/build-wasm/bin
+        working-directory: barretenberg/cpp/build-wasm/bin
         run: tar -cvzf barretenberg.wasm.tar.gz barretenberg.wasm
 
       - name: Tar and GZip acvm_backend.wasm
-        working-directory: circuits/cpp/barretenberg/cpp/build-wasm/bin
+        working-directory: barretenberg/cpp/build-wasm/bin
         run: tar -cvzf acvm_backend.wasm.tar.gz acvm_backend.wasm
 
       - name: Setup Node.js
@@ -126,7 +126,7 @@ jobs:
       - name: Deploy Typescript to NPM
         if: github.event.inputs.tag != 'nightly' && github.event.inputs.tag != '' # Do not deploy to npm if it is a nightly build
         run: |
-          cd circuits/cpp/barretenberg/ts
+          cd barretenberg/ts
           yarn deploy
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
@@ -136,8 +136,8 @@ jobs:
         with:
           name: release-wasm
           path: |
-            ./circuits/cpp/barretenberg/cpp/build-wasm/bin/barretenberg.wasm.tar.gz
-            ./circuits/cpp/barretenberg/cpp/build-wasm/bin/acvm_backend.wasm.tar.gz
+            ./barretenberg/cpp/build-wasm/bin/barretenberg.wasm.tar.gz
+            ./barretenberg/cpp/build-wasm/bin/acvm_backend.wasm.tar.gz
 
   build-mac:
     name: Build on Mac (${{ matrix.target }})
@@ -163,20 +163,20 @@ jobs:
 
       - name: Compile Barretenberg (x86_64)
         if: matrix.target == 'x86_64-apple-darwin'
-        working-directory: circuits/cpp/barretenberg/cpp
+        working-directory: barretenberg/cpp
         run: |
           cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert
           cmake --build --preset default --target bb
 
       - name: Compile Barretenberg (ARM)
         if: matrix.target == 'aarch64-apple-darwin'
-        working-directory: circuits/cpp/barretenberg/cpp
+        working-directory: barretenberg/cpp
         run: |
           cmake --toolchain ./cmake/toolchains/aarch64-darwin.cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert
           cmake --build --preset default --target bb
 
       - name: Package barretenberg artifact
-        working-directory: circuits/cpp/barretenberg/cpp/build/bin
+        working-directory: barretenberg/cpp/build/bin
         run: |
           mkdir dist
           cp ./bb ./dist/bb
@@ -186,7 +186,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: barretenberg-${{ matrix.target }}
-          path: ./circuits/cpp/barretenberg/cpp/build/bin/barretenberg-${{ matrix.target }}.tar.gz
+          path: ./barretenberg/cpp/build/bin/barretenberg-${{ matrix.target }}.tar.gz
           retention-days: 3
 
   release:

.gitignore

@@ -6,3 +6,4 @@ node_modules
 build/
 .idea
 cmake-build-debug
+.bootstrapped

.gitmodules

@@ -1,18 +1,18 @@
 [submodule "legacy-barretenberg-build-system"]
-	path = circuits/cpp/barretenberg/build-system
+	path = barretenberg/build-system
 	url = https://github.com/AztecProtocol/build-system
 [submodule "l1-contracts/lib/openzeppelin-contracts"]
 	path = l1-contracts/lib/openzeppelin-contracts
 	url = https://github.com/openzeppelin/openzeppelin-contracts
 [submodule "l1-contracts/lib/forge-std"]
 	path = l1-contracts/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "circuits/cpp/barretenberg/sol/lib/forge-std"]
-	path = circuits/cpp/barretenberg/sol/lib/forge-std
+[submodule "barretenberg/sol/lib/forge-std"]
+	path = barretenberg/sol/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "circuits/cpp/barretenberg/sol/lib/solidity-stringutils"]
-	path = circuits/cpp/barretenberg/sol/lib/solidity-stringutils
+[submodule "barretenberg/sol/lib/solidity-stringutils"]
+	path = barretenberg/sol/lib/solidity-stringutils
 	url = https://github.com/Arachnid/solidity-stringutils
-[submodule "circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts"]
-	path = circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts
+[submodule "barretenberg/sol/lib/openzeppelin-contracts"]
+	path = barretenberg/sol/lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts

.ignore

@@ -1,2 +1,2 @@
-/circuits/cpp/barretenberg/ts
-/circuits/cpp/barretenberg/foundation
+/barretenberg/ts
+/barretenberg/foundation

.release-please-manifest.json

@@ -1,5 +1,5 @@
 {
-  ".": "0.6.7",
-  "circuits/cpp/barretenberg": "0.6.7",
-  "circuits/cpp/barretenberg/ts": "0.6.7"
+  ".": "0.7.0",
+  "barretenberg": "0.7.0",
+  "barretenberg/ts": "0.7.0"
 }

CHANGELOG.md

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

README.md

@@ -28,7 +28,7 @@ All packages need to be included in the [build manifest](`build_manifest.json`),
 
 ## Debugging
 
-Logging goes through the [`info` and `debug`](circuits/cpp/barretenberg/cpp/src/barretenberg/common/log.hpp) functions in C++, and through the [DebugLogger](yarn-project/foundation/src/log/debug.ts) module in Typescript. To see the log output, set a `DEBUG` environment variable to the name of the module you want to debug, to `aztec:*`, or to `*` to see all logs.
+Logging goes through the [`info` and `debug`](barretenberg/cpp/src/barretenberg/common/log.hpp) functions in C++, and through the [DebugLogger](yarn-project/foundation/src/log/debug.ts) module in Typescript. To see the log output, set a `DEBUG` environment variable to the name of the module you want to debug, to `aztec:*`, or to `*` to see all logs.
 
 ## Releases
 

VERSION

@@ -1 +1 @@
-v0.6.7 x-release-please-version
+v0.7.0 x-release-please-version

circuits/cpp/barretenberg/.gitrepo → barretenberg/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 760438bf40eb3315b1953898a439e462baef5c90
-	parent = 1d0e25d9fad69aebccacf9f646e3291ea89716ca
+	commit = 7edb1644d0ae472a70fc3554b7d2cfc6c5496168
+	parent = 404ec34d38e1a9c3fbe7a3cdb6e88c28f62f72e4
 	method = merge
 	cmdver = 0.4.6