Merge branch 'master' into palla/reenable-bench-summary

.github/workflows/ci.yml

@@ -192,7 +192,7 @@ jobs:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
           concurrency_key: yarn-project-test-${{ github.actor }}-x86
       - name: "Yarn Project Tests"
-        timeout-minutes: 25
+        timeout-minutes: 30
         run: earthly-ci --no-output ./yarn-project/+test
 
   prover-client-test:
@@ -292,7 +292,7 @@ jobs:
           dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
           concurrency_key: docs-preview-${{ inputs.username || github.actor }}-x86
       - name: "Docs Preview"
-        timeout-minutes: 25
+        timeout-minutes: 30
         run: earthly --no-output ./docs/+deploy-preview --PR=${{ github.event.number }} --AZTEC_BOT_COMMENTER_GITHUB_TOKEN=${{ secrets.AZTEC_BOT_GITHUB_TOKEN }} --NETLIFY_AUTH_TOKEN=${{ secrets.NETLIFY_AUTH_TOKEN }} --NETLIFY_SITE_ID=${{ secrets.NETLIFY_SITE_ID }}
 
   # push benchmarking binaries to dockerhub registry
@@ -348,6 +348,41 @@ jobs:
         working-directory: ./barretenberg/cpp/
         timeout-minutes: 15
         run: earthly-ci --no-output +bench-ultra-honk --bench_mode=cache
+
+  protocol-circuits-gates-report:
+    needs: setup
+    runs-on: ${{ inputs.username || github.actor }}-x86
+    steps:
+      - {
+          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: protocol-circuits-gates-report-${{ inputs.username || github.actor }}-x86
+      - name: "Noir Protocol Circuits Report"
+        working-directory: ./noir-projects/
+        timeout-minutes: 25
+        run: |
+          earthly-ci --artifact +gates-report/gates_report.json
+          mv gates_report.json ../protocol_circuits_report.json
+
+      - name: Compare gates reports
+        id: gates_diff
+        uses: vezenovm/noir-gates-diff@acf12797860f237117e15c0d6e08d64253af52b6
+        with:
+          report: protocol_circuits_report.json
+          summaryQuantile: 0 # Display any diff in gate count
+
+      - name: Add gates diff to sticky comment
+        if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target'
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          # delete the comment in case changes no longer impact circuit sizes
+          delete: ${{ !steps.gates_diff.outputs.markdown }}
+          message: ${{ steps.gates_diff.outputs.markdown }}
 
   merge-check:
     runs-on: ubuntu-latest

.noir-sync-commit

@@ -1 +1 @@
-d4c68066ab35ce1c52510cf0c038fb627a0677c3
+a87c655c6c8c077c71e3372cc9181b7870348a3d

barretenberg/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/barretenberg
 	branch = master
-	commit = d6e0824b144875a9a0fd1561047affa319d64b83
-	parent = c9b32061b2849442516ff0395b69d9a230191234
+	commit = 4a453f4c7b3b01410968abc95ff3ba13d5d2da8b
+	parent = 3ed41a08c1fef80a6b8eecf4618dcc9be891e4c0
 	method = merge
 	cmdver = 0.4.6

l1-contracts/src/core/libraries/ConstantsGen.sol

@@ -137,7 +137,7 @@ library Constants {
     + (NULLIFIER_KEY_VALIDATION_REQUEST_LENGTH * MAX_NULLIFIER_KEY_VALIDATION_REQUESTS_PER_CALL)
     + (NOTE_HASH_LENGTH * MAX_NEW_NOTE_HASHES_PER_CALL)
     + (NULLIFIER_LENGTH * MAX_NEW_NULLIFIERS_PER_CALL) + MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL
-    + MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL
+    + MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL + 1
     + (L2_TO_L1_MESSAGE_LENGTH * MAX_NEW_L2_TO_L1_MSGS_PER_CALL) + 2
     + (SIDE_EFFECT_LENGTH * MAX_ENCRYPTED_LOGS_PER_CALL)
     + (SIDE_EFFECT_LENGTH * MAX_UNENCRYPTED_LOGS_PER_CALL) + 2 + HEADER_LENGTH + TX_CONTEXT_LENGTH;

noir-projects/Earthfile

@@ -29,3 +29,13 @@ test:
   RUN cd noir-protocol-circuits && nargo test --silence-warnings
   RUN cd aztec-nr && nargo test --silence-warnings
   RUN cd noir-contracts && nargo test --silence-warnings
+
+gates-report:
+  FROM +build
+  WORKDIR /usr/src/noir-projects/noir-protocol-circuits
+
+  COPY ../barretenberg/cpp/+preset-clang-assert/bin/bb /usr/src/barretenberg/cpp/build/bin/bb
+
+  RUN  NARGO_BACKEND_PATH=/usr/src/barretenberg/cpp/build/bin/bb nargo info --json > gates_report.json
+
+  SAVE ARTIFACT gates_report.json gates_report.json

noir-projects/aztec-nr/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/AztecProtocol/aztec-nr
 	branch = master
-	commit = 8128c63b218dcc1cc7d18db5e19b3e0a9f63d81b
+	commit = 500bdad257ae68720a8d9b7ea72db491a6f373c8
 	method = merge
 	cmdver = 0.4.6
-	parent = 380de6c91037690ea6ff7130b7094b3f50a9963e
+	parent = 12851e40fee04f468855961f75dd31a0b344a1f4

noir-projects/aztec-nr/aztec/src/context/avm_context.nr

@@ -78,6 +78,11 @@ impl PublicContextInterface for AvmContext {
         0
     }
 
+    fn transaction_fee(self) -> Field {
+        assert(false, "'transaction_fee' not implemented!");
+        0
+    }
+
     fn nullifier_exists(self, unsiloed_nullifier: Field, address: AztecAddress) -> bool {
         nullifier_exists(unsiloed_nullifier, address.to_field()) == 1
     }

noir-projects/aztec-nr/aztec/src/context/interface.nr

@@ -54,6 +54,7 @@ trait PublicContextInterface {
         args: [Field]
     ) -> FunctionReturns<RETURNS_COUNT>;
     fn nullifier_exists(self, unsiloed_nullifier: Field, address: AztecAddress) -> bool;
+    fn transaction_fee(self) -> Field;
 }
 
 struct PrivateCallInterface<T> {