Merge branch 'master' into sync-noir

* master: (30 commits) chore: run noir projects tests in earthly (#6024) feat: add key registry to deployment (e2e & sandbox) (#5875) fix(docs): Fix admonition in contract class protocol spec (#6017) chore: lift run-e2e to yarn-project earthfile (#6018) chore!: remove `Opcode::Brillig` from ACIR (#5995) chore(ci): Reenable deploy tests (#6011) refactor: improved naming in `TxExecutionRequest` (#6014) test: extend SharedMutable tests (#6005) fix: bigint corruption in lmdb (#6002) chore: rename capture to end_setup (#6008) feat: AES oracle padding (#6013) refactor: replace queue with facade over CircuitProver (#5972) chore(ci): fix concurrency key (#5962) chore(ci): prevent haywire logs (#5966) git subrepo push --branch=master noir-projects/aztec-nr git_subrepo.sh: Fix parent in .gitrepo file. [skip ci] chore: replace relative paths to noir-protocol-circuits git subrepo push --branch=master barretenberg docs: Aztec smart contract tutorial - crowdfunding (#5786) feat: Wire gas from public execution to kernels (#5941) ...
AztecProtocol · Apr 25, 2024 · 527f8dc · 527f8dc
2 parents d3175e9 + e950433
commit 527f8dc
Show file tree

Hide file tree

Showing 178 changed files with 2,652 additions and 1,568 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
     inputs:
       username:
-        description: 'Defaults to GitHub Actor'
+        description: "Defaults to GitHub Actor"
         required: false
       runner_action:
         description: "The action to take with the self-hosted runner (start, stop, restart)."
@@ -34,7 +34,10 @@ jobs:
     outputs:
       e2e_list: ${{ steps.e2e_list.outputs.list }}
     steps:
-      - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
+      - {
+          uses: actions/checkout@v4,
+          with: { ref: "${{ github.event.pull_request.head.sha }}" },
+        }
       - uses: ./.github/ci-setup-action
         with:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
@@ -58,7 +61,10 @@ jobs:
       matrix:
         test: ${{ fromJson( needs.build.outputs.e2e_list )}}
     steps:
-      - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
+      - {
+          uses: actions/checkout@v4,
+          with: { ref: "${{ github.event.pull_request.head.sha }}" },
+        }
       - uses: ./.github/ci-setup-action
         with:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
@@ -78,7 +84,10 @@ jobs:
     needs: setup
     runs-on: ${{ inputs.username || github.actor }}-x86
     steps:
-      - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
+      - {
+          uses: actions/checkout@v4,
+          with: { ref: "${{ github.event.pull_request.head.sha }}" },
+        }
       # Only allow one memory-hunger prover test to use this runner
       - uses: ./.github/ci-setup-action
         with:
@@ -91,25 +100,47 @@ jobs:
         # limit our parallelism to half our cores
         run: earthly --no-output +test --hardware_concurrency=64
 
+  noir-projects:
+    needs: setup
+    runs-on: ${{ inputs.username || github.actor }}-x86
+    steps:
+      - {
+          uses: actions/checkout@v4,
+          with: { ref: "${{ github.event.pull_request.head.sha }}" },
+        }
+      - uses: ./.github/ci-setup-action
+        with:
+          dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
+          concurrency_key: noir-projects-${{ inputs.username || github.actor }}-x86
+      - name: "Noir Projects"
+        timeout-minutes: 25
+        run: earthly --no-output ./noir-projects/+test
+
   yarn-project-formatting:
     needs: setup
     runs-on: ${{ github.actor }}-x86
     steps:
-      - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
+      - {
+          uses: actions/checkout@v4,
+          with: { ref: "${{ github.event.pull_request.head.sha }}" },
+        }
       # Only allow one memory-hunger prover test to use this runner
       - uses: ./.github/ci-setup-action
         with:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
-          concurrency_key: yarn-project-test-${{ github.actor }}-x86
+          concurrency_key: yarn-project-formatting-${{ github.actor }}-x86
       - name: "Yarn Project Tests"
         timeout-minutes: 25
         run: earthly --no-output ./yarn-project/+format-check
 
   yarn-project-test:
-    needs: setup
+    needs: noir-projects
     runs-on: ${{ github.actor }}-x86
     steps:
-      - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
+      - {
+          uses: actions/checkout@v4,
+          with: { ref: "${{ github.event.pull_request.head.sha }}" },
+        }
       # Only allow one memory-hunger prover test to use this runner
       - uses: ./.github/ci-setup-action
         with:
@@ -124,7 +155,10 @@ jobs:
     needs: setup
     runs-on: ${{ inputs.username || github.actor }}-x86
     steps:
-      - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
+      - {
+          uses: actions/checkout@v4,
+          with: { ref: "${{ github.event.pull_request.head.sha }}" },
+        }
       - uses: ./.github/ci-setup-action
         with:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
@@ -151,7 +185,10 @@ jobs:
     runs-on: ${{ inputs.username || github.actor }}-bench-x86
     needs: setup-bench
     steps:
-      - {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
+      - {
+          uses: actions/checkout@v4,
+          with: { ref: "${{ github.event.pull_request.head.sha }}" },
+        }
       - uses: ./.github/ci-setup-action
         with:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
@@ -169,12 +206,26 @@ jobs:
 
   merge-check:
     runs-on: ubuntu-latest
-    needs: [e2e, bb-native-tests, bb-bench, yarn-project-formatting, yarn-project-test]
+    needs:
+      [
+        e2e,
+        bb-native-tests,
+        bb-bench,
+        yarn-project-formatting,
+        yarn-project-test,
+      ]
     steps:
       - run: echo Pull request merging now allowed.
 
   notify:
-    needs: [e2e, bb-native-tests, bb-bench, yarn-project-formatting, yarn-project-test]
+    needs:
+      [
+        e2e,
+        bb-native-tests,
+        bb-bench,
+        yarn-project-formatting,
+        yarn-project-test,
+      ]
     runs-on: ubuntu-latest
     if: ${{ github.ref == 'refs/heads/master' && failure() }}
     steps:

diff --git a/.github/workflows/protocol-circuits-gate-diff.yml b/.github/workflows/protocol-circuits-gate-diff.yml
@@ -90,7 +90,7 @@ jobs:
 
       - name: Compare gates reports
         id: gates_diff
-        uses: TomAFrench/noir-gates-diff@df05f34e2ab275ddc4f2cac065df1c88f8a05e5d
+        uses: vezenovm/noir-gates-diff@acf12797860f237117e15c0d6e08d64253af52b6
         with:
           report: protocol_circuits_report.json
           summaryQuantile: 0 # Display any diff in gate count

diff --git a/.github/workflows/setup-runner.yml b/.github/workflows/setup-runner.yml
@@ -58,7 +58,7 @@ jobs:
       group: start-builder-${{ inputs.runner_label }}
     steps:
       - name: Start EC2 runner
-        uses: AztecProtocol/ec2-action-builder@v0.14e
+        uses: AztecProtocol/ec2-action-builder@v0.15
         with:
           github_token: ${{ secrets.GH_SELF_HOSTED_RUNNER_TOKEN }}
           aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -105,7 +105,7 @@ jobs:
             echo '{"default-address-pools":[{"base":"172.17.0.0/12","size":20}, {"base":"10.99.0.0/12","size":20}, {"base":"192.168.0.0/16","size":24}]}' > /etc/docker/daemon.json
             sudo service docker restart
             # helps to not overuse space
-            docker system prune -f || true
+            docker system prune -f -a || true
             echo "Configured docker daemon for making many networks."
             # Run maybe_exit_spot.sh every minute
             cp scripts/ci/spot_runner_graceful_exit.sh /run/spot_runner_graceful_exit.sh

diff --git a/barretenberg/.gitrepo b/barretenberg/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = 40fdf900bf687d93bd2eb7e54ee39d336346097a
-	parent = d8fcfb590f788b911111010e20458797d76f5779
+	commit = 297d96b6ea5fc4471d9e39993658e27affe3aecf
+	parent = 91cc0a424031b9b8346cc9182f303d1468b1179b
 	method = merge
 	cmdver = 0.4.6