Skip to content

Commit 7d92c11

Browse files
authored
Merge branch 'master' into ab/inline-constants-into-brillig-functions
2 parents 4a64541 + 5b725bb commit 7d92c11

File tree

156 files changed

+5019
-633
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+5019
-633
lines changed

.aztec-sync-commit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f7a65ee697aa7e1a2bbdfcafe9d846aadd9aa2c2
1+
f733879bd5e59a222cc288de6c298eaa8553312c
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Download noir-execute
2+
description: Downloads the noir-execute binary from an artifact and adds it to the path
3+
4+
runs:
5+
using: composite
6+
steps:
7+
- name: Download noir-execute binary
8+
uses: actions/download-artifact@v4
9+
with:
10+
name: noir-execute
11+
path: ./noir-execute
12+
13+
- name: Set noir-execute on PATH
14+
shell: bash
15+
run: |
16+
noir_binary="${{ github.workspace }}/noir-execute/noir-execute"
17+
chmod +x $noir_binary
18+
echo "$(dirname $noir_binary)" >> $GITHUB_PATH

.github/benchmark_projects.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
define: &AZ_COMMIT 5f141167d16f1450348a4bbe55d94a462b5b62eb
1+
define: &AZ_COMMIT fd9f1458557f2d67bcf2d58ba4194e000f58600c
22
projects:
33
private-kernel-inner:
44
repo: AztecProtocol/aztec-packages
@@ -16,7 +16,7 @@ projects:
1616
num_runs: 5
1717
timeout: 4
1818
compilation-timeout: 1.2
19-
execution-timeout: 0.02
19+
execution-timeout: 0.04
2020
compilation-memory-limit: 250
2121
execution-memory-limit: 230
2222
private-kernel-reset:
@@ -47,7 +47,7 @@ projects:
4747
timeout: 15
4848
compilation-timeout: 15
4949
execution-timeout: 0.75
50-
compilation-memory-limit: 1300
50+
compilation-memory-limit: 1500
5151
execution-memory-limit: 500
5252
rollup-block-root-empty:
5353
repo: AztecProtocol/aztec-packages

.github/critical_libraries_status/noir-lang/keccak256/.failures.jsonl

Whitespace-only changes.

.github/critical_libraries_status/noir-lang/sha512/.failures.jsonl

Whitespace-only changes.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22
set -eu
33

4-
apt-get install libc++-dev -y
4+
apt-get install libc6 libstdc++6 -y
55
yarn workspace integration-tests test:node

.github/workflows/publish-nargo.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ jobs:
5454
cargo build --package nargo_cli --release --target ${{ matrix.target }} --no-default-features --features "${{ inputs.features }}"
5555
cargo build --package noir_profiler --release --target ${{ matrix.target }} --no-default-features --features "${{ inputs.features }}"
5656
cargo build --package noir_inspector --release --target ${{ matrix.target }} --no-default-features --features "${{ inputs.features }}"
57+
env:
58+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5759

5860
- name: Package artifacts
5961
run: |
@@ -237,5 +239,3 @@ jobs:
237239
make_latest: false
238240
overwrite: true
239241
tag: ${{ format('{0}-{1}', 'nightly', steps.date.outputs.date) }}
240-
241-

.github/workflows/reports.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ jobs:
4242

4343
- name: Build Nargo
4444
run: cargo build --package nargo_cli --release
45+
env:
46+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4547

4648
- name: Package artifacts
4749
run: |
@@ -58,7 +60,7 @@ jobs:
5860
compare_gates_reports:
5961
name: Circuit sizes
6062
needs: [build-nargo]
61-
runs-on: ubuntu-22.04
63+
runs-on: ubuntu-24.04
6264
permissions:
6365
pull-requests: write
6466

.github/workflows/test-js-packages.yml

+47-3
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ jobs:
6464

6565
- name: Build Nargo
6666
run: cargo build --package nargo_cli --release
67+
env:
68+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6769

6870
- name: Package artifacts
6971
run: |
@@ -78,6 +80,39 @@ jobs:
7880
path: ./dist/*
7981
retention-days: 3
8082

83+
build-noir-execute:
84+
runs-on: ubuntu-22.04
85+
timeout-minutes: 30
86+
87+
steps:
88+
- name: Checkout Noir repo
89+
uses: actions/checkout@v4
90+
91+
- name: Setup toolchain
92+
uses: dtolnay/rust-toolchain@1.85.0
93+
94+
- uses: Swatinem/rust-cache@v2
95+
with:
96+
key: x86_64-unknown-linux-gnu
97+
cache-on-failure: true
98+
save-if: ${{ github.event_name != 'merge_group' }}
99+
100+
- name: Build noir-execute
101+
run: cargo build --package noir_artifact_cli --release
102+
103+
- name: Package artifacts
104+
run: |
105+
mkdir dist
106+
cp ./target/release/noir-execute ./dist/noir-execute
107+
7z a -ttar -so -an ./dist/* | 7z a -si ./noir-execute-x86_64-unknown-linux-gnu.tar.gz
108+
109+
- name: Upload artifact
110+
uses: actions/upload-artifact@v4
111+
with:
112+
name: noir-execute
113+
path: ./dist/*
114+
retention-days: 3
115+
81116
build-noirc-abi:
82117
runs-on: ubuntu-22.04
83118
timeout-minutes: 30
@@ -361,7 +396,7 @@ jobs:
361396

362397
test-integration-node:
363398
name: Integration Tests (Node)
364-
runs-on: ubuntu-22.04
399+
runs-on: ubuntu-24.04
365400
needs: [build-acvm-js, build-noir-wasm, build-nargo, build-noirc-abi]
366401
timeout-minutes: 30
367402

@@ -373,6 +408,7 @@ jobs:
373408
run: |
374409
./scripts/install_bb.sh
375410
echo "$HOME/.bb/" >> $GITHUB_PATH
411+
sudo apt-get install libc6 libstdc++6 -y
376412
377413
- name: Download nargo binary
378414
uses: ./.github/actions/download-nargo
@@ -456,8 +492,8 @@ jobs:
456492
457493
test-examples:
458494
name: Example scripts
459-
runs-on: ubuntu-22.04
460-
needs: [build-nargo]
495+
runs-on: ubuntu-24.04
496+
needs: [build-nargo, build-noir-execute]
461497
timeout-minutes: 30
462498

463499
steps:
@@ -473,10 +509,14 @@ jobs:
473509
run: |
474510
./scripts/install_bb.sh
475511
echo "$HOME/.bb/" >> $GITHUB_PATH
512+
sudo apt-get install libc6 libstdc++6 -y
476513
477514
- name: Download nargo binary
478515
uses: ./.github/actions/download-nargo
479516

517+
- name: Download noir-execute binary
518+
uses: ./.github/actions/download-noir-execute
519+
480520
- name: Run `prove_and_verify`
481521
working-directory: ./examples/prove_and_verify
482522
run: ./test.sh
@@ -485,6 +525,10 @@ jobs:
485525
working-directory: ./examples/codegen_verifier
486526
run: ./test.sh
487527

528+
- name: Run `oracle_transcript`
529+
working-directory: ./examples/oracle_transcript
530+
run: ./test.sh
531+
488532
external-repo-checks:
489533
needs: [build-nargo, critical-library-list]
490534
runs-on: ubuntu-22.04

.rustfmt.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
edition = "2018"
1+
edition = "2024"
2+
style_edition = "2024"
23
use_small_heuristics = "Max"

CRITICAL_NOIR_LIBRARIES

+3
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ https://github.com/noir-lang/noir_string_search
1212
https://github.com/noir-lang/sparse_array
1313
https://github.com/noir-lang/noir_rsa
1414
https://github.com/noir-lang/noir_json_parser
15+
https://github.com/noir-lang/sha256
16+
https://github.com/noir-lang/sha512
17+
https://github.com/noir-lang/keccak256

0 commit comments

Comments
 (0)