Merge branch 'main' into feat/redis-derive

taikoxyz · Jan 13, 2025 · 4ff602b · 4ff602b
2 parents d608e1f + fd2be53
commit 4ff602b
Show file tree

Hide file tree

Showing 24 changed files with 1,823 additions and 1,650 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -53,14 +53,15 @@ 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 = "=1.1.2", features = ["prove", "getrandom"] }
-bonsai-sdk = { version = "=1.1.2" }
-risc0-binfmt = { version = "=1.1.2" }
+risc0-zkvm = { version = "=1.2.0", features = ["prove", "getrandom"] }
+bonsai-sdk = { version = "=1.2.0" }
+risc0-binfmt = { version = "=1.2.0" }
 
 # SP1
-sp1-sdk = { version = "=3.3.0" }
-sp1-zkvm = { version = "=3.3.0" }
-sp1-helper = { version = "=3.3.0" }
+sp1-sdk = { version = "=4.0.0-rc.8" }
+sp1-prover = { version = "=4.0.0-rc.8" }
+sp1-zkvm = { version = "=4.0.0-rc.8" }
+sp1-helper = { version = "=4.0.0-rc.8" }
 
 # alloy
 alloy-rlp = { version = "0.3.4", default-features = false }
@@ -129,7 +130,7 @@ cap = { git = "https://github.com/brechtpd/cap", branch = "more-stats", features
 # async, server, http queries
 axum = { version = "0.7.4", features = ["macros"] }
 tower-http = { version = "0.5.2", features = ["full"] }
-tower = { version = "0.4.13", features = ["full"] }
+tower = { version = "0.5.2", features = ["full"] }
 utoipa-swagger-ui = { version = "7.1.0", features = ["axum"] }
 utoipa-scalar = { version = "0.1.0", features = ["axum"] }
 utoipa = { version = "4.2.0", features = ["axum_extras"] }

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.75.0 AS builder
+FROM rust:1.81.0 AS builder
 
 ENV DEBIAN_FRONTEND=noninteractive
 ARG BUILD_FLAGS=""

diff --git a/Dockerfile.zk b/Dockerfile.zk
@@ -1,4 +1,4 @@
-FROM rust:1.79.0 AS base-builder
+FROM rust:1.81.0 AS base-builder
 
 ENV DEBIAN_FRONTEND=noninteractive
 ARG BUILD_FLAGS=""

diff --git a/docs/README_Sp1.md b/docs/README_Sp1.md
@@ -8,11 +8,7 @@ To enable CPU acceleration, you can use the `RUSTFLAGS` environment variable to
 RUSTFLAGS='-C target-cpu=native' cargo run --release
 ```
 
-Currently there is support for AVX512 and NEON SIMD instructions. For NEON, you must also enable the `sp1-driver` feature `neon`.
-
-```bash
-cargo run --features sp1,neon --release
-```
+Currently there is support for AVX512 SIMD instructions.
 
 ## Performance
 

diff --git a/host/src/bin/gen_kzg_settings.rs b/host/src/bin/gen_kzg_settings.rs
@@ -1,4 +1,3 @@
-#![feature(slice_flatten)]
 use std::{fs, path::PathBuf};
 
 use kzg::kzg_proofs::KZGSettings;
@@ -7,8 +6,16 @@ static FILE_NAME: &str = "zkcrypto_kzg_settings.bin";
 
 fn main() {
     let kzg_setting: KZGSettings = kzg_traits::eip_4844::load_trusted_setup_rust(
-        G1Points::as_ref(G1_POINTS).flatten(),
-        G2Points::as_ref(G2_POINTS).flatten(),
+        &G1Points::as_ref(G1_POINTS)
+            .into_iter()
+            .flatten()
+            .cloned()
+            .collect::<Vec<_>>(),
+        &G2Points::as_ref(G2_POINTS)
+            .into_iter()
+            .flatten()
+            .cloned()
+            .collect::<Vec<_>>(),
     )
     .expect("failed to load trusted setup");
 

diff --git a/host/src/proof.rs b/host/src/proof.rs
@@ -717,10 +717,14 @@ mod tests {
         let result = actor.handle_system_pause().await;
 
         // Verify error contains all accumulated errors
-        assert!(matches!(
-            result,
-            Err(HostError::Core(RaikoError::FeatureNotSupportedError(..)))
-        ));
+        #[cfg(not(feature = "risc0"))]
+        assert!(
+            matches!(
+                result,
+                Err(HostError::Core(RaikoError::FeatureNotSupportedError(..)))
+            ),
+            "Unexpected result: {result:?}",
+        );
         assert!(good_running_task_token.is_cancelled());
         assert!(good_aggregation_task_token.is_cancelled());
         assert!(actor.pending_tasks.lock().await.is_empty());

diff --git a/lib/src/lib.rs b/lib/src/lib.rs
@@ -1,6 +1,4 @@
 #![cfg_attr(any(not(feature = "std")), no_std)]
-#![feature(slice_flatten)]
-#![feature(result_flattening)]
 #[cfg(feature = "std")]
 use std::io::{self, Write};
 
@@ -84,7 +82,7 @@ impl CycleTracker {
             title: title.to_string(),
         };
         #[cfg(all(
-            all(target_os = "zkvm", target_vendor = "succinct"),
+            all(target_os = "zkvm", not(target_vendor = "risc0")),
             feature = "sp1-cycle-tracker"
         ))]
         println!("cycle-tracker-start: {0}", title);
@@ -93,15 +91,15 @@ impl CycleTracker {
 
     pub fn end(&self) {
         #[cfg(all(
-            all(target_os = "zkvm", target_vendor = "succinct"),
+            all(target_os = "zkvm", not(target_vendor = "risc0")),
             feature = "sp1-cycle-tracker"
         ))]
         println!("cycle-tracker-end: {0}", self.title);
     }
 
     pub fn println(_inner: impl Fn()) {
         #[cfg(all(
-            all(target_os = "zkvm", target_vendor = "succinct"),
+            all(target_os = "zkvm", not(target_vendor = "risc0")),
             feature = "sp1-cycle-tracker"
         ))]
         _inner()

diff --git a/lib/src/primitives/eip4844.rs b/lib/src/primitives/eip4844.rs
@@ -167,8 +167,16 @@ mod test {
     #[test]
     fn test_kzg_settings_equivalence() {
         let kzg_settings: KZGSettings = kzg_traits::eip_4844::load_trusted_setup_rust(
-            G1Points::as_ref(G1_POINTS).flatten(),
-            G2Points::as_ref(G2_POINTS).flatten(),
+            &G1Points::as_ref(G1_POINTS)
+                .into_iter()
+                .flatten()
+                .cloned()
+                .collect::<Vec<_>>(),
+            &G2Points::as_ref(G2_POINTS)
+                .into_iter()
+                .flatten()
+                .cloned()
+                .collect::<Vec<_>>(),
         )
         .expect("failed to load trusted setup");
         assert_eq!(KZG_SETTINGS.clone().secret_g1, kzg_settings.secret_g1);

diff --git a/provers/risc0/driver/src/methods/risc0_aggregation.rs b/provers/risc0/driver/src/methods/risc0_aggregation.rs
@@ -1,5 +1,5 @@
 pub const RISC0_AGGREGATION_ELF: &[u8] =
     include_bytes!("../../../guest/target/riscv32im-risc0-zkvm-elf/release/risc0-aggregation");
 pub const RISC0_AGGREGATION_ID: [u32; 8] = [
-    1011950429, 2998663226, 1723944064, 1742472798, 1225419420, 1333504266, 3595009277, 3228775676,
+    1132337184, 861215425, 2474295562, 3812987433, 1104601167, 1875139555, 1619752567, 983201767,
 ];
diff --git a/provers/risc0/driver/src/methods/risc0_guest.rs b/provers/risc0/driver/src/methods/risc0_guest.rs
@@ -1,5 +1,5 @@
 pub const RISC0_GUEST_ELF: &[u8] =
     include_bytes!("../../../guest/target/riscv32im-risc0-zkvm-elf/release/risc0-guest");
 pub const RISC0_GUEST_ID: [u32; 8] = [
-    1848002361, 3447634449, 2932177819, 2827220601, 4284138344, 2572487667, 1602600202, 3769687346,
+    2915820976, 1641740336, 1994238336, 1088773515, 373888610, 185287152, 956320274, 2549679061,
 ];
diff --git a/provers/risc0/guest/Cargo.lock b/provers/risc0/guest/Cargo.lock
diff --git a/provers/risc0/guest/Cargo.toml b/provers/risc0/guest/Cargo.toml
@@ -23,10 +23,13 @@ path = "src/benchmark/ecdsa.rs"
 
 [dependencies]
 raiko-lib = { path = "../../../lib", features = ["std", "risc0"] }
-risc0-zkvm = { version = "=1.1.2", default-features = false, features = [
+risc0-zkvm = { version = "=1.2.0", default-features = false, features = [
     'std',
     "getrandom",
-    "heap-embedded-alloc"
+    "heap-embedded-alloc",
+] }
+risc0-zkvm-platform = { version = "=1.2.0", default-features = false, features = [
+    "sys-getenv",
 ] }
 k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" }
 sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.6-risczero.0" }
@@ -47,4 +50,4 @@ c-kzg = { git = "https://github.com/brechtpd/c-kzg-4844", branch = "for-alpha7"
 blst = { git = "https://github.com/CeciliaZ030/blst.git", branch = "v0.3.12-serialize" }
 crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.2-risczero.0" }
 k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" }
-sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.6-risczero.0" }
+sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.6-risczero.0" }
diff --git a/provers/sp1/contracts/README.md b/provers/sp1/contracts/README.md
@@ -25,7 +25,7 @@ The contract and proof is generated by [./provers/sp1/driver/src/gen_verifier.rs
     RUST_LOG=debug 
     ```
 - generate proof given `GuestInput` in [input.json](../contracts/src/fixtures/input.json) either remotely or locally
-- serealize the proof into [fixture.json](../contracts/src/fixtures/fixture.json) to be tested in `RaikoVerifier.sol`
+- serialize the proof into [fixture.json](../contracts/src/fixtures/fixture.json) to be tested in `RaikoVerifier.sol`
 
 ### To verify  a different block
 You can either start Raiko and run [prove-block.sh](../../../script/prove-block.sh) to get the block you want from certain network and then run the `run-verifier` to prove. Make sure the prover is not in `mock` mode. Finally, you can verify with smart contract test.