Skip to content

update ere and ere-guests #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jsign merged 2 commits into from
Feb 17, 2026
Merged

update ere and ere-guests #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
213e241
update ere and ere-guests
jsign Feb 17, 2026
ce6eb31
skip flaky live rpc tests
jsign Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 21 additions & 34 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
8 changes: 4 additions & 4 deletions crates/benchmark-runner/src/runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand All @@ -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 {
Expand Down Expand Up @@ -237,7 +237,7 @@ pub(crate) fn get_panic_msg(panic_info: Box<dyn Any + Send>) -> String {
pub async fn get_el_zkvm_instances(
el: &str,
zkvms: &[zkVMKind],
resource: ProverResourceType,
resource: ProverResource,
bin_path: Option<&Path>,
) -> Result<Vec<ZkVMInstance>> {
let guest_name_prefix = format!("stateless-validator-{el}");
Expand All @@ -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<Vec<ZkVMInstance>> {
let mut instances = Vec::new();
Expand Down
4 changes: 2 additions & 2 deletions crates/ere-hosts/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -151,7 +151,7 @@ pub enum BenchmarkAction {
Verify,
}

impl From<Resource> for ProverResourceType {
impl From<Resource> for ProverResource {
fn from(resource: Resource) -> Self {
match resource {
Resource::Cpu => Self::Cpu,
Expand Down
4 changes: 2 additions & 2 deletions crates/ere-hosts/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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={:?}",
Expand Down
3 changes: 3 additions & 0 deletions crates/witness-generator/src/rpc_generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand Down