Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Sync from noir #10922

Merged
merged 43 commits into from
Jan 2, 2025
Merged
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
3eddfd7
[1 changes] chore: Release Noir(1.0.0-beta.1) (https://github.com/noi…
AztecBot Dec 21, 2024
f3ff9e7
chore: apply sync fixes
AztecBot Dec 21, 2024
12331a8
[1 changes] chore: Release Noir(1.0.0-beta.1) (https://github.com/noi…
AztecBot Dec 22, 2024
5f01455
chore: apply sync fixes
AztecBot Dec 22, 2024
f122e71
chore: Release Noir(1.0.0-beta.1) (https://github.com/noir-lang/noir/…
AztecBot Dec 22, 2024
8f5e992
[1 changes] chore: Release Noir(1.0.0-beta.1) (https://github.com/noi…
AztecBot Dec 23, 2024
dba0c59
chore: apply sync fixes
AztecBot Dec 23, 2024
ac58df9
chore: Release Noir(1.0.0-beta.1) (https://github.com/noir-lang/noir/…
AztecBot Dec 23, 2024
c27aa49
[1 changes] chore: add `rollup_root` and `rollup_block_merge` to trac…
AztecBot Dec 24, 2024
2ec3c4a
chore: apply sync fixes
AztecBot Dec 24, 2024
cf8b9ad
chore: add `rollup_root` and `rollup_block_merge` to tracked protocol…
AztecBot Dec 24, 2024
14f10e9
[1 changes] chore: add `rollup_root` and `rollup_block_merge` to trac…
AztecBot Dec 25, 2024
36fd4aa
chore: apply sync fixes
AztecBot Dec 25, 2024
fd61ca2
chore: add `rollup_root` and `rollup_block_merge` to tracked protocol…
AztecBot Dec 25, 2024
e4f3f00
[1 changes] chore: add `rollup_root` and `rollup_block_merge` to trac…
AztecBot Dec 26, 2024
c3c4b5e
chore: apply sync fixes
AztecBot Dec 26, 2024
c727e9b
chore: add `rollup_root` and `rollup_block_merge` to tracked protocol…
AztecBot Dec 26, 2024
8ec0999
[1 changes] chore: add `rollup_root` and `rollup_block_merge` to trac…
AztecBot Dec 27, 2024
6a94364
chore: apply sync fixes
AztecBot Dec 27, 2024
52edcb6
chore: add `rollup_root` and `rollup_block_merge` to tracked protocol…
AztecBot Dec 27, 2024
1702195
[1 changes] chore: add `rollup_root` and `rollup_block_merge` to trac…
AztecBot Dec 28, 2024
d53fefb
chore: apply sync fixes
AztecBot Dec 28, 2024
22b2a93
chore: add `rollup_root` and `rollup_block_merge` to tracked protocol…
AztecBot Dec 28, 2024
b9b0a19
[1 changes] chore: add `rollup_root` and `rollup_block_merge` to trac…
AztecBot Dec 29, 2024
dd772ba
chore: apply sync fixes
AztecBot Dec 29, 2024
61c186e
chore: add `rollup_root` and `rollup_block_merge` to tracked protocol…
AztecBot Dec 29, 2024
21ce0f3
[1 changes] chore: add `rollup_root` and `rollup_block_merge` to trac…
AztecBot Dec 30, 2024
669f788
chore: apply sync fixes
AztecBot Dec 30, 2024
0c1d29c
chore: add `rollup_root` and `rollup_block_merge` to tracked protocol…
AztecBot Dec 30, 2024
01e93ae
[1 changes] chore: add `rollup_root` and `rollup_block_merge` to trac…
AztecBot Dec 31, 2024
3d2915b
chore: apply sync fixes
AztecBot Dec 31, 2024
b23d97d
chore: add `rollup_root` and `rollup_block_merge` to tracked protocol…
AztecBot Dec 31, 2024
2cdb860
[1 changes] chore: add `rollup_root` and `rollup_block_merge` to trac…
AztecBot Jan 1, 2025
3e61028
chore: apply sync fixes
AztecBot Jan 1, 2025
e6fc1a6
chore: add `rollup_root` and `rollup_block_merge` to tracked protocol…
AztecBot Jan 1, 2025
8cfacf1
[1 changes] chore: add `rollup_root` and `rollup_block_merge` to trac…
AztecBot Jan 2, 2025
cf0b250
chore: apply sync fixes
AztecBot Jan 2, 2025
123376a
chore: add `rollup_root` and `rollup_block_merge` to tracked protocol…
AztecBot Jan 2, 2025
9a5abda
Merge branch 'master' into sync-noir
TomAFrench Jan 2, 2025
82c0996
Merge branch 'master' into sync-noir
TomAFrench Jan 2, 2025
406cc32
.
TomAFrench Jan 2, 2025
1d737fb
.
TomAFrench Jan 2, 2025
b11da25
Merge branch 'master' into sync-noir
TomAFrench Jan 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .noir-sync-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
913be5b013323449963d31ab00f521f572cfcd67
c8a25b52a484115663cccf614bbebe3ca11778f3
25 changes: 25 additions & 0 deletions noir/noir-repo/.github/workflows/reports.yml
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@ jobs:
- project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-inner, take_average: true }
- project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-tail, take_average: true }
- project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/private-kernel-reset, take_average: true }
- project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-root }
#- project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-block-root }
- project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-block-merge }
- project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-private }
- project: { repo: AztecProtocol/aztec-packages, path: noir-projects/noir-protocol-circuits/crates/rollup-base-public }

Expand Down Expand Up @@ -389,6 +392,28 @@ jobs:
mv /home/runner/work/noir/noir/scripts/test_programs/execution_report.sh ./execution_report.sh
./execution_report.sh 1 1

- name: Generate compilation report with averages
working-directory: ./test-repo/${{ matrix.project.path }}
if: ${{ matrix.project.take_average }}
run: |
mv /home/runner/work/noir/noir/scripts/test_programs/compilation_report.sh ./compilation_report.sh
chmod +x ./compilation_report.sh
./compilation_report.sh 1 1

- name: Generate execution report without averages
working-directory: ./test-repo/${{ matrix.project.path }}
if: ${{ !matrix.project.is_library && !matrix.project.take_average }}
run: |
mv /home/runner/work/noir/noir/scripts/test_programs/execution_report.sh ./execution_report.sh
./execution_report.sh 1

- name: Generate execution report with averages
working-directory: ./test-repo/${{ matrix.project.path }}
if: ${{ !matrix.project.is_library && matrix.project.take_average }}
run: |
mv /home/runner/work/noir/noir/scripts/test_programs/execution_report.sh ./execution_report.sh
./execution_report.sh 1 1

- name: Move compilation report
id: compilation_report
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion noir/noir-repo/.release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "1.0.0-beta.0"
".": "1.0.0-beta.1"
}
101 changes: 101 additions & 0 deletions noir/noir-repo/CHANGELOG.md

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions noir/noir-repo/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions noir/noir-repo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ resolver = "2"

[workspace.package]
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors = ["The Noir Team <[email protected]>"]
edition = "2021"
Expand All @@ -57,13 +57,13 @@ unused_qualifications = "warn"
[workspace.dependencies]

# ACVM workspace dependencies
acir_field = { version = "1.0.0-beta.0", path = "acvm-repo/acir_field", default-features = false }
acir = { version = "1.0.0-beta.0", path = "acvm-repo/acir", default-features = false }
acvm = { version = "1.0.0-beta.0", path = "acvm-repo/acvm" }
brillig = { version = "1.0.0-beta.0", path = "acvm-repo/brillig", default-features = false }
brillig_vm = { version = "1.0.0-beta.0", path = "acvm-repo/brillig_vm", default-features = false }
acvm_blackbox_solver = { version = "1.0.0-beta.0", path = "acvm-repo/blackbox_solver", default-features = false }
bn254_blackbox_solver = { version = "1.0.0-beta.0", path = "acvm-repo/bn254_blackbox_solver", default-features = false }
acir_field = { version = "1.0.0-beta.1", path = "acvm-repo/acir_field", default-features = false }
acir = { version = "1.0.0-beta.1", path = "acvm-repo/acir", default-features = false }
acvm = { version = "1.0.0-beta.1", path = "acvm-repo/acvm" }
brillig = { version = "1.0.0-beta.1", path = "acvm-repo/brillig", default-features = false }
brillig_vm = { version = "1.0.0-beta.1", path = "acvm-repo/brillig_vm", default-features = false }
acvm_blackbox_solver = { version = "1.0.0-beta.1", path = "acvm-repo/blackbox_solver", default-features = false }
bn254_blackbox_solver = { version = "1.0.0-beta.1", path = "acvm-repo/bn254_blackbox_solver", default-features = false }

# Noir compiler workspace dependencies
fm = { path = "compiler/fm" }
Expand Down
2 changes: 1 addition & 1 deletion noir/noir-repo/acvm-repo/acir/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "acir"
description = "ACIR is the IR that the VM processes, it is analogous to LLVM IR"
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion noir/noir-repo/acvm-repo/acir_field/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "acir_field"
description = "The field implementation being used by ACIR."
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion noir/noir-repo/acvm-repo/acvm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "acvm"
description = "The virtual machine that processes ACIR given a backend/proof system."
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion noir/noir-repo/acvm-repo/acvm_js/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "acvm_js"
description = "Typescript wrapper around the ACVM allowing execution of ACIR code"
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion noir/noir-repo/acvm-repo/acvm_js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@noir-lang/acvm_js",
"version": "1.0.0-beta.0",
"version": "1.0.0-beta.1",
"publishConfig": {
"access": "public"
},
Expand Down
2 changes: 1 addition & 1 deletion noir/noir-repo/acvm-repo/blackbox_solver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "acvm_blackbox_solver"
description = "A solver for the blackbox functions found in ACIR and Brillig"
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion noir/noir-repo/acvm-repo/bn254_blackbox_solver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "bn254_blackbox_solver"
description = "Solvers for black box functions which are specific for the bn254 curve"
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion noir/noir-repo/acvm-repo/brillig/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "brillig"
description = "Brillig is the bytecode ACIR uses for non-determinism."
# x-release-please-start-version
version = "1.0.0-beta.0"
version = "1.0.0-beta.1"
# x-release-please-end
authors.workspace = true
edition.workspace = true
Expand Down
Loading
Loading