Validation Inputs wiring

arbitrator/arbutil/src/types.rs

@@ -8,6 +8,7 @@ use std::{
     borrow::Borrow,
     fmt,
     ops::{Deref, DerefMut},
+    str::FromStr,
 };
 
 // These values must be kept in sync with `arbutil/preimage_type.go`,
@@ -83,6 +84,21 @@ impl From<usize> for Bytes32 {
     }
 }
 
+impl FromStr for Bytes32 {
+    type Err = hex::FromHexError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let trimmed = match s.strip_prefix("0x") {
+            Some(t) => t,
+            None => s,
+        };
+        let bytes = hex::decode(trimmed)?;
+        let mut b = [0u8; 32];
+        b.copy_from_slice(&bytes);
+        Ok(Self(b))
+    }
+}
+
 impl TryFrom<&[u8]> for Bytes32 {
     type Error = std::array::TryFromSliceError;
 

arbitrator/bench/Cargo.toml

@@ -3,10 +3,6 @@ name = "bench"
 version = "0.1.0"
 edition = "2021"
 
-[lib]
-name = "bench"
-path = "src/lib.rs"
-
 [[bin]]
 name = "benchbin"
 path = "src/bin.rs"
@@ -20,7 +16,6 @@ clap = { version = "4.4.8", features = ["derive"] }
 gperftools = { version = "0.2.0", optional = true }
 serde = { version = "1.0.130", features = ["derive", "rc"] }
 serde_json = "1.0.67"
-serde_with = { version = "3.8.1", features = ["base64"] }
 
 [features]
 counters = []

arbitrator/bench/src/bin.rs

@@ -1,6 +1,5 @@
 use std::{path::PathBuf, time::Duration};
 
-use bench::prepare::*;
 use clap::Parser;
 use eyre::bail;
 
@@ -10,11 +9,12 @@ use gperftools::profiler::PROFILER;
 #[cfg(feature = "heapprof")]
 use gperftools::heap_profiler::HEAP_PROFILER;
 
-use prover::machine::MachineStatus;
-
 #[cfg(feature = "counters")]
 use prover::{machine, memory, merkle};
 
+use prover::machine::MachineStatus;
+use prover::prepare::prepare_machine;
+
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about = None)]
 struct Args {

arbitrator/prover/Cargo.toml

@@ -19,10 +19,10 @@ num = "0.4"
 rustc-demangle = "0.1.21"
 serde = { version = "1.0.130", features = ["derive", "rc"] }
 serde_json = "1.0.67"
+serde_with = { version = "3.8.1", features = ["base64"] }
 sha3 = "0.9.1"
 static_assertions = "1.1.0"
 structopt = "0.3.23"
-serde_with = "1.12.1"
 parking_lot = "0.12.1"
 lazy_static.workspace = true
 itertools = "0.10.5"

arbitrator/prover/src/lib.rs

@@ -11,6 +11,8 @@ pub mod machine;
 /// cbindgen:ignore
 pub mod memory;
 pub mod merkle;
+pub mod parse_input;
+pub mod prepare;
 mod print;
 pub mod programs;
 mod reinterpret;