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.

Sign up for GitHub

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

fix: Revert "feat: Sync from noir (#7512)" #7558

Merged
merged 1 commit into from
Jul 23, 2024
Merged

fix: Revert "feat: Sync from noir (#7512)" #7558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2b4853e71859f225acc123160e87c522212b16b5
951e821a585fe7e0697291cadd4d3c3aa49fd8e4
20 changes: 10 additions & 10 deletions avm-transpiler/Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
".": "0.32.0",
"acvm-repo": "0.48.0"
".": "0.31.0",
"acvm-repo": "0.47.0"
}
132 changes: 0 additions & 132 deletions noir/noir-repo/CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions noir/noir-repo/Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
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.32.0"
version = "0.31.0"
# x-release-please-end
authors = ["The Noir Team <team@noir-lang.org>"]
edition = "2021"
Expand All @@ -53,13 +53,13 @@ repository = "https://github.com/noir-lang/noir/"
[workspace.dependencies]

# ACVM workspace dependencies
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 }
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 }

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