Skip to content

Commit

Permalink
feat: Sync from aztec-packages (#4494)
Browse files Browse the repository at this point in the history
Automated pull of Noir development from
[aztec-packages](https://github.com/AztecProtocol/aztec-packages).
BEGIN_COMMIT_OVERRIDE
chore!: Remove open keyword from Noir
(AztecProtocol/aztec-packages#4967)
chore: aztec-macros refactor
(AztecProtocol/aztec-packages#5127)
feat: make brillig-gen more AVM-friendly
(AztecProtocol/aztec-packages#5091)
feat: Integrated native ACVM
(AztecProtocol/aztec-packages#4903)
END_COMMIT_OVERRIDE

---------

Co-authored-by: sirasistant <[email protected]>
Co-authored-by: Maddiaa <[email protected]>
Co-authored-by: Tom French <[email protected]>
Co-authored-by: TomAFrench <[email protected]>
Co-authored-by: Alex Gherghisan <[email protected]>
  • Loading branch information
6 people authored Mar 13, 2024
1 parent f3243b7 commit a6016b4
Show file tree
Hide file tree
Showing 59 changed files with 2,415 additions and 1,961 deletions.
2 changes: 1 addition & 1 deletion .aztec-sync-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7ff9b71d8d87fc93ae7dbd8ba63f5176b0cd17be
58e15edf7fd3d32267b0aed883fc84f6cee327c9
20 changes: 20 additions & 0 deletions Cargo.lock

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

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ members = [
"tooling/nargo_toml",
"tooling/noirc_abi",
"tooling/noirc_abi_wasm",
"tooling/acvm_cli",
# ACVM
"acvm-repo/acir_field",
"acvm-repo/acir",
Expand All @@ -35,7 +36,7 @@ members = [
"acvm-repo/blackbox_solver",
"acvm-repo/bn254_blackbox_solver",
]
default-members = ["tooling/nargo_cli"]
default-members = ["tooling/nargo_cli", "tooling/acvm_cli"]
resolver = "2"

[workspace.package]
Expand Down Expand Up @@ -77,6 +78,7 @@ noir_lsp = { path = "tooling/lsp" }
noir_debugger = { path = "tooling/debugger" }
noirc_abi = { path = "tooling/noirc_abi" }
bb_abstraction_leaks = { path = "tooling/bb_abstraction_leaks" }
acvm_cli = { path = "tooling/acvm_cli" }

# LSP
async-lsp = { version = "0.1.0", default-features = false }
Expand Down
Loading

0 comments on commit a6016b4

Please sign in to comment.