feat(cli): add noir-execute binary (#7384)

Co-authored-by: Tom French <[email protected]>
Co-authored-by: Tom French <[email protected]>

Cargo.toml

@@ -23,6 +23,7 @@ members = [
     "tooling/noirc_abi",
     "tooling/noirc_abi_wasm",
     "tooling/acvm_cli",
+    "tooling/artifact_cli",
     "tooling/profiler",
     "tooling/inspector",
     # ACVM
@@ -40,6 +41,7 @@ members = [
 default-members = [
     "tooling/nargo_cli",
     "tooling/acvm_cli",
+    "tooling/artifact_cli",
     "tooling/profiler",
     "tooling/inspector",
 ]
@@ -91,6 +93,7 @@ noir_debugger = { path = "tooling/debugger" }
 noirc_abi = { path = "tooling/noirc_abi" }
 noirc_artifacts = { path = "tooling/noirc_artifacts" }
 noirc_artifacts_info = { path = "tooling/noirc_artifacts_info" }
+noir_artifact_cli = { path = "tooling/artifact_cli" }
 
 # Arkworks
 ark-bn254 = { version = "^0.5.0", default-features = false, features = [

acvm-repo/acir/src/circuit/mod.rs

@@ -272,6 +272,7 @@ impl<F: for<'a> Deserialize<'a>> Program<F> {
             .map_err(|err| std::io::Error::new(std::io::ErrorKind::InvalidInput, err))
     }
 
+    /// Deserialize bytecode.
     pub fn deserialize_program(serialized_circuit: &[u8]) -> std::io::Result<Self> {
         Program::read(serialized_circuit)
     }

compiler/noirc_errors/src/reporter.rs

@@ -211,6 +211,7 @@ pub fn report_all<'files>(
 }
 
 impl FileDiagnostic {
+    /// Print the report; return true if it was an error.
     pub fn report<'files>(
         &self,
         files: &'files impl Files<'files, FileId = fm::FileId>,

tooling/acvm_cli/Cargo.toml

@@ -21,15 +21,16 @@ name = "acvm"
 path = "src/main.rs"
 
 [dependencies]
-thiserror.workspace = true
-toml.workspace = true
 color-eyre.workspace = true
 clap.workspace = true
-acvm.workspace = true
-nargo.workspace = true
 const_format.workspace = true
-bn254_blackbox_solver.workspace = true
+toml.workspace = true
+
 acir.workspace = true
+acvm.workspace = true
+bn254_blackbox_solver.workspace = true
+nargo.workspace = true
+noir_artifact_cli.workspace = true
 
 # Logs
 tracing-subscriber.workspace = true

tooling/acvm_cli/src/cli/execute_cmd.rs

@@ -1,4 +1,5 @@
 use std::io::{self, Write};
+use std::path::PathBuf;
 
 use acir::circuit::Program;
 use acir::native_types::{WitnessMap, WitnessStack};
@@ -7,11 +8,12 @@ use bn254_blackbox_solver::Bn254BlackBoxSolver;
 use clap::Args;
 use nargo::PrintOutput;
 
-use crate::cli::fs::inputs::{read_bytecode_from_file, read_inputs_from_file};
-use crate::errors::CliError;
 use nargo::{foreign_calls::DefaultForeignCallBuilder, ops::execute_program};
+use noir_artifact_cli::errors::CliError;
+use noir_artifact_cli::fs::artifact::read_bytecode_from_file;
+use noir_artifact_cli::fs::witness::save_witness_to_dir;
 
-use super::fs::witness::{create_output_witness_string, save_witness_to_dir};
+use crate::fs::witness::{create_output_witness_string, read_witness_from_file};
 
 /// Executes a circuit to calculate its return value
 #[derive(Debug, Clone, Args)]
@@ -30,7 +32,7 @@ pub(crate) struct ExecuteCommand {
 
     /// The working directory
     #[clap(long, short)]
-    working_directory: String,
+    working_directory: PathBuf,
 
     /// Set to print output witness to stdout
     #[clap(long, short, action)]
@@ -45,9 +47,9 @@ pub(crate) struct ExecuteCommand {
 
 fn run_command(args: ExecuteCommand) -> Result<String, CliError> {
     let bytecode = read_bytecode_from_file(&args.working_directory, &args.bytecode)?;
-    let circuit_inputs = read_inputs_from_file(&args.working_directory, &args.input_witness)?;
+    let input_witness = read_witness_from_file(&args.working_directory.join(&args.input_witness))?;
     let output_witness =
-        execute_program_from_witness(circuit_inputs, &bytecode, args.pedantic_solving)?;
+        execute_program_from_witness(input_witness, &bytecode, args.pedantic_solving)?;
     assert_eq!(output_witness.length(), 1, "ACVM CLI only supports a witness stack of size 1");
     let output_witness_string = create_output_witness_string(
         &output_witness.peek().expect("Should have a witness stack item").witness,
@@ -76,8 +78,8 @@ pub(crate) fn execute_program_from_witness(
     bytecode: &[u8],
     pedantic_solving: bool,
 ) -> Result<WitnessStack<FieldElement>, CliError> {
-    let program: Program<FieldElement> = Program::deserialize_program(bytecode)
-        .map_err(|_| CliError::CircuitDeserializationError())?;
+    let program: Program<FieldElement> =
+        Program::deserialize_program(bytecode).map_err(CliError::CircuitDeserializationError)?;
     execute_program(
         &program,
         inputs_map,

tooling/acvm_cli/src/cli/mod.rs

@@ -3,7 +3,6 @@ use color_eyre::eyre;
 use const_format::formatcp;
 
 mod execute_cmd;
-mod fs;
 
 const ACVM_VERSION: &str = env!("CARGO_PKG_VERSION");
 

tooling/acvm_cli/src/fs/mod.rs

@@ -0,0 +1 @@
+pub(crate) mod witness;