From e8b7b1c4e644679f84e1e20e170d4efa7a624622 Mon Sep 17 00:00:00 2001
From: Kamen Mladenov <kamen@syndamia.com>
Date: Tue, 14 Jan 2025 16:39:48 +0200
Subject: feat(zkvms): Export io logic to it's own crate

---
 zkvms/sp1/host/Cargo.toml  |  2 +
 zkvms/sp1/host/src/main.rs | 92 +++++++++++++++++++---------------------------
 2 files changed, 40 insertions(+), 54 deletions(-)

(limited to 'zkvms/sp1/host')

diff --git a/zkvms/sp1/host/Cargo.toml b/zkvms/sp1/host/Cargo.toml
index 40722b6..6ab50a3 100644
--- a/zkvms/sp1/host/Cargo.toml
+++ b/zkvms/sp1/host/Cargo.toml
@@ -11,3 +11,5 @@ clap = { version = "4.0", features = ["derive", "env"] }
 tracing = "0.1.40"
 hex = "0.4.3"
 alloy-sol-types = "0.7.7"
+
+zkvms_host_io = { path = "../../../zkvms_host_io" }
diff --git a/zkvms/sp1/host/src/main.rs b/zkvms/sp1/host/src/main.rs
index bed7c29..28cc319 100644
--- a/zkvms/sp1/host/src/main.rs
+++ b/zkvms/sp1/host/src/main.rs
@@ -1,69 +1,53 @@
-use clap::Parser;
-use sp1_sdk::{ProverClient, SP1Stdin};
+use zkvms_host_io::{read_args, RunType::{ Execute, Prove, Verify }};
+use sp1_sdk::{ProverClient, EnvProver, SP1Stdin, SP1ProofWithPublicValues, SP1VerifyingKey};
 
 /// The ELF (executable and linkable format) file for the Succinct RISC-V zkVM.
 pub const FIBONACCI_ELF: &[u8] = include_bytes!("./guest");
 
-/// The arguments for the command.
-#[derive(Parser, Debug)]
-#[clap(author, version, about, long_about = None)]
-struct Args {
-    #[clap(long)]
-    execute: bool,
+type Input = (Vec<Vec<bool>>, u32, Vec<Vec<u32>>);
 
-    #[clap(long)]
-    prove: bool,
-}
-
-fn main() {
-    // Setup the logger.
-    sp1_sdk::utils::setup_logger();
-
-    // Parse the command line arguments.
-    let args = Args::parse();
-
-    if args.execute == args.prove {
-        eprintln!("Error: You must specify either --execute or --prove");
-        std::process::exit(1);
-    }
-
-    // Setup the prover client.
-    let client = ProverClient::new();
-
-    // Setup the inputs.
+fn build_stdin((graph, colors, coloring): &Input) -> SP1Stdin {
     let mut stdin = SP1Stdin::new();
-
-    let (graph, colors, coloring): (Vec<Vec<bool>>, u32, Vec<Vec<u32>>) = include!(env!("INPUTS"));
-
     stdin.write(&graph);
     stdin.write(&colors);
     stdin.write(&coloring);
+    stdin
+}
 
-    if args.execute {
-        // Execute the program
-        let (output, report) = client.execute(FIBONACCI_ELF, &stdin).run().unwrap();
-        println!("Program executed successfully.");
-
-        // Read the output.
-        let decoded = output;
-        println!("{:?}", decoded);
-
-        // Record the number of cycles executed.
-        println!("Number of cycles: {}", report.total_instruction_count());
-    } else {
-        // Setup the program for proving.
-        let (pk, vk) = client.setup(FIBONACCI_ELF);
+fn prove(client: &EnvProver, stdin: SP1Stdin) -> (SP1ProofWithPublicValues, SP1VerifyingKey) {
+    let (pk, vk) = client.setup(FIBONACCI_ELF);
+    let proof = client
+        .prove(&pk, &stdin)
+        .run()
+        .expect("failed to generate proof");
+    (proof, vk)
+}
 
-        // Generate the proof
-        let proof = client
-            .prove(&pk, &stdin)
-            .run()
-            .expect("failed to generate proof");
+fn main() {
+    let run_info = read_args();
+    let stdin = build_stdin(&run_info.input);
 
-        println!("Successfully generated proof!");
+    sp1_sdk::utils::setup_logger();
+    let client = ProverClient::new();
 
-        // Verify the proof.
-        client.verify(&proof, &vk).expect("failed to verify proof");
-        println!("Successfully verified proof!");
+    match run_info.run_type {
+        Execute => {
+            let (output, report) = client.execute(FIBONACCI_ELF, &stdin).run().unwrap();
+
+            println!("Program executed successfully.");
+            println!("{:?}", output);
+            println!("Number of cycles: {}", report.total_instruction_count());
+        },
+        Prove => {
+            let _ = prove(&client, stdin);
+            println!("Successfully generated proof!");
+        },
+        Verify => {
+            let (proof, vk) = prove(&client, stdin);
+            println!("Successfully generated proof!");
+
+            client.verify(&proof, &vk).expect("failed to verify proof");
+            println!("Successfully verified proof!");
+        },
     }
 }
-- 
cgit v1.2.3