Merge branch 'master' into jm/3738-arithmetic-non-ff

.circleci/config.yml

@@ -205,7 +205,7 @@ jobs:
       - run:
           name: "Deploy barretenberg docs"
           command: |
-            barretenberg/cpp/docs/deploy_doxygen.sh
+            barretenberg/cpp/scripts/ci/upload_doxygen_to_s3.sh
 
   barretenberg-stdlib-tests:
     docker:
@@ -240,16 +240,22 @@ jobs:
           name: "Test"
           command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/bb-tests.sh
 
-  barretenberg-honk-tests:
-    docker:
-      - image: aztecprotocol/alpine-build-image
-    resource_class: small
+  barretenberg-bench:
+    machine:
+      # NOTE: we usually use alpine build image when making spot images, but
+      # we are not able to upload to S3 with it
+      image: ubuntu-2204:2023.07.2
+    resource_class: medium 
     steps:
       - *checkout
       - *setup_env
       - run:
-          name: "Test"
-          command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 1 honk_tests
+          name: "Benchmark"
+          command: cond_spot_run_build barretenberg-bench 32
+      - run:
+          name: "Upload"
+          command: |
+            barretenberg/cpp/scripts/ci/upload_benchmarks_to_s3.sh
 
   barretenberg-proof-system-tests:
     docker:
@@ -758,6 +764,17 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_cli.test.ts
 
+  e2e-persistence:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Test"
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=e2e_persistence.test.ts
+
   e2e-p2p:
     docker:
       - image: aztecprotocol/alpine-build-image
@@ -769,7 +786,7 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=e2e_p2p_network.test.ts
 
-  e2e-browser-sandbox:
+  e2e-browser:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
@@ -791,7 +808,7 @@ jobs:
           name: "Test"
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_card_game.test.ts
 
-  pxe-sandbox:
+  pxe:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
@@ -969,6 +986,11 @@ jobs:
             deploy_dockerhub cli
             deploy_dockerhub aztec-faucet
             deploy_dockerhub mainnet-fork
+      - run:
+          name: "Release canary to NPM: bb.js"
+          command: |
+            should_release || exit 0
+            deploy_npm bb.js canary
       - run:
           name: "Release canary to NPM: yarn-project"
           command: |
@@ -1097,8 +1119,11 @@ workflows:
       - barretenberg-x86_64-linux-clang-fuzzing: *defaults
       - barretenberg-wasm-linux-clang: *defaults
       - barretenberg-x86_64-linux-clang-sol: *defaults
+      - barretenberg-bench:
+          requires:
+            - barretenberg-x86_64-linux-clang
+          <<: *defaults
       - barretenberg-proof-system-tests: *bb_test
-      - barretenberg-honk-tests: *bb_test
       - barretenberg-dsl-tests: *bb_test
       - barretenberg-tests: *bb_test
       - barretenberg-stdlib-tests: *bb_test
@@ -1205,10 +1230,11 @@ workflows:
       - uniswap-trade-on-l1-from-l2: *e2e_test
       - integration-l1-publisher: *e2e_test
       - integration-archiver-l1-to-l2: *e2e_test
+      - e2e-persistence: *e2e_test
       - e2e-p2p: *e2e_test
-      - e2e-browser-sandbox: *e2e_test
+      - e2e-browser: *e2e_test
       - e2e-card-game: *e2e_test
-      - pxe-sandbox: *e2e_test
+      - pxe: *e2e_test
       - cli-docs-sandbox: *e2e_test
       - guides-writing-an-account-contract: *e2e_test
       - guides-dapp-testing: *e2e_test
@@ -1241,10 +1267,14 @@ workflows:
             - uniswap-trade-on-l1-from-l2
             - integration-l1-publisher
             - integration-archiver-l1-to-l2
+            - e2e-persistence
             - e2e-p2p
-            - e2e-browser-sandbox
+            - e2e-browser
             - e2e-card-game
-            - pxe-sandbox
+            - pxe
+            - boxes-blank
+            - boxes-blank-react
+            - boxes-token
             - cli-docs-sandbox
             - guides-writing-an-account-contract
             - guides-dapp-testing

.github/pull_request_template.md

@@ -1,8 +1 @@
-Please provide a paragraph or two giving a summary of the change, including relevant motivation and context.
-
-# 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](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) this pull request to relevant issues (if any exist).
+Please read [contributing guidelines](CONTRIBUTING.md) and remove this line.

.github/workflows/mirror_noir_subrepo.yml

@@ -41,6 +41,9 @@ jobs:
           if ./scripts/git_subrepo.sh push $SUBREPO_PATH --branch=$BRANCH; then
             git commit --amend -m "$(git log -1 --pretty=%B) [skip ci]"
             git push
+          else
+            echo "Problems syncing noir. We may need to pull the subrepo."
+            exit 1
           fi
 
       - name: Checkout

.release-please-manifest.json

@@ -1,5 +1,5 @@
 {
-  ".": "0.16.9",
-  "barretenberg": "0.16.9",
-  "barretenberg/ts": "0.16.9"
+  ".": "0.17.0",
+  "barretenberg": "0.17.0",
+  "barretenberg/ts": "0.17.0"
 }