feat(acvm): Update to acvm 0.4.1 (#779)

* update acvm to 0.4.1 and correct aztec_backend commit * missed file save * renaming changes from acvm 0.4.1 --------- Co-authored-by: kevaundray <[email protected]>
noir-lang · Feb 9, 2023 · 6f57e86 · 6f57e86
1 parent f979918
commit 6f57e86
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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" }

diff --git a/crates/nargo/Cargo.toml b/crates/nargo/Cargo.toml
@@ -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]

diff --git a/crates/noirc_driver/src/lib.rs b/crates/noirc_driver/src/lib.rs
@@ -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) => {

diff --git a/crates/noirc_frontend/src/node_interner.rs b/crates/noirc_frontend/src/node_interner.rs
@@ -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,