bump risc0 to v1.3.0

Signed-off-by: Jun Kimura <jun.kimura@datachain.jp>

Author: bluele

zkvm/risc0/Cargo.toml

@@ -7,14 +7,14 @@ edition = "2021"
 methods = ["guest"]
 
 [dependencies]
-risc0-zkvm = { version = "=1.2.4", default-features = false, optional = true }
+risc0-zkvm = { version = "=1.3.0", default-features = false, optional = true }
 
 [build-dependencies]
-risc0-build  = { version = "=1.2.4", features = ["docker", "unstable"] }
-risc0-binfmt = { version = "=1.2.4", default-features = false }
+risc0-build  = { version = "=2.0.0", features = ["docker", "unstable"] }
+risc0-binfmt = { version = "=1.3.0", default-features = false }
 
 [dev-dependencies]
-risc0-zkvm          = { version = "=1.2.4", default-features = false, features = ["prove"] }
+risc0-zkvm          = { version = "=1.3.0", default-features = false, features = ["prove"] }
 hex                 = { version = "0.4", default-features = false, features = ["alloc"] }
 dcap-quote-verifier = { path = "../../crates/quote-verifier" }
 

zkvm/risc0/artifacts/dcap-quote-verifier

@@ -1,13 +1,6 @@
 use risc0_binfmt::compute_image_id;
-use risc0_build::{embed_method_metadata_with_options, DockerOptions, GuestOptions};
-use std::{
-    collections::HashMap,
-    env,
-    fs::File,
-    io::Write,
-    path::{Path, PathBuf},
-    str::FromStr,
-};
+use risc0_build::{embed_method_metadata_with_options, DockerOptionsBuilder, GuestOptionsBuilder};
+use std::{collections::HashMap, env, fs::File, io::Write};
 
 fn main() {
     println!("cargo:rerun-if-env-changed=ZKDCAP_RISC0_BUILD");
@@ -23,24 +16,23 @@ fn main() {
 
     // Builds can be made deterministic, and thereby reproducible, by using Docker to build the
     // guest.
-    let use_docker = Some(DockerOptions {
-        root_dir: Some("../../".into()),
-    });
+    let use_docker = DockerOptionsBuilder::default()
+        .root_dir("../../")
+        .build()
+        .unwrap();
+
+    let guest_options = GuestOptionsBuilder::default()
+        .use_docker(use_docker)
+        .build()
+        .unwrap();
 
     // Generate Rust source files for the methods crate.
-    let guests = embed_method_metadata_with_options(HashMap::from([(
-        "guests",
-        GuestOptions {
-            features: Vec::new(),
-            use_docker,
-        },
-    )]));
+    let guests = embed_method_metadata_with_options(HashMap::from([("guests", guest_options)]));
 
     if guests.len() != 1 {
         panic!("expected exactly one guest, found {}", guests.len());
     };
-    let elf_path = get_correct_elf_path(&PathBuf::from_str(&guests[0].path).unwrap());
-    let elf_value = std::fs::read(&elf_path).unwrap();
+    let elf_value = std::fs::read(guests[0].path.to_string()).unwrap();
     let image_id = compute_image_id(&elf_value).unwrap();
     let image_id_words = image_id.as_words().to_vec();
     let image_id_str = image_id.to_string();
@@ -60,28 +52,3 @@ pub const DCAP_QUOTE_VERIFIER_ELF: &[u8] = include_bytes!("../artifacts/dcap-quo
         )
         .unwrap();
 }
-
-fn get_correct_elf_path(elf_path: &Path) -> String {
-    elf_path
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .parent()
-        .unwrap()
-        .join("target/riscv-guest/riscv32im-risc0-zkvm-elf/docker/guests/dcap_quote_verifier")
-        .as_path()
-        .to_str()
-        .unwrap()
-        .to_string()
-}

zkvm/risc0/build.rs

@@ -8,7 +8,7 @@ name = "dcap_quote_verifier"
 path = "src/bin/main.rs"
 
 [dependencies]
-risc0-zkvm          = { version = "=1.2.4", default-features = false, features = ["std", "unstable"] }
+risc0-zkvm          = { version = "=1.3.0", default-features = false, features = ["std", "unstable"] }
 dcap-quote-verifier = { path = "../../../crates/quote-verifier" }
 
 [profile.release]

zkvm/risc0/guest/Cargo.lock

@@ -1,4 +1,4 @@
 
-pub const DCAP_QUOTE_VERIFIER_ID: [u32; 8] = [2354812792, 752117600, 1571109129, 2757371367, 428495466, 2124350151, 343129816, 1519734798];
-pub const DCAP_QUOTE_VERIFIER_ID_STR: &str = "78975b8c6067d42c0939a55de7255aa46a528a19c7029f7ed8be73140e50955a";
+pub const DCAP_QUOTE_VERIFIER_ID: [u32; 8] = [3859908620, 1001363221, 1458918782, 2806747239, 2091826072, 2225290957, 1100890290, 1935156227];
+pub const DCAP_QUOTE_VERIFIER_ID_STR: &str = "0c8811e61597af3b7e55f55667904ba798bbae7ccd3ea384b2409e4103245873";
 pub const DCAP_QUOTE_VERIFIER_ELF: &[u8] = include_bytes!("../artifacts/dcap-quote-verifier");