feat: Sync from noir

.noir-sync-commit

@@ -1 +1 @@
-89846cfbc4961c5258d91b5973f027be80885a20
+e4eb5f539f377fd3c2e1a874707ffce62a5bc10a

noir/Earthfile

@@ -60,7 +60,7 @@ examples:
 
   ENV BACKEND=/usr/src/barretenberg/cpp/build/bin/bb
 
-  WORKDIR noir-repo/examples/codegen-verifier
+  WORKDIR noir-repo/examples/codegen_verifier
   RUN ./test.sh
 
   WORKDIR ../prove_and_verify

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/[email protected]
-
-#       - 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/[email protected]
+
+      - 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 }}

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/[email protected]
+
+      - 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

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 {

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
                 }

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,

noir/noir-repo/acvm-repo/acvm_js/src/execute.rs

@@ -117,11 +117,11 @@ async fn execute_program_with_native_program_and_return(
     initial_witness: JsWitnessMap,
     foreign_call_executor: &ForeignCallHandler,
 ) -> Result<WitnessStack, Error> {
-    let solver = Bn254BlackBoxSolver::initialize().await;
+    let blackbox_solver = Bn254BlackBoxSolver;
     let executor = ProgramExecutor::new(
         &program.functions,
         &program.unconstrained_functions,
-        &solver,
+        &blackbox_solver,
         foreign_call_executor,
     );
     let witness_stack = executor.execute(initial_witness.into()).await?;

noir/noir-repo/acvm-repo/bn254_blackbox_solver/benches/criterion.rs

@@ -15,23 +15,21 @@ fn bench_poseidon2(c: &mut Criterion) {
 
 fn bench_pedersen_commitment(c: &mut Criterion) {
     let inputs = [FieldElement::one(); 2];
-    let solver = Bn254BlackBoxSolver::new();
 
     c.bench_function("pedersen_commitment", |b| {
-        b.iter(|| solver.pedersen_commitment(black_box(&inputs), 0))
+        b.iter(|| Bn254BlackBoxSolver.pedersen_commitment(black_box(&inputs), 0))
     });
 }
 
 fn bench_pedersen_hash(c: &mut Criterion) {
     let inputs = [FieldElement::one(); 2];
-    let solver = Bn254BlackBoxSolver::new();
 
-    c.bench_function("pedersen_hash", |b| b.iter(|| solver.pedersen_hash(black_box(&inputs), 0)));
+    c.bench_function("pedersen_hash", |b| {
+        b.iter(|| Bn254BlackBoxSolver.pedersen_hash(black_box(&inputs), 0))
+    });
 }
 
 fn bench_schnorr_verify(c: &mut Criterion) {
-    let solver = Bn254BlackBoxSolver::new();
-
     let pub_key_x = FieldElement::from_hex(
         "0x04b260954662e97f00cab9adb773a259097f7a274b83b113532bce27fa3fb96a",
     )
@@ -51,7 +49,7 @@ fn bench_schnorr_verify(c: &mut Criterion) {
 
     c.bench_function("schnorr_verify", |b| {
         b.iter(|| {
-            solver.schnorr_verify(
+            Bn254BlackBoxSolver.schnorr_verify(
                 black_box(&pub_key_x),
                 black_box(&pub_key_y),
                 black_box(&sig_bytes),

noir/noir-repo/acvm-repo/bn254_blackbox_solver/src/lib.rs

@@ -15,26 +15,9 @@ use ark_ec::AffineRepr;
 pub use embedded_curve_ops::{embedded_curve_add, multi_scalar_mul};
 pub use poseidon2::poseidon2_permutation;
 
+#[derive(Default)]
 pub struct Bn254BlackBoxSolver;
 
-impl Bn254BlackBoxSolver {
-    pub async fn initialize() -> Bn254BlackBoxSolver {
-        Bn254BlackBoxSolver
-    }
-
-    #[cfg(not(target_arch = "wasm32"))]
-    pub fn new() -> Bn254BlackBoxSolver {
-        Bn254BlackBoxSolver
-    }
-}
-
-#[cfg(not(target_arch = "wasm32"))]
-impl Default for Bn254BlackBoxSolver {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 impl BlackBoxFunctionSolver for Bn254BlackBoxSolver {
     fn schnorr_verify(
         &self,