From 1142cad79f21c5408523a63397dc2529467137fd Mon Sep 17 00:00:00 2001 From: fborello-lambda Date: Mon, 4 Nov 2024 14:35:16 -0300 Subject: [PATCH] fix zkvm compilation --- crates/l2/prover/zkvm/interface/Cargo.toml | 13 +++---------- crates/l2/prover/zkvm/interface/guest/Cargo.toml | 4 ++-- crates/vm/Cargo.toml | 1 + 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/crates/l2/prover/zkvm/interface/Cargo.toml b/crates/l2/prover/zkvm/interface/Cargo.toml index 16d3f0842..06db01290 100644 --- a/crates/l2/prover/zkvm/interface/Cargo.toml +++ b/crates/l2/prover/zkvm/interface/Cargo.toml @@ -4,20 +4,13 @@ version = "0.1.0" edition = "2021" [dependencies] -serde = { version = "1.0", default-features = false, features = ["derive"] } -thiserror = "1.0.64" - ethereum_rust-storage = { path = "../../../../storage/store" } -# revm -revm = { version = "14.0.3", features = [ - "std", - "serde", - "kzg-rs", -], default-features = false } - [build-dependencies] risc0-build = { version = "1.1.2" } +## cc version 1.1.34 breaks the compilation, testing if it breaks compilation +## https://github.com/rust-lang/cc-rs/compare/cc-v1.1.34...main +cc = "=1.1.34" [package.metadata.risc0] methods = ["guest"] diff --git a/crates/l2/prover/zkvm/interface/guest/Cargo.toml b/crates/l2/prover/zkvm/interface/guest/Cargo.toml index a0f8c93e8..dbe99aacd 100644 --- a/crates/l2/prover/zkvm/interface/guest/Cargo.toml +++ b/crates/l2/prover/zkvm/interface/guest/Cargo.toml @@ -17,5 +17,5 @@ ethereum_rust-blockchain = { path = "../../../../../blockchain", default-feature crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-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" } -secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", branch = "patch-secp256k1-v0.29.1" } -ecdsa-core = { git = "https://github.com/sp1-patches/signatures", package = "ecdsa", branch = "patch-ecdsa-v0.16.9" } +secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", tag = "secp256k1-v0.29.1-patch-v1" } +ecdsa-core = { git = "https://github.com/sp1-patches/signatures", package = "ecdsa", tag = "ecdsa-v0.16.9-patch-v1" } diff --git a/crates/vm/Cargo.toml b/crates/vm/Cargo.toml index 8646baf0b..999e4684e 100644 --- a/crates/vm/Cargo.toml +++ b/crates/vm/Cargo.toml @@ -36,5 +36,6 @@ path = "./vm.rs" default = ["libmdbx", "c-kzg", "blst"] l2 = [] c-kzg = ["revm/c-kzg"] +prover = ["revm/std", "revm/kzg-rs", "revm/serde"] blst = ["revm/blst"] libmdbx = ["ethereum_rust-storage/default", "ethereum_rust-core/libmdbx"]