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 #7512

Merged
merged 52 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
b468f94
[1 changes] feat: add comptime support for `modulus_*` compiler built…
AztecBot Jul 17, 2024
5d2a448
chore: apply sync fixes
AztecBot Jul 17, 2024
7aa90aa
Merge branch 'master' into sync-noir
TomAFrench Jul 17, 2024
d9f4555
.
TomAFrench Jul 17, 2024
39d9d7b
.
TomAFrench Jul 17, 2024
d04c84c
.
TomAFrench Jul 17, 2024
dd6d9c1
.
TomAFrench Jul 17, 2024
96d3fe4
[1 changes] feat: LSP document symbol (https://github.com/noir-lang/n…
AztecBot Jul 18, 2024
d0e3734
chore: apply sync fixes
AztecBot Jul 18, 2024
101f375
feat: LSP document symbol (https://github.com/noir-lang/noir/pull/5532)
AztecBot Jul 18, 2024
a0e9158
.
TomAFrench Jul 18, 2024
0090029
[1 changes] fix: revert PR #5449 (https://github.com/noir-lang/noir/p…
AztecBot Jul 18, 2024
b451bb2
chore: apply sync fixes
AztecBot Jul 18, 2024
01609aa
fix: revert PR #5449 (https://github.com/noir-lang/noir/pull/5548)
AztecBot Jul 18, 2024
4fdf4ad
.
TomAFrench Jul 18, 2024
820a793
.
TomAFrench Jul 18, 2024
943ca4d
format
guipublic Jul 18, 2024
6c23742
remove unused crate
guipublic Jul 18, 2024
fe42f2e
Merge branch 'master' into sync-noir
guipublic Jul 18, 2024
db9734d
filter warnings from the elaborator in Aztec Macro
guipublic Jul 18, 2024
b4b94ff
Merge branch 'master' into sync-noir
guipublic Jul 18, 2024
6a8b549
[1 changes] feat: Add a compile-time hash map type (https://github.co…
AztecBot Jul 19, 2024
163783c
chore: apply sync fixes
AztecBot Jul 19, 2024
683cf80
feat: Add a compile-time hash map type (https://github.com/noir-lang/…
AztecBot Jul 19, 2024
cd7fe72
trying to transpile keccakf1600
guipublic Jul 19, 2024
e8177a3
Merge branch 'master' into sync-noir
guipublic Jul 19, 2024
1857b5a
revert keccakf1600 in transpiler
guipublic Jul 19, 2024
548cecc
enable keccak blackbox in stdlib
guipublic Jul 19, 2024
81226c5
fix the build, but why?
guipublic Jul 19, 2024
45543f1
duplicates are back..?
guipublic Jul 19, 2024
abeee24
add back support for keccak256 blackbox (revert #5508)
guipublic Jul 19, 2024
5972dc9
format
guipublic Jul 19, 2024
34c9720
revert #5547
guipublic Jul 19, 2024
34e6aa8
remove debug info
guipublic Jul 19, 2024
57e8816
revert #5557: move test cases
guipublic Jul 19, 2024
abe8b92
update yarn.lock
guipublic Jul 19, 2024
7a76d30
Merge branch 'master' into sync-noir
guipublic Jul 19, 2024
62920d4
[1 changes] fix(frontend): Disallow signed numeric generics (https://…
AztecBot Jul 20, 2024
697795e
chore: apply sync fixes
AztecBot Jul 20, 2024
f9c28e5
fix(frontend): Disallow signed numeric generics (https://github.com/n…
AztecBot Jul 20, 2024
e68a3a8
[1 changes] fix(frontend): Disallow signed numeric generics (https://…
AztecBot Jul 21, 2024
5d7a6fb
chore: apply sync fixes
AztecBot Jul 21, 2024
ae8ec17
fix(frontend): Disallow signed numeric generics (https://github.com/n…
AztecBot Jul 21, 2024
508d839
duplicates
guipublic Jul 22, 2024
ed49eab
[1 changes] fix(frontend): Disallow signed numeric generics (https://…
AztecBot Jul 22, 2024
5605c27
chore: apply sync fixes
AztecBot Jul 22, 2024
883788d
fix(frontend): Disallow signed numeric generics (https://github.com/n…
AztecBot Jul 22, 2024
a01535e
remove duplicated multi_scalar_mul_slice
vezenovm Jul 22, 2024
a5abf0c
try and fix typ differences when merging
vezenovm Jul 22, 2024
e57c16c
Merge branch 'master' into sync-noir
vezenovm Jul 22, 2024
8da4487
Merge branch 'master' into sync-noir
vezenovm Jul 22, 2024
22418f9
Merge branch 'master' into sync-noir
sirasistant Jul 23, 2024
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 @@
951e821a585fe7e0697291cadd4d3c3aa49fd8e4
2b4853e71859f225acc123160e87c522212b16b5
20 changes: 10 additions & 10 deletions avm-transpiler/Cargo.lock

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

4 changes: 2 additions & 2 deletions noir/noir-repo/.github/workflows/test-js-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -517,8 +517,8 @@ jobs:
fail-fast: false
matrix:
project:
- { repo: AztecProtocol/aztec-nr, path: ./ }
- { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts }
# - { repo: AztecProtocol/aztec-nr, path: ./ }
# - { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-contracts }
# Disabled as aztec-packages requires a setup-step in order to generate a `Nargo.toml`
#- { repo: AztecProtocol/aztec-packages, path: ./noir-projects/noir-protocol-circuits }
- { repo: zac-williamson/noir-edwards, path: ./, ref: 0016ce82cd58b6ebb0c43c271725590bcff4e755 }
Expand Down
4 changes: 2 additions & 2 deletions noir/noir-repo/.release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
".": "0.31.0",
"acvm-repo": "0.47.0"
".": "0.32.0",
"acvm-repo": "0.48.0"
}
132 changes: 132 additions & 0 deletions noir/noir-repo/CHANGELOG.md

Large diffs are not rendered by default.

58 changes: 29 additions & 29 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 @@ -42,7 +42,7 @@ resolver = "2"

[workspace.package]
# x-release-please-start-version
version = "0.31.0"
version = "0.32.0"
# x-release-please-end
authors = ["The Noir Team <[email protected]>"]
edition = "2021"
Expand All @@ -53,13 +53,13 @@ repository = "https://github.com/noir-lang/noir/"
[workspace.dependencies]

# ACVM workspace dependencies
acir_field = { version = "0.47.0", path = "acvm-repo/acir_field", default-features = false }
acir = { version = "0.47.0", path = "acvm-repo/acir", default-features = false }
acvm = { version = "0.47.0", path = "acvm-repo/acvm" }
brillig = { version = "0.47.0", path = "acvm-repo/brillig", default-features = false }
brillig_vm = { version = "0.47.0", path = "acvm-repo/brillig_vm", default-features = false }
acvm_blackbox_solver = { version = "0.47.0", path = "acvm-repo/blackbox_solver", default-features = false }
bn254_blackbox_solver = { version = "0.47.0", path = "acvm-repo/bn254_blackbox_solver", default-features = false }
acir_field = { version = "0.48.0", path = "acvm-repo/acir_field", default-features = false }
acir = { version = "0.48.0", path = "acvm-repo/acir", default-features = false }
acvm = { version = "0.48.0", path = "acvm-repo/acvm" }
brillig = { version = "0.48.0", path = "acvm-repo/brillig", default-features = false }
brillig_vm = { version = "0.48.0", path = "acvm-repo/brillig_vm", default-features = false }
acvm_blackbox_solver = { version = "0.48.0", path = "acvm-repo/blackbox_solver", default-features = false }
bn254_blackbox_solver = { version = "0.48.0", path = "acvm-repo/bn254_blackbox_solver", default-features = false }

# Noir compiler workspace dependencies
fm = { path = "compiler/fm" }
Expand Down
Loading
Loading