diff --git a/Cargo.lock b/Cargo.lock index f971cc19..1ed31f7d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1555,7 +1555,7 @@ dependencies = [ [[package]] name = "block-encoding-length" version = "0.5.0" -source = "git+https://github.com/eth-act/ere-guests?rev=885398bc1478e777096a8456bc925b2ab28a8d0f#885398bc1478e777096a8456bc925b2ab28a8d0f" +source = "git+https://github.com/eth-act/ere-guests?tag=v0.6.0#64c94bb3da631101a6cb2f276c89392cb7c3426f" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2634,7 +2634,7 @@ dependencies = [ [[package]] name = "downloader" version = "0.5.0" -source = "git+https://github.com/eth-act/ere-guests?rev=885398bc1478e777096a8456bc925b2ab28a8d0f#885398bc1478e777096a8456bc925b2ab28a8d0f" +source = "git+https://github.com/eth-act/ere-guests?tag=v0.6.0#64c94bb3da631101a6cb2f276c89392cb7c3426f" dependencies = [ "anyhow", "reqwest", @@ -2860,16 +2860,16 @@ dependencies = [ [[package]] name = "ere-build-utils" -version = "0.2.0" -source = "git+https://github.com/eth-act/ere?tag=v0.2.0#a274f17c4a1a8843ccdb8febcf0ec56afb457745" +version = "0.3.0" +source = "git+https://github.com/eth-act/ere?tag=v0.3.0#ffc0e230cf4387fb22eb755f0fb323b38294520f" dependencies = [ "cargo_metadata 0.19.2", ] [[package]] name = "ere-common" -version = "0.2.0" -source = "git+https://github.com/eth-act/ere?tag=v0.2.0#a274f17c4a1a8843ccdb8febcf0ec56afb457745" +version = "0.3.0" +source = "git+https://github.com/eth-act/ere?tag=v0.3.0#ffc0e230cf4387fb22eb755f0fb323b38294520f" dependencies = [ "ere-build-utils", "serde", @@ -2878,8 +2878,8 @@ dependencies = [ [[package]] name = "ere-dockerized" -version = "0.2.0" -source = "git+https://github.com/eth-act/ere?tag=v0.2.0#a274f17c4a1a8843ccdb8febcf0ec56afb457745" +version = "0.3.0" +source = "git+https://github.com/eth-act/ere?tag=v0.3.0#ffc0e230cf4387fb22eb755f0fb323b38294520f" dependencies = [ "anyhow", "ere-common", @@ -2909,8 +2909,8 @@ dependencies = [ [[package]] name = "ere-io" -version = "0.2.0" -source = "git+https://github.com/eth-act/ere?tag=v0.2.0#a274f17c4a1a8843ccdb8febcf0ec56afb457745" +version = "0.3.0" +source = "git+https://github.com/eth-act/ere?tag=v0.3.0#ffc0e230cf4387fb22eb755f0fb323b38294520f" dependencies = [ "bincode 2.0.1", "rkyv", @@ -2919,16 +2919,16 @@ dependencies = [ [[package]] name = "ere-platform-trait" -version = "0.2.0" -source = "git+https://github.com/eth-act/ere?tag=v0.2.0#a274f17c4a1a8843ccdb8febcf0ec56afb457745" +version = "0.3.0" +source = "git+https://github.com/eth-act/ere?tag=v0.3.0#ffc0e230cf4387fb22eb755f0fb323b38294520f" dependencies = [ "digest 0.10.7", ] [[package]] name = "ere-server" -version = "0.2.0" -source = "git+https://github.com/eth-act/ere?tag=v0.2.0#a274f17c4a1a8843ccdb8febcf0ec56afb457745" +version = "0.3.0" +source = "git+https://github.com/eth-act/ere?tag=v0.3.0#ffc0e230cf4387fb22eb755f0fb323b38294520f" dependencies = [ "anyhow", "bincode 2.0.1", @@ -2942,8 +2942,8 @@ dependencies = [ [[package]] name = "ere-zkvm-interface" -version = "0.2.0" -source = "git+https://github.com/eth-act/ere?tag=v0.2.0#a274f17c4a1a8843ccdb8febcf0ec56afb457745" +version = "0.3.0" +source = "git+https://github.com/eth-act/ere?tag=v0.3.0#ffc0e230cf4387fb22eb755f0fb323b38294520f" dependencies = [ "anyhow", "auto_impl", @@ -2951,7 +2951,6 @@ dependencies = [ "clap", "indexmap 2.12.1", "serde", - "serde-untagged", "strum 0.27.2", "thiserror 2.0.17", ] @@ -3792,7 +3791,7 @@ dependencies = [ [[package]] name = "guest" version = "0.5.0" -source = "git+https://github.com/eth-act/ere-guests?rev=885398bc1478e777096a8456bc925b2ab28a8d0f#885398bc1478e777096a8456bc925b2ab28a8d0f" +source = "git+https://github.com/eth-act/ere-guests?tag=v0.6.0#64c94bb3da631101a6cb2f276c89392cb7c3426f" dependencies = [ "ere-io", "ere-platform-trait", @@ -4452,7 +4451,7 @@ dependencies = [ [[package]] name = "integration-tests" version = "0.5.0" -source = "git+https://github.com/eth-act/ere-guests?rev=885398bc1478e777096a8456bc925b2ab28a8d0f#885398bc1478e777096a8456bc925b2ab28a8d0f" +source = "git+https://github.com/eth-act/ere-guests?tag=v0.6.0#64c94bb3da631101a6cb2f276c89392cb7c3426f" dependencies = [ "alloy-primitives", "ere-dockerized", @@ -9146,18 +9145,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-untagged" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9faf48a4a2d2693be24c6289dbe26552776eb7737074e6722891fadbe6c5058" -dependencies = [ - "erased-serde", - "serde", - "serde_core", - "typeid", -] - [[package]] name = "serde_arrays" version = "0.2.0" @@ -9577,7 +9564,7 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "stateless-validator-common" version = "0.5.0" -source = "git+https://github.com/eth-act/ere-guests?rev=885398bc1478e777096a8456bc925b2ab28a8d0f#885398bc1478e777096a8456bc925b2ab28a8d0f" +source = "git+https://github.com/eth-act/ere-guests?tag=v0.6.0#64c94bb3da631101a6cb2f276c89392cb7c3426f" dependencies = [ "alloy-eips", "alloy-primitives", @@ -9597,7 +9584,7 @@ dependencies = [ [[package]] name = "stateless-validator-ethrex" version = "0.5.0" -source = "git+https://github.com/eth-act/ere-guests?rev=885398bc1478e777096a8456bc925b2ab28a8d0f#885398bc1478e777096a8456bc925b2ab28a8d0f" +source = "git+https://github.com/eth-act/ere-guests?tag=v0.6.0#64c94bb3da631101a6cb2f276c89392cb7c3426f" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9622,7 +9609,7 @@ dependencies = [ [[package]] name = "stateless-validator-reth" version = "0.5.0" -source = "git+https://github.com/eth-act/ere-guests?rev=885398bc1478e777096a8456bc925b2ab28a8d0f#885398bc1478e777096a8456bc925b2ab28a8d0f" +source = "git+https://github.com/eth-act/ere-guests?tag=v0.6.0#64c94bb3da631101a6cb2f276c89392cb7c3426f" dependencies = [ "alloy-consensus", "alloy-eips", diff --git a/Cargo.toml b/Cargo.toml index 145d616b..512e43a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -104,17 +104,17 @@ zkevm-metrics = { path = "crates/metrics" } benchmark-runner = { path = "crates/benchmark-runner" } # ere -ere-zkvm-interface = { git = "https://github.com/eth-act/ere", tag = "v0.2.0", package = "ere-zkvm-interface" } -ere-dockerized = { git = "https://github.com/eth-act/ere", tag = "v0.2.0", package = "ere-dockerized" } -ere-io = { git = "https://github.com/eth-act/ere", tag = "v0.2.0", package = "ere-io" } +ere-zkvm-interface = { git = "https://github.com/eth-act/ere", tag = "v0.3.0", package = "ere-zkvm-interface" } +ere-dockerized = { git = "https://github.com/eth-act/ere", tag = "v0.3.0", package = "ere-dockerized" } +ere-io = { git = "https://github.com/eth-act/ere", tag = "v0.3.0", package = "ere-io" } # ere-guests -ere-guests-block-encoding-length = { git = "https://github.com/eth-act/ere-guests", rev = "885398bc1478e777096a8456bc925b2ab28a8d0f", package = "block-encoding-length" } -ere-guests-stateless-validator-reth = { git = "https://github.com/eth-act/ere-guests", rev = "885398bc1478e777096a8456bc925b2ab28a8d0f", package = "stateless-validator-reth" } -ere-guests-stateless-validator-ethrex = { git = "https://github.com/eth-act/ere-guests", rev = "885398bc1478e777096a8456bc925b2ab28a8d0f", package = "stateless-validator-ethrex" } -ere-guests-guest = { git = "https://github.com/eth-act/ere-guests", rev = "885398bc1478e777096a8456bc925b2ab28a8d0f", package = "guest" } -ere-guests-integration-tests = { git = "https://github.com/eth-act/ere-guests", rev = "885398bc1478e777096a8456bc925b2ab28a8d0f", package = "integration-tests" } -ere-guests-downloader = { git = "https://github.com/eth-act/ere-guests", rev = "885398bc1478e777096a8456bc925b2ab28a8d0f", package = "downloader" } +ere-guests-block-encoding-length = { git = "https://github.com/eth-act/ere-guests", tag = "v0.6.0", package = "block-encoding-length" } +ere-guests-stateless-validator-reth = { git = "https://github.com/eth-act/ere-guests", tag = "v0.6.0", package = "stateless-validator-reth" } +ere-guests-stateless-validator-ethrex = { git = "https://github.com/eth-act/ere-guests", tag = "v0.6.0", package = "stateless-validator-ethrex" } +ere-guests-guest = { git = "https://github.com/eth-act/ere-guests", tag = "v0.6.0", package = "guest" } +ere-guests-integration-tests = { git = "https://github.com/eth-act/ere-guests", tag = "v0.6.0", package = "integration-tests" } +ere-guests-downloader = { git = "https://github.com/eth-act/ere-guests", tag = "v0.6.0", package = "downloader" } ef-tests = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" } reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" } diff --git a/crates/benchmark-runner/src/runner.rs b/crates/benchmark-runner/src/runner.rs index ae739857..22ba9a13 100644 --- a/crates/benchmark-runner/src/runner.rs +++ b/crates/benchmark-runner/src/runner.rs @@ -9,7 +9,7 @@ use std::path::{Path, PathBuf}; use std::{any::Any, panic}; use tracing::info; -use ere_zkvm_interface::{zkVM, ProofKind, ProverResourceType}; +use ere_zkvm_interface::{zkVM, ProofKind, ProverResource}; use zkevm_metrics::{BenchmarkRun, CrashInfo, ExecutionMetrics, HardwareInfo, ProvingMetrics}; use crate::guest_programs::{GuestFixture, OutputVerifierResult}; @@ -18,7 +18,7 @@ use crate::zisk_profiling::run_profiling; pub use crate::zisk_profiling::ProfileConfig; /// Default version tag for guest programs -const DEFAULT_GUEST_VERSION: &str = "v0.5.0"; +const DEFAULT_GUEST_VERSION: &str = "v0.6.0"; /// A zkVM instance bundled with ELF bytes (used for profiling). pub struct ZkVMInstance { @@ -237,7 +237,7 @@ pub(crate) fn get_panic_msg(panic_info: Box) -> String { pub async fn get_el_zkvm_instances( el: &str, zkvms: &[zkVMKind], - resource: ProverResourceType, + resource: ProverResource, bin_path: Option<&Path>, ) -> Result> { let guest_name_prefix = format!("stateless-validator-{el}"); @@ -248,7 +248,7 @@ pub async fn get_el_zkvm_instances( pub async fn get_guest_zkvm_instances( guest_name_prefix: &str, zkvms: &[zkVMKind], - resource: ProverResourceType, + resource: ProverResource, bin_path: Option<&Path>, ) -> Result> { let mut instances = Vec::new(); diff --git a/crates/ere-hosts/src/cli.rs b/crates/ere-hosts/src/cli.rs index 89ac9aa7..b30b61f1 100644 --- a/crates/ere-hosts/src/cli.rs +++ b/crates/ere-hosts/src/cli.rs @@ -3,7 +3,7 @@ use benchmark_runner::{runner::Action, stateless_validator}; use clap::{Parser, Subcommand, ValueEnum}; use ere_dockerized::zkVMKind; -use ere_zkvm_interface::ProverResourceType; +use ere_zkvm_interface::ProverResource; use std::path::PathBuf; /// Command line interface for the zkVM benchmarker @@ -151,7 +151,7 @@ pub enum BenchmarkAction { Verify, } -impl From for ProverResourceType { +impl From for ProverResource { fn from(resource: Resource) -> Self { match resource { Resource::Cpu => Self::Cpu, diff --git a/crates/ere-hosts/src/main.rs b/crates/ere-hosts/src/main.rs index cb5e1d55..8b5ecbc2 100644 --- a/crates/ere-hosts/src/main.rs +++ b/crates/ere-hosts/src/main.rs @@ -15,7 +15,7 @@ use benchmark_runner::{ use ere_dockerized::zkVMKind; use clap::Parser; -use ere_zkvm_interface::ProverResourceType; +use ere_zkvm_interface::ProverResource; use tracing::info; use tracing_subscriber::EnvFilter; @@ -47,7 +47,7 @@ async fn main() -> Result<()> { } } - let resource: ProverResourceType = cli.resource.into(); + let resource: ProverResource = cli.resource.into(); let action: Action = cli.action.into(); info!( "Running benchmarks with resource={:?} and action={:?}", diff --git a/crates/witness-generator/src/rpc_generator.rs b/crates/witness-generator/src/rpc_generator.rs index 4bcf2254..a8478bef 100644 --- a/crates/witness-generator/src/rpc_generator.rs +++ b/crates/witness-generator/src/rpc_generator.rs @@ -507,6 +507,7 @@ mod test { } #[tokio::test] + #[ignore = "requires external RPC service (set RPC_URL)"] async fn test_last_n_blocks() { if std::env::var("RPC_URL").is_err() { eprintln!("skipping test: set RPC_URL to run this test"); @@ -545,6 +546,7 @@ mod test { } #[tokio::test] + #[ignore = "requires external RPC service (set RPC_URL)"] async fn test_concrete_block_num() { if std::env::var("RPC_URL").is_err() { eprintln!("skipping test: set RPC_URL to run this test"); @@ -609,6 +611,7 @@ mod test { } #[tokio::test] + #[ignore = "requires external RPC service (set RPC_URL)"] async fn test_live_blocks() { if std::env::var("RPC_URL").is_err() { eprintln!("skipping test: set RPC_URL to run this test");