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

feat(acvm): Update to acvm 0.4.1 #779

Merged
merged 5 commits into from
Feb 9, 2023
Merged

feat(acvm): Update to acvm 0.4.1 #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b928d27
update acvm to 0.4.1 and correct aztec_backend commit
vezenovm Feb 9, 2023
07ca685
missed file save
vezenovm Feb 9, 2023
f87026c
renaming changes from acvm 0.4.1
vezenovm Feb 9, 2023
2139708
Merge branch 'master' into mv/update-acvm-0.4.1
kevaundray Feb 9, 2023
3b702e5
Merge branch 'master' into mv/update-acvm-0.4.1
kevaundray Feb 9, 2023
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
91 changes: 73 additions & 18 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ edition = "2021"
rust-version = "1.64"

[workspace.dependencies]
acvm = "0.3.1"
acvm = "0.4.1"
arena = { path = "crates/arena" }
fm = { path = "crates/fm" }
iter-extended = { path = "crates/iter-extended" }
Expand Down
4 changes: 2 additions & 2 deletions crates/nargo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ termcolor = "1.1.2"
tempdir = "0.3.7"

# Backends
aztec_backend = { optional = true, package = "barretenberg_static_lib", git = "https://github.com/noir-lang/aztec_backend", rev = "9de36b642d125d1fb4facd1bf60db67946be70ae" }
aztec_wasm_backend = { optional = true, package = "barretenberg_wasm", git = "https://github.com/noir-lang/aztec_backend", rev = "9de36b642d125d1fb4facd1bf60db67946be70ae" }
aztec_backend = { optional = true, package = "barretenberg_static_lib", git = "https://github.com/noir-lang/aztec_backend", rev = "d0e1257c22618f98f53781faba3c372ef91a0172" }
aztec_wasm_backend = { optional = true, package = "barretenberg_wasm", git = "https://github.com/noir-lang/aztec_backend", rev = "d0e1257c22618f98f53781faba3c372ef91a0172" }
marlin_arkworks_backend = { optional = true, git = "https://github.com/noir-lang/marlin_arkworks_backend", rev = "144378edad821bfaa52bf2cacca8ecc87514a4fc" }

[features]
Expand Down
2 changes: 1 addition & 1 deletion crates/noirc_driver/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ impl Driver {

let program = monomorphize(main_function, &self.context.def_interner);

let blackbox_supported = acvm::default_is_blackbox_supported(np_language.clone());
let blackbox_supported = acvm::default_is_black_box_supported(np_language.clone());
match create_circuit(program, np_language, blackbox_supported, show_ssa) {
Ok(circuit) => Ok(CompiledProgram { circuit, abi: Some(abi) }),
Err(err) => {
Expand Down
2 changes: 1 addition & 1 deletion crates/noirc_frontend/src/node_interner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ impl NodeInterner {

#[allow(deprecated)]
pub fn foreign(&self, opcode: &str) -> bool {
let is_supported = acvm::default_is_blackbox_supported(self.language.clone());
let is_supported = acvm::default_is_black_box_supported(self.language.clone());
let black_box_func = match acvm::acir::BlackBoxFunc::lookup(opcode) {
Some(black_box_func) => black_box_func,
None => return false,
Expand Down