Merge pull request #16 from Wollac/fix/risc0/precompiles

Enable more risc0 precompiles

Author: kevaundray

crates/zkevm-risc0/host/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
-name = "host"
+name = "risc0-host"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
 methods = { path = "../methods" }
-risc0-zkvm = { version = "^2.0.2" }
+risc0-zkvm = { version = "^2.0.2", features = ["unstable"] }
 witness-generator.workspace = true
 zkevm-metrics.workspace = true
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

crates/zkevm-risc0/host/src/main.rs

@@ -1,37 +1,13 @@
-// These constants represent the RISC-V ELF and the image ID generated by risc0-build.
-// The ELF is used for proving and the ID is used for verification.
-use methods::{RISC0GUEST_ELF, RISC0GUEST_ID};
+use methods::RISC0_GUEST_ELF;
 use risc0_zkvm::{default_prover, ExecutorEnv};
-use std::collections::HashMap;
 use witness_generator::generate_stateless_witness::generate;
-use zkevm_metrics::WorkloadMetrics;
 
 fn main() {
     // Initialize tracing. In order to view logs, run `RUST_LOG=info cargo run`
     tracing_subscriber::fmt()
         .with_env_filter(tracing_subscriber::filter::EnvFilter::from_default_env())
         .init();
 
-    // An executor environment describes the configurations for the zkVM
-    // including program inputs.
-    // A default ExecutorEnv can be created like so:
-    // `let env = ExecutorEnv::builder().build().unwrap();`
-    // However, this `env` does not have any inputs.
-    //
-    // To add guest input to the executor environment, use
-    // ExecutorEnvBuilder::write().
-    // To access this method, you'll need to use ExecutorEnv::builder(), which
-    // creates an ExecutorEnvBuilder. When you're done adding input, call
-    // ExecutorEnvBuilder::build().
-
-    // For example:
-    let input: u32 = 15 * u32::pow(2, 27) + 1;
-    let env = ExecutorEnv::builder()
-        .write(&input)
-        .unwrap()
-        .build()
-        .unwrap();
-
     // Obtain the default prover.
     let prover = default_prover();
 
@@ -57,7 +33,6 @@ fn main() {
             let block_number = client_input.block.number;
 
             let env = ExecutorEnv::builder()
-                // Send a & b to the guest
                 .write(&client_input)
                 .unwrap()
                 .write(&blockchain_corpus.network)
@@ -67,7 +42,7 @@ fn main() {
 
             // Proof information by proving the specified ELF binary.
             // This struct contains the receipt along with statistics about execution of the guest
-            let _prove_info = prover.prove(env, RISC0GUEST_ELF).unwrap();
+            let _prove_info = prover.prove(env, RISC0_GUEST_ELF).unwrap();
         }
     }
 }

crates/zkevm-risc0/methods/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [build-dependencies]
-risc0-build = { version = "^2.1.1" }
+risc0-build = { version = "^2.1.1", features = ["unstable"] }
 
 [package.metadata.risc0]
 methods = ["guest"]

crates/zkevm-risc0/methods/guest/Cargo.toml

@@ -1,13 +1,11 @@
 [package]
-name = "risc0guest"
+name = "risc0-guest"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-risc0-zkvm = { version = "^2.0.2", default-features = false, features = [
-    'std',
-] }
-reth-stateless.workspace = true
+alloy-primitives.workspace = true
+c-kzg = { version = "=2.1.0", default-features = true }
 reth-ethereum-primitives = { workspace = true, features = [
     "serde",
     "serde-bincode-compat",
@@ -16,4 +14,9 @@ reth-primitives-traits = { workspace = true, features = [
     "serde",
     "serde-bincode-compat",
 ] }
-alloy-primitives.workspace = true
+reth-stateless.workspace = true
+revm = { version = "22.0", features = ["std", "c-kzg", "blst", "bn"] }
+risc0-zkvm = { version = "^2.0.2", default-features = false, features = [
+    "std", "unstable"
+] }
+sha2 = "=0.10.8"

precompile-patches/risc0.toml

@@ -1,9 +1,10 @@
 [patch.crates-io]
+blst = { git = "https://github.com/risc0/blst", tag = "v0.3.14-risczero.0" }
+c-kzg = { git = "https://github.com/risc0/c-kzg-4844.git", tag = "c-kzg/v2.1.0-risczero.0" }
 sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
 tiny-keccak = { git = "https://github.com/risc0/tiny-keccak", tag = "tiny-keccak/v2.0.2-risczero.0" }
-k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.1" }
+k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.4-risczero.1" }
 p256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "p256/v0.13.2-risczero.1" }
-rsa = { git = "https://github.com/risc0/RustCrypto-RSA", tag = "v0.9.6-risczero.0" }
 substrate-bn = { git = "https://github.com/risc0/paritytech-bn", tag = "v0.6.0-risczero.0" }
 bls12_381 = { git = "https://github.com/risc0/zkcrypto-bls12_381", tag = "bls12_381/v0.8.0-risczero.1" }
 crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" }