feat: Pull latest noir for brillig optimizations

barretenberg/acir_tests/Dockerfile.bb

@@ -4,7 +4,7 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/noir-acir-tests as noir-acir-t
 FROM node:18-alpine
 RUN apk update && apk add git bash curl jq coreutils
 COPY --from=0 /usr/src/barretenberg/cpp/build /usr/src/barretenberg/cpp/build
-COPY --from=noir-acir-tests /usr/src/noir/tooling/nargo_cli/tests /usr/src/noir/tooling/nargo_cli/tests
+COPY --from=noir-acir-tests /usr/src/noir/test_programs /usr/src/noir/test_programs
 WORKDIR /usr/src/barretenberg/acir_tests
 COPY . .
 # Run every acir test through native bb build prove_then_verify flow.

barretenberg/acir_tests/Dockerfile.bb.js

@@ -3,7 +3,7 @@ FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/noir-acir-tests as noir-acir-t
 
 FROM node:18
 COPY --from=0 /usr/src/barretenberg/ts /usr/src/barretenberg/ts
-COPY --from=noir-acir-tests /usr/src/noir/tooling/nargo_cli/tests /usr/src/noir/tooling/nargo_cli/tests
+COPY --from=noir-acir-tests /usr/src/noir/test_programs /usr/src/noir/test_programs
 RUN apt update && apt install -y lsof jq
 WORKDIR /usr/src/barretenberg/acir_tests
 # Build/install ts apps.

barretenberg/acir_tests/Dockerfile.bb.sol

@@ -6,7 +6,7 @@ FROM node:18-alpine
 RUN apk update && apk add git bash curl jq
 COPY --from=0 /usr/src/barretenberg/cpp/build /usr/src/barretenberg/cpp/build
 COPY --from=1 /usr/src/barretenberg/sol/src/ultra/BaseUltraVerifier.sol /usr/src/barretenberg/sol/src/ultra/BaseUltraVerifier.sol
-COPY --from=noir-acir-tests /usr/src/noir/tooling/nargo_cli/tests /usr/src/noir/tooling/nargo_cli/tests
+COPY --from=noir-acir-tests /usr/src/noir/test_programs /usr/src/noir/test_programs
 COPY --from=ghcr.io/foundry-rs/foundry:latest /usr/local/bin/anvil /usr/local/bin/anvil
 WORKDIR /usr/src/barretenberg/acir_tests
 COPY . .

barretenberg/acir_tests/Dockerfile.noir_acir_tests

@@ -5,6 +5,6 @@
 FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/noir
 RUN apk add bash jq
 ENV PATH="/usr/src/noir/target/release:${PATH}"
-WORKDIR /usr/src/noir/tooling/nargo_cli/tests
+WORKDIR /usr/src/noir/test_programs
 COPY . .
 RUN ./rebuild.sh

barretenberg/acir_tests/clone_test_vectors.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eu
 
-TEST_SRC=${TEST_SRC:-../../noir/tooling/nargo_cli/tests/acir_artifacts}
+TEST_SRC=${TEST_SRC:-../../noir/test_programs/acir_artifacts}
 
 if [ ! -d acir_tests ]; then
   cp -R $TEST_SRC acir_tests

build_manifest.yml

@@ -7,11 +7,11 @@ noir-packages:
   dockerfile: Dockerfile.packages
 
 noir-acir-tests:
-  buildDir: noir/tooling/nargo_cli/tests
+  buildDir: noir/test_programs
   # Awkward. Maybe change dockerfile paths to be absolute.
-  dockerfile: ../../../../barretenberg/acir_tests/Dockerfile.noir_acir_tests
+  dockerfile: ../../barretenberg/acir_tests/Dockerfile.noir_acir_tests
   rebuildPatterns:
-    - ^noir/tooling/nargo_cli/tests
+    - ^noir/test_programs
     - ^barretenberg/acir_tests/Dockerfile.noir_acir_tests
   dependencies:
     - noir

noir/.github/workflows/auto-pr-rebuild-script.yml

@@ -99,7 +99,7 @@ jobs:
           git config --local user.email [email protected]
 
       - name: Run rebuild script
-        working-directory: tooling/nargo_cli/tests
+        working-directory: test_programs
         run: |
           chmod +x ./rebuild.sh
           ./rebuild.sh
@@ -108,14 +108,14 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: acir-artifacts
-          path: ./tooling/nargo_cli/tests/acir_artifacts
+          path: ./test_programs/acir_artifacts
           retention-days: 10
 
       - name: Check for changes in acir_artifacts directory
         id: check_changes
         if: ${{ github.ref_name }} == "master"
         run: |
-          git diff --quiet tooling/nargo_cli/tests/acir_artifacts/ || echo "::set-output name=changes::true"
+          git diff --quiet test_programs/acir_artifacts/ || echo "::set-output name=changes::true"
 
       - name: Create or Update PR
         if: steps.check_changes.outputs.changes == 'true'
@@ -125,6 +125,6 @@ jobs:
           commit-message: "chore: update acir artifacts"
           title: "chore: Update ACIR artifacts"
           body: "Automatic PR to update acir artifacts"
-          add-paths: tooling/nargo_cli/tests/acir_artifacts/*.gz
+          add-paths: test_programs/acir_artifacts/*.gz
           labels: "auto-pr"
           branch: "auto-pr-rebuild-script-branch"

noir/.github/workflows/build-aztec-feature-flag.yml

@@ -42,4 +42,4 @@ jobs:
           save-if: ${{ github.event_name != 'merge_group' }}
 
       - name: Build with feature flag
-        run: cargo build --features="noirc_frontend/aztec"
+        run: cargo build --features="noirc_driver/aztec"

noir/.github/workflows/gates_report.yml

@@ -50,9 +50,7 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
+      - uses: actions/checkout@v4
 
       - name: Download nargo binary
         uses: actions/download-artifact@v3
@@ -69,10 +67,10 @@ jobs:
           nargo -V
 
       - name: Generate gates report
-        working-directory: ./tooling/nargo_cli/tests
+        working-directory: ./test_programs
         run: |
           ./gates_report.sh
-          mv gates_report.json ../../../gates_report.json
+          mv gates_report.json ../gates_report.json
 
       - name: Compare gates reports
         id: gates_diff

noir/.github/workflows/publish-es-packages.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Enable aztec features
         if: ${{ inputs.npm-tag == 'aztec' }}
         run: |
-          echo $'\n'"default = [\"aztec\"]"$'\n' >> compiler/noirc_frontend/Cargo.toml
+          echo $'\n'"default = [\"aztec\"]"$'\n' >> compiler/noirc_driver/Cargo.toml
 
       - name: Build wasm package
         run: |