Merge branch 'master' into mv/aztec-prelude

* master: (39 commits)
  fix: Remove the `VerificationKey` from `ProverInstance` (#4908)
  chore(avm-transpiler): minor rust fixes (#4889)
  add some migration notes (#4913)
  fix: depreciated ci image (#4911)
  feat: Public initializer check (#4894)
  feat: Use yarns topological build to get rid of explicit sequential steps, and let it solve. (#4868)
  git subrepo push --branch=master barretenberg
  fix: Temporarily skip failing deployment test
  feat: Check initializer by default in private functions (#4832)
  feat: Allow nullifier proofs in public (#4892)
  refactor: Move remaining data out of Honk UltraComposer (#4848)
  chore: Do not download foundry during L1 contracts fast bootstrap (#4865)
  chore: Add custom inspect for base types (#4890)
  refactor: rename read request to note hash read request (#4888)
  feat(avm-simulator): implement NOTEHASHEXISTS (#4882)
  Fix noir mirror path.
  feat: public refunds via FPC (#4750)
  chore: purge SafeU120 (#4819)
  refactor: replacing use of `L2Tx` with `TxEffect` (#4876)
  fix: Fetch Headers and Bodies separately #4167 (#4632)
  ...

.circleci/config.yml

@@ -114,7 +114,7 @@ jobs:
 
   noir-ecr-manifest:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: medium
     steps:
       - *checkout
@@ -124,6 +124,18 @@ jobs:
           command: create_ecr_manifest noir x86_64,arm64
           aztec_manifest_key: noir
 
+  noir-tests:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build noir-tests 32
+          aztec_manifest_key: noir-tests
+
   noir-packages:
     docker:
       - image: aztecprotocol/alpine-build-image
@@ -136,6 +148,18 @@ jobs:
           command: cond_spot_run_build noir-packages 32
           aztec_manifest_key: noir-packages
 
+  noir-packages-tests:
+    docker:
+      - image: aztecprotocol/alpine-build-image
+    resource_class: small
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build"
+          command: cond_spot_run_build noir-packages-tests 32
+          aztec_manifest_key: noir-packages-tests
+
   noir-compile-acir-tests:
     docker:
       - image: aztecprotocol/alpine-build-image
@@ -235,7 +259,7 @@ jobs:
 
   barretenberg-docs:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -289,7 +313,7 @@ jobs:
     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
+      image: default
     resource_class: medium
     steps:
       - *checkout
@@ -353,7 +377,7 @@ jobs:
 
   bb-js:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -389,7 +413,7 @@ jobs:
 
   l1-contracts:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -401,7 +425,7 @@ jobs:
 
   noir-projects:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -413,7 +437,7 @@ jobs:
 
   boxes-files:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: medium
     steps:
       - *checkout
@@ -425,7 +449,7 @@ jobs:
 
   yarn-project-base:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -437,7 +461,7 @@ jobs:
 
   yarn-project:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -449,7 +473,7 @@ jobs:
 
   yarn-project-prod:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -485,7 +509,7 @@ jobs:
 
   aztec-package:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -497,7 +521,7 @@ jobs:
 
   cli:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -509,7 +533,7 @@ jobs:
 
   mainnet-fork:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -521,7 +545,7 @@ jobs:
 
   aztec-faucet:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -569,7 +593,7 @@ jobs:
 
   end-to-end:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -869,7 +893,7 @@ jobs:
           command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_inclusion_proofs_contract.test.ts
           aztec_manifest_key: end-to-end
 
-  e2e-pending-commitments-contract:
+  e2e-pending-note-hashes-contract:
     docker:
       - image: aztecprotocol/alpine-build-image
     resource_class: small
@@ -878,7 +902,7 @@ jobs:
       - *setup_env
       - run:
           name: "Test"
-          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_pending_commitments_contract.test.ts
+          command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=e2e_pending_note_hashes_contract.test.ts
           aztec_manifest_key: end-to-end
 
   e2e-ordering:
@@ -1111,7 +1135,7 @@ jobs:
 
   build-docs:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -1141,7 +1165,7 @@ jobs:
 
   yellow-paper:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: large
     steps:
       - *checkout
@@ -1171,7 +1195,7 @@ jobs:
 
   bench-summary:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     steps:
       - *checkout
       - *setup_env
@@ -1182,7 +1206,7 @@ jobs:
   # Deploy & release jobs.
   deploy-and-release:
     machine:
-      image: ubuntu-2204:2023.07.2
+      image: default
     resource_class: medium
     steps:
       - *checkout
@@ -1335,7 +1359,12 @@ workflows:
             - noir-x86_64
             - noir-arm64
           <<: *defaults
+      - noir-tests: *defaults
       - noir-packages: *defaults
+      - noir-packages-tests:
+          requires:
+            - noir-ecr-manifest
+          <<: *defaults
       - noir-compile-acir-tests:
           requires:
             - noir-ecr-manifest
@@ -1464,7 +1493,7 @@ workflows:
       - e2e-account-contracts: *e2e_test
       - e2e-escrow-contract: *e2e_test
       - e2e-inclusion-proofs-contract: *e2e_test
-      - e2e-pending-commitments-contract: *e2e_test
+      - e2e-pending-note-hashes-contract: *e2e_test
       - e2e-ordering: *e2e_test
       - e2e-counter: *e2e_test
       - e2e-private-voting: *e2e_test
@@ -1510,7 +1539,7 @@ workflows:
             - e2e-account-contracts
             - e2e-escrow-contract
             - e2e-inclusion-proofs-contract
-            - e2e-pending-commitments-contract
+            - e2e-pending-note-hashes-contract
             - e2e-ordering
             - e2e-counter
             - e2e-private-voting

.github/workflows/mirror_noir_subrepo.yml

@@ -13,8 +13,8 @@ on:
     branches:
       - master
     paths:
-      - 'noir/**'
-      - '!noir/.gitrepo'
+      - "noir/noir-repo/**"
+      - "!noir/noir-repo/.gitrepo"
 
 jobs:
   mirror_repo:
@@ -35,7 +35,7 @@ jobs:
           # Do we have a PR active?
           PR_URL=$(gh pr list --repo noir-lang/noir --head aztec-packages --json url --jq ".[0].url")
           echo "PR_URL=$PR_URL" >> $GITHUB_ENV
-          
+
       - name: Generate PR body
         run: |
           set -xue # print commands
@@ -47,7 +47,7 @@ jobs:
               AZTEC_SYNC_COMMIT="a7889f8d21684099306b72a87e0fb57b3bba0cb4"
             fi
             # Create a filtered git log for release-please changelog / metadata
-            RAW_MESSAGE=$(git log --pretty=format:"%s" $AZTEC_SYNC_COMMIT..HEAD -- noir/  ':!noir/.gitrepo' | grep -v 'git subrepo' || true)
+            RAW_MESSAGE=$(git log --pretty=format:"%s" $AZTEC_SYNC_COMMIT..HEAD -- noir/noir-repo/  ':!noir/noir-repo/.gitrepo' | grep -v 'git subrepo' || true)
             # Fix Aztec PR links and output message
             echo "$RAW_MESSAGE" | sed -E 's/\(#([0-9]+)\)/(https:\/\/github.com\/AztecProtocol\/aztec-packages\/pull\/\1)/g'
           }
@@ -64,7 +64,7 @@ jobs:
       - name: Push to branch
         run: |
           set -xue # print commands
-          SUBREPO_PATH=noir
+          SUBREPO_PATH=noir/noir-repo
           BRANCH=aztec-packages
           if [[ "$PR_URL" == "" ]]; then
             # if no staging branch, we can overwrite
@@ -73,7 +73,7 @@ jobs:
             # otherwise we first reset our staging branch
             STAGING_BRANCH=$BRANCH-staging
           fi
-          BASE_NOIR_COMMIT=`git config --file=noir/.gitrepo subrepo.commit`
+          BASE_NOIR_COMMIT=`git config --file=$SUBREPO_PATH/.gitrepo subrepo.commit`
           COMMIT=$(git rev-parse HEAD)
           COMMIT_MESSAGE=$(git log -1 --pretty=format:%B)
 
@@ -91,7 +91,7 @@ jobs:
           }
           # force_sync_staging: Push to our aztec-packages staging branch.
           function force_sync_staging() {
-            echo "$COMMIT" > noir/.aztec-sync-commit && git add noir/.aztec-sync-commit
+            echo "$COMMIT" > $SUBREPO_PATH/.aztec-sync-commit && git add $SUBREPO_PATH/.aztec-sync-commit
             # make a new commit with our previous message
             git commit -am "$COMMIT_MESSAGE"
             # Now push to it with subrepo with computed commit messages
@@ -122,7 +122,7 @@ jobs:
       - name: Update PR
         run: |
           set -xue # print commands
-          # Formatted for updating the PR, overrides for release-please commit message parsing 
+          # Formatted for updating the PR, overrides for release-please commit message parsing
           PR_BODY="""BEGIN_COMMIT_OVERRIDE
           $(cat .PR_BODY_MESSAGE)
           END_COMMIT_OVERRIDE"""

.github/workflows/mirror_repos.yml

@@ -58,9 +58,9 @@ jobs:
           nargo_files="$(find $SUBREPO_PATH -name 'Nargo.toml' | xargs grep --files-with-matches 'noir-protocol-circuits')"
 
           # match lines like this:
-          # protocol_types = { path = "../../noir-protocol-circuits/src/crates/types" }
+          # protocol_types = { path = "../../noir-protocol-circuits/crates/types" }
           # and replace with
-          # protocol_types = { git="https://github.com/aztecprotocol/aztec-packages", tag="aztec-packages-v0.16.9", directory="noir-projects/noir-protocol-circuits/src/crates/types" }
+          # protocol_types = { git="https://github.com/aztecprotocol/aztec-packages", tag="aztec-packages-v0.16.9", directory="noir-projects/noir-protocol-circuits/crates/types" }
           for nargo_file in $nargo_files; do
             sed --regexp-extended --in-place \
               "s;path\s*=\s*\".*noir-protocol-circuits(.*)\";git=\"$monorepo_url\", tag=\"$monorepo_tag\", directory=\"$monorepo_protocol_circuits_path\1\";" \

.github/workflows/protocol-circuits-gate-diff.yml

@@ -72,18 +72,18 @@ jobs:
       - name: Install nargo from source with noirup
         run: noirup $toolchain
         env:
-          toolchain: --path ./noir
+          toolchain: --path ./noir/noir-repo
 
       - name: Check nargo installation
         run: nargo --version
 
       - name: Generate gates report
-        working-directory: ./noir-projects/noir-protocol-circuits/src
+        working-directory: ./noir-projects/noir-protocol-circuits
         run: |
-          nargo info --json > protocol_circuits_report.json
-          mv protocol_circuits_report.json ../../../protocol_circuits_report.json
+          nargo info --json --silence-warnings > protocol_circuits_report.json
+          mv protocol_circuits_report.json ../../protocol_circuits_report.json
         env:
-          NARGO_BACKEND_PATH: ../../../barretenberg/cpp/build/bin/bb
+          NARGO_BACKEND_PATH: ../../barretenberg/cpp/build/bin/bb
 
       - name: Compare gates reports
         id: gates_diff

README.md

@@ -72,7 +72,7 @@ There is an automatic mirror pushing noir to a PR on noir side. If the mirror is
 
 Recovering if the sync is not happening with basic pull commands:
 
-- manually editing the commit variable in noir/.gitrepo:
+- manually editing the commit variable in noir/noir-repo/.gitrepo:
   this needs to exist in the branch we push to, and have the same content as our base. This is similar to submodules, except instead of pointing to the final state of the module, it points to the last commit we have sync'd from, for purposes of commit replay. This can be fixed to match the commit in master after merges.
-- manually editing the parent variable in noir/.gitrepo: this is the parent of the last sync commit on aztec side. If you get errors with a commit not being found in the upstream repo, and the commit mentioned is not the commit variable above, it might indicate this is somehow incorrect. This can happen when commit content is ported without its history, e.g. squashes
+- manually editing the parent variable in noir/noir-repo/.gitrepo: this is the parent of the last sync commit on aztec side. If you get errors with a commit not being found in the upstream repo, and the commit mentioned is not the commit variable above, it might indicate this is somehow incorrect. This can happen when commit content is ported without its history, e.g. squashes
 - use pull --force ONLY where you would use git reset. That is, if you really want to match some upstream noir for a purpose its fine, but you'll lose local changes (if any)

avm-transpiler/Cargo.toml

@@ -9,8 +9,8 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 # local
-acvm = { path = "../noir/acvm-repo/acvm" }
-noirc_driver = { path = "../noir/compiler/noirc_driver" }
+acvm = { path = "../noir/noir-repo/acvm-repo/acvm" }
+noirc_driver = { path = "../noir/noir-repo/compiler/noirc_driver" }
 
 # external
 base64 = "0.21"