feat(raiko): upgrade r0 to v2.0.2 (#555)

* upgrade r0 to v2.0.2

* update prove-batch.sh

* fix append issue

* update README

Author: smtmfft

Cargo.lock

@@ -62,10 +62,10 @@ reth-chainspec = { git = "https://github.com/taikoxyz/taiko-reth.git", branch =
 reth-provider = { git = "https://github.com/taikoxyz/taiko-reth.git", branch = "v1.0.0-rc.2-taiko", default-features = false }
 
 # risc zero
-risc0-zkvm = { version = "=2.0.1", features = ["prove", "getrandom"] }
+risc0-zkvm = { version = "=2.0.2", features = ["prove", "getrandom"] }
 bonsai-sdk = { version = "=1.4.0" }
-risc0-binfmt = { version = "=2.0.0" }
-risc0-zkos-v1compat = { version = "=2.0.0" }
+risc0-binfmt = { version = "=2.0.1" }
+risc0-zkos-v1compat = { version = "=2.0.1" }
 
 # SP1
 sp1-sdk = { version = "=4.1.7" }

Cargo.toml

@@ -1,3 +1,23 @@
+# v1.7.4-zk
+
+## zk image
+"/opt/raiko/provers/risc0/guest/target/riscv32im-risc0-zkvm-elf/release/risc0-aggregation"
+risc0 elf image id: 02ca31a77475bbef11606b3a35464b0d94d5042f33cb483c4ba10de924a204fb
+"/opt/raiko/provers/risc0/guest/target/riscv32im-risc0-zkvm-elf/release/risc0-batch"
+risc0 elf image id: 44f1110ca785f265ef17f673642f059357a034fca2a7e783f4133923c78b985e
+"/opt/raiko/provers/risc0/guest/target/riscv32im-risc0-zkvm-elf/release/risc0-guest"
+risc0 elf image id: 8f0a65ce70c5ff40a1b1551168d2af6e91c2df74ec3e539181505499ac0ec59c
+
+"/opt/raiko/provers/sp1/guest/target/riscv32im-succinct-zkvm-elf/release/sp1-aggregation"
+sp1 elf vk bn256 is: 0x00ea4798a8cb36fa438a38d1092194921c1e0d984cde18f28249d1d2457436e2
+sp1 elf vk hash_bytes is: 7523cc5432cdbe9071471a211219492160f06cc2337863ca0493a3a4457436e2
+"/opt/raiko/provers/sp1/guest/target/riscv32im-succinct-zkvm-elf/release/sp1-batch"
+sp1 elf vk bn256 is: 0x0054527f6c42c6e20420a139277d1f61b039a6844859978eed26f7b771462549
+sp1 elf vk hash_bytes is: 2a293fb610b1b8810414272477d1f61b01cd342221665e3b5a4def6e71462549
+"/opt/raiko/provers/sp1/guest/target/riscv32im-succinct-zkvm-elf/release/sp1-guest"
+sp1 elf vk bn256 is: 0x0033cdccfcd57b8d1e17a10a251c7d9fd9a88992195e5fc63464626b8830ec3e
+sp1 elf vk hash_bytes is: 19e6e67e355ee34742f4214451c7d9fd4d444c9065797f1868c8c4d70830ec3e
+
 # v1.7.3
 
 ## image

RELEASE.md

@@ -114,6 +114,8 @@ pub struct CommandBuilder {
     pub rustc: Option<PathBuf>,
     // -C flags
     pub rust_flags: Option<Vec<String>>,
+    // --cfg configs
+    pub rust_cfgs: Option<Vec<String>>,
     // -Z flags
     pub z_flags: Option<Vec<String>>,
     // riscv32im gcc
@@ -163,6 +165,7 @@ impl CommandBuilder {
             rustc: CommandBuilder::get_path_buf("rustc", toolchain),
             sanitized_env: Vec::new(),
             rust_flags: None,
+            rust_cfgs: None,
             z_flags: None,
             cc_compiler: None,
             c_flags: None,
@@ -189,6 +192,11 @@ impl CommandBuilder {
         self
     }
 
+    pub fn rust_cfgs(mut self, flags: &[&str]) -> Self {
+        self.rust_cfgs = Some(to_strings(flags));
+        self
+    }
+
     pub fn z_flags(mut self, flags: &[&str]) -> Self {
         self.z_flags = Some(to_strings(flags));
         self
@@ -321,6 +329,7 @@ impl CommandBuilder {
             cargo,
             rustc,
             rust_flags,
+            rust_cfgs,
             z_flags,
             cc_compiler,
             c_flags,
@@ -373,12 +382,15 @@ impl CommandBuilder {
             }),
         );
 
+        let mut encoded_flags: Vec<String> = vec![];
         if let Some(rust_flags) = rust_flags {
-            cmd.env(
-                "CARGO_ENCODED_RUSTFLAGS",
-                format_flags("-C", &rust_flags).join("\x1f"),
-            );
+            encoded_flags = format_flags("-C", &rust_flags);
+        }
+
+        if let Some(cfgs) = rust_cfgs {
+            encoded_flags.extend(format_flags("--cfg", &cfgs));
         }
+        cmd.env("CARGO_ENCODED_RUSTFLAGS", encoded_flags.join("\x1f"));
 
         // Set C compiler path and flags
         if let Some(cc_compiler) = cc_compiler {

pipeline/src/builder.rs

@@ -35,10 +35,12 @@ impl Pipeline for Risc0Pipeline {
             //       and can be removed in the future.
             .custom_env([("RISC0_FEATURE_bigint2".to_string(), "1".to_string())].into())
             .rust_flags(&[
-                "passes=loweratomic",
+                "passes=lower-atomic",
                 "link-arg=-Ttext=0x00200800",
+                "link-arg=--fatal-warnings",
                 "panic=abort",
             ])
+            .rust_cfgs(&["getrandom_backend=\"custom\""])
             .cc_compiler("gcc".into())
             .c_flags(&[
                 "/opt/riscv/bin/riscv32-unknown-elf-gcc",

provers/risc0/builder/src/main.rs

@@ -1,5 +1,5 @@
 pub const RISC0_AGGREGATION_ELF: &[u8] =
     include_bytes!("../../../guest/target/riscv32im-risc0-zkvm-elf/release/risc0-aggregation.bin");
 pub const RISC0_AGGREGATION_ID: [u32; 8] = [
-    1755096741, 3104731471, 3897409404, 1764987546, 2368818630, 438608404, 2673773745, 4059657912,
+    1007494747, 4111588986, 2925906166, 2944070927, 3385479535, 596818810, 3549952976, 2950587177,
 ];

provers/risc0/driver/src/methods/risc0_aggregation.rs

@@ -1,5 +1,5 @@
 pub const RISC0_BATCH_ELF: &[u8] =
     include_bytes!("../../../guest/target/riscv32im-risc0-zkvm-elf/release/risc0-batch.bin");
 pub const RISC0_BATCH_ID: [u32; 8] = [
-    2799826313, 1146822635, 4144432365, 299604400, 536823753, 1503986349, 3698813577, 2002202435,
+    992250817, 2928324580, 4087942144, 3418630899, 315269259, 393989864, 1105406974, 925281959,
 ];

provers/risc0/driver/src/methods/risc0_batch.rs

@@ -1,5 +1,5 @@
 pub const RISC0_GUEST_ELF: &[u8] =
     include_bytes!("../../../guest/target/riscv32im-risc0-zkvm-elf/release/risc0-guest.bin");
 pub const RISC0_GUEST_ID: [u32; 8] = [
-    1095459983, 1406338564, 3500532327, 2251670090, 1544526449, 3367186052, 2772914985, 2149869005,
+    2151630411, 3224101199, 1088151439, 676925749, 2975387509, 3045345968, 522682411, 3254761167,
 ];