diff --git a/.gitignore b/.gitignore index 97bd7280..374d1bf6 100644 --- a/.gitignore +++ b/.gitignore @@ -28,7 +28,10 @@ execution-reports/ **/rollup-config.json # DB -db/* +db + +# Stdins +stdins **/bin/op-proposer diff --git a/Cargo.lock b/Cargo.lock index 7dc03c6f..9fa744db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4288,6 +4288,7 @@ dependencies = [ "futures", "kona-host", "kona-primitives", + "log", "num-format", "op-alloy-genesis", "op-alloy-rpc-types", diff --git a/elf/riscv32im-succinct-zkvm-elf b/elf/riscv32im-succinct-zkvm-elf deleted file mode 100755 index c8a8d373..00000000 Binary files a/elf/riscv32im-succinct-zkvm-elf and /dev/null differ diff --git a/utils/host/Cargo.toml b/utils/host/Cargo.toml index 22e9a9c5..8632e113 100644 --- a/utils/host/Cargo.toml +++ b/utils/host/Cargo.toml @@ -22,6 +22,7 @@ futures.workspace = true num-format.workspace = true serde.workspace = true reqwest.workspace = true +log.workspace = true # sp1 sp1-sdk.workspace = true diff --git a/utils/host/src/witnessgen.rs b/utils/host/src/witnessgen.rs index 726f331d..71e64adc 100644 --- a/utils/host/src/witnessgen.rs +++ b/utils/host/src/witnessgen.rs @@ -53,6 +53,7 @@ pub const WITNESSGEN_TIMEOUT: Duration = Duration::from_secs(1200); struct WitnessGenProcess { child: tokio::process::Child, exec: String, + host_cli: HostCli, } /// Stateful executor for witness generation. Useful for executing several witness generation @@ -95,6 +96,7 @@ impl WitnessGenExecutor { self.ongoing_processes.push(WitnessGenProcess { child, exec: host_cli.exec.clone().unwrap(), + host_cli: host_cli.clone(), }); Ok(()) } @@ -135,16 +137,16 @@ impl WitnessGenExecutor { result = child.child.wait() => { match result { Ok(status) if !status.success() => { - return Err(anyhow::anyhow!("Witness generation process exited because it failed.")); + return Err(anyhow::anyhow!("Witness generation process for end block {} failed.", child.host_cli.l2_block_number)); } Err(e) => { - return Err(anyhow::anyhow!("Failed to get witness generation process status: {}", e)); + return Err(anyhow::anyhow!("Failed to get witness generation process status for end block {}: {}", child.host_cli.l2_block_number, e)); } _ => {} } } _ = tokio::time::sleep(self.timeout) => { - return Err(anyhow::anyhow!("Witness generation process timed out.")); + return Err(anyhow::anyhow!("Witness generation process for end block {} timed out.", child.host_cli.l2_block_number)); } } }