Migrate to 0.3.0

.github/workflows/rust.yml

@@ -12,7 +12,7 @@ env:
 jobs:
   check_n_test:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -49,7 +49,7 @@ jobs:
 
   clippy:
     name: cargo clippy
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2
@@ -71,7 +71,7 @@ jobs:
 
   format:
     name: cargo fmt
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v2

Cargo.toml

@@ -17,7 +17,3 @@ members = [
 ]
 exclude = ["examples/9/merkle_tree_processor"]
 default-members = ["crates/nargo"]
-
-# Patch github versions of acvm with local copy
-[patch.'https://github.com/noir-lang/noir']
-acvm = { path = "crates/acvm" }

crates/nargo/Cargo.toml

@@ -17,7 +17,7 @@ noirc_driver = { path = "../noirc_driver" }
 noirc_frontend = { path = "../noirc_frontend" }
 noirc_abi = { path = "../noirc_abi" }
 fm = { path = "../fm" }
-acvm = { git = "https://github.com/noir-lang/noir" }
+acvm = { git = "https://github.com/noir-lang/acvm" }
 cfg-if = "1.0.0"
 
 toml = "0.5"
@@ -29,7 +29,7 @@ hex = "0.4.2"
 tempdir = "0.3.7"
 
 # Backends
-aztec_backend = { optional = true, package = "barretenberg_static_lib", git = "https://github.com/noir-lang/aztec_backend", rev = "8c8ec2dd9c376bef598d17f023fac172e5e47860" }
+aztec_backend = { optional = true, package = "barretenberg_static_lib", git = "https://github.com/noir-lang/aztec_backend", branch = "kw/acvm3.0" }
 marlin_arkworks_backend = { optional = true, git = "https://github.com/noir-lang/marlin_arkworks_backend", rev = "601e24dcb5dcbe72e3de7a33879aaf84e171d541" }
 
 [features]

crates/nargo/src/cli/build_cmd.rs

@@ -22,6 +22,7 @@ pub(crate) fn run(args: ArgMatches) -> Result<(), CliError> {
 // This is exposed so that we can run the examples and verify that they pass
 pub fn build_from_path<P: AsRef<Path>>(p: P, allow_warnings: bool) -> Result<(), CliError> {
     let backend = crate::backends::ConcreteBackend;
+
     let mut driver = Resolver::resolve_root_config(p.as_ref(), backend.np_language())?;
     add_std_lib(&mut driver);
     driver.build(allow_warnings);

crates/nargo/src/cli/compile_cmd.rs

@@ -34,6 +34,7 @@ pub(crate) fn run(args: ArgMatches) -> Result<(), CliError> {
     }
 }
 
+#[allow(deprecated)]
 pub fn generate_circuit_and_witness_to_disk<P: AsRef<Path>>(
     circuit_name: &str,
     program_dir: P,

crates/nargo/src/cli/gates_cmd.rs

@@ -23,10 +23,14 @@ pub fn count_gates_with_path<P: AsRef<Path>>(
     allow_warnings: bool,
 ) -> Result<(), CliError> {
     let compiled_program = compile_circuit(program_dir.as_ref(), show_ssa, allow_warnings)?;
-    let gates = compiled_program.circuit.gates.clone();
+    let num_opcodes = compiled_program.circuit.opcodes.len();
     let backend = crate::backends::ConcreteBackend;
 
-    println!("Total gates generated for language {:?}: {}\n", backend.np_language(), gates.len());
+    println!(
+        "Total ACIR opcodes generated for language {:?}: {}\n",
+        backend.np_language(),
+        num_opcodes
+    );
 
     let exact_circuit_size = backend.get_exact_circuit_size(compiled_program.circuit);
     println!("\nBackend circuit size: {exact_circuit_size}\n");

crates/nargo/src/cli/prove_cmd.rs

@@ -2,8 +2,8 @@ use std::{collections::BTreeMap, path::PathBuf};
 
 use acvm::acir::native_types::Witness;
 use acvm::FieldElement;
+use acvm::PartialWitnessGenerator;
 use acvm::ProofSystemCompiler;
-use acvm::{GateResolution, PartialWitnessGenerator};
 use clap::ArgMatches;
 use noirc_abi::errors::AbiError;
 use noirc_abi::input_parser::{Format, InputValue};
@@ -104,18 +104,9 @@ fn solve_witness(
         .collect();
 
     let backend = crate::backends::ConcreteBackend;
-    let solver_res = backend.solve(&mut solved_witness, compiled_program.circuit.gates.clone());
-
-    match solver_res {
-        GateResolution::UnsupportedOpcode(opcode) => return Err(CliError::Generic(format!(
-                "backend does not currently support the {opcode} opcode. ACVM does not currently fall back to arithmetic gates.",
-        ))),
-        GateResolution::UnsatisfiedConstrain => return Err(CliError::Generic(
-                "could not satisfy all constraints".to_string()
-        )),
-        GateResolution::Resolved => (),
-        _ => unreachable!(),
-    }
+    let solver_res = backend.solve(&mut solved_witness, compiled_program.circuit.opcodes.clone());
+
+    solver_res.map_err(CliError::from)?;
 
     Ok(solved_witness)
 }