Merge pull request #101 from taikoxyz/integrate-r0

update risc0 dependency to 0.21.0 to run bonsai

Cargo.toml

@@ -38,9 +38,9 @@ revm = { git = "https://github.com/taikoxyz/revm.git", branch = "fix-ecrecover",
 ] }
 
 # risc zero
-risc0-zkvm = { version = "0.20.1", features = ["prove", "getrandom"]}
-bonsai-sdk = { version = "0.6.0", features = ["async"]}
-risc0-build = { version = "0.20.1" }
+risc0-zkvm = { version = "0.21.0", features = ["prove", "getrandom"]}
+bonsai-sdk = { version = "0.7.0", features = ["async"]}
+risc0-build = { version = "0.21.0" }
 
 # SP1
 sp1-core = { git = "https://github.com/succinctlabs/sp1.git", rev = "cb43fd74b24fad8ed24a4885499159de3680c89f" }
@@ -108,6 +108,7 @@ cfg-if = "1.0.0"
 libflate = { version = "2.0.0" }
 sha3 = { version = "0.10", default-features = false }
 log = { version = "0.4" }
+env_logger = { version = "0.11.3" }
 typetag = { version = "0.2.15" }
 hex = { version = "0.4.3" }
 thiserror-no-std = "2.0.2"

host/Cargo.toml

@@ -41,6 +41,7 @@ serde_json = { workspace = true }
 tokio = { workspace = true }
 hyper = { workspace = true }
 hashbrown = { workspace = true }
+env_logger = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
 tracing-appender = { workspace = true }

host/src/execution.rs

@@ -37,42 +37,40 @@ pub async fn execute<D: Prover>(
 
     // 2. Test run the block
     memory::reset_stats();
-    let build_result = TaikoStrategy::build_from(&input);
-    let output = match &build_result {
+    match TaikoStrategy::build_from(&input) {
         Ok((header, _mpt_node)) => {
             info!("Verifying final state using provider data ...");
             info!("Final block hash derived successfully. {}", header.hash());
             info!("Final block header derived successfully. {:?}", header);
-            let pi = D::instance_hash(assemble_protocol_instance(&input, header)?);
+            let pi = D::instance_hash(assemble_protocol_instance(&input, &header)?);
             // Make sure the blockhash from the node matches the one from the builder
             assert_eq!(header.hash().0, input.block_hash, "block hash unexpected");
-            GuestOutput::Success((
+            let output = GuestOutput::Success((
                 WrappedHeader {
                     header: header.clone(),
                 },
                 pi,
-            ))
+            ));
+            memory::print_stats("Guest program peak memory used: ");
+
+            // Prove
+            memory::reset_stats();
+            let measurement = Measurement::start("Generating proof...", false);
+            let res = D::run(input.clone(), output, config)
+                .await
+                .map(|proof| (input, proof))
+                .map_err(|e| HostError::GuestError(e.to_string()));
+            measurement.stop_with("=> Proof generated");
+            memory::print_stats("Prover peak memory used: ");
+
+            total_proving_time.stop_with("====> Complete proof generated");
+            res
         }
-        Err(_) => {
+        Err(e) => {
             warn!("Proving bad block construction!");
-            GuestOutput::Failure
+            Err(HostError::GuestError(e.to_string()))
         }
-    };
-    memory::print_stats("Guest program peak memory used: ");
-
-    // Prove
-    memory::reset_stats();
-    let measurement = Measurement::start("Generating proof...", false);
-    let res = D::run(input.clone(), output, config)
-        .await
-        .map(|proof| (input, proof))
-        .map_err(|e| HostError::GuestError(e.to_string()));
-    measurement.stop_with("=> Proof generated");
-    memory::print_stats("Prover peak memory used: ");
-
-    total_proving_time.stop_with("====> Complete proof generated");
-
-    res
+    }
 }
 
 /// prepare input data for provers

host/src/main.rs

@@ -27,6 +27,7 @@ use std::{alloc, fmt::Debug, fs::File, io::BufReader, path::PathBuf};
 
 use anyhow::Result;
 use cap::Cap;
+use env_logger;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use server::serve;
@@ -74,6 +75,7 @@ pub struct Opt {
 
 #[tokio::main]
 async fn main() -> Result<()> {
+    env_logger::init();
     let opt = Opt::from_args();
     let config = get_config(None).unwrap();
     println!("Start config:\n{:#?}", config);