From 3cc28f67d81936ef4187d081068506f11fb2d0b3 Mon Sep 17 00:00:00 2001 From: Joss Date: Tue, 28 Mar 2023 10:57:12 +0100 Subject: [PATCH 1/3] chore!: upgrade to acvm 0.7.1 --- Cargo.lock | 45 ++++++++++--------- Cargo.toml | 2 +- crates/nargo/Cargo.toml | 4 +- crates/nargo/src/cli/execute_cmd.rs | 11 ++++- crates/nargo/src/cli/test_cmd.rs | 26 +++++++---- crates/noirc_driver/src/lib.rs | 4 +- crates/noirc_evaluator/src/lib.rs | 11 +++-- .../src/ssa/acir_gen/constraints.rs | 6 +-- crates/noirc_frontend/src/node_interner.rs | 10 ++++- 9 files changed, 73 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c04345b45c9..94e052b5835 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,11 +16,11 @@ dependencies = [ [[package]] name = "acir" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744c21590f6da95914f1d83f247dba49d4f287beb725bfbcbc54eaf823484b1a" +checksum = "4752b7bce78f98f865733f53fae0e0ed3f0c115b090853508d27f84a2ba13e9c" dependencies = [ - "acir_field 0.6.0", + "acir_field 0.7.1", "flate2", "rmp-serde", "serde", @@ -45,9 +45,9 @@ dependencies = [ [[package]] name = "acir_field" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081a09b71facabddd411bfb8459c0f4d9350c39707680da6c04debb3db9de503" +checksum = "9b044b5d4fc80af9cae007edc2de609594ca64b34df6ad90967279bbddb356f2" dependencies = [ "ark-bn254 0.4.0", "ark-ff 0.4.1", @@ -78,13 +78,14 @@ dependencies = [ [[package]] name = "acvm" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73876b7d5d23d0826ea4c9150b4a62af0b20a6937a79472ee0ceda30868aa207" +checksum = "241f3ac90354dc65110f2689a0bb6b0bd2e4e4f2d7bc94d5219ebf3a95fa0a80" dependencies = [ - "acir 0.6.0", - "acvm_stdlib 0.6.0", + "acir 0.7.1", + "acvm_stdlib 0.7.1", "blake2", + "crc32fast", "indexmap", "k256", "num-bigint", @@ -105,11 +106,11 @@ dependencies = [ [[package]] name = "acvm_stdlib" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2259c21b06db652e41bddb1deb22da8d303746a0e8bf877983c7d83f71943b8" +checksum = "b043f336644ba4ac506d230c3aa4aba0f48bafe944ebaab192155673080fa32e" dependencies = [ - "acir 0.6.0", + "acir 0.7.1", ] [[package]] @@ -546,7 +547,7 @@ dependencies = [ [[package]] name = "barretenberg_static_lib" version = "0.1.0" -source = "git+https://github.com/noir-lang/aztec_backend?rev=2cb523d2ab95249157b22e198d9dcd6841c3eed8#2cb523d2ab95249157b22e198d9dcd6841c3eed8" +source = "git+https://github.com/noir-lang/aztec_backend?rev=d4bcec67fecfcd527e373221e942eacd7ba7c083#d4bcec67fecfcd527e373221e942eacd7ba7c083" dependencies = [ "barretenberg_wrapper", "common", @@ -555,7 +556,7 @@ dependencies = [ [[package]] name = "barretenberg_wasm" version = "0.1.0" -source = "git+https://github.com/noir-lang/aztec_backend?rev=2cb523d2ab95249157b22e198d9dcd6841c3eed8#2cb523d2ab95249157b22e198d9dcd6841c3eed8" +source = "git+https://github.com/noir-lang/aztec_backend?rev=d4bcec67fecfcd527e373221e942eacd7ba7c083#d4bcec67fecfcd527e373221e942eacd7ba7c083" dependencies = [ "common", "wasmer", @@ -901,9 +902,9 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/noir-lang/aztec_backend?rev=2cb523d2ab95249157b22e198d9dcd6841c3eed8#2cb523d2ab95249157b22e198d9dcd6841c3eed8" +source = "git+https://github.com/noir-lang/aztec_backend?rev=d4bcec67fecfcd527e373221e942eacd7ba7c083#d4bcec67fecfcd527e373221e942eacd7ba7c083" dependencies = [ - "acvm 0.6.0", + "acvm 0.7.1", "blake2", "dirs 3.0.2", "downloader", @@ -2243,7 +2244,7 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" name = "nargo" version = "0.3.2" dependencies = [ - "acvm 0.6.0", + "acvm 0.7.1", "assert_cmd", "assert_fs", "barretenberg_static_lib", @@ -2275,7 +2276,7 @@ dependencies = [ name = "noir_wasm" version = "0.3.2" dependencies = [ - "acvm 0.6.0", + "acvm 0.7.1", "build-data", "console_error_panic_hook", "gloo-utils", @@ -2291,7 +2292,7 @@ dependencies = [ name = "noirc_abi" version = "0.3.2" dependencies = [ - "acvm 0.6.0", + "acvm 0.7.1", "iter-extended", "serde", "serde_json", @@ -2303,7 +2304,7 @@ dependencies = [ name = "noirc_driver" version = "0.3.2" dependencies = [ - "acvm 0.6.0", + "acvm 0.7.1", "clap 4.1.8", "fm", "iter-extended", @@ -2329,7 +2330,7 @@ dependencies = [ name = "noirc_evaluator" version = "0.3.2" dependencies = [ - "acvm 0.6.0", + "acvm 0.7.1", "arena", "iter-extended", "noirc_abi", @@ -2345,7 +2346,7 @@ dependencies = [ name = "noirc_frontend" version = "0.3.2" dependencies = [ - "acvm 0.6.0", + "acvm 0.7.1", "arena", "chumsky", "fm", diff --git a/Cargo.toml b/Cargo.toml index 6af65433e38..9c2d9ae2431 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ edition = "2021" rust-version = "1.66" [workspace.dependencies] -acvm = "0.6.0" +acvm = "0.7.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 index 9304ebd9b56..ebb726b54ec 100644 --- a/crates/nargo/Cargo.toml +++ b/crates/nargo/Cargo.toml @@ -34,8 +34,8 @@ color-eyre = "0.6.2" # Backends -aztec_backend = { optional = true, package = "barretenberg_static_lib", git = "https://github.com/noir-lang/aztec_backend", rev = "2cb523d2ab95249157b22e198d9dcd6841c3eed8" } -aztec_wasm_backend = { optional = true, package = "barretenberg_wasm", git = "https://github.com/noir-lang/aztec_backend", rev = "2cb523d2ab95249157b22e198d9dcd6841c3eed8" } +aztec_backend = { optional = true, package = "barretenberg_static_lib", git = "https://github.com/noir-lang/aztec_backend", rev = "d4bcec67fecfcd527e373221e942eacd7ba7c083" } +aztec_wasm_backend = { optional = true, package = "barretenberg_wasm", git = "https://github.com/noir-lang/aztec_backend", rev = "d4bcec67fecfcd527e373221e942eacd7ba7c083" } marlin_arkworks_backend = { optional = true, git = "https://github.com/noir-lang/marlin_arkworks_backend", rev = "144378edad821bfaa52bf2cacca8ecc87514a4fc" } [dev-dependencies] diff --git a/crates/nargo/src/cli/execute_cmd.rs b/crates/nargo/src/cli/execute_cmd.rs index 7ca32629039..4a3d89585bf 100644 --- a/crates/nargo/src/cli/execute_cmd.rs +++ b/crates/nargo/src/cli/execute_cmd.rs @@ -1,5 +1,6 @@ use std::path::Path; +use acvm::pwg::block::Blocks; use acvm::PartialWitnessGenerator; use clap::Args; use noirc_abi::input_parser::{Format, InputValue}; @@ -67,7 +68,15 @@ pub(crate) fn execute_program( let mut solved_witness = compiled_program.abi.encode(inputs_map, None)?; let backend = crate::backends::ConcreteBackend; - backend.solve(&mut solved_witness, compiled_program.circuit.opcodes.clone())?; + let mut blocks = Blocks::default(); + let (unresolved_opcodes, oracles) = backend.solve( + &mut solved_witness, + &mut blocks, + compiled_program.circuit.opcodes.clone(), + )?; + if !unresolved_opcodes.is_empty() || !oracles.is_empty() { + todo!("Add oracle support to nargo execute") + } Ok(solved_witness) } diff --git a/crates/nargo/src/cli/test_cmd.rs b/crates/nargo/src/cli/test_cmd.rs index b447ebd6774..665591f188d 100644 --- a/crates/nargo/src/cli/test_cmd.rs +++ b/crates/nargo/src/cli/test_cmd.rs @@ -1,6 +1,6 @@ use std::{collections::BTreeMap, io::Write, path::Path}; -use acvm::{PartialWitnessGenerator, ProofSystemCompiler}; +use acvm::{pwg::block::Blocks, PartialWitnessGenerator, ProofSystemCompiler}; use clap::Args; use noirc_driver::{CompileOptions, Driver}; use noirc_frontend::node_interner::FuncId; @@ -79,6 +79,7 @@ fn run_test( config: &CompileOptions, ) -> Result<(), CliError> { let backend = crate::backends::ConcreteBackend; + let mut blocks = Blocks::default(); let program = driver .compile_no_check(config, main) @@ -88,13 +89,20 @@ fn run_test( // Run the backend to ensure the PWG evaluates functions like std::hash::pedersen, // otherwise constraints involving these expressions will not error. - if let Err(error) = backend.solve(&mut solved_witness, program.circuit.opcodes) { - let writer = StandardStream::stderr(ColorChoice::Always); - let mut writer = writer.lock(); - writer.set_color(ColorSpec::new().set_fg(Some(Color::Red))).ok(); - writeln!(writer, "failed").ok(); - writer.reset().ok(); - return Err(error.into()); + match backend.solve(&mut solved_witness, &mut blocks, program.circuit.opcodes) { + Ok((unresolved_opcodes, oracles)) => { + if !unresolved_opcodes.is_empty() || !oracles.is_empty() { + todo!("Add oracle support to nargo test") + } + Ok(()) + } + Err(error) => { + let writer = StandardStream::stderr(ColorChoice::Always); + let mut writer = writer.lock(); + writer.set_color(ColorSpec::new().set_fg(Some(Color::Red))).ok(); + writeln!(writer, "failed").ok(); + writer.reset().ok(); + Err(error.into()) + } } - Ok(()) } diff --git a/crates/noirc_driver/src/lib.rs b/crates/noirc_driver/src/lib.rs index d1bcc7b71af..e5dec62693f 100644 --- a/crates/noirc_driver/src/lib.rs +++ b/crates/noirc_driver/src/lib.rs @@ -244,12 +244,12 @@ impl Driver { let program = monomorphize(main_function, &self.context.def_interner); let np_language = self.language.clone(); - let blackbox_supported = acvm::default_is_black_box_supported(np_language.clone()); + let is_opcode_supported = acvm::default_is_opcode_supported(np_language.clone()); match create_circuit( program, np_language, - blackbox_supported, + is_opcode_supported, options.show_ssa, options.show_output, ) { diff --git a/crates/noirc_evaluator/src/lib.rs b/crates/noirc_evaluator/src/lib.rs index 705bb746942..119d3739319 100644 --- a/crates/noirc_evaluator/src/lib.rs +++ b/crates/noirc_evaluator/src/lib.rs @@ -8,7 +8,7 @@ mod ssa; use acvm::{ acir::circuit::{opcodes::Opcode as AcirOpcode, Circuit, PublicInputs}, acir::native_types::{Expression, Witness}, - compiler::transformers::IsBlackBoxSupported, + compiler::transformers::IsOpcodeSupported, Language, }; use errors::{RuntimeError, RuntimeErrorKind}; @@ -53,7 +53,7 @@ pub struct Evaluator { pub fn create_circuit( program: Program, np_language: Language, - is_blackbox_supported: IsBlackBoxSupported, + is_opcode_supported: IsOpcodeSupported, enable_logging: bool, show_output: bool, ) -> Result<(Circuit, Abi), RuntimeError> { @@ -70,6 +70,8 @@ pub fn create_circuit( // see https://github.com/noir-lang/acvm/pull/56 let mut param_witnesses = evaluator.param_witnesses; let return_witnesses = param_witnesses.remove(MAIN_RETURN_NAME).unwrap_or_default(); + let return_witnesses_set: BTreeSet = + return_witnesses.iter().map(|w| w.clone()).collect(); let abi = Abi { parameters, param_witnesses, return_type, return_witnesses }; @@ -77,10 +79,11 @@ pub fn create_circuit( Circuit { current_witness_index: witness_index, opcodes: evaluator.opcodes, - public_inputs: PublicInputs(evaluator.public_inputs), + public_parameters: PublicInputs(evaluator.public_inputs), + return_values: PublicInputs(return_witnesses_set), }, np_language, - is_blackbox_supported, + is_opcode_supported, ) .map_err(|_| RuntimeErrorKind::Spanless(String::from("produced an acvm compile error")))?; diff --git a/crates/noirc_evaluator/src/ssa/acir_gen/constraints.rs b/crates/noirc_evaluator/src/ssa/acir_gen/constraints.rs index f0911380d4d..978bfe49008 100644 --- a/crates/noirc_evaluator/src/ssa/acir_gen/constraints.rs +++ b/crates/noirc_evaluator/src/ssa/acir_gen/constraints.rs @@ -9,7 +9,7 @@ use acvm::{ directives::Directive, opcodes::{BlackBoxFuncCall, FunctionInput, Opcode as AcirOpcode}, }, - native_types::{Expression, Linear, Witness}, + native_types::{Expression, Witness}, }, FieldElement, }; @@ -266,7 +266,7 @@ pub(crate) fn range_constraint( let exp_big = BigUint::from(2_u128).pow(num_bits - 1); let exp = FieldElement::from_be_bytes_reduce(&exp_big.to_bytes_be()); evaluator.push_opcode(AcirOpcode::Directive(Directive::Quotient { - a: Linear::from(witness).into(), + a: Expression::from(witness), b: Expression::from_field(exp), q: b_witness, r: r_witness, @@ -546,7 +546,7 @@ pub(crate) fn evaluate_udiv( })); //r bool { - let is_supported = acvm::default_is_black_box_supported(self.language.clone()); + let is_supported = acvm::default_is_opcode_supported(self.language.clone()); let black_box_func = match acvm::acir::BlackBoxFunc::lookup(opcode) { Some(black_box_func) => black_box_func, None => return false, }; - is_supported(&black_box_func) + is_supported(&Opcode::BlackBoxFuncCall(BlackBoxFuncCall { + name: black_box_func, + inputs: Vec::new(), + outputs: Vec::new(), + })) } pub fn push_delayed_type_check(&mut self, f: TypeCheckFn) { From 386307e06772be4dd8cb4d26dab4aba205fde06a Mon Sep 17 00:00:00 2001 From: Joss Date: Tue, 28 Mar 2023 11:54:51 +0100 Subject: [PATCH 2/3] chore: update test and tidy --- crates/noirc_evaluator/src/lib.rs | 3 +-- .../src/ssa/acir_gen/operations/sort.rs | 11 +++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/crates/noirc_evaluator/src/lib.rs b/crates/noirc_evaluator/src/lib.rs index 119d3739319..9f39dc3baa4 100644 --- a/crates/noirc_evaluator/src/lib.rs +++ b/crates/noirc_evaluator/src/lib.rs @@ -70,8 +70,7 @@ pub fn create_circuit( // see https://github.com/noir-lang/acvm/pull/56 let mut param_witnesses = evaluator.param_witnesses; let return_witnesses = param_witnesses.remove(MAIN_RETURN_NAME).unwrap_or_default(); - let return_witnesses_set: BTreeSet = - return_witnesses.iter().map(|w| w.clone()).collect(); + let return_witnesses_set: BTreeSet = return_witnesses.iter().copied().collect(); let abi = Abi { parameters, param_witnesses, return_type, return_witnesses }; diff --git a/crates/noirc_evaluator/src/ssa/acir_gen/operations/sort.rs b/crates/noirc_evaluator/src/ssa/acir_gen/operations/sort.rs index 38910e0ef94..48837136083 100644 --- a/crates/noirc_evaluator/src/ssa/acir_gen/operations/sort.rs +++ b/crates/noirc_evaluator/src/ssa/acir_gen/operations/sort.rs @@ -117,7 +117,8 @@ mod test { use acvm::{ acir::{circuit::opcodes::BlackBoxFuncCall, native_types::Witness}, - FieldElement, OpcodeResolutionError, PartialWitnessGenerator, + pwg::block::Blocks, + FieldElement, OpcodeResolution, OpcodeResolutionError, PartialWitnessGenerator, }; use crate::{ @@ -131,7 +132,7 @@ mod test { fn solve_black_box_function_call( _initial_witness: &mut BTreeMap, _func_call: &BlackBoxFuncCall, - ) -> Result<(), OpcodeResolutionError> { + ) -> Result { unreachable!(); } } @@ -177,9 +178,11 @@ mod test { } // compute the network output by solving the constraints let backend = MockBackend {}; - backend - .solve(&mut solved_witness, eval.opcodes.clone()) + let mut blocks = Blocks::default(); + let (unresolved_opcodes, oracles) = backend + .solve(&mut solved_witness, &mut blocks, eval.opcodes.clone()) .expect("Could not solve permutation constraints"); + assert!(unresolved_opcodes.is_empty() && oracles.is_empty(), "Incomplete solution"); let mut b_val = Vec::new(); for i in 0..output.len() { b_val.push(solved_witness[&b_wit[i]]); From 5da7c15b2c47f4b20a1b4640c1b944a0477053d4 Mon Sep 17 00:00:00 2001 From: Joss Date: Tue, 28 Mar 2023 12:05:48 +0100 Subject: [PATCH 3/3] chore: upgrade to ACVM 0.8.0 --- Cargo.lock | 44 ++++++++++++++++++++--------------------- Cargo.toml | 2 +- crates/nargo/Cargo.toml | 4 ++-- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 94e052b5835..b8f37714d27 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -16,11 +16,11 @@ dependencies = [ [[package]] name = "acir" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752b7bce78f98f865733f53fae0e0ed3f0c115b090853508d27f84a2ba13e9c" +checksum = "1f764b474e341efc3e8ee3d5054840b2fd2ac002f764fc2f4cd3569ce76badd1" dependencies = [ - "acir_field 0.7.1", + "acir_field 0.8.0", "flate2", "rmp-serde", "serde", @@ -45,9 +45,9 @@ dependencies = [ [[package]] name = "acir_field" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b044b5d4fc80af9cae007edc2de609594ca64b34df6ad90967279bbddb356f2" +checksum = "cbca7df5192c7823d4108d2c34cadcfd30dca94506b9e9861f85f0ea747ddedc" dependencies = [ "ark-bn254 0.4.0", "ark-ff 0.4.1", @@ -78,12 +78,12 @@ dependencies = [ [[package]] name = "acvm" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "241f3ac90354dc65110f2689a0bb6b0bd2e4e4f2d7bc94d5219ebf3a95fa0a80" +checksum = "92d5df175b6923bf9bb05ba973b017b0fa1356066be8f0ebadd3d2dbbc48bd5b" dependencies = [ - "acir 0.7.1", - "acvm_stdlib 0.7.1", + "acir 0.8.0", + "acvm_stdlib 0.8.0", "blake2", "crc32fast", "indexmap", @@ -106,11 +106,11 @@ dependencies = [ [[package]] name = "acvm_stdlib" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b043f336644ba4ac506d230c3aa4aba0f48bafe944ebaab192155673080fa32e" +checksum = "aa2bbc18fe9732ca3d93a2bf8f1a1ad99a003b565e7bc1ad5c67f69867449e8f" dependencies = [ - "acir 0.7.1", + "acir 0.8.0", ] [[package]] @@ -547,7 +547,7 @@ dependencies = [ [[package]] name = "barretenberg_static_lib" version = "0.1.0" -source = "git+https://github.com/noir-lang/aztec_backend?rev=d4bcec67fecfcd527e373221e942eacd7ba7c083#d4bcec67fecfcd527e373221e942eacd7ba7c083" +source = "git+https://github.com/noir-lang/aztec_backend?rev=26178359a2251e885f15f0a4d1a686afda04aec9#26178359a2251e885f15f0a4d1a686afda04aec9" dependencies = [ "barretenberg_wrapper", "common", @@ -556,7 +556,7 @@ dependencies = [ [[package]] name = "barretenberg_wasm" version = "0.1.0" -source = "git+https://github.com/noir-lang/aztec_backend?rev=d4bcec67fecfcd527e373221e942eacd7ba7c083#d4bcec67fecfcd527e373221e942eacd7ba7c083" +source = "git+https://github.com/noir-lang/aztec_backend?rev=26178359a2251e885f15f0a4d1a686afda04aec9#26178359a2251e885f15f0a4d1a686afda04aec9" dependencies = [ "common", "wasmer", @@ -902,9 +902,9 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/noir-lang/aztec_backend?rev=d4bcec67fecfcd527e373221e942eacd7ba7c083#d4bcec67fecfcd527e373221e942eacd7ba7c083" +source = "git+https://github.com/noir-lang/aztec_backend?rev=26178359a2251e885f15f0a4d1a686afda04aec9#26178359a2251e885f15f0a4d1a686afda04aec9" dependencies = [ - "acvm 0.7.1", + "acvm 0.8.0", "blake2", "dirs 3.0.2", "downloader", @@ -2244,7 +2244,7 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" name = "nargo" version = "0.3.2" dependencies = [ - "acvm 0.7.1", + "acvm 0.8.0", "assert_cmd", "assert_fs", "barretenberg_static_lib", @@ -2276,7 +2276,7 @@ dependencies = [ name = "noir_wasm" version = "0.3.2" dependencies = [ - "acvm 0.7.1", + "acvm 0.8.0", "build-data", "console_error_panic_hook", "gloo-utils", @@ -2292,7 +2292,7 @@ dependencies = [ name = "noirc_abi" version = "0.3.2" dependencies = [ - "acvm 0.7.1", + "acvm 0.8.0", "iter-extended", "serde", "serde_json", @@ -2304,7 +2304,7 @@ dependencies = [ name = "noirc_driver" version = "0.3.2" dependencies = [ - "acvm 0.7.1", + "acvm 0.8.0", "clap 4.1.8", "fm", "iter-extended", @@ -2330,7 +2330,7 @@ dependencies = [ name = "noirc_evaluator" version = "0.3.2" dependencies = [ - "acvm 0.7.1", + "acvm 0.8.0", "arena", "iter-extended", "noirc_abi", @@ -2346,7 +2346,7 @@ dependencies = [ name = "noirc_frontend" version = "0.3.2" dependencies = [ - "acvm 0.7.1", + "acvm 0.8.0", "arena", "chumsky", "fm", diff --git a/Cargo.toml b/Cargo.toml index 9c2d9ae2431..aaa77ee4e7c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ edition = "2021" rust-version = "1.66" [workspace.dependencies] -acvm = "0.7.1" +acvm = "0.8.0" 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 index ebb726b54ec..ed102fce52c 100644 --- a/crates/nargo/Cargo.toml +++ b/crates/nargo/Cargo.toml @@ -34,8 +34,8 @@ color-eyre = "0.6.2" # Backends -aztec_backend = { optional = true, package = "barretenberg_static_lib", git = "https://github.com/noir-lang/aztec_backend", rev = "d4bcec67fecfcd527e373221e942eacd7ba7c083" } -aztec_wasm_backend = { optional = true, package = "barretenberg_wasm", git = "https://github.com/noir-lang/aztec_backend", rev = "d4bcec67fecfcd527e373221e942eacd7ba7c083" } +aztec_backend = { optional = true, package = "barretenberg_static_lib", git = "https://github.com/noir-lang/aztec_backend", rev = "26178359a2251e885f15f0a4d1a686afda04aec9" } +aztec_wasm_backend = { optional = true, package = "barretenberg_wasm", git = "https://github.com/noir-lang/aztec_backend", rev = "26178359a2251e885f15f0a4d1a686afda04aec9" } marlin_arkworks_backend = { optional = true, git = "https://github.com/noir-lang/marlin_arkworks_backend", rev = "144378edad821bfaa52bf2cacca8ecc87514a4fc" } [dev-dependencies]