Merge branch 'master' into contract-workspace

* 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) ...
AztecProtocol · Sep 12, 2023 · c3727c6 · c3727c6
2 parents 23f125c + ff96eef
commit c3727c6
Show file tree

Hide file tree

Showing 436 changed files with 6,713 additions and 3,662 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -58,7 +58,7 @@ checkout: &checkout
 
       # Only download metadata when fetching.
       retry git fetch --depth 1 --filter=blob:none origin $CIRCLE_SHA1
-      git checkout FETCH_HEAD
+      retry git checkout FETCH_HEAD
 
 # Called setup_env to setup a bunch of global variables used throughout the rest of the build process.
 # It takes the required CCI environment variables as inputs, and gives them normalised names for the rest of
@@ -227,18 +227,18 @@ jobs:
           command: cond_spot_run_tests barretenberg-x86_64-linux-clang-assert 3 join_split_example_proofs_join_split_tests --gtest_filter=-*full_proof*
       - *save_logs
 
-  barretenberg-benchmark-aggregator:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
-    steps:
-      - attach_workspace:
-          at: /tmp/test-logs
-      - *checkout
-      - *setup_env
-      - run:
-          name: "Test"
-          command: ./scripts/ci/store_test_benchmark_logs $AZTEC_GITHUB_TOKEN
+  # barretenberg-benchmark-aggregator:
+  #   docker:
+  #     - image: aztecprotocol/alpine-build-image
+  #   resource_class: small
+  #   steps:
+  #     - attach_workspace:
+  #         at: /tmp/test-logs
+  #     - *checkout
+  #     - *setup_env
+  #     - run:
+  #         name: "Test"
+  #         command: ./scripts/ci/store_test_benchmark_logs $AZTEC_GITHUB_TOKEN
 
   barretenberg-acir-tests-bb:
     docker:
@@ -947,6 +947,17 @@ jobs:
           command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_aztec_js_browser.test.ts ./scripts/docker-compose-e2e-sandbox.yml
           working_directory: yarn-project/end-to-end
 
+  e2e-card-game:
+    machine:
+      image: ubuntu-2004:202010-01
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local e2e_card_game.test.ts
+          working_directory: yarn-project/end-to-end
+
   aztec-rpc-sandbox:
     machine:
       image: ubuntu-2004:202010-01
@@ -958,6 +969,17 @@ jobs:
           command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local aztec_rpc_sandbox.test.ts ./scripts/docker-compose-e2e-sandbox.yml
           working_directory: yarn-project/end-to-end
 
+  cli-docs-sandbox:
+    machine:
+      image: ubuntu-2004:202010-01
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local cli_docs_sandbox.test.ts ./scripts/docker-compose-e2e-sandbox.yml
+          working_directory: yarn-project/end-to-end
+
   guides-writing-an-account-contract:
     machine:
       image: ubuntu-2004:202010-01
@@ -980,6 +1002,17 @@ jobs:
           name: "Test"
           command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local guides/dapp_testing.test.ts ./scripts/docker-compose-e2e-sandbox.yml
           working_directory: yarn-project/end-to-end
+
+  guides-sample-dapp:
+    machine:
+      image: ubuntu-2004:202010-01
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: ./scripts/cond_run_script end-to-end $JOB_NAME ./scripts/run_tests_local sample-dapp ./scripts/docker-compose-e2e-sandbox.yml
+          working_directory: yarn-project/end-to-end
 
   e2e-canary-test:
     machine:
@@ -1191,7 +1224,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: spot_run_test_script ./scripts/run_tests canary uniswap_trade_on_l1_from_l2.test.ts canary ./scripts/docker-compose.yml
+          command: spot_run_test_script ./scripts/run_tests canary uniswap_trade_on_l1_from_l2.test.ts canary docker-compose.yml
 
   run-deployment-canary-browser:
     docker:
@@ -1202,7 +1235,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: spot_run_test_script ./scripts/run_tests canary aztec_js_browser.test.ts canary ./scripts/docker-compose.yml
+          command: spot_run_test_script ./scripts/run_tests canary aztec_js_browser.test.ts canary docker-compose.yml
 
   run-deployment-canary-cli:
     docker:
@@ -1213,10 +1246,10 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: spot_run_test_script ./scripts/run_tests canary cli.test.ts canary ./scripts/docker-compose.yml
+          command: spot_run_test_script ./scripts/run_tests canary cli.test.ts canary docker-compose.yml
 
 # Repeatable config for defining the workflow below.
-tag_regex: &tag_regex /^v.*/
+tag_regex: &tag_regex /^aztec-packages-v.*/
 defaults: &defaults
   filters:
     tags:
@@ -1281,18 +1314,18 @@ workflows:
       - barretenberg-stdlib-recursion-turbo-tests: *bb_test
       - barretenberg-stdlib-recursion-ultra-tests: *bb_test
       - barretenberg-join-split-tests: *bb_test
-      - barretenberg-benchmark-aggregator:
-          requires:
-            - barretenberg-tests
-            - barretenberg-stdlib-tests
-            - barretenberg-stdlib-recursion-turbo-tests
-            - barretenberg-stdlib-recursion-ultra-tests
-            - barretenberg-join-split-tests
-          filters:
-            branches:
-              only:
-                - master
-          <<: *defaults
+      # - barretenberg-benchmark-aggregator:
+      #     requires:
+      #       - barretenberg-tests
+      #       - barretenberg-stdlib-tests
+      #       - barretenberg-stdlib-recursion-turbo-tests
+      #       - barretenberg-stdlib-recursion-ultra-tests
+      #       - barretenberg-join-split-tests
+      #     filters:
+      #       branches:
+      #         only:
+      #           - master
+      #     <<: *defaults
       - bb-js:
           requires:
             - barretenberg-wasm-linux-clang
@@ -1416,9 +1449,12 @@ workflows:
       - e2e-p2p: *e2e_test
       - e2e-canary-test: *e2e_test
       - e2e-browser-sandbox: *e2e_test
+      - e2e-card-game: *e2e_test
       - aztec-rpc-sandbox: *e2e_test
+      - cli-docs-sandbox: *e2e_test
       - guides-writing-an-account-contract: *e2e_test
       - guides-dapp-testing: *e2e_test
+      - guides-sample-dapp: *e2e_test
 
       - e2e-end:
           requires:
@@ -1447,9 +1483,12 @@ workflows:
             - e2e-p2p
             - e2e-browser-sandbox
             - e2e-canary-test
+            - e2e-card-game
             - aztec-rpc-sandbox
+            - cli-docs-sandbox
             - guides-writing-an-account-contract
             - guides-dapp-testing
+            - guides-sample-dapp
           <<: *defaults
 
       - deploy-dockerhub:

diff --git a/...arretenberg/.github/workflows/publish.yml → .github/workflows/publish-bb.yml b/...arretenberg/.github/workflows/publish.yml → .github/workflows/publish-bb.yml
@@ -37,7 +37,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y install ninja-build
-      
+
       - name: Install Clang16
         run: |
           wget https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz
@@ -46,27 +46,27 @@ jobs:
           sudo cp -r clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/include/* /usr/local/include/
           sudo cp -r clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/lib/* /usr/local/lib/
           sudo cp -r clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/share/* /usr/local/share/
-          
+
       - name: Compile Barretenberg
         run: |
-          cd cpp
+          cd circuits/cpp/barretenberg/cpp
 
           cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert
           cmake --build --preset default --target bb
 
       - name: Tar and GZip bb Binary (Ubuntu)
-        working-directory: cpp/build/bin
+        working-directory: circuits/cpp/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: |
-            ./cpp/build/bin/barretenberg-x86_64-linux-gnu.tar.gz
+            ./circuits/cpp/barretenberg/cpp/build/bin/barretenberg-x86_64-linux-gnu.tar.gz
 
   build-wasm-ts:
-    name: Build WASM and deploy to TS 
+    name: Build WASM and deploy to TS
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Code
@@ -83,7 +83,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get -y install ninja-build yarn
-      
+
       - name: Install Clang16
         run: |
           wget https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0/clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz
@@ -92,29 +92,29 @@ jobs:
           sudo cp -r clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/include/* /usr/local/include/
           sudo cp -r clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/lib/* /usr/local/lib/
           sudo cp -r clang+llvm-16.0.0-x86_64-linux-gnu-ubuntu-18.04/share/* /usr/local/share/
-      
+
       - name: Install yarn
         run: |
           curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
           echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
           sudo apt -y update && sudo apt -y install yarn
       - name: Install WASI-SDK
         run: |
-          cd cpp
+          cd circuits/cpp/barretenberg/cpp
 
           ./scripts/install-wasi-sdk.sh
 
       - name: Compile Typescript
         run: |
-          cd ts
+          cd circuits/cpp/barretenberg/ts
           yarn install && yarn && yarn build
 
       - name: Tar and GZip barretenberg.wasm
-        working-directory: cpp/build-wasm/bin
+        working-directory: circuits/cpp/barretenberg/cpp/build-wasm/bin
         run: tar -cvzf barretenberg.wasm.tar.gz barretenberg.wasm
 
       - name: Tar and GZip acvm_backend.wasm
-        working-directory: cpp/build-wasm/bin
+        working-directory: circuits/cpp/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 ts
+          cd circuits/cpp/barretenberg/ts
           yarn deploy
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
@@ -136,8 +136,8 @@ jobs:
         with:
           name: release-wasm
           path: |
-            ./cpp/build-wasm/bin/barretenberg.wasm.tar.gz
-            ./cpp/build-wasm/bin/acvm_backend.wasm.tar.gz
+            ./circuits/cpp/barretenberg/cpp/build-wasm/bin/barretenberg.wasm.tar.gz
+            ./circuits/cpp/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: cpp
+        working-directory: circuits/cpp/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: cpp
+        working-directory: circuits/cpp/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: cpp/build/bin
+        working-directory: circuits/cpp/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: ./cpp/build/bin/barretenberg-${{ matrix.target }}.tar.gz
+          path: ./circuits/cpp/barretenberg/cpp/build/bin/barretenberg-${{ matrix.target }}.tar.gz
           retention-days: 3
 
   release:
@@ -225,4 +225,4 @@ jobs:
             acvm_backend.wasm.tar.gz
             barretenberg-x86_64-linux-gnu.tar.gz
             barretenberg-x86_64-apple-darwin.tar.gz
-            barretenberg-aarch64-apple-darwin.tar.gz
+            barretenberg-aarch64-apple-darwin.tar.gz
diff --git a/.github/workflows/release_please.yml b/.github/workflows/release_please.yml
@@ -12,35 +12,21 @@ permissions:
 
 jobs:
   release-please:
+    name: Create Release
     runs-on: ubuntu-latest
     steps:
-      - uses: google-github-actions/release-please-action@v3
+      - name: Run Release Please
+        id: release
+        uses: google-github-actions/release-please-action@v3
         with:
-          # Our release type is simple as all we really want is to update the changelog and trigger a github release
-          release-type: simple
-          # Self explanatory
-          package-name: aztec-packages
-          # Marks github releases as 'Pre-Release'
-          prerelease: true
-          # Our default branch
-          default-branch: master
-          # Uses the 'prerelease' versioning strategy to update the pre-release number only e.g. 0.1.0-alpha23 -> 0.1.0-alpha24
-          versioning-strategy: prerelease
-          # Don't include the component name in the tag name
-          include-component-in-tag: false
-          # Influences the versioning strategy to only update the pre-release number
-          bump-minor-pre-major: true
-          # Influences the versioning strategy to only update the pre-release number
-          bump-patch-for-minor-pre-major: true
-          # Just a bit of test at the top of the 'Release PR'
-          pull-request-header: ":robot: I have created a new Aztec Packages release"
-          # The sections into which changes are grouped on the github release notes
-          changelog-types: >
-            [
-              {"type":"feat","section":"Features","hidden":false},
-              {"type":"fix","section":"Bug Fixes","hidden":false},
-              {"type":"chore","section":"Miscellaneous","hidden":false},
-              {"type":"test","section":"Miscellaneous","hidden":false},
-              {"type":"refactor","section":"Miscellaneous","hidden":false},
-              {"type":"docs","section":"Documentation","hidden":false}
-            ]
+          token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+          command: manifest
+
+      - name: Dispatch to publish workflow
+        uses: benc-uk/workflow-dispatch@v1
+        if: ${{ steps.release.outputs.tag_name }}
+        with:
+          workflow: publish-bb.yml
+          ref: master
+          token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
+          inputs: '{ "tag": "${{ steps.release.outputs.tag_name }}", "publish": true }'
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -0,0 +1,5 @@
+{
+  ".": "0.6.7",
+  "circuits/cpp/barretenberg": "0.6.7",
+  "circuits/cpp/barretenberg/ts": "0.6.7"
+}