Skip to content

Commit

Permalink
Merge branch 'master' into tf/less-visibility-hardcoding
Browse files Browse the repository at this point in the history
* master:
  feat: Sync from aztec-packages (#4494)
  feat: Add checks for bit size consistency on brillig gen (#4542)
  fix: Allow non-integer globals to reference struct methods (#4490)
  • Loading branch information
TomAFrench committed Mar 13, 2024
2 parents 97e53e6 + a6016b4 commit 885bcd1
Show file tree
Hide file tree
Showing 67 changed files with 2,792 additions and 2,258 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 885bcd1

Please sign in to comment.