[1 changes] feat: Consider block parameters in variable liveness (noi…

…r-lang/noir#5097) chore(docs): Link to evmdiff for supported EVM chains (noir-lang/noir#5107) chore: Avoid creating witness for simple multiplications (noir-lang/noir#5100) feat: Add intrinsic to get if running inside an unconstrained context (noir-lang/noir#5098) chore: Move turbofish changes to the elaborator (noir-lang/noir#5094) fix: Apply self type from generic trait constraint before instantiating identifiers (noir-lang/noir#5087) chore: reactivate gates report (noir-lang/noir#5084) chore: automatically clear any unwanted directories in `test_programs` (noir-lang/noir#5081) chore: update `nargo info` table to remove circuit size column feat: Activate return_data in ACIR opcodes (noir-lang/noir#5080) fix: Use plain integer addresses for opcodes in DAP disassembly view (noir-lang/noir#4941) chore(experimental): Elaborate globals (noir-lang/noir#5069) chore(experimental): Add types and traits to the elaborator (noir-lang/noir#5066) feat: remove conditional compilation of `bn254_blackbox_solver` (noir-lang/noir#5058) chore: use `bbup` to install `bb` (noir-lang/noir#5073) feat: Sync from aztec-packages (noir-lang/noir#5070) chore: update docs to represent zksync supporting necessary precompiles (noir-lang/noir#5071) feat(stdlib)!: eddsa function using turbofish (noir-lang/noir#5050) fix(frontend): Correctly monomorphize turbofish functions (noir-lang/noir#5049)
AztecProtocol · May 27, 2024 · 1d99554 · 1d99554
1 parent 221e247
commit 1d99554
Show file tree

Hide file tree

Showing 85 changed files with 1,514 additions and 700 deletions.
diff --git a/.noir-sync-commit b/.noir-sync-commit
@@ -1 +1 @@
-89846cfbc4961c5258d91b5973f027be80885a20
+e4eb5f539f377fd3c2e1a874707ffce62a5bc10a
diff --git a/noir/noir-repo/.github/workflows/gates_report.yml b/noir/noir-repo/.github/workflows/gates_report.yml
@@ -1,88 +1,94 @@
-# name: Report gates diff
-
-# on:
-#   push:
-#     branches:
-#       - master
-#   pull_request:
-
-# jobs:
-#   build-nargo:
-#     runs-on: ubuntu-latest
-#     strategy:
-#       matrix:
-#         target: [x86_64-unknown-linux-gnu]
-
-#     steps:
-#       - name: Checkout Noir repo
-#         uses: actions/checkout@v4
-
-#       - name: Setup toolchain
-#         uses: dtolnay/rust-toolchain@1.74.1
-
-#       - uses: Swatinem/rust-cache@v2
-#         with:
-#           key: ${{ matrix.target }}
-#           cache-on-failure: true
-#           save-if: ${{ github.event_name != 'merge_group' }}
-
-#       - name: Build Nargo
-#         run: cargo build --package nargo_cli --release
-
-#       - name: Package artifacts
-#         run: |
-#           mkdir dist
-#           cp ./target/release/nargo ./dist/nargo
-#           7z a -ttar -so -an ./dist/* | 7z a -si ./nargo-x86_64-unknown-linux-gnu.tar.gz
-
-#       - name: Upload artifact
-#         uses: actions/upload-artifact@v4
-#         with:
-#           name: nargo
-#           path: ./dist/*
-#           retention-days: 3
-
-
-#   compare_gas_reports:
-#     needs: [build-nargo]
-#     runs-on: ubuntu-latest
-#     permissions:
-#       pull-requests: write
-
-#     steps:
-#       - uses: actions/checkout@v4
-
-#       - name: Download nargo binary
-#         uses: actions/download-artifact@v4
-#         with:
-#           name: nargo
-#           path: ./nargo
-
-#       - name: Set nargo on PATH
-#         run: |
-#           nargo_binary="${{ github.workspace }}/nargo/nargo"
-#           chmod +x $nargo_binary
-#           echo "$(dirname $nargo_binary)" >> $GITHUB_PATH
-#           export PATH="$PATH:$(dirname $nargo_binary)"
-#           nargo -V
-
-#       - name: Generate gates report
-#         working-directory: ./test_programs
-#         run: |
-#           ./gates_report.sh
-#           mv gates_report.json ../gates_report.json
+name: Report gates diff
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  build-nargo:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target: [x86_64-unknown-linux-gnu]
+
+    steps:
+      - name: Checkout Noir repo
+        uses: actions/checkout@v4
+
+      - name: Setup toolchain
+        uses: dtolnay/rust-toolchain@1.74.1
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          key: ${{ matrix.target }}
+          cache-on-failure: true
+          save-if: ${{ github.event_name != 'merge_group' }}
+
+      - name: Build Nargo
+        run: cargo build --package nargo_cli --release
+
+      - name: Package artifacts
+        run: |
+          mkdir dist
+          cp ./target/release/nargo ./dist/nargo
+          7z a -ttar -so -an ./dist/* | 7z a -si ./nargo-x86_64-unknown-linux-gnu.tar.gz
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: nargo
+          path: ./dist/*
+          retention-days: 3
+
+
+  compare_gates_reports:
+    needs: [build-nargo]
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install `bb`
+        run: |
+          ./scripts/install_bb.sh
+          echo "$HOME/.bb/" >> $GITHUB_PATH
+
+      - name: Download nargo binary
+        uses: actions/download-artifact@v4
+        with:
+          name: nargo
+          path: ./nargo
+
+      - name: Set nargo on PATH
+        run: |
+          nargo_binary="${{ github.workspace }}/nargo/nargo"
+          chmod +x $nargo_binary
+          echo "$(dirname $nargo_binary)" >> $GITHUB_PATH
+          export PATH="$PATH:$(dirname $nargo_binary)"
+          nargo -V
+
+      - name: Generate gates report
+        working-directory: ./test_programs
+        run: |
+          ./rebuild.sh
+          ./gates_report.sh
+          mv gates_report.json ../gates_report.json
       
-#       - name: Compare gates reports
-#         id: gates_diff
-#         uses: vezenovm/noir-gates-diff@acf12797860f237117e15c0d6e08d64253af52b6
-#         with:
-#           report: gates_report.json
-#           summaryQuantile: 0.9 # only display the 10% most significant circuit size diffs in the summary (defaults to 20%)
-
-#       - 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 }}
+      - name: Compare gates reports
+        id: gates_diff
+        uses: vezenovm/noir-gates-diff@acf12797860f237117e15c0d6e08d64253af52b6
+        with:
+          report: gates_report.json
+          summaryQuantile: 0.9 # only display the 10% most significant circuit size diffs in the summary (defaults to 20%)
+
+      - 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 }}
diff --git a/noir/noir-repo/.github/workflows/test-js-packages.yml b/noir/noir-repo/.github/workflows/test-js-packages.yml
@@ -399,10 +399,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Download bb binary
+      - name: Install `bb`
         run: |
-          # Adds `bb` to PATH
           ./scripts/install_bb.sh
+          echo "$HOME/.bb/" >> $GITHUB_PATH
 
       - name: Download nargo binary
         uses: actions/download-artifact@v4
@@ -453,7 +453,7 @@ jobs:
   test-integration-browser:
     name: Integration Tests (Browser)
     runs-on: ubuntu-latest
-    needs: [build-acvm-js, build-noir-wasm, build-nargo, build-noirc-abi]
+    needs: [build-acvm-js, build-noir-wasm, build-noirc-abi]
     timeout-minutes: 30
 
     steps:
@@ -495,6 +495,46 @@ jobs:
         run: |
           yarn test:browser
   
+  test-examples:
+    name: Example scripts
+    runs-on: ubuntu-latest
+    needs: [build-nargo]
+    timeout-minutes: 30
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1.2.0
+
+      - name: Install `bb`
+        run: |
+          ./scripts/install_bb.sh
+          echo "$HOME/.bb/" >> $GITHUB_PATH
+
+      - name: Download nargo binary
+        uses: actions/download-artifact@v4
+        with:
+          name: nargo
+          path: ./nargo
+
+      - name: Set nargo on PATH
+        run: |
+          nargo_binary="${{ github.workspace }}/nargo/nargo"
+          chmod +x $nargo_binary
+          echo "$(dirname $nargo_binary)" >> $GITHUB_PATH
+          export PATH="$PATH:$(dirname $nargo_binary)"
+          nargo -V
+
+      - name: Run `prove_and_verify`
+        working-directory: ./examples/prove_and_verify
+        run: ./test.sh
+
+      - name: Run `codegen_verifier`
+        working-directory: ./examples/codegen_verifier
+        run: ./test.sh
+
   # This is a job which depends on all test jobs and reports the overall status.
   # This allows us to add/remove test jobs without having to update the required workflows.
   tests-end:
@@ -512,6 +552,7 @@ jobs:
       - test-noir-codegen
       - test-integration-node
       - test-integration-browser
+      - test-examples
 
     steps:
         - name: Report overall success

diff --git a/noir/noir-repo/acvm-repo/acir/src/circuit/opcodes.rs b/noir/noir-repo/acvm-repo/acir/src/circuit/opcodes.rs
@@ -18,6 +18,12 @@ pub enum BlockType {
     ReturnData,
 }
 
+impl BlockType {
+    pub fn is_databus(&self) -> bool {
+        matches!(self, BlockType::CallData | BlockType::ReturnData)
+    }
+}
+
 #[allow(clippy::large_enum_variant)]
 #[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Opcode {

diff --git a/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/unused_memory.rs b/noir/noir-repo/acvm-repo/acvm/src/compiler/optimizers/unused_memory.rs
@@ -44,8 +44,9 @@ impl UnusedMemoryOptimizer {
         let mut optimized_opcodes = Vec::with_capacity(self.circuit.opcodes.len());
         for (idx, opcode) in self.circuit.opcodes.into_iter().enumerate() {
             match opcode {
-                Opcode::MemoryInit { block_id, .. }
-                    if self.unused_memory_initializations.contains(&block_id) =>
+                Opcode::MemoryInit { block_id, block_type, .. }
+                    if !block_type.is_databus()
+                        && self.unused_memory_initializations.contains(&block_id) =>
                 {
                     // Drop opcode
                 }

diff --git a/noir/noir-repo/acvm-repo/acvm/src/compiler/transformers/csat.rs b/noir/noir-repo/acvm-repo/acvm/src/compiler/transformers/csat.rs
@@ -210,16 +210,16 @@ impl CSatTransformer {
                             }
                         } else {
                             // No more usable elements left in the old opcode
-                            opcode.linear_combinations = remaining_linear_terms;
                             break;
                         }
                     }
+                    opcode.linear_combinations.extend(remaining_linear_terms);
+
                     // Constraint this intermediate_opcode to be equal to the temp variable by adding it into the IndexMap
                     // We need a unique name for our intermediate variable
                     // XXX: Another optimization, which could be applied in another algorithm
                     // If two opcodes have a large fan-in/out and they share a few common terms, then we should create intermediate variables for them
                     // Do some sort of subset matching algorithm for this on the terms of the polynomial
-
                     let inter_var = Self::get_or_create_intermediate_vars(
                         intermediate_variables,
                         intermediate_opcode,