Update the kitchensink tests

.gitignore

@@ -9,5 +9,3 @@ node_modules
 *.log
 
 profile.json.gz
-resolc-compiler-tests
-workdir

Cargo.lock

@@ -4492,7 +4492,6 @@ dependencies = [
  "semver 1.0.26",
  "serde",
  "serde_json",
- "tempfile",
  "tokio",
  "tracing",
 ]
@@ -4505,7 +4504,7 @@ dependencies = [
  "clap",
  "semver 1.0.26",
  "serde",
- "tempfile",
+ "temp-dir",
 ]
 
 [[package]]
@@ -4530,6 +4529,7 @@ dependencies = [
  "semver 1.0.26",
  "serde",
  "serde_json",
+ "temp-dir",
  "tempfile",
  "tokio",
  "tracing",
@@ -4571,7 +4571,7 @@ dependencies = [
  "serde_json",
  "sp-core",
  "sp-runtime",
- "tempfile",
+ "temp-dir",
  "tokio",
  "tracing",
 ]
@@ -4596,6 +4596,7 @@ dependencies = [
  "revive-dt-compiler",
  "revive-dt-config",
  "revive-dt-format",
+ "semver 1.0.26",
  "serde",
  "serde_json",
  "serde_with",
@@ -5817,6 +5818,12 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
+[[package]]
+name = "temp-dir"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964"
+
 [[package]]
 name = "tempfile"
 version = "3.20.0"

Cargo.toml

@@ -48,6 +48,7 @@ serde_with = { version = "3.14.0" }
 sha2 = { version = "0.10.9" }
 sp-core = "36.1.0"
 sp-runtime = "41.1.0"
+temp-dir = { version = "0.1.16" }
 tempfile = "3.3"
 thiserror = "2"
 tokio = { version = "1.47.0", default-features = false, features = [

crates/common/src/fs/clear_dir.rs

@@ -3,28 +3,19 @@ use std::{
     path::Path,
 };
 
-use anyhow::{Context, Result};
+use anyhow::Result;
 
 /// This method clears the passed directory of all of the files and directories contained within
 /// without deleting the directory.
 pub fn clear_directory(path: impl AsRef<Path>) -> Result<()> {
-    for entry in read_dir(path.as_ref())
+    for entry in read_dir(path.as_ref())? {
-        .with_context(|| format!("Failed to read directory: {}", path.as_ref().display()))?
+        let entry = entry?;
-    {
-        let entry = entry.with_context(|| {
-            format!(
-                "Failed to read an entry in directory: {}",
-                path.as_ref().display()
-            )
-        })?;
         let entry_path = entry.path();
 
         if entry_path.is_file() {
-            remove_file(&entry_path)
+            remove_file(entry_path)?
-                .with_context(|| format!("Failed to remove file: {}", entry_path.display()))?
         } else {
-            remove_dir_all(&entry_path)
+            remove_dir_all(entry_path)?
-                .with_context(|| format!("Failed to remove directory: {}", entry_path.display()))?
         }
     }
     Ok(())

crates/common/src/futures/poll.rs

@@ -1,7 +1,7 @@
 use std::ops::ControlFlow;
 use std::time::Duration;
 
-use anyhow::{Context as _, Result, anyhow};
+use anyhow::{Result, anyhow};
 
 const EXPONENTIAL_BACKOFF_MAX_WAIT_DURATION: Duration = Duration::from_secs(60);
 
@@ -38,10 +38,7 @@ where
             ));
         }
 
-        match future()
+        match future().await? {
-            .await
-            .context("Polled future returned an error during polling loop")?
-        {
             ControlFlow::Continue(()) => {
                 let next_wait_duration = match polling_wait_behavior {
                     PollingWaitBehavior::Constant(duration) => duration,

crates/common/src/types/version_or_requirement.rs

@@ -6,42 +6,6 @@ pub enum VersionOrRequirement {
     Requirement(VersionReq),
 }
 
-impl VersionOrRequirement {
-    /// A helper function to convert a [`semver::Version`] into a [`semver::VersionReq`].
-    pub fn version_to_requirement(version: &Version) -> VersionReq {
-        // Ignoring "build" metadata in the version, we can turn
-        // it into a requirement which is an exact match for the
-        // given version and nothing else:
-        VersionReq {
-            comparators: vec![semver::Comparator {
-                op: semver::Op::Exact,
-                major: version.major,
-                minor: Some(version.minor),
-                patch: Some(version.patch),
-                pre: version.pre.clone(),
-            }],
-        }
-    }
-}
-
-impl serde::Serialize for VersionOrRequirement {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: serde::Serializer,
-    {
-        match self {
-            VersionOrRequirement::Version(v) => serializer.serialize_str(&v.to_string()),
-            VersionOrRequirement::Requirement(r) => serializer.serialize_str(&r.to_string()),
-        }
-    }
-}
-
-impl Default for VersionOrRequirement {
-    fn default() -> Self {
-        VersionOrRequirement::Requirement(VersionReq::STAR)
-    }
-}
-
 impl From<Version> for VersionOrRequirement {
     fn from(value: Version) -> Self {
         Self::Version(value)
@@ -54,45 +18,24 @@ impl From<VersionReq> for VersionOrRequirement {
     }
 }
 
-impl From<VersionOrRequirement> for VersionReq {
-    fn from(value: VersionOrRequirement) -> Self {
-        match value {
-            VersionOrRequirement::Version(version) => {
-                VersionOrRequirement::version_to_requirement(&version)
-            }
-            VersionOrRequirement::Requirement(version_req) => version_req,
-        }
-    }
-}
-
 impl TryFrom<VersionOrRequirement> for Version {
     type Error = anyhow::Error;
 
     fn try_from(value: VersionOrRequirement) -> Result<Self, Self::Error> {
-        match value {
+        let VersionOrRequirement::Version(version) = value else {
-            VersionOrRequirement::Version(version) => Ok(version),
+            anyhow::bail!("Version or requirement was not a version");
-            VersionOrRequirement::Requirement(mut version_req) => {
-                if version_req.comparators.len() != 1 {
-                    anyhow::bail!(
-                        "The version requirement in VersionOrRequirement is not a single exact version"
-                    );
-                }
-
-                let c = version_req.comparators.pop().unwrap();
-                let (semver::Op::Exact, Some(minor), Some(patch)) = (c.op, c.minor, c.patch) else {
-                    anyhow::bail!(
-                        "The version requirement in VersionOrRequirement is not an exact version"
-                    );
         };
-
+        Ok(version)
-                Ok(Version {
+    }
-                    major: c.major,
+}
-                    minor,
+
-                    patch,
+impl TryFrom<VersionOrRequirement> for VersionReq {
-                    pre: c.pre,
+    type Error = anyhow::Error;
-                    build: Default::default(),
+
-                })
+    fn try_from(value: VersionOrRequirement) -> Result<Self, Self::Error> {
-            }
+        let VersionOrRequirement::Requirement(requirement) = value else {
-        }
+            anyhow::bail!("Version or requirement was not a requirement");
+        };
+        Ok(requirement)
     }
 }

crates/compiler/Cargo.toml

@@ -26,8 +26,5 @@ serde_json = { workspace = true }
 tracing = { workspace = true }
 tokio = { workspace = true }
 
-[dev-dependencies]
-tempfile = { workspace = true }
-
 [lints]
 workspace = true

crates/compiler/src/constants.rs

@@ -0,0 +1,4 @@
+use semver::Version;
+
+/// This is the first version of solc that supports the `--via-ir` flag / "viaIR" input JSON.
+pub const SOLC_VERSION_SUPPORTING_VIA_YUL_IR: Version = Version::new(0, 8, 13);

crates/compiler/src/lib.rs

@@ -3,7 +3,7 @@
 //! - Polkadot revive resolc compiler
 //! - Polkadot revive Wasm compiler
 
-mod utils;
+mod constants;
 
 use std::{
     collections::HashMap,
@@ -13,19 +13,17 @@ use std::{
 
 use alloy::json_abi::JsonAbi;
 use alloy_primitives::Address;
-use anyhow::Context;
+use semver::Version;
 use serde::{Deserialize, Serialize};
 
 use revive_common::EVMVersion;
 use revive_dt_common::cached_fs::read_to_string;
+use revive_dt_common::types::VersionOrRequirement;
 use revive_dt_config::Arguments;
 
 // Re-export this as it's a part of the compiler interface.
 pub use revive_dt_common::types::{Mode, ModeOptimizerSetting, ModePipeline};
 
-// Expose functionality for instantiating a SolcCompiler.
-pub use utils::{SolcCompiler, solc_compiler};
-
 pub mod revive_js;
 pub mod revive_resolc;
 pub mod solc;
@@ -42,19 +40,28 @@ pub trait SolidityCompiler {
         additional_options: Self::Options,
     ) -> impl Future<Output = anyhow::Result<CompilerOutput>>;
 
-    /// Instantiate a new compiler.
+    fn new(solc_executable: PathBuf) -> Self;
-    fn new(config: &Arguments) -> Self;
+
+    fn get_compiler_executable(
+        config: &Arguments,
+        version: impl Into<VersionOrRequirement>,
+    ) -> impl Future<Output = anyhow::Result<PathBuf>>;
+
+    fn version(&self) -> impl Future<Output = anyhow::Result<Version>>;
 
     /// Does the compiler support the provided mode and version settings?
-    fn supports_mode(optimize_setting: ModeOptimizerSetting, pipeline: ModePipeline) -> bool;
+    fn supports_mode(
+        compiler_version: &Version,
+        optimize_setting: ModeOptimizerSetting,
+        pipeline: ModePipeline,
+    ) -> bool;
 }
 
 /// The generic compilation input configuration.
-#[derive(Debug, Clone, Serialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct CompilerInput {
     pub pipeline: Option<ModePipeline>,
     pub optimization: Option<ModeOptimizerSetting>,
-    pub solc: Option<SolcCompiler>,
     pub evm_version: Option<EVMVersion>,
     pub allow_paths: Vec<PathBuf>,
     pub base_path: Option<PathBuf>,
@@ -92,7 +99,6 @@ where
             input: CompilerInput {
                 pipeline: Default::default(),
                 optimization: Default::default(),
-                solc: Default::default(),
                 evm_version: Default::default(),
                 allow_paths: Default::default(),
                 base_path: Default::default(),
@@ -104,11 +110,6 @@ where
         }
     }
 
-    pub fn with_solc(mut self, value: impl Into<Option<SolcCompiler>>) -> Self {
-        self.input.solc = value.into();
-        self
-    }
-
     pub fn with_optimization(mut self, value: impl Into<Option<ModeOptimizerSetting>>) -> Self {
         self.input.optimization = value.into();
         self
@@ -135,10 +136,9 @@ where
     }
 
     pub fn with_source(mut self, path: impl AsRef<Path>) -> anyhow::Result<Self> {
-        self.input.sources.insert(
+        self.input
-            path.as_ref().to_path_buf(),
+            .sources
-            read_to_string(path.as_ref()).context("Failed to read the contract source")?,
+            .insert(path.as_ref().to_path_buf(), read_to_string(path.as_ref())?);
-        );
         Ok(self)
     }
 
@@ -177,8 +177,11 @@ where
         callback(self)
     }
 
-    pub async fn try_build(self, config: &Arguments) -> anyhow::Result<CompilerOutput> {
+    pub async fn try_build(
-        T::new(config)
+        self,
+        compiler_path: impl AsRef<Path>,
+    ) -> anyhow::Result<CompilerOutput> {
+        T::new(compiler_path.as_ref().to_path_buf())
             .build(self.input, self.additional_options)
             .await
     }

crates/compiler/src/revive_resolc.rs

@@ -1,8 +1,14 @@
 //! Implements the [SolidityCompiler] trait with `resolc` for
 //! compiling contracts to PolkaVM (PVM) bytecode.
 
-use std::{path::PathBuf, process::Stdio};
+use std::{
+    path::PathBuf,
+    process::{Command, Stdio},
+    sync::LazyLock,
+};
 
+use dashmap::DashMap;
+use revive_dt_common::types::VersionOrRequirement;
 use revive_dt_config::Arguments;
 use revive_solc_json_interface::{
     SolcStandardJsonInput, SolcStandardJsonInputLanguage, SolcStandardJsonInputSettings,
@@ -17,6 +23,10 @@ use anyhow::Context;
 use semver::Version;
 use tokio::{io::AsyncWriteExt, process::Command as AsyncCommand};
 
+// TODO: I believe that we need to also pass the solc compiler to resolc so that resolc uses the
+// specified solc compiler. I believe that currently we completely ignore the specified solc binary
+// when invoking resolc which doesn't seem right if we're using solc as a compiler frontend.
+
 /// A wrapper around the `resolc` binary, emitting PVM-compatible bytecode.
 #[derive(Debug)]
 pub struct Resolc {
@@ -33,7 +43,6 @@ impl SolidityCompiler for Resolc {
         CompilerInput {
             pipeline,
             optimization,
-            solc,
             evm_version,
             allow_paths,
             base_path,
@@ -51,7 +60,6 @@ impl SolidityCompiler for Resolc {
             );
         }
 
-        let solc = solc.ok_or_else(|| anyhow::anyhow!("solc compiler not provided to resolc."))?;
         let input = SolcStandardJsonInput {
             language: SolcStandardJsonInputLanguage::Solidity,
             sources: sources
@@ -97,8 +105,6 @@ impl SolidityCompiler for Resolc {
             .stdin(Stdio::piped())
             .stdout(Stdio::piped())
             .stderr(Stdio::piped())
-            .arg("--solc")
-            .arg(&solc.path)
             .arg("--standard-json");
 
         if let Some(ref base_path) = base_path {
@@ -113,28 +119,18 @@ impl SolidityCompiler for Resolc {
                     .join(","),
             );
         }
-        let mut child = command
+        let mut child = command.spawn()?;
-            .spawn()
-            .with_context(|| format!("Failed to spawn resolc at {}", self.resolc_path.display()))?;
 
         let stdin_pipe = child.stdin.as_mut().expect("stdin must be piped");
-        let serialized_input = serde_json::to_vec(&input)
+        let serialized_input = serde_json::to_vec(&input)?;
-            .context("Failed to serialize Standard JSON input for resolc")?;
+        stdin_pipe.write_all(&serialized_input).await?;
-        stdin_pipe
-            .write_all(&serialized_input)
-            .await
-            .context("Failed to write Standard JSON to resolc stdin")?;
 
-        let output = child
+        let output = child.wait_with_output().await?;
-            .wait_with_output()
-            .await
-            .context("Failed while waiting for resolc process to finish")?;
         let stdout = output.stdout;
         let stderr = output.stderr;
 
         if !output.status.success() {
-            let json_in = serde_json::to_string_pretty(&input)
+            let json_in = serde_json::to_string_pretty(&input)?;
-                .context("Failed to pretty-print Standard JSON input for logging")?;
             let message = String::from_utf8_lossy(&stderr);
             tracing::error!(
                 status = %output.status,
@@ -145,14 +141,12 @@ impl SolidityCompiler for Resolc {
             anyhow::bail!("Compilation failed with an error: {message}");
         }
 
-        let parsed = serde_json::from_slice::<SolcStandardJsonOutput>(&stdout)
+        let parsed = serde_json::from_slice::<SolcStandardJsonOutput>(&stdout).map_err(|e| {
-            .map_err(|e| {
             anyhow::anyhow!(
                 "failed to parse resolc JSON output: {e}\nstderr: {}",
                 String::from_utf8_lossy(&stderr)
             )
-            })
+        })?;
-            .context("Failed to parse resolc standard JSON output")?;
 
         tracing::debug!(
             output = %serde_json::to_string(&parsed).unwrap(),
@@ -179,10 +173,7 @@ impl SolidityCompiler for Resolc {
 
         let mut compiler_output = CompilerOutput::default();
         for (source_path, contracts) in contracts.into_iter() {
-            let src_for_msg = source_path.clone();
+            let source_path = PathBuf::from(source_path).canonicalize()?;
-            let source_path = PathBuf::from(source_path)
-                .canonicalize()
-                .with_context(|| format!("Failed to canonicalize path {src_for_msg}"))?;
 
             let map = compiler_output.contracts.entry(source_path).or_default();
             for (contract_name, contract_information) in contracts.into_iter() {
@@ -190,41 +181,23 @@ impl SolidityCompiler for Resolc {
                     .evm
                     .and_then(|evm| evm.bytecode.clone())
                     .context("Unexpected - Contract compiled with resolc has no bytecode")?;
-                let abi = {
+                let abi = contract_information
-                    let metadata = contract_information
                     .metadata
                     .as_ref()
-                        .context("No metadata found for the contract")?;
+                    .and_then(|metadata| metadata.as_object())
-                    let solc_metadata_str = match metadata {
+                    .and_then(|metadata| metadata.get("solc_metadata"))
-                        serde_json::Value::String(solc_metadata_str) => solc_metadata_str.as_str(),
+                    .and_then(|solc_metadata| solc_metadata.as_str())
-                        serde_json::Value::Object(metadata_object) => {
+                    .and_then(|metadata| serde_json::from_str::<serde_json::Value>(metadata).ok())
-                            let solc_metadata_value = metadata_object
+                    .and_then(|metadata| {
-                                .get("solc_metadata")
+                        metadata.get("output").and_then(|output| {
-                                .context("Contract doesn't have a 'solc_metadata' field")?;
+                            output
-                            solc_metadata_value
-                                .as_str()
-                                .context("The 'solc_metadata' field is not a string")?
-                        }
-                        serde_json::Value::Null
-                        | serde_json::Value::Bool(_)
-                        | serde_json::Value::Number(_)
-                        | serde_json::Value::Array(_) => {
-                            anyhow::bail!("Unsupported type of metadata {metadata:?}")
-                        }
-                    };
-                    let solc_metadata =
-                        serde_json::from_str::<serde_json::Value>(solc_metadata_str).context(
-                            "Failed to deserialize the solc_metadata as a serde_json generic value",
-                        )?;
-                    let output_value = solc_metadata
-                        .get("output")
-                        .context("solc_metadata doesn't have an output field")?;
-                    let abi_value = output_value
                                 .get("abi")
-                        .context("solc_metadata output doesn't contain an abi field")?;
+                                .and_then(|abi| serde_json::from_value::<JsonAbi>(abi.clone()).ok())
-                    serde_json::from_value::<JsonAbi>(abi_value.clone())
+                        })
-                        .context("ABI found in solc_metadata output is not valid ABI")?
+                    })
-                };
+                    .context(
+                        "Unexpected - Failed to get the ABI for a contract compiled with resolc",
+                    )?;
                 map.insert(contract_name, (bytecode.object, abi));
             }
         }
@@ -232,15 +205,94 @@ impl SolidityCompiler for Resolc {
         Ok(compiler_output)
     }
 
-    fn new(config: &Arguments) -> Self {
+    fn new(resolc_path: PathBuf) -> Self {
-        Resolc {
+        Resolc { resolc_path }
-            resolc_path: config.resolc.clone(),
+    }
+
+    async fn get_compiler_executable(
+        config: &Arguments,
+        _version: impl Into<VersionOrRequirement>,
+    ) -> anyhow::Result<PathBuf> {
+        if !config.resolc.as_os_str().is_empty() {
+            return Ok(config.resolc.clone());
+        }
+
+        Ok(PathBuf::from("resolc"))
+    }
+
+    async fn version(&self) -> anyhow::Result<semver::Version> {
+        /// This is a cache of the path of the compiler to the version number of the compiler. We
+        /// choose to cache the version in this way rather than through a field on the struct since
+        /// compiler objects are being created all the time from the path and the compiler object is
+        /// not reused over time.
+        static VERSION_CACHE: LazyLock<DashMap<PathBuf, Version>> = LazyLock::new(Default::default);
+
+        match VERSION_CACHE.entry(self.resolc_path.clone()) {
+            dashmap::Entry::Occupied(occupied_entry) => Ok(occupied_entry.get().clone()),
+            dashmap::Entry::Vacant(vacant_entry) => {
+                let output = Command::new(self.resolc_path.as_path())
+                    .arg("--version")
+                    .stdout(Stdio::piped())
+                    .spawn()?
+                    .wait_with_output()?
+                    .stdout;
+
+                let output = String::from_utf8_lossy(&output);
+                let version_string = output
+                    .split("version ")
+                    .nth(1)
+                    .context("Version parsing failed")?
+                    .split("+")
+                    .next()
+                    .context("Version parsing failed")?;
+
+                let version = Version::parse(version_string)?;
+
+                vacant_entry.insert(version.clone());
+
+                Ok(version)
+            }
         }
     }
 
-    fn supports_mode(_optimize_setting: ModeOptimizerSetting, pipeline: ModePipeline) -> bool {
+    fn supports_mode(
-        // We only support the Y (IE compile via Yul IR) mode here. We must always compile
+        _compiler_version: &Version,
-        // via Yul IR as resolc needs this to translate to LLVM IR and then RISCV.
+        _optimize_setting: ModeOptimizerSetting,
+        pipeline: ModePipeline,
+    ) -> bool {
+        // We only support the Y (IE compile via Yul IR) mode here, which also means that we can
+        // only use solc version 0.8.13 and above. We must always compile via Yul IR as resolc
+        // needs this to translate to LLVM IR and then RISCV.
+
+        // Note: the original implementation of this function looked like the following:
+        // ```
+        // pipeline == ModePipeline::ViaYulIR && compiler_version >= &SOLC_VERSION_SUPPORTING_VIA_YUL_IR
+        // ```
+        // However, that implementation is sadly incorrect since the version that's passed into this
+        // function is not the version of solc but the version of resolc. This is despite the fact
+        // that resolc depends on Solc for the initial Yul codegen. Therefore, we have skipped the
+        // version check until we do a better integrations between resolc and solc.
         pipeline == ModePipeline::ViaYulIR
     }
 }
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[tokio::test]
+    async fn compiler_version_can_be_obtained() {
+        // Arrange
+        let args = Arguments::default();
+        let path = Resolc::get_compiler_executable(&args, Version::new(0, 7, 6))
+            .await
+            .unwrap();
+        let compiler = Resolc::new(path);
+
+        // Act
+        let version = compiler.version().await;
+
+        // Assert
+        let _ = version.expect("Failed to get version");
+    }
+}

crates/compiler/src/solc.rs

@@ -1,8 +1,20 @@
 //! Implements the [SolidityCompiler] trait with solc for
 //! compiling contracts to EVM bytecode.
 
-use super::utils;
+use std::{
+    path::PathBuf,
+    process::{Command, Stdio},
+    sync::LazyLock,
+};
+
+use dashmap::DashMap;
+use revive_dt_common::types::VersionOrRequirement;
+use revive_dt_config::Arguments;
+use revive_dt_solc_binaries::download_solc;
+
+use super::constants::SOLC_VERSION_SUPPORTING_VIA_YUL_IR;
 use crate::{CompilerInput, CompilerOutput, ModeOptimizerSetting, ModePipeline, SolidityCompiler};
+
 use anyhow::Context;
 use foundry_compilers_artifacts::{
     output_selection::{
@@ -11,12 +23,13 @@ use foundry_compilers_artifacts::{
     solc::CompilerOutput as SolcOutput,
     solc::*,
 };
-use revive_dt_config::Arguments;
+use semver::Version;
-use std::process::Stdio;
 use tokio::{io::AsyncWriteExt, process::Command as AsyncCommand};
 
 #[derive(Debug)]
-pub struct Solc {}
+pub struct Solc {
+    solc_path: PathBuf,
+}
 
 impl SolidityCompiler for Solc {
     type Options = ();
@@ -27,7 +40,6 @@ impl SolidityCompiler for Solc {
         CompilerInput {
             pipeline,
             optimization,
-            solc,
             evm_version,
             allow_paths,
             base_path,
@@ -37,9 +49,7 @@ impl SolidityCompiler for Solc {
         }: CompilerInput,
         _: Self::Options,
     ) -> anyhow::Result<CompilerOutput> {
-        let solc = solc.ok_or_else(|| anyhow::anyhow!("solc compiler not provided to resolc."))?;
+        let compiler_supports_via_ir = self.version().await? >= SOLC_VERSION_SUPPORTING_VIA_YUL_IR;
-        let compiler_supports_via_ir =
-            utils::solc_versions_supporting_yul_ir().matches(&solc.version);
 
         // Be careful to entirely omit the viaIR field if the compiler does not support it,
         // as it will error if you provide fields it does not know about. Because
@@ -105,7 +115,7 @@ impl SolidityCompiler for Solc {
             },
         };
 
-        let mut command = AsyncCommand::new(&solc.path);
+        let mut command = AsyncCommand::new(&self.solc_path);
         command
             .stdin(Stdio::piped())
             .stdout(Stdio::piped())
@@ -124,25 +134,15 @@ impl SolidityCompiler for Solc {
                     .join(","),
             );
         }
-        let mut child = command
+        let mut child = command.spawn()?;
-            .spawn()
-            .with_context(|| format!("Failed to spawn solc at {}", solc.path.display()))?;
 
         let stdin = child.stdin.as_mut().expect("should be piped");
-        let serialized_input = serde_json::to_vec(&input)
+        let serialized_input = serde_json::to_vec(&input)?;
-            .context("Failed to serialize Standard JSON input for solc")?;
+        stdin.write_all(&serialized_input).await?;
-        stdin
+        let output = child.wait_with_output().await?;
-            .write_all(&serialized_input)
-            .await
-            .context("Failed to write Standard JSON to solc stdin")?;
-        let output = child
-            .wait_with_output()
-            .await
-            .context("Failed while waiting for solc process to finish")?;
 
         if !output.status.success() {
-            let json_in = serde_json::to_string_pretty(&input)
+            let json_in = serde_json::to_string_pretty(&input)?;
-                .context("Failed to pretty-print Standard JSON input for logging")?;
             let message = String::from_utf8_lossy(&output.stderr);
             tracing::error!(
                 status = %output.status,
@@ -153,14 +153,12 @@ impl SolidityCompiler for Solc {
             anyhow::bail!("Compilation failed with an error: {message}");
         }
 
-        let parsed = serde_json::from_slice::<SolcOutput>(&output.stdout)
+        let parsed = serde_json::from_slice::<SolcOutput>(&output.stdout).map_err(|e| {
-            .map_err(|e| {
             anyhow::anyhow!(
                 "failed to parse resolc JSON output: {e}\nstderr: {}",
                 String::from_utf8_lossy(&output.stdout)
             )
-            })
+        })?;
-            .context("Failed to parse solc standard JSON output")?;
 
         // Detecting if the compiler output contained errors and reporting them through logs and
         // errors instead of returning the compiler output that might contain errors.
@@ -180,12 +178,7 @@ impl SolidityCompiler for Solc {
         for (contract_path, contracts) in parsed.contracts {
             let map = compiler_output
                 .contracts
-                .entry(contract_path.canonicalize().with_context(|| {
+                .entry(contract_path.canonicalize()?)
-                    format!(
-                        "Failed to canonicalize contract path {}",
-                        contract_path.display()
-                    )
-                })?)
                 .or_default();
             for (contract_name, contract_info) in contracts.into_iter() {
                 let source_code = contract_info
@@ -206,13 +199,110 @@ impl SolidityCompiler for Solc {
         Ok(compiler_output)
     }
 
-    fn new(_config: &Arguments) -> Self {
+    fn new(solc_path: PathBuf) -> Self {
-        Self {}
+        Self { solc_path }
     }
 
-    fn supports_mode(_optimize_setting: ModeOptimizerSetting, pipeline: ModePipeline) -> bool {
+    async fn get_compiler_executable(
+        config: &Arguments,
+        version: impl Into<VersionOrRequirement>,
+    ) -> anyhow::Result<PathBuf> {
+        let path = download_solc(config.directory(), version, config.wasm).await?;
+        Ok(path)
+    }
+
+    async fn version(&self) -> anyhow::Result<semver::Version> {
+        /// This is a cache of the path of the compiler to the version number of the compiler. We
+        /// choose to cache the version in this way rather than through a field on the struct since
+        /// compiler objects are being created all the time from the path and the compiler object is
+        /// not reused over time.
+        static VERSION_CACHE: LazyLock<DashMap<PathBuf, Version>> = LazyLock::new(Default::default);
+
+        match VERSION_CACHE.entry(self.solc_path.clone()) {
+            dashmap::Entry::Occupied(occupied_entry) => Ok(occupied_entry.get().clone()),
+            dashmap::Entry::Vacant(vacant_entry) => {
+                // The following is the parsing code for the version from the solc version strings
+                // which look like the following:
+                // ```
+                // solc, the solidity compiler commandline interface
+                // Version: 0.8.30+commit.73712a01.Darwin.appleclang
+                // ```
+                let child = Command::new(self.solc_path.as_path())
+                    .arg("--version")
+                    .stdout(Stdio::piped())
+                    .spawn()?;
+                let output = child.wait_with_output()?;
+                let output = String::from_utf8_lossy(&output.stdout);
+                let version_line = output
+                    .split("Version: ")
+                    .nth(1)
+                    .context("Version parsing failed")?;
+                let version_string = version_line
+                    .split("+")
+                    .next()
+                    .context("Version parsing failed")?;
+
+                let version = Version::parse(version_string)?;
+
+                vacant_entry.insert(version.clone());
+
+                Ok(version)
+            }
+        }
+    }
+
+    fn supports_mode(
+        compiler_version: &Version,
+        _optimize_setting: ModeOptimizerSetting,
+        pipeline: ModePipeline,
+    ) -> bool {
         // solc 0.8.13 and above supports --via-ir, and less than that does not. Thus, we support mode E
         // (ie no Yul IR) in either case, but only support Y (via Yul IR) if the compiler is new enough.
-        pipeline == ModePipeline::ViaEVMAssembly || pipeline == ModePipeline::ViaYulIR
+        pipeline == ModePipeline::ViaEVMAssembly
+            || (pipeline == ModePipeline::ViaYulIR
+                && compiler_version >= &SOLC_VERSION_SUPPORTING_VIA_YUL_IR)
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[tokio::test]
+    async fn compiler_version_can_be_obtained() {
+        // Arrange
+        let args = Arguments::default();
+        let path = Solc::get_compiler_executable(&args, Version::new(0, 7, 6))
+            .await
+            .unwrap();
+        let compiler = Solc::new(path);
+
+        // Act
+        let version = compiler.version().await;
+
+        // Assert
+        assert_eq!(
+            version.expect("Failed to get version"),
+            Version::new(0, 7, 6)
+        )
+    }
+
+    #[tokio::test]
+    async fn compiler_version_can_be_obtained1() {
+        // Arrange
+        let args = Arguments::default();
+        let path = Solc::get_compiler_executable(&args, Version::new(0, 4, 21))
+            .await
+            .unwrap();
+        let compiler = Solc::new(path);
+
+        // Act
+        let version = compiler.version().await;
+
+        // Assert
+        assert_eq!(
+            version.expect("Failed to get version"),
+            Version::new(0, 4, 21)
+        )
     }
 }

crates/compiler/src/utils.rs

@@ -1,159 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::{
-    path::{Path, PathBuf},
-    process::{Command, Stdio},
-    sync::LazyLock,
-};
-
-use anyhow::Context;
-use dashmap::DashMap;
-use revive_dt_common::types::{ModePipeline, VersionOrRequirement};
-use semver::{Version, VersionReq};
-
-/// Return the path and version of a suitable `solc` compiler given the requirements provided.
-///
-/// This caches any compiler binaries/paths that are downloaded as a result of calling this.
-pub async fn solc_compiler(
-    cache_directory: &Path,
-    fallback_version: &Version,
-    required_version: Option<&VersionReq>,
-    pipeline: ModePipeline,
-) -> anyhow::Result<SolcCompiler> {
-    // Require Yul compatible solc, or any if we don't care about compiling via Yul.
-    let mut version_req = if pipeline == ModePipeline::ViaYulIR {
-        solc_versions_supporting_yul_ir()
-    } else {
-        VersionReq::STAR
-    };
-
-    // Take into account the version requirements passed in, too.
-    if let Some(other_version_req) = required_version {
-        version_req
-            .comparators
-            .extend(other_version_req.comparators.iter().cloned());
-    }
-
-    // If no requirements yet then fall back to the fallback version.
-    let version_req = if version_req == VersionReq::STAR {
-        VersionOrRequirement::version_to_requirement(fallback_version)
-    } else {
-        version_req
-    };
-
-    // Download (or pull from cache) a suitable solc compiler given this.
-    let solc_path =
-        revive_dt_solc_binaries::download_solc(cache_directory, version_req, false).await?;
-    let solc_version = solc_version(&solc_path).await?;
-
-    Ok(SolcCompiler {
-        version: solc_version,
-        path: solc_path,
-    })
-}
-
-/// A `solc` compiler, returned from [`solc_compiler`].
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct SolcCompiler {
-    /// Version of the compiler.
-    pub version: Version,
-    /// Path to the compiler executable.
-    pub path: PathBuf,
-}
-
-/// Fetch the solc version given a path to the executable
-async fn solc_version(solc_path: &Path) -> anyhow::Result<semver::Version> {
-    /// This is a cache of the path of the compiler to the version number of the compiler. We
-    /// choose to cache the version in this way rather than through a field on the struct since
-    /// compiler objects are being created all the time from the path and the compiler object is
-    /// not reused over time.
-    static VERSION_CACHE: LazyLock<DashMap<PathBuf, Version>> = LazyLock::new(Default::default);
-
-    match VERSION_CACHE.entry(solc_path.to_path_buf()) {
-        dashmap::Entry::Occupied(occupied_entry) => Ok(occupied_entry.get().clone()),
-        dashmap::Entry::Vacant(vacant_entry) => {
-            // The following is the parsing code for the version from the solc version strings
-            // which look like the following:
-            // ```
-            // solc, the solidity compiler commandline interface
-            // Version: 0.8.30+commit.73712a01.Darwin.appleclang
-            // ```
-            let child = Command::new(solc_path)
-                .arg("--version")
-                .stdout(Stdio::piped())
-                .spawn()?;
-            let output = child.wait_with_output()?;
-            let output = String::from_utf8_lossy(&output.stdout);
-            let version_line = output
-                .split("Version: ")
-                .nth(1)
-                .context("Version parsing failed")?;
-            let version_string = version_line
-                .split("+")
-                .next()
-                .context("Version parsing failed")?;
-
-            let version = Version::parse(version_string)?;
-
-            vacant_entry.insert(version.clone());
-
-            Ok(version)
-        }
-    }
-}
-
-/// This returns the solc versions which support Yul IR.
-pub fn solc_versions_supporting_yul_ir() -> VersionReq {
-    use semver::{Comparator, Op, Prerelease, VersionReq};
-    VersionReq {
-        comparators: vec![Comparator {
-            op: Op::GreaterEq,
-            major: 0,
-            minor: Some(8),
-            patch: Some(13),
-            pre: Prerelease::EMPTY,
-        }],
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[tokio::test]
-    async fn compiler_version_can_be_obtained() {
-        // Arrange
-        let temp_dir = tempfile::tempdir().expect("can create tempdir");
-        let solc_path =
-            revive_dt_solc_binaries::download_solc(temp_dir.path(), Version::new(0, 7, 6), false)
-                .await
-                .expect("can download solc");
-
-        // Act
-        let version = solc_version(&solc_path).await;
-
-        // Assert
-        assert_eq!(
-            version.expect("Failed to get version"),
-            Version::new(0, 7, 6)
-        )
-    }
-
-    #[tokio::test]
-    async fn compiler_version_can_be_obtained1() {
-        // Arrange
-        let temp_dir = tempfile::tempdir().expect("can create tempdir");
-        let solc_path =
-            revive_dt_solc_binaries::download_solc(temp_dir.path(), Version::new(0, 4, 21), false)
-                .await
-                .expect("can download solc");
-
-        // Act
-        let version = solc_version(&solc_path).await;
-
-        // Assert
-        assert_eq!(
-            version.expect("Failed to get version"),
-            Version::new(0, 4, 21)
-        )
-    }
-}

crates/compiler/tests/lib.rs

@@ -1,12 +1,16 @@
 use std::path::PathBuf;
 
-use revive_dt_compiler::{Compiler, revive_resolc::Resolc, solc::Solc};
+use revive_dt_compiler::{Compiler, SolidityCompiler, revive_resolc::Resolc, solc::Solc};
 use revive_dt_config::Arguments;
+use semver::Version;
 
 #[tokio::test]
 async fn contracts_can_be_compiled_with_solc() {
     // Arrange
     let args = Arguments::default();
+    let compiler_path = Solc::get_compiler_executable(&args, Version::new(0, 8, 30))
+        .await
+        .unwrap();
 
     // Act
     let output = Compiler::<Solc>::new()
@@ -14,7 +18,7 @@ async fn contracts_can_be_compiled_with_solc() {
         .unwrap()
         .with_source("./tests/assets/array_one_element/main.sol")
         .unwrap()
-        .try_build(&args)
+        .try_build(compiler_path)
         .await;
 
     // Assert
@@ -45,6 +49,9 @@ async fn contracts_can_be_compiled_with_solc() {
 async fn contracts_can_be_compiled_with_resolc() {
     // Arrange
     let args = Arguments::default();
+    let compiler_path = Resolc::get_compiler_executable(&args, Version::new(0, 8, 30))
+        .await
+        .unwrap();
 
     // Act
     let output = Compiler::<Resolc>::new()
@@ -52,7 +59,7 @@ async fn contracts_can_be_compiled_with_resolc() {
         .unwrap()
         .with_source("./tests/assets/array_one_element/main.sol")
         .unwrap()
-        .try_build(&args)
+        .try_build(compiler_path)
         .await;
 
     // Assert

crates/config/Cargo.toml

@@ -12,7 +12,7 @@ rust-version.workspace = true
 alloy = { workspace = true }
 clap = { workspace = true }
 semver = { workspace = true }
-tempfile = { workspace = true }
+temp-dir = { workspace = true }
 serde = { workspace = true }
 
 [lints]

crates/config/src/lib.rs

@@ -10,7 +10,7 @@ use alloy::{network::EthereumWallet, signers::local::PrivateKeySigner};
 use clap::{Parser, ValueEnum};
 use semver::Version;
 use serde::{Deserialize, Serialize};
-use tempfile::TempDir;
+use temp_dir::TempDir;
 
 #[derive(Debug, Parser, Clone, Serialize, Deserialize)]
 #[command(name = "retester")]

crates/core/Cargo.toml

@@ -36,6 +36,7 @@ tracing-subscriber = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
+temp-dir = { workspace = true }
 tempfile = { workspace = true }
 
 [lints]

crates/core/src/cached_compiler.rs

@@ -9,12 +9,12 @@ use std::{
 
 use futures::FutureExt;
 use revive_dt_common::iterators::FilesWithExtensionIterator;
-use revive_dt_compiler::{Compiler, CompilerInput, CompilerOutput, Mode, SolcCompiler};
+use revive_dt_compiler::{Compiler, CompilerInput, CompilerOutput, Mode, SolidityCompiler};
 use revive_dt_config::Arguments;
 use revive_dt_format::metadata::{ContractIdent, ContractInstance, Metadata};
 
 use alloy::{hex::ToHexExt, json_abi::JsonAbi, primitives::Address};
-use anyhow::{Context as _, Error, Result};
+use anyhow::{Error, Result};
 use once_cell::sync::Lazy;
 use semver::Version;
 use serde::{Deserialize, Serialize};
@@ -29,10 +29,7 @@ impl CachedCompiler {
     pub async fn new(path: impl AsRef<Path>, invalidate_cache: bool) -> Result<Self> {
         let mut cache = ArtifactsCache::new(path);
         if invalidate_cache {
-            cache = cache
+            cache = cache.with_invalidated_cache().await?;
-                .with_invalidated_cache()
-                .await
-                .context("Failed to invalidate compilation cache directory")?;
         }
         Ok(Self(cache))
     }
@@ -53,38 +50,64 @@ impl CachedCompiler {
         &self,
         metadata: &Metadata,
         metadata_file_path: impl AsRef<Path>,
-        solc: SolcCompiler,
         mode: &Mode,
         config: &Arguments,
         deployed_libraries: Option<&HashMap<ContractInstance, (ContractIdent, Address, JsonAbi)>>,
-        compilation_success_report_callback: impl Fn(bool, Option<CompilerInput>, CompilerOutput)
+        compilation_success_report_callback: impl Fn(
-        + Clone,
+            Version,
-        compilation_failure_report_callback: impl Fn(Option<CompilerInput>, String),
+            PathBuf,
-    ) -> Result<CompilerOutput> {
+            bool,
+            Option<CompilerInput>,
+            CompilerOutput,
+        ) + Clone,
+        compilation_failure_report_callback: impl Fn(
+            Option<Version>,
+            Option<PathBuf>,
+            Option<CompilerInput>,
+            String,
+        ),
+    ) -> Result<(CompilerOutput, Version)> {
         static CACHE_KEY_LOCK: Lazy<RwLock<HashMap<CacheKey, Arc<Mutex<()>>>>> =
             Lazy::new(Default::default);
 
+        let compiler_version_or_requirement = mode.compiler_version_to_use(config.solc.clone());
+        let compiler_path = <P::Compiler as SolidityCompiler>::get_compiler_executable(
+            config,
+            compiler_version_or_requirement,
+        )
+        .await
+        .inspect_err(|err| {
+            compilation_failure_report_callback(None, None, None, err.to_string())
+        })?;
+        let compiler_version = <P::Compiler as SolidityCompiler>::new(compiler_path.clone())
+            .version()
+            .await
+            .inspect_err(|err| {
+                compilation_failure_report_callback(
+                    None,
+                    Some(compiler_path.clone()),
+                    None,
+                    err.to_string(),
+                )
+            })?;
+
         let cache_key = CacheKey {
             platform_key: P::config_id().to_string(),
-            compiler_version: solc.version.clone(),
+            compiler_version: compiler_version.clone(),
             metadata_file_path: metadata_file_path.as_ref().to_path_buf(),
             solc_mode: mode.clone(),
         };
 
         let compilation_callback = || {
-            // let compiler_path = compiler_path.clone();
+            let compiler_path = compiler_path.clone();
-            // let compiler_version = compiler_version.clone();
+            let compiler_version = compiler_version.clone();
             let compilation_success_report_callback = compilation_success_report_callback.clone();
             async move {
                 compile_contracts::<P>(
-                    metadata
+                    metadata.directory()?,
-                        .directory()
+                    compiler_path,
-                        .context("Failed to get metadata directory while preparing compilation")?,
+                    compiler_version,
-                    metadata
+                    metadata.files_to_compile()?,
-                        .files_to_compile()
-                        .context("Failed to enumerate files to compile from metadata")?,
-                    config,
-                    solc,
                     mode,
                     deployed_libraries,
                     compilation_success_report_callback,
@@ -108,10 +131,7 @@ impl CachedCompiler {
             Some(_) => {
                 debug!("Deployed libraries defined, recompilation must take place");
                 debug!("Cache miss");
-                compilation_callback()
+                compilation_callback().await?.compiler_output
-                    .await
-                    .context("Compilation callback for deployed libraries failed")?
-                    .compiler_output
             }
             // If no deployed libraries are specified then we can follow the cached flow and attempt
             // to lookup the compilation artifacts in the cache.
@@ -139,36 +159,44 @@ impl CachedCompiler {
                 match self.0.get(&cache_key).await {
                     Some(cache_value) => {
                         compilation_success_report_callback(
+                            compiler_version.clone(),
+                            compiler_path,
                             true,
                             None,
                             cache_value.compiler_output.clone(),
                         );
                         cache_value.compiler_output
                     }
-                    None => {
+                    None => compilation_callback().await?.compiler_output,
-                        compilation_callback()
-                            .await
-                            .context("Compilation callback failed (cache miss path)")?
-                            .compiler_output
-                    }
                 }
             }
         };
 
-        Ok(compiled_contracts)
+        Ok((compiled_contracts, compiler_version))
     }
 }
 
 #[allow(clippy::too_many_arguments)]
 async fn compile_contracts<P: Platform>(
     metadata_directory: impl AsRef<Path>,
+    compiler_path: impl AsRef<Path>,
+    compiler_version: Version,
     mut files_to_compile: impl Iterator<Item = PathBuf>,
-    config: &Arguments,
-    solc: SolcCompiler,
     mode: &Mode,
     deployed_libraries: Option<&HashMap<ContractInstance, (ContractIdent, Address, JsonAbi)>>,
-    compilation_success_report_callback: impl Fn(bool, Option<CompilerInput>, CompilerOutput),
+    compilation_success_report_callback: impl Fn(
-    compilation_failure_report_callback: impl Fn(Option<CompilerInput>, String),
+        Version,
+        PathBuf,
+        bool,
+        Option<CompilerInput>,
+        CompilerOutput,
+    ),
+    compilation_failure_report_callback: impl Fn(
+        Option<Version>,
+        Option<PathBuf>,
+        Option<CompilerInput>,
+        String,
+    ),
 ) -> Result<CompilerOutput> {
     let all_sources_in_dir = FilesWithExtensionIterator::new(metadata_directory.as_ref())
         .with_allowed_extension("sol")
@@ -176,7 +204,6 @@ async fn compile_contracts<P: Platform>(
         .collect::<Vec<_>>();
 
     let compiler = Compiler::<P::Compiler>::new()
-        .with_solc(solc)
         .with_allow_path(metadata_directory)
         // Handling the modes
         .with_optimization(mode.optimize_setting)
@@ -185,7 +212,14 @@ async fn compile_contracts<P: Platform>(
         .try_then(|compiler| {
             files_to_compile.try_fold(compiler, |compiler, path| compiler.with_source(path))
         })
-        .inspect_err(|err| compilation_failure_report_callback(None, format!("{err:#}")))?
+        .inspect_err(|err| {
+            compilation_failure_report_callback(
+                Some(compiler_version.clone()),
+                Some(compiler_path.as_ref().to_path_buf()),
+                None,
+                err.to_string(),
+            )
+        })?
         // Adding the deployed libraries to the compiler.
         .then(|compiler| {
             deployed_libraries
@@ -204,14 +238,23 @@ async fn compile_contracts<P: Platform>(
 
     let compiler_input = compiler.input();
     let compiler_output = compiler
-        .try_build(config)
+        .try_build(compiler_path.as_ref())
         .await
         .inspect_err(|err| {
-            compilation_failure_report_callback(Some(compiler_input.clone()), format!("{err:#}"))
+            compilation_failure_report_callback(
-        })
+                Some(compiler_version.clone()),
-        .context("Failed to configure compiler with sources and options")?;
+                Some(compiler_path.as_ref().to_path_buf()),
-
+                Some(compiler_input.clone()),
-    compilation_success_report_callback(false, Some(compiler_input), compiler_output.clone());
+                err.to_string(),
+            )
+        })?;
+    compilation_success_report_callback(
+        compiler_version,
+        compiler_path.as_ref().to_path_buf(),
+        false,
+        Some(compiler_input),
+        compiler_output.clone(),
+    );
     Ok(compiler_output)
 }
 
@@ -230,20 +273,15 @@ impl ArtifactsCache {
     pub async fn with_invalidated_cache(self) -> Result<Self> {
         cacache::clear(self.path.as_path())
             .await
-            .map_err(Into::<Error>::into)
+            .map_err(Into::<Error>::into)?;
-            .with_context(|| format!("Failed to clear cache at {}", self.path.display()))?;
         Ok(self)
     }
 
     #[instrument(level = "debug", skip_all, err)]
     pub async fn insert(&self, key: &CacheKey, value: &CacheValue) -> Result<()> {
-        let key = bson::to_vec(key).context("Failed to serialize cache key (bson)")?;
+        let key = bson::to_vec(key)?;
-        let value = bson::to_vec(value).context("Failed to serialize cache value (bson)")?;
+        let value = bson::to_vec(value)?;
-        cacache::write(self.path.as_path(), key.encode_hex(), value)
+        cacache::write(self.path.as_path(), key.encode_hex(), value).await?;
-            .await
-            .with_context(|| {
-                format!("Failed to write cache entry under {}", self.path.display())
-            })?;
         Ok(())
     }
 

crates/core/src/driver/mod.rs

@@ -86,22 +86,18 @@ where
     ) -> anyhow::Result<StepOutput> {
         match step {
             Step::FunctionCall(input) => {
-                let (receipt, geth_trace, diff_mode) = self
+                let (receipt, geth_trace, diff_mode) =
-                    .handle_input(metadata, input, node)
+                    self.handle_input(metadata, input, node).await?;
-                    .await
-                    .context("Failed to handle function call step")?;
                 Ok(StepOutput::FunctionCall(receipt, geth_trace, diff_mode))
             }
             Step::BalanceAssertion(balance_assertion) => {
                 self.handle_balance_assertion(metadata, balance_assertion, node)
-                    .await
+                    .await?;
-                    .context("Failed to handle balance assertion step")?;
                 Ok(StepOutput::BalanceAssertion)
             }
             Step::StorageEmptyAssertion(storage_empty) => {
                 self.handle_storage_empty(metadata, storage_empty, node)
-                    .await
+                    .await?;
-                    .context("Failed to handle storage empty assertion step")?;
                 Ok(StepOutput::StorageEmptyAssertion)
             }
         }
@@ -117,23 +113,18 @@ where
     ) -> anyhow::Result<(TransactionReceipt, GethTrace, DiffMode)> {
         let deployment_receipts = self
             .handle_input_contract_deployment(metadata, input, node)
-            .await
+            .await?;
-            .context("Failed during contract deployment phase of input handling")?;
         let execution_receipt = self
             .handle_input_execution(input, deployment_receipts, node)
-            .await
+            .await?;
-            .context("Failed during transaction execution phase of input handling")?;
         let tracing_result = self
             .handle_input_call_frame_tracing(&execution_receipt, node)
-            .await
+            .await?;
-            .context("Failed during callframe tracing phase of input handling")?;
+        self.handle_input_variable_assignment(input, &tracing_result)?;
-        self.handle_input_variable_assignment(input, &tracing_result)
-            .context("Failed to assign variables from callframe output")?;
         let (_, (geth_trace, diff_mode)) = try_join!(
             self.handle_input_expectations(input, &execution_receipt, node, &tracing_result),
             self.handle_input_diff(&execution_receipt, node)
-        )
+        )?;
-        .context("Failed while evaluating expectations and diffs in parallel")?;
         Ok((execution_receipt, geth_trace, diff_mode))
     }
 
@@ -145,11 +136,9 @@ where
         node: &T::Blockchain,
     ) -> anyhow::Result<()> {
         self.handle_balance_assertion_contract_deployment(metadata, balance_assertion, node)
-            .await
+            .await?;
-            .context("Failed to deploy contract for balance assertion")?;
         self.handle_balance_assertion_execution(balance_assertion, node)
-            .await
+            .await?;
-            .context("Failed to execute balance assertion")?;
         Ok(())
     }
 
@@ -161,11 +150,9 @@ where
         node: &T::Blockchain,
     ) -> anyhow::Result<()> {
         self.handle_storage_empty_assertion_contract_deployment(metadata, storage_empty, node)
-            .await
+            .await?;
-            .context("Failed to deploy contract for storage empty assertion")?;
         self.handle_storage_empty_assertion_execution(storage_empty, node)
-            .await
+            .await?;
-            .context("Failed to execute storage empty assertion")?;
         Ok(())
     }
 
@@ -204,8 +191,7 @@ where
                     value,
                     node,
                 )
-                .await
+                .await?
-                .context("Failed to get or deploy contract instance during input execution")?
             {
                 receipts.insert(instance.clone(), receipt);
             }
@@ -227,7 +213,7 @@ where
             // lookup the transaction receipt in this case and continue on.
             Method::Deployer => deployment_receipts
                 .remove(&input.instance)
-                .context("Failed to find deployment receipt for constructor call"),
+                .context("Failed to find deployment receipt"),
             Method::Fallback | Method::FunctionName(_) => {
                 let tx = match input
                     .legacy_transaction(node, self.default_resolution_context())
@@ -399,8 +385,7 @@ where
             let actual = &tracing_result.output.as_ref().unwrap_or_default();
             if !expected
                 .is_equivalent(actual, resolver, resolution_context)
-                .await
+                .await?
-                .context("Failed to resolve calldata equivalence for return data assertion")?
             {
                 tracing::error!(
                     ?execution_receipt,
@@ -463,8 +448,7 @@ where
                     let expected = Calldata::new_compound([expected]);
                     if !expected
                         .is_equivalent(&actual.0, resolver, resolution_context)
-                        .await
+                        .await?
-                        .context("Failed to resolve event topic equivalence")?
                     {
                         tracing::error!(
                             event_idx,
@@ -484,8 +468,7 @@ where
                 let actual = &actual_event.data().data;
                 if !expected
                     .is_equivalent(&actual.0, resolver, resolution_context)
-                    .await
+                    .await?
-                    .context("Failed to resolve event value equivalence")?
                 {
                     tracing::error!(
                         event_idx,
@@ -518,12 +501,8 @@ where
 
         let trace = node
             .trace_transaction(execution_receipt, trace_options)
-            .await
+            .await?;
-            .context("Failed to obtain geth prestate tracer output")?;
+        let diff = node.state_diff(execution_receipt).await?;
-        let diff = node
-            .state_diff(execution_receipt)
-            .await
-            .context("Failed to obtain state diff for transaction")?;
 
         Ok((trace, diff))
     }

crates/core/src/main.rs

@@ -14,15 +14,15 @@ use alloy::{
 };
 use anyhow::Context;
 use clap::Parser;
-use futures::StreamExt;
 use futures::stream;
+use futures::{Stream, StreamExt};
 use indexmap::IndexMap;
 use revive_dt_node_interaction::EthereumNode;
 use revive_dt_report::{
     NodeDesignation, ReportAggregator, Reporter, ReporterEvent, TestCaseStatus,
     TestSpecificReporter, TestSpecifier,
 };
-use tempfile::TempDir;
+use temp_dir::TempDir;
 use tokio::{join, try_join};
 use tracing::{debug, info, info_span, instrument};
 use tracing_appender::non_blocking::WorkerGuard;
@@ -60,7 +60,7 @@ struct Test<'a> {
 }
 
 fn main() -> anyhow::Result<()> {
-    let (args, _guard) = init_cli().context("Failed to initialize CLI and tracing subscriber")?;
+    let (args, _guard) = init_cli()?;
     info!(
         leader = args.leader.to_string(),
         follower = args.follower.to_string(),
@@ -74,8 +74,7 @@ fn main() -> anyhow::Result<()> {
 
     let number_of_threads = args.number_of_threads;
     let body = async move {
-        let tests = collect_corpora(&args)
+        let tests = collect_corpora(&args)?
-            .context("Failed to collect corpus files from provided arguments")?
             .into_iter()
             .inspect(|(corpus, _)| {
                 reporter
@@ -97,9 +96,7 @@ fn main() -> anyhow::Result<()> {
             Some(platform) => {
                 compile_corpus(&args, &tests, platform, reporter, report_aggregator_task).await
             }
-            None => execute_corpus(&args, &tests, reporter, report_aggregator_task)
+            None => execute_corpus(&args, &tests, reporter, report_aggregator_task).await?,
-                .await
-                .context("Failed to execute corpus")?,
         }
         Ok(())
     };
@@ -185,10 +182,8 @@ where
     L::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
     F::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
 {
-    let tests = prepare_tests::<L, F>(metadata_files, reporter.clone());
+    let tests = prepare_tests::<L, F>(args, metadata_files, reporter.clone());
-    let driver_task = start_driver_task::<L, F>(args, tests)
+    let driver_task = start_driver_task::<L, F>(args, tests).await?;
-        .await
-        .context("Failed to start driver task")?;
     let cli_reporting_task = start_cli_reporting_task(reporter);
 
     let (_, _, rtn) = tokio::join!(cli_reporting_task, driver_task, report_aggregator_task);
@@ -198,16 +193,17 @@ where
 }
 
 fn prepare_tests<'a, L, F>(
+    args: &Arguments,
     metadata_files: &'a [MetadataFile],
     reporter: Reporter,
-) -> impl Iterator<Item = Test<'a>>
+) -> impl Stream<Item = Test<'a>>
 where
     L: Platform,
     F: Platform,
     L::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
     F::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
 {
-    metadata_files
+    let filtered_tests = metadata_files
         .iter()
         .flat_map(|metadata_file| {
             metadata_file
@@ -372,12 +368,19 @@ where
             } else {
                 true
             }
-        })
+        });
-        .filter_map(move |test| {
+
-            let leader_support =
+    stream::iter(filtered_tests)
-                L::Compiler::supports_mode(test.mode.optimize_setting, test.mode.pipeline);
+        // Filter based on the compiler compatibility
-            let follower_support =
+        .filter_map(move |test| async move {
-                F::Compiler::supports_mode(test.mode.optimize_setting, test.mode.pipeline);
+            let leader_support = does_compiler_support_mode::<L>(args, &test.mode)
+                .await
+                .ok()
+                .unwrap_or(false);
+            let follower_support = does_compiler_support_mode::<F>(args, &test.mode)
+                .await
+                .ok()
+                .unwrap_or(false);
             let is_allowed = leader_support && follower_support;
 
             if !is_allowed {
@@ -411,9 +414,25 @@ where
         })
 }
 
+async fn does_compiler_support_mode<P: Platform>(
+    args: &Arguments,
+    mode: &Mode,
+) -> anyhow::Result<bool> {
+    let compiler_version_or_requirement = mode.compiler_version_to_use(args.solc.clone());
+    let compiler_path =
+        P::Compiler::get_compiler_executable(args, compiler_version_or_requirement).await?;
+    let compiler_version = P::Compiler::new(compiler_path.clone()).version().await?;
+
+    Ok(P::Compiler::supports_mode(
+        &compiler_version,
+        mode.optimize_setting,
+        mode.pipeline,
+    ))
+}
+
 async fn start_driver_task<'a, L, F>(
     args: &Arguments,
-    tests: impl Iterator<Item = Test<'a>>,
+    tests: impl Stream<Item = Test<'a>>,
 ) -> anyhow::Result<impl Future<Output = ()>>
 where
     L: Platform,
@@ -423,23 +442,18 @@ where
 {
     info!("Starting driver task");
 
-    let leader_nodes = Arc::new(
+    let leader_nodes = Arc::new(NodePool::<L::Blockchain>::new(args)?);
-        NodePool::<L::Blockchain>::new(args).context("Failed to initialize leader node pool")?,
+    let follower_nodes = Arc::new(NodePool::<F::Blockchain>::new(args)?);
-    );
-    let follower_nodes = Arc::new(
-        NodePool::<F::Blockchain>::new(args).context("Failed to initialize follower node pool")?,
-    );
     let number_concurrent_tasks = args.number_of_concurrent_tasks();
     let cached_compiler = Arc::new(
         CachedCompiler::new(
             args.directory().join("compilation_cache"),
             args.invalidate_compilation_cache,
         )
-        .await
+        .await?,
-        .context("Failed to initialize cached compiler")?,
     );
 
-    Ok(stream::iter(tests).for_each_concurrent(
+    Ok(tests.for_each_concurrent(
         // We want to limit the concurrent tasks here because:
         //
         // 1. We don't want to overwhelm the nodes with too many requests, leading to responses timing out.
@@ -487,7 +501,7 @@ where
                         .report_test_succeeded_event(steps_executed)
                         .expect("Can't fail"),
                     Err(error) => reporter
-                        .report_test_failed_event(format!("{error:#}"))
+                        .report_test_failed_event(error.to_string())
                         .expect("Can't fail"),
                 }
             }
@@ -532,30 +546,22 @@ async fn start_cli_reporting_task(reporter: Reporter) {
                     number_of_successes += 1;
                     writeln!(
                         buf,
-                        "{}{}Case Succeeded{} - Steps Executed: {}{}",
+                        "{}{}Case Succeeded{}{} - Steps Executed: {}",
-                        GREEN, BOLD, BOLD_RESET, steps_executed, COLOR_RESET
+                        GREEN, BOLD, BOLD_RESET, COLOR_RESET, steps_executed
                     )
                 }
                 TestCaseStatus::Failed { reason } => {
                     number_of_failures += 1;
                     writeln!(
                         buf,
-                        "{}{}Case Failed{} - Reason: {}{}",
+                        "{}{}Case Failed{}{} - Reason: {}",
-                        RED,
+                        RED, BOLD, BOLD_RESET, COLOR_RESET, reason
-                        BOLD,
-                        BOLD_RESET,
-                        reason.trim(),
-                        COLOR_RESET,
                     )
                 }
                 TestCaseStatus::Ignored { reason, .. } => writeln!(
                     buf,
-                    "{}{}Case Ignored{} - Reason: {}{}",
+                    "{}{}Case Ignored{}{} - Reason: {}",
-                    GREY,
+                    GREY, BOLD, BOLD_RESET, COLOR_RESET, reason
-                    BOLD,
-                    BOLD_RESET,
-                    reason.trim(),
-                    COLOR_RESET,
                 ),
             };
         }
@@ -604,14 +610,6 @@ where
     L::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
     F::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
 {
-    let solc = revive_dt_compiler::solc_compiler(
-        config.directory(),
-        &config.solc,
-        test.mode.version.as_ref(),
-        test.mode.pipeline,
-    )
-    .await?;
-
     let leader_reporter = test
         .reporter
         .execution_specific_reporter(leader_node.id(), NodeDesignation::Leader);
@@ -620,34 +618,41 @@ where
         .execution_specific_reporter(follower_node.id(), NodeDesignation::Follower);
 
     let (
+        (
             CompilerOutput {
                 contracts: leader_pre_link_contracts,
             },
+            _,
+        ),
+        (
             CompilerOutput {
                 contracts: follower_pre_link_contracts,
             },
+            _,
+        ),
     ) = try_join!(
         cached_compiler.compile_contracts::<L>(
             test.metadata,
             test.metadata_file_path,
-            solc.clone(),
             &test.mode,
             config,
             None,
-            |is_cached, compiler_input, compiler_output| {
+            |compiler_version, compiler_path, is_cached, compiler_input, compiler_output| {
                 leader_reporter
                     .report_pre_link_contracts_compilation_succeeded_event(
+                        compiler_version,
+                        compiler_path,
                         is_cached,
-                        solc.clone(),
                         compiler_input,
                         compiler_output,
                     )
                     .expect("Can't fail")
             },
-            |compiler_input, failure_reason| {
+            |compiler_version, compiler_path, compiler_input, failure_reason| {
                 leader_reporter
                     .report_pre_link_contracts_compilation_failed_event(
-                        solc.clone(),
+                        compiler_version,
+                        compiler_path,
                         compiler_input,
                         failure_reason,
                     )
@@ -657,39 +662,36 @@ where
         cached_compiler.compile_contracts::<F>(
             test.metadata,
             test.metadata_file_path,
-            solc.clone(),
             &test.mode,
             config,
             None,
-            |is_cached, compiler_input, compiler_output| {
+            |compiler_version, compiler_path, is_cached, compiler_input, compiler_output| {
                 follower_reporter
                     .report_pre_link_contracts_compilation_succeeded_event(
+                        compiler_version,
+                        compiler_path,
                         is_cached,
-                        solc.clone(),
                         compiler_input,
                         compiler_output,
                     )
                     .expect("Can't fail")
             },
-            |compiler_input, failure_reason| {
+            |compiler_version, compiler_path, compiler_input, failure_reason| {
                 follower_reporter
                     .report_pre_link_contracts_compilation_failed_event(
-                        solc.clone(),
+                        compiler_version,
+                        compiler_path,
                         compiler_input,
                         failure_reason,
                     )
                     .expect("Can't fail")
             }
         )
-    )
+    )?;
-    .context("Failed to compile pre-link contracts for leader/follower in parallel")?;
 
     let mut leader_deployed_libraries = None::<HashMap<_, _>>;
     let mut follower_deployed_libraries = None::<HashMap<_, _>>;
-    let mut contract_sources = test
+    let mut contract_sources = test.metadata.contract_sources()?;
-        .metadata
-        .contract_sources()
-        .context("Failed to retrieve contract sources from metadata")?;
     for library_instance in test
         .metadata
         .libraries
@@ -811,34 +813,41 @@ where
     }
 
     let (
+        (
             CompilerOutput {
                 contracts: leader_post_link_contracts,
             },
+            leader_compiler_version,
+        ),
+        (
             CompilerOutput {
                 contracts: follower_post_link_contracts,
             },
+            follower_compiler_version,
+        ),
     ) = try_join!(
         cached_compiler.compile_contracts::<L>(
             test.metadata,
             test.metadata_file_path,
-            solc.clone(),
             &test.mode,
             config,
             leader_deployed_libraries.as_ref(),
-            |is_cached, compiler_input, compiler_output| {
+            |compiler_version, compiler_path, is_cached, compiler_input, compiler_output| {
                 leader_reporter
                     .report_post_link_contracts_compilation_succeeded_event(
+                        compiler_version,
+                        compiler_path,
                         is_cached,
-                        solc.clone(),
                         compiler_input,
                         compiler_output,
                     )
                     .expect("Can't fail")
             },
-            |compiler_input, failure_reason| {
+            |compiler_version, compiler_path, compiler_input, failure_reason| {
                 leader_reporter
                     .report_post_link_contracts_compilation_failed_event(
-                        solc.clone(),
+                        compiler_version,
+                        compiler_path,
                         compiler_input,
                         failure_reason,
                     )
@@ -848,41 +857,41 @@ where
         cached_compiler.compile_contracts::<F>(
             test.metadata,
             test.metadata_file_path,
-            solc.clone(),
             &test.mode,
             config,
             follower_deployed_libraries.as_ref(),
-            |is_cached, compiler_input, compiler_output| {
+            |compiler_version, compiler_path, is_cached, compiler_input, compiler_output| {
                 follower_reporter
                     .report_post_link_contracts_compilation_succeeded_event(
+                        compiler_version,
+                        compiler_path,
                         is_cached,
-                        solc.clone(),
                         compiler_input,
                         compiler_output,
                     )
                     .expect("Can't fail")
             },
-            |compiler_input, failure_reason| {
+            |compiler_version, compiler_path, compiler_input, failure_reason| {
                 follower_reporter
                     .report_post_link_contracts_compilation_failed_event(
-                        solc.clone(),
+                        compiler_version,
+                        compiler_path,
                         compiler_input,
                         failure_reason,
                     )
                     .expect("Can't fail")
             }
         )
-    )
+    )?;
-    .context("Failed to compile post-link contracts for leader/follower in parallel")?;
 
     let leader_state = CaseState::<L>::new(
-        solc.version.clone(),
+        leader_compiler_version,
         leader_post_link_contracts,
         leader_deployed_libraries.unwrap_or_default(),
         leader_reporter,
     );
     let follower_state = CaseState::<F>::new(
-        solc.version.clone(),
+        follower_compiler_version,
         follower_post_link_contracts,
         follower_deployed_libraries.unwrap_or_default(),
         follower_reporter,
@@ -925,7 +934,7 @@ async fn compile_corpus(
     config: &Arguments,
     tests: &[MetadataFile],
     platform: &TestingPlatform,
-    reporter: Reporter,
+    _: Reporter,
     report_aggregator_task: impl Future<Output = anyhow::Result<()>>,
 ) {
     let tests = tests.iter().flat_map(|metadata| {
@@ -944,42 +953,19 @@ async fn compile_corpus(
     let compilation_task =
         futures::stream::iter(tests).for_each_concurrent(None, |(metadata, mode)| {
             let cached_compiler = cached_compiler.clone();
-            let reporter = reporter.clone();
 
             async move {
-                let solc = revive_dt_compiler::solc_compiler(
-                    config.directory(),
-                    &config.solc,
-                    mode.version.as_ref(),
-                    mode.pipeline,
-                )
-                .await;
-
-                let solc = match solc {
-                    Ok(solc) => solc,
-                    Err(err) => {
-                        let test_specifier = TestSpecifier {
-                            solc_mode: mode,
-                            metadata_file_path: metadata.metadata_file_path.clone(),
-                            case_idx: 0.into(),
-                        };
-                        let _ = reporter.report_test_failed_event(test_specifier, err.to_string());
-                        return;
-                    }
-                };
-
                 match platform {
                     TestingPlatform::Geth => {
                         let _ = cached_compiler
                             .compile_contracts::<Geth>(
                                 metadata,
                                 metadata.metadata_file_path.as_path(),
-                                solc,
                                 &mode,
                                 config,
                                 None,
-                                |_, _, _| {},
+                                |_, _, _, _, _| {},
-                                |_, _| {},
+                                |_, _, _, _| {},
                             )
                             .await;
                     }
@@ -988,12 +974,11 @@ async fn compile_corpus(
                             .compile_contracts::<Kitchensink>(
                                 metadata,
                                 metadata.metadata_file_path.as_path(),
-                                solc,
                                 &mode,
                                 config,
                                 None,
-                                |_, _, _| {},
+                                |_, _, _, _, _| {},
-                                |_, _| {},
+                                |_, _, _, _| {},
                             )
                             .await;
                     }

crates/format/src/corpus.rs

@@ -8,7 +8,6 @@ use serde::{Deserialize, Serialize};
 use tracing::{debug, info};
 
 use crate::metadata::{Metadata, MetadataFile};
-use anyhow::Context as _;
 
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 #[serde(untagged)]
@@ -21,24 +20,23 @@ impl Corpus {
     pub fn try_from_path(file_path: impl AsRef<Path>) -> anyhow::Result<Self> {
         let mut corpus = File::open(file_path.as_ref())
             .map_err(anyhow::Error::from)
-            .and_then(|file| serde_json::from_reader::<_, Corpus>(file).map_err(Into::into))
+            .and_then(|file| serde_json::from_reader::<_, Corpus>(file).map_err(Into::into))?;
-            .with_context(|| {
-                format!(
-                    "Failed to open and deserialize corpus file at {}",
-                    file_path.as_ref().display()
-                )
-            })?;
-
-        let corpus_directory = file_path
-            .as_ref()
-            .canonicalize()
-            .context("Failed to canonicalize the path to the corpus file")?
-            .parent()
-            .context("Corpus file has no parent")?
-            .to_path_buf();
 
         for path in corpus.paths_iter_mut() {
-            *path = corpus_directory.join(path.as_path())
+            *path = file_path
+                .as_ref()
+                .parent()
+                .ok_or_else(|| {
+                    anyhow::anyhow!("Corpus path '{}' does not point to a file", path.display())
+                })?
+                .canonicalize()
+                .map_err(|error| {
+                    anyhow::anyhow!(
+                        "Failed to canonicalize path to corpus '{}': {error}",
+                        path.display()
+                    )
+                })?
+                .join(path.as_path())
         }
 
         Ok(corpus)

crates/format/src/input.rs

@@ -268,11 +268,7 @@ impl Input {
     ) -> anyhow::Result<Bytes> {
         match self.method {
             Method::Deployer | Method::Fallback => {
-                let calldata = self
+                let calldata = self.calldata.calldata(resolver, context).await?;
-                    .calldata
-                    .calldata(resolver, context)
-                    .await
-                    .context("Failed to produce calldata for deployer/fallback method")?;
 
                 Ok(calldata.into())
             }
@@ -287,8 +283,7 @@ impl Input {
                 // Overloads are handled by providing the full function signature in the "function
                 // name".
                 // https://github.com/matter-labs/era-compiler-tester/blob/1dfa7d07cba0734ca97e24704f12dd57f6990c2c/compiler_tester/src/test/case/input/mod.rs#L158-L190
-                let selector =
+                let selector = if function_name.contains('(') && function_name.contains(')') {
-                    if function_name.contains('(') && function_name.contains(')') {
                     Function::parse(function_name)
                         .context(
                             "Failed to parse the provided function name into a function signature",
@@ -303,11 +298,7 @@ impl Input {
                                 function_name,
                                 &self.instance
                             )
-                        })
+                        })?
-                        .with_context(|| format!(
-                            "Failed to resolve function selector for {:?} on instance {:?}",
-                            function_name, &self.instance
-                        ))?
                         .selector()
                 };
 
@@ -321,8 +312,7 @@ impl Input {
                 calldata.extend(selector.0);
                 self.calldata
                     .calldata_into_slice(&mut calldata, resolver, context)
-                    .await
+                    .await?;
-                    .context("Failed to append encoded argument to calldata buffer")?;
 
                 Ok(calldata.into())
             }
@@ -335,10 +325,7 @@ impl Input {
         resolver: &impl ResolverApi,
         context: ResolutionContext<'_>,
     ) -> anyhow::Result<TransactionRequest> {
-        let input_data = self
+        let input_data = self.encoded_input(resolver, context).await?;
-            .encoded_input(resolver, context)
-            .await
-            .context("Failed to encode input bytes for transaction request")?;
         let transaction_request = TransactionRequest::default().from(self.caller).value(
             self.value
                 .map(|value| value.into_inner())
@@ -450,8 +437,7 @@ impl Calldata {
                     })
                     .buffered(0xFF)
                     .try_collect::<Vec<_>>()
-                    .await
+                    .await?;
-                    .context("Failed to resolve one or more calldata arguments")?;
 
                 buffer.extend(resolved.into_iter().flatten());
             }
@@ -492,10 +478,7 @@ impl Calldata {
                             std::borrow::Cow::Borrowed(other)
                         };
 
-                        let this = this
+                        let this = this.resolve(resolver, context).await?;
-                            .resolve(resolver, context)
-                            .await
-                            .context("Failed to resolve calldata item during equivalence check")?;
                         let other = U256::from_be_slice(&other);
                         Ok(this == other)
                     })
@@ -681,24 +664,17 @@ impl<T: AsRef<str>> CalldataToken<T> {
 
                     let current_block_number = match context.tip_block_number() {
                         Some(block_number) => *block_number,
-                        None => resolver.last_block_number().await.context(
+                        None => resolver.last_block_number().await?,
-                            "Failed to query last block number while resolving $BLOCK_HASH",
-                        )?,
                     };
                     let desired_block_number = current_block_number.saturating_sub(offset);
 
-                    let block_hash = resolver
+                    let block_hash = resolver.block_hash(desired_block_number.into()).await?;
-                        .block_hash(desired_block_number.into())
-                        .await
-                        .context("Failed to resolve block hash for desired block number")?;
 
                     Ok(U256::from_be_bytes(block_hash.0))
                 } else if item == Self::BLOCK_NUMBER_VARIABLE {
                     let current_block_number = match context.tip_block_number() {
                         Some(block_number) => *block_number,
-                        None => resolver.last_block_number().await.context(
+                        None => resolver.last_block_number().await?,
-                            "Failed to query last block number while resolving $BLOCK_NUMBER",
-                        )?,
                     };
                     Ok(U256::from(current_block_number))
                 } else if item == Self::BLOCK_TIMESTAMP_VARIABLE {

crates/format/src/metadata.rs

@@ -132,15 +132,7 @@ impl Metadata {
         ) in contracts
         {
             let alias = alias.clone();
-            let absolute_path = directory
+            let absolute_path = directory.join(contract_source_path).canonicalize()?;
-                .join(contract_source_path)
-                .canonicalize()
-                .map_err(|error| {
-                    anyhow::anyhow!(
-                        "Failed to canonicalize contract source path '{}': {error}",
-                        directory.join(contract_source_path).display()
-                    )
-                })?;
             let contract_ident = contract_ident.clone();
 
             sources.insert(

crates/format/src/mode.rs

@@ -1,4 +1,3 @@
-use anyhow::Context;
 use regex::Regex;
 use revive_dt_common::types::{Mode, ModeOptimizerSetting, ModePipeline};
 use serde::{Deserialize, Serialize};
@@ -45,34 +44,21 @@ impl FromStr for ParsedMode {
         };
 
         let pipeline = match caps.name("pipeline") {
-            Some(m) => Some(
+            Some(m) => Some(ModePipeline::from_str(m.as_str())?),
-                ModePipeline::from_str(m.as_str())
-                    .context("Failed to parse mode pipeline from string")?,
-            ),
             None => None,
         };
 
         let optimize_flag = caps.name("optimize_flag").map(|m| m.as_str() == "+");
 
         let optimize_setting = match caps.name("optimize_setting") {
-            Some(m) => Some(
+            Some(m) => Some(ModeOptimizerSetting::from_str(m.as_str())?),
-                ModeOptimizerSetting::from_str(m.as_str())
-                    .context("Failed to parse optimizer setting from string")?,
-            ),
             None => None,
         };
 
         let version = match caps.name("version") {
-            Some(m) => Some(
+            Some(m) => Some(semver::VersionReq::parse(m.as_str()).map_err(|e| {
-                semver::VersionReq::parse(m.as_str())
+                anyhow::anyhow!("Cannot parse the version requirement '{}': {e}", m.as_str())
-                    .map_err(|e| {
+            })?),
-                        anyhow::anyhow!(
-                            "Cannot parse the version requirement '{}': {e}",
-                            m.as_str()
-                        )
-                    })
-                    .context("Failed to parse semver requirement from mode string")?,
-            ),
             None => None,
         };
 

crates/node/Cargo.toml

@@ -27,7 +27,7 @@ sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 
 [dev-dependencies]
-tempfile = { workspace = true }
+temp-dir = { workspace = true }
 tokio = { workspace = true }
 
 [lints]

crates/node/src/geth.rs

@@ -101,13 +101,10 @@ impl GethNode {
         let _ = clear_directory(&self.base_directory);
         let _ = clear_directory(&self.logs_directory);
 
-        create_dir_all(&self.base_directory)
+        create_dir_all(&self.base_directory)?;
-            .context("Failed to create base directory for geth node")?;
+        create_dir_all(&self.logs_directory)?;
-        create_dir_all(&self.logs_directory)
-            .context("Failed to create logs directory for geth node")?;
 
-        let mut genesis = serde_json::from_str::<Genesis>(&genesis)
+        let mut genesis = serde_json::from_str::<Genesis>(&genesis)?;
-            .context("Failed to deserialize geth genesis JSON")?;
         for signer_address in
             <EthereumWallet as NetworkWallet<Ethereum>>::signer_addresses(&self.wallet)
         {
@@ -119,11 +116,7 @@ impl GethNode {
                 .or_insert(GenesisAccount::default().with_balance(U256::from(INITIAL_BALANCE)));
         }
         let genesis_path = self.base_directory.join(Self::GENESIS_JSON_FILE);
-        serde_json::to_writer(
+        serde_json::to_writer(File::create(&genesis_path)?, &genesis)?;
-            File::create(&genesis_path).context("Failed to create geth genesis file")?,
-            &genesis,
-        )
-        .context("Failed to serialize geth genesis JSON to file")?;
 
         let mut child = Command::new(&self.geth)
             .arg("--state.scheme")
@@ -134,22 +127,16 @@ impl GethNode {
             .arg(genesis_path)
             .stderr(Stdio::piped())
             .stdout(Stdio::null())
-            .spawn()
+            .spawn()?;
-            .context("Failed to spawn geth --init process")?;
 
         let mut stderr = String::new();
         child
             .stderr
             .take()
             .expect("should be piped")
-            .read_to_string(&mut stderr)
+            .read_to_string(&mut stderr)?;
-            .context("Failed to read geth --init stderr")?;
 
-        if !child
+        if !child.wait()?.success() {
-            .wait()
-            .context("Failed waiting for geth --init process to finish")?
-            .success()
-        {
             anyhow::bail!("failed to initialize geth node #{:?}: {stderr}", &self.id);
         }
 
@@ -174,11 +161,8 @@ impl GethNode {
 
         let stdout_logs_file = open_options
             .clone()
-            .open(self.geth_stdout_log_file_path())
+            .open(self.geth_stdout_log_file_path())?;
-            .context("Failed to open geth stdout logs file")?;
+        let stderr_logs_file = open_options.open(self.geth_stderr_log_file_path())?;
-        let stderr_logs_file = open_options
-            .open(self.geth_stderr_log_file_path())
-            .context("Failed to open geth stderr logs file")?;
         self.handle = Command::new(&self.geth)
             .arg("--dev")
             .arg("--datadir")
@@ -198,24 +182,14 @@ impl GethNode {
             .arg("full")
             .arg("--gcmode")
             .arg("archive")
-            .stderr(
+            .stderr(stderr_logs_file.try_clone()?)
-                stderr_logs_file
+            .stdout(stdout_logs_file.try_clone()?)
-                    .try_clone()
+            .spawn()?
-                    .context("Failed to clone geth stderr log file handle")?,
-            )
-            .stdout(
-                stdout_logs_file
-                    .try_clone()
-                    .context("Failed to clone geth stdout log file handle")?,
-            )
-            .spawn()
-            .context("Failed to spawn geth node process")?
             .into();
 
         if let Err(error) = self.wait_ready() {
             tracing::error!(?error, "Failed to start geth, shutting down gracefully");
-            self.shutdown()
+            self.shutdown()?;
-                .context("Failed to gracefully shutdown after geth start error")?;
             return Err(error);
         }
 
@@ -237,8 +211,7 @@ impl GethNode {
             .write(false)
             .append(false)
             .truncate(false)
-            .open(self.geth_stderr_log_file_path())
+            .open(self.geth_stderr_log_file_path())?;
-            .context("Failed to open geth stderr logs file for readiness check")?;
 
         let maximum_wait_time = Duration::from_millis(self.start_timeout);
         let mut stderr = BufReader::new(logs_file).lines();
@@ -304,18 +277,11 @@ impl EthereumNode for GethNode {
         &self,
         transaction: TransactionRequest,
     ) -> anyhow::Result<alloy::rpc::types::TransactionReceipt> {
-        let provider = self
+        let provider = self.provider().await?;
-            .provider()
-            .await
-            .context("Failed to create provider for transaction submission")?;
 
-        let pending_transaction = provider
+        let pending_transaction = provider.send_transaction(transaction).await.inspect_err(
-            .send_transaction(transaction)
-            .await
-            .inspect_err(
             |err| tracing::error!(%err, "Encountered an error when submitting the transaction"),
-            )
+        )?;
-            .context("Failed to submit transaction to geth node")?;
         let transaction_hash = *pending_transaction.tx_hash();
 
         // The following is a fix for the "transaction indexing is in progress" error that we used
@@ -369,11 +335,7 @@ impl EthereumNode for GethNode {
         transaction: &TransactionReceipt,
         trace_options: GethDebugTracingOptions,
     ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
-        let provider = Arc::new(
+        let provider = Arc::new(self.provider().await?);
-            self.provider()
-                .await
-                .context("Failed to create provider for tracing")?,
-        );
         poll(
             Self::TRACE_POLLING_DURATION,
             PollingWaitBehavior::Constant(Duration::from_millis(200)),
@@ -409,10 +371,8 @@ impl EthereumNode for GethNode {
         });
         match self
             .trace_transaction(transaction, trace_options)
-            .await
+            .await?
-            .context("Failed to trace transaction for prestate diff")?
+            .try_into_pre_state_frame()?
-            .try_into_pre_state_frame()
-            .context("Failed to convert trace into pre-state frame")?
         {
             PreStateFrame::Diff(diff) => Ok(diff),
             _ => anyhow::bail!("expected a diff mode trace"),
@@ -422,8 +382,7 @@ impl EthereumNode for GethNode {
     #[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
     async fn balance_of(&self, address: Address) -> anyhow::Result<U256> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Geth provider")?
             .get_balance(address)
             .await
             .map_err(Into::into)
@@ -436,8 +395,7 @@ impl EthereumNode for GethNode {
         keys: Vec<StorageKey>,
     ) -> anyhow::Result<EIP1186AccountProofResponse> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Geth provider")?
             .get_proof(address, keys)
             .latest()
             .await
@@ -449,8 +407,7 @@ impl ResolverApi for GethNode {
     #[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
     async fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Geth provider")?
             .get_chain_id()
             .await
             .map_err(Into::into)
@@ -459,8 +416,7 @@ impl ResolverApi for GethNode {
     #[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
     async fn transaction_gas_price(&self, tx_hash: &TxHash) -> anyhow::Result<u128> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Geth provider")?
             .get_transaction_receipt(*tx_hash)
             .await?
             .context("Failed to get the transaction receipt")
@@ -470,48 +426,40 @@ impl ResolverApi for GethNode {
     #[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
     async fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Geth provider")?
             .get_block_by_number(number)
-            .await
+            .await?
-            .context("Failed to get the geth block")?
+            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .context("Failed to get the Geth block, perhaps there are no blocks?")
             .map(|block| block.header.gas_limit as _)
     }
 
     #[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
     async fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Geth provider")?
             .get_block_by_number(number)
-            .await
+            .await?
-            .context("Failed to get the geth block")?
+            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .context("Failed to get the Geth block, perhaps there are no blocks?")
             .map(|block| block.header.beneficiary)
     }
 
     #[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
     async fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Geth provider")?
             .get_block_by_number(number)
-            .await
+            .await?
-            .context("Failed to get the geth block")?
+            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .context("Failed to get the Geth block, perhaps there are no blocks?")
             .map(|block| U256::from_be_bytes(block.header.mix_hash.0))
     }
 
     #[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
     async fn block_base_fee(&self, number: BlockNumberOrTag) -> anyhow::Result<u64> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Geth provider")?
             .get_block_by_number(number)
-            .await
+            .await?
-            .context("Failed to get the geth block")?
+            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .context("Failed to get the Geth block, perhaps there are no blocks?")
             .and_then(|block| {
                 block
                     .header
@@ -523,32 +471,27 @@ impl ResolverApi for GethNode {
     #[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
     async fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Geth provider")?
             .get_block_by_number(number)
-            .await
+            .await?
-            .context("Failed to get the geth block")?
+            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .context("Failed to get the Geth block, perhaps there are no blocks?")
             .map(|block| block.header.hash)
     }
 
     #[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
     async fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Geth provider")?
             .get_block_by_number(number)
-            .await
+            .await?
-            .context("Failed to get the geth block")?
+            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .context("Failed to get the Geth block, perhaps there are no blocks?")
             .map(|block| block.header.timestamp)
     }
 
     #[instrument(level = "info", skip_all, fields(geth_node_id = self.id))]
     async fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Geth provider")?
             .get_block_number()
             .await
             .map_err(Into::into)
@@ -633,10 +576,8 @@ impl Node for GethNode {
             .stdin(Stdio::null())
             .stdout(Stdio::piped())
             .stderr(Stdio::null())
-            .spawn()
+            .spawn()?
-            .context("Failed to spawn geth --version process")?
+            .wait_with_output()?
-            .wait_with_output()
-            .context("Failed to wait for geth --version output")?
             .stdout;
         Ok(String::from_utf8_lossy(&output).into())
     }
@@ -664,7 +605,7 @@ impl Drop for GethNode {
 mod tests {
     use revive_dt_config::Arguments;
 
-    use tempfile::TempDir;
+    use temp_dir::TempDir;
 
     use crate::{GENESIS_JSON, Node};
 

crates/node/src/kitchensink.rs

@@ -96,10 +96,8 @@ impl KitchensinkNode {
         let _ = clear_directory(&self.base_directory);
         let _ = clear_directory(&self.logs_directory);
 
-        create_dir_all(&self.base_directory)
+        create_dir_all(&self.base_directory)?;
-            .context("Failed to create base directory for kitchensink node")?;
+        create_dir_all(&self.logs_directory)?;
-        create_dir_all(&self.logs_directory)
-            .context("Failed to create logs directory for kitchensink node")?;
 
         let template_chainspec_path = self.base_directory.join(Self::CHAIN_SPEC_JSON_FILE);
 
@@ -128,10 +126,8 @@ impl KitchensinkNode {
             );
         }
 
-        let content = String::from_utf8(output.stdout)
+        let content = String::from_utf8(output.stdout)?;
-            .context("Failed to decode substrate export-chain-spec output as UTF-8")?;
+        let mut chainspec_json: JsonValue = serde_json::from_str(&content)?;
-        let mut chainspec_json: JsonValue =
-            serde_json::from_str(&content).context("Failed to parse substrate chain spec JSON")?;
 
         let existing_chainspec_balances =
             chainspec_json["genesis"]["runtimeGenesis"]["patch"]["balances"]["balances"]
@@ -153,8 +149,7 @@ impl KitchensinkNode {
             })
             .collect();
         let mut eth_balances = {
-            let mut genesis = serde_json::from_str::<Genesis>(genesis)
+            let mut genesis = serde_json::from_str::<Genesis>(genesis)?;
-                .context("Failed to deserialize EVM genesis JSON for kitchensink")?;
             for signer_address in
                 <EthereumWallet as NetworkWallet<Ethereum>>::signer_addresses(&self.wallet)
             {
@@ -165,8 +160,7 @@ impl KitchensinkNode {
                     .entry(signer_address)
                     .or_insert(GenesisAccount::default().with_balance(U256::from(INITIAL_BALANCE)));
             }
-            self.extract_balance_from_genesis_file(&genesis)
+            self.extract_balance_from_genesis_file(&genesis)?
-                .context("Failed to extract balances from EVM genesis JSON")?
         };
         merged_balances.append(&mut eth_balances);
 
@@ -174,11 +168,9 @@ impl KitchensinkNode {
             json!(merged_balances);
 
         serde_json::to_writer_pretty(
-            std::fs::File::create(&template_chainspec_path)
+            std::fs::File::create(&template_chainspec_path)?,
-                .context("Failed to create kitchensink template chainspec file")?,
             &chainspec_json,
-        )
+        )?;
-        .context("Failed to write kitchensink template chainspec JSON")?;
         Ok(self)
     }
 
@@ -204,12 +196,10 @@ impl KitchensinkNode {
         // Start Substrate node
         let kitchensink_stdout_logs_file = open_options
             .clone()
-            .open(self.kitchensink_stdout_log_file_path())
+            .open(self.kitchensink_stdout_log_file_path())?;
-            .context("Failed to open kitchensink stdout logs file")?;
         let kitchensink_stderr_logs_file = open_options
             .clone()
-            .open(self.kitchensink_stderr_log_file_path())
+            .open(self.kitchensink_stderr_log_file_path())?;
-            .context("Failed to open kitchensink stderr logs file")?;
         let node_binary_path = if self.use_kitchensink_not_dev_node {
             self.substrate_binary.as_path()
         } else {
@@ -233,18 +223,9 @@ impl KitchensinkNode {
             .arg("--rpc-max-connections")
             .arg(u32::MAX.to_string())
             .env("RUST_LOG", Self::SUBSTRATE_LOG_ENV)
-            .stdout(
+            .stdout(kitchensink_stdout_logs_file.try_clone()?)
-                kitchensink_stdout_logs_file
+            .stderr(kitchensink_stderr_logs_file.try_clone()?)
-                    .try_clone()
+            .spawn()?
-                    .context("Failed to clone kitchensink stdout log file handle")?,
-            )
-            .stderr(
-                kitchensink_stderr_logs_file
-                    .try_clone()
-                    .context("Failed to clone kitchensink stderr log file handle")?,
-            )
-            .spawn()
-            .context("Failed to spawn substrate node process")?
             .into();
 
         // Give the node a moment to boot
@@ -253,18 +234,14 @@ impl KitchensinkNode {
             Self::SUBSTRATE_READY_MARKER,
             Duration::from_secs(60),
         ) {
-            self.shutdown()
+            self.shutdown()?;
-                .context("Failed to gracefully shutdown after substrate start error")?;
             return Err(error);
         };
 
         let eth_proxy_stdout_logs_file = open_options
             .clone()
-            .open(self.proxy_stdout_log_file_path())
+            .open(self.proxy_stdout_log_file_path())?;
-            .context("Failed to open eth-proxy stdout logs file")?;
+        let eth_proxy_stderr_logs_file = open_options.open(self.proxy_stderr_log_file_path())?;
-        let eth_proxy_stderr_logs_file = open_options
-            .open(self.proxy_stderr_log_file_path())
-            .context("Failed to open eth-proxy stderr logs file")?;
         self.process_proxy = Command::new(&self.eth_proxy_binary)
             .arg("--dev")
             .arg("--rpc-port")
@@ -274,18 +251,9 @@ impl KitchensinkNode {
             .arg("--rpc-max-connections")
             .arg(u32::MAX.to_string())
             .env("RUST_LOG", Self::PROXY_LOG_ENV)
-            .stdout(
+            .stdout(eth_proxy_stdout_logs_file.try_clone()?)
-                eth_proxy_stdout_logs_file
+            .stderr(eth_proxy_stderr_logs_file.try_clone()?)
-                    .try_clone()
+            .spawn()?
-                    .context("Failed to clone eth-proxy stdout log file handle")?,
-            )
-            .stderr(
-                eth_proxy_stderr_logs_file
-                    .try_clone()
-                    .context("Failed to clone eth-proxy stderr log file handle")?,
-            )
-            .spawn()
-            .context("Failed to spawn eth-proxy process")?
             .into();
 
         if let Err(error) = Self::wait_ready(
@@ -293,8 +261,7 @@ impl KitchensinkNode {
             Self::ETH_PROXY_READY_MARKER,
             Duration::from_secs(60),
         ) {
-            self.shutdown()
+            self.shutdown()?;
-                .context("Failed to gracefully shutdown after eth-proxy start error")?;
             return Err(error);
         };
 
@@ -419,14 +386,11 @@ impl EthereumNode for KitchensinkNode {
     ) -> anyhow::Result<TransactionReceipt> {
         let receipt = self
             .provider()
-            .await
+            .await?
-            .context("Failed to create provider for transaction submission")?
             .send_transaction(transaction)
-            .await
+            .await?
-            .context("Failed to submit transaction to kitchensink proxy")?
             .get_receipt()
-            .await
+            .await?;
-            .context("Failed to fetch transaction receipt from kitchensink proxy")?;
         Ok(receipt)
     }
 
@@ -436,12 +400,11 @@ impl EthereumNode for KitchensinkNode {
         trace_options: GethDebugTracingOptions,
     ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
         let tx_hash = transaction.transaction_hash;
-        self.provider()
+        Ok(self
-            .await
+            .provider()
-            .context("Failed to create provider for debug tracing")?
+            .await?
             .debug_trace_transaction(tx_hash, trace_options)
-            .await
+            .await?)
-            .context("Failed to obtain debug trace from kitchensink proxy")
     }
 
     async fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
@@ -462,8 +425,7 @@ impl EthereumNode for KitchensinkNode {
 
     async fn balance_of(&self, address: Address) -> anyhow::Result<U256> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Kitchensink provider")?
             .get_balance(address)
             .await
             .map_err(Into::into)
@@ -475,8 +437,7 @@ impl EthereumNode for KitchensinkNode {
         keys: Vec<StorageKey>,
     ) -> anyhow::Result<EIP1186AccountProofResponse> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Kitchensink provider")?
             .get_proof(address, keys)
             .latest()
             .await
@@ -487,8 +448,7 @@ impl EthereumNode for KitchensinkNode {
 impl ResolverApi for KitchensinkNode {
     async fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Kitchensink provider")?
             .get_chain_id()
             .await
             .map_err(Into::into)
@@ -496,8 +456,7 @@ impl ResolverApi for KitchensinkNode {
 
     async fn transaction_gas_price(&self, tx_hash: &TxHash) -> anyhow::Result<u128> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Kitchensink provider")?
             .get_transaction_receipt(*tx_hash)
             .await?
             .context("Failed to get the transaction receipt")
@@ -506,45 +465,37 @@ impl ResolverApi for KitchensinkNode {
 
     async fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Kitchensink provider")?
             .get_block_by_number(number)
-            .await
+            .await?
-            .context("Failed to get the kitchensink block")?
+            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .context("Failed to get the Kitchensink block, perhaps the chain has no blocks?")
             .map(|block| block.header.gas_limit as _)
     }
 
     async fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Kitchensink provider")?
             .get_block_by_number(number)
-            .await
+            .await?
-            .context("Failed to get the kitchensink block")?
+            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .context("Failed to get the Kitchensink block, perhaps the chain has no blocks?")
             .map(|block| block.header.beneficiary)
     }
 
     async fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Kitchensink provider")?
             .get_block_by_number(number)
-            .await
+            .await?
-            .context("Failed to get the kitchensink block")?
+            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .context("Failed to get the Kitchensink block, perhaps the chain has no blocks?")
             .map(|block| U256::from_be_bytes(block.header.mix_hash.0))
     }
 
     async fn block_base_fee(&self, number: BlockNumberOrTag) -> anyhow::Result<u64> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Kitchensink provider")?
             .get_block_by_number(number)
-            .await
+            .await?
-            .context("Failed to get the kitchensink block")?
+            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .context("Failed to get the Kitchensink block, perhaps the chain has no blocks?")
             .and_then(|block| {
                 block
                     .header
@@ -555,30 +506,25 @@ impl ResolverApi for KitchensinkNode {
 
     async fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Kitchensink provider")?
             .get_block_by_number(number)
-            .await
+            .await?
-            .context("Failed to get the kitchensink block")?
+            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .context("Failed to get the Kitchensink block, perhaps the chain has no blocks?")
             .map(|block| block.header.hash)
     }
 
     async fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Kitchensink provider")?
             .get_block_by_number(number)
-            .await
+            .await?
-            .context("Failed to get the kitchensink block")?
+            .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .context("Failed to get the Kitchensink block, perhaps the chain has no blocks?")
             .map(|block| block.header.timestamp)
     }
 
     async fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
         self.provider()
-            .await
+            .await?
-            .context("Failed to get the Kitchensink provider")?
             .get_block_number()
             .await
             .map_err(Into::into)
@@ -665,10 +611,8 @@ impl Node for KitchensinkNode {
             .stdin(Stdio::null())
             .stdout(Stdio::piped())
             .stderr(Stdio::null())
-            .spawn()
+            .spawn()?
-            .context("Failed to spawn kitchensink --version")?
+            .wait_with_output()?
-            .wait_with_output()
-            .context("Failed to wait for kitchensink --version")?
             .stdout;
         Ok(String::from_utf8_lossy(&output).into())
     }

crates/node/src/pool.rs

@@ -44,10 +44,8 @@ where
             nodes.push(
                 handle
                     .join()
-                    .map_err(|error| anyhow::anyhow!("failed to spawn node: {:?}", error))
+                    .map_err(|error| anyhow::anyhow!("failed to spawn node: {:?}", error))?
-                    .context("Failed to join node spawn thread")?
+                    .map_err(|error| anyhow::anyhow!("node failed to spawn: {error}"))?,
-                    .map_err(|error| anyhow::anyhow!("node failed to spawn: {error}"))
-                    .context("Node failed to spawn")?,
             );
         }
 
@@ -71,8 +69,7 @@ fn spawn_node<T: Node + Send>(args: &Arguments, genesis: String) -> anyhow::Resu
         connection_string = node.connection_string(),
         "Spawning node"
     );
-    node.spawn(genesis)
+    node.spawn(genesis)?;
-        .context("Failed to spawn node process")?;
     info!(
         id = node.id(),
         connection_string = node.connection_string(),

crates/report/Cargo.toml

@@ -17,6 +17,7 @@ alloy-primitives = { workspace = true }
 anyhow = { workspace = true }
 paste = { workspace = true }
 indexmap = { workspace = true, features = ["serde"] }
+semver = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_with = { workspace = true }

crates/report/src/aggregator.rs

@@ -4,15 +4,17 @@
 use std::{
     collections::{BTreeMap, BTreeSet, HashMap, HashSet},
     fs::OpenOptions,
+    path::PathBuf,
     time::{SystemTime, UNIX_EPOCH},
 };
 
 use alloy_primitives::Address;
-use anyhow::{Context as _, Result};
+use anyhow::Result;
 use indexmap::IndexMap;
-use revive_dt_compiler::{CompilerInput, CompilerOutput, Mode, SolcCompiler};
+use revive_dt_compiler::{CompilerInput, CompilerOutput, Mode};
 use revive_dt_config::{Arguments, TestingPlatform};
 use revive_dt_format::{case::CaseIdx, corpus::Corpus, metadata::ContractInstance};
+use semver::Version;
 use serde::Serialize;
 use serde_with::{DisplayFromStr, serde_as};
 use tokio::sync::{
@@ -111,10 +113,7 @@ impl ReportAggregator {
         debug!("Report aggregation completed");
 
         let file_name = {
-            let current_timestamp = SystemTime::now()
+            let current_timestamp = SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs();
-                .duration_since(UNIX_EPOCH)
-                .context("System clock is before UNIX_EPOCH; cannot compute report timestamp")?
-                .as_secs();
             let mut file_name = current_timestamp.to_string();
             file_name.push_str(".json");
             file_name
@@ -125,16 +124,8 @@ impl ReportAggregator {
             .write(true)
             .truncate(true)
             .read(false)
-            .open(&file_path)
+            .open(file_path)?;
-            .with_context(|| {
+        serde_json::to_writer_pretty(file, &self.report)?;
-                format!(
-                    "Failed to open report file for writing: {}",
-                    file_path.display()
-                )
-            })?;
-        serde_json::to_writer_pretty(&file, &self.report).with_context(|| {
-            format!("Failed to serialize report JSON to {}", file_path.display())
-        })?;
 
         Ok(())
     }
@@ -298,7 +289,8 @@ impl ReportAggregator {
 
         execution_information.pre_link_compilation_status = Some(CompilationStatus::Success {
             is_cached: event.is_cached,
-            solc_info: event.solc_info,
+            compiler_version: event.compiler_version,
+            compiler_path: event.compiler_path,
             compiler_input,
             compiler_output,
         });
@@ -326,7 +318,8 @@ impl ReportAggregator {
 
         execution_information.post_link_compilation_status = Some(CompilationStatus::Success {
             is_cached: event.is_cached,
-            solc_info: event.solc_info,
+            compiler_version: event.compiler_version,
+            compiler_path: event.compiler_path,
             compiler_input,
             compiler_output,
         });
@@ -348,7 +341,8 @@ impl ReportAggregator {
 
         execution_information.pre_link_compilation_status = Some(CompilationStatus::Failure {
             reason: event.reason,
-            solc_info: event.solc_info,
+            compiler_version: event.compiler_version,
+            compiler_path: event.compiler_path,
             compiler_input,
         });
     }
@@ -369,7 +363,8 @@ impl ReportAggregator {
 
         execution_information.post_link_compilation_status = Some(CompilationStatus::Failure {
             reason: event.reason,
-            solc_info: event.solc_info,
+            compiler_version: event.compiler_version,
+            compiler_path: event.compiler_path,
             compiler_input,
         });
     }
@@ -522,8 +517,10 @@ pub enum CompilationStatus {
     Success {
         /// A flag with information on whether the compilation artifacts were cached or not.
         is_cached: bool,
-        /// The version and path of the solc compiler used to compile the contracts.
+        /// The version of the compiler used to compile the contracts.
-        solc_info: SolcCompiler,
+        compiler_version: Version,
+        /// The path of the compiler used to compile the contracts.
+        compiler_path: PathBuf,
         /// The input provided to the compiler to compile the contracts. This is only included if
         /// the appropriate flag is set in the CLI configuration and if the contracts were not
         /// cached and the compiler was invoked.
@@ -538,8 +535,12 @@ pub enum CompilationStatus {
     Failure {
         /// The failure reason.
         reason: String,
-        /// The version and path of the solc compiler used to compile the contracts.
+        /// The version of the compiler used to compile the contracts.
-        solc_info: SolcCompiler,
+        #[serde(skip_serializing_if = "Option::is_none")]
+        compiler_version: Option<Version>,
+        /// The path of the compiler used to compile the contracts.
+        #[serde(skip_serializing_if = "Option::is_none")]
+        compiler_path: Option<PathBuf>,
         /// The input provided to the compiler to compile the contracts. This is only included if
         /// the appropriate flag is set in the CLI configuration and if the contracts were not
         /// cached and the compiler was invoked.

crates/report/src/runner_event.rs

@@ -1,15 +1,15 @@
 //! The types associated with the events sent by the runner to the reporter.
 #![allow(dead_code)]
 
-use std::{collections::BTreeMap, sync::Arc};
+use std::{collections::BTreeMap, path::PathBuf, sync::Arc};
 
 use alloy_primitives::Address;
-use anyhow::Context as _;
 use indexmap::IndexMap;
-use revive_dt_compiler::{CompilerInput, CompilerOutput, SolcCompiler};
+use revive_dt_compiler::{CompilerInput, CompilerOutput};
 use revive_dt_config::TestingPlatform;
 use revive_dt_format::metadata::Metadata;
 use revive_dt_format::{corpus::Corpus, metadata::ContractInstance};
+use semver::Version;
 use tokio::sync::{broadcast, oneshot};
 
 use crate::{ExecutionSpecifier, ReporterEvent, TestSpecifier, common::MetadataFilePath};
@@ -546,11 +546,13 @@ define_event! {
         PreLinkContractsCompilationSucceeded {
             /// A specifier for the execution that's taking place.
             execution_specifier: Arc<ExecutionSpecifier>,
+            /// The version of the compiler used to compile the contracts.
+            compiler_version: Version,
+            /// The path of the compiler used to compile the contracts.
+            compiler_path: PathBuf,
             /// A flag of whether the contract bytecode and ABI were cached or if they were compiled
             /// anew.
             is_cached: bool,
-            /// The version and path of the solc compiler used to compile the contracts.
-            solc_info: SolcCompiler,
             /// The input provided to the compiler - this is optional and not provided if the
             /// contracts were obtained from the cache.
             compiler_input: Option<CompilerInput>,
@@ -562,11 +564,13 @@ define_event! {
         PostLinkContractsCompilationSucceeded {
             /// A specifier for the execution that's taking place.
             execution_specifier: Arc<ExecutionSpecifier>,
+            /// The version of the compiler used to compile the contracts.
+            compiler_version: Version,
+            /// The path of the compiler used to compile the contracts.
+            compiler_path: PathBuf,
             /// A flag of whether the contract bytecode and ABI were cached or if they were compiled
             /// anew.
             is_cached: bool,
-            /// The version and path of the solc compiler used to compile the contracts.
-            solc_info: SolcCompiler,
             /// The input provided to the compiler - this is optional and not provided if the
             /// contracts were obtained from the cache.
             compiler_input: Option<CompilerInput>,
@@ -578,8 +582,10 @@ define_event! {
         PreLinkContractsCompilationFailed {
             /// A specifier for the execution that's taking place.
             execution_specifier: Arc<ExecutionSpecifier>,
-            /// The version and path of the solc compiler used to compile the contracts.
+            /// The version of the compiler used to compile the contracts.
-            solc_info: SolcCompiler,
+            compiler_version: Option<Version>,
+            /// The path of the compiler used to compile the contracts.
+            compiler_path: Option<PathBuf>,
             /// The input provided to the compiler - this is optional and not provided if the
             /// contracts were obtained from the cache.
             compiler_input: Option<CompilerInput>,
@@ -591,8 +597,10 @@ define_event! {
         PostLinkContractsCompilationFailed {
             /// A specifier for the execution that's taking place.
             execution_specifier: Arc<ExecutionSpecifier>,
-            /// The version and path of the solc compiler used to compile the contracts.
+            /// The version of the compiler used to compile the contracts.
-            solc_info: SolcCompiler,
+            compiler_version: Option<Version>,
+            /// The path of the compiler used to compile the contracts.
+            compiler_path: Option<PathBuf>,
             /// The input provided to the compiler - this is optional and not provided if the
             /// contracts were obtained from the cache.
             compiler_input: Option<CompilerInput>,
@@ -622,8 +630,7 @@ define_event! {
 impl RunnerEventReporter {
     pub async fn subscribe(&self) -> anyhow::Result<broadcast::Receiver<ReporterEvent>> {
         let (tx, rx) = oneshot::channel::<broadcast::Receiver<ReporterEvent>>();
-        self.report_subscribe_to_events_event(tx)
+        self.report_subscribe_to_events_event(tx)?;
-            .context("Failed to send subscribe request to reporter task")?;
         rx.await.map_err(Into::into)
     }
 }

crates/solc-binaries/src/cache.rs

@@ -12,7 +12,6 @@ use std::{
 use tokio::sync::Mutex;
 
 use crate::download::SolcDownloader;
-use anyhow::Context;
 
 pub const SOLC_CACHE_DIRECTORY: &str = "solc";
 pub(crate) static SOLC_CACHER: LazyLock<Mutex<HashSet<PathBuf>>> = LazyLock::new(Default::default);
@@ -32,20 +31,8 @@ pub(crate) async fn get_or_download(
         return Ok(target_file);
     }
 
-    create_dir_all(&target_directory).with_context(|| {
+    create_dir_all(target_directory)?;
-        format!(
+    download_to_file(&target_file, downloader).await?;
-            "Failed to create solc cache directory: {}",
-            target_directory.display()
-        )
-    })?;
-    download_to_file(&target_file, downloader)
-        .await
-        .with_context(|| {
-            format!(
-                "Failed to write downloaded solc to {}",
-                target_file.display()
-            )
-        })?;
     cache.insert(target_file.clone());
 
     Ok(target_file)
@@ -58,26 +45,14 @@ async fn download_to_file(path: &Path, downloader: &SolcDownloader) -> anyhow::R
 
     #[cfg(unix)]
     {
-        let mut permissions = file
+        let mut permissions = file.metadata()?.permissions();
-            .metadata()
-            .with_context(|| format!("Failed to read metadata for {}", path.display()))?
-            .permissions();
         permissions.set_mode(permissions.mode() | 0o111);
-        file.set_permissions(permissions).with_context(|| {
+        file.set_permissions(permissions)?;
-            format!("Failed to set executable permissions on {}", path.display())
-        })?;
     }
 
     let mut file = BufWriter::new(file);
-    file.write_all(
+    file.write_all(&downloader.download().await?)?;
-        &downloader
+    file.flush()?;
-            .download()
-            .await
-            .context("Failed to download solc binary bytes")?,
-    )
-    .with_context(|| format!("Failed to write solc binary to {}", path.display()))?;
-    file.flush()
-        .with_context(|| format!("Failed to flush file {}", path.display()))?;
     drop(file);
 
     #[cfg(target_os = "macos")]
@@ -88,20 +63,8 @@ async fn download_to_file(path: &Path, downloader: &SolcDownloader) -> anyhow::R
         .stderr(std::process::Stdio::null())
         .stdout(std::process::Stdio::null())
         .stdout(std::process::Stdio::null())
-        .spawn()
+        .spawn()?
-        .with_context(|| {
+        .wait()?;
-            format!(
-                "Failed to spawn xattr to remove quarantine attribute on {}",
-                path.display()
-            )
-        })?
-        .wait()
-        .with_context(|| {
-            format!(
-                "Failed waiting for xattr operation to complete on {}",
-                path.display()
-            )
-        })?;
 
     Ok(())
 }

crates/solc-binaries/src/download.rs

@@ -11,7 +11,6 @@ use semver::Version;
 use sha2::{Digest, Sha256};
 
 use crate::list::List;
-use anyhow::Context;
 
 pub static LIST_CACHE: LazyLock<Mutex<HashMap<&'static str, List>>> =
     LazyLock::new(Default::default);
@@ -31,12 +30,7 @@ impl List {
             return Ok(list.clone());
         }
 
-        let body: List = reqwest::get(url)
+        let body: List = reqwest::get(url).await?.json().await?;
-            .await
-            .with_context(|| format!("Failed to GET solc list from {url}"))?
-            .json()
-            .await
-            .with_context(|| format!("Failed to deserialize solc list JSON from {url}"))?;
 
         LIST_CACHE.lock().unwrap().insert(url, body.clone());
 
@@ -74,15 +68,14 @@ impl SolcDownloader {
             }),
             VersionOrRequirement::Requirement(requirement) => {
                 let Some(version) = List::download(list)
-                    .await
+                    .await?
-                    .with_context(|| format!("Failed to download solc builds list from {list}"))?
                     .builds
                     .into_iter()
                     .map(|build| build.version)
                     .filter(|version| requirement.matches(version))
                     .max()
                 else {
-                    anyhow::bail!("Failed to find a version that satisfies {requirement}");
+                    anyhow::bail!("Failed to find a version that satisfies {requirement:?}");
                 };
                 Ok(Self {
                     version,
@@ -114,20 +107,11 @@ impl SolcDownloader {
     /// Errors out if the download fails or the digest of the downloaded file
     /// mismatches the expected digest from the release [List].
     pub async fn download(&self) -> anyhow::Result<Vec<u8>> {
-        let builds = List::download(self.list)
+        let builds = List::download(self.list).await?.builds;
-            .await
-            .with_context(|| format!("Failed to download solc builds list from {}", self.list))?
-            .builds;
         let build = builds
             .iter()
             .find(|build| build.version == self.version)
-            .ok_or_else(|| anyhow::anyhow!("solc v{} not found builds", self.version))
+            .ok_or_else(|| anyhow::anyhow!("solc v{} not found builds", self.version))?;
-            .with_context(|| {
-                format!(
-                    "Requested solc version {} was not found in builds list fetched from {}",
-                    self.version, self.list
-                )
-            })?;
 
         let path = build.path.clone();
         let expected_digest = build
@@ -137,13 +121,7 @@ impl SolcDownloader {
             .to_string();
         let url = format!("{}/{}/{}", Self::BASE_URL, self.target, path.display());
 
-        let file = reqwest::get(&url)
+        let file = reqwest::get(url).await?.bytes().await?.to_vec();
-            .await
-            .with_context(|| format!("Failed to GET solc binary from {url}"))?
-            .bytes()
-            .await
-            .with_context(|| format!("Failed to read solc binary bytes from {url}"))?
-            .to_vec();
 
         if hex::encode(Sha256::digest(&file)) != expected_digest {
             anyhow::bail!("sha256 mismatch for solc version {}", self.version);

crates/solc-binaries/src/lib.rs

@@ -3,9 +3,10 @@
 //!
 //! [0]: https://binaries.soliditylang.org
 
+use std::path::{Path, PathBuf};
+
 use cache::get_or_download;
 use download::SolcDownloader;
-use std::path::{Path, PathBuf};
 
 use revive_dt_common::types::VersionOrRequirement;
 
@@ -13,25 +14,6 @@ pub mod cache;
 pub mod download;
 pub mod list;
 
-/// Return a [`SolcDownloader`] which can be used to download a `solc`
-/// binary or return the resolved version it will download.
-async fn downloader(
-    version: impl Into<VersionOrRequirement>,
-    wasm: bool,
-) -> anyhow::Result<SolcDownloader> {
-    if wasm {
-        SolcDownloader::wasm(version).await
-    } else if cfg!(target_os = "linux") {
-        SolcDownloader::linux(version).await
-    } else if cfg!(target_os = "macos") {
-        SolcDownloader::macosx(version).await
-    } else if cfg!(target_os = "windows") {
-        SolcDownloader::windows(version).await
-    } else {
-        unimplemented!()
-    }
-}
-
 /// Downloads the solc binary for Wasm is `wasm` is set, otherwise for
 /// the target platform.
 ///
@@ -42,6 +24,17 @@ pub async fn download_solc(
     version: impl Into<VersionOrRequirement>,
     wasm: bool,
 ) -> anyhow::Result<PathBuf> {
-    let downloader = downloader(version, wasm).await?;
+    let downloader = if wasm {
+        SolcDownloader::wasm(version).await
+    } else if cfg!(target_os = "linux") {
+        SolcDownloader::linux(version).await
+    } else if cfg!(target_os = "macos") {
+        SolcDownloader::macosx(version).await
+    } else if cfg!(target_os = "windows") {
+        SolcDownloader::windows(version).await
+    } else {
+        unimplemented!()
+    }?;
+
     get_or_download(cache_directory, &downloader).await
 }

run_tests.sh

@@ -1,102 +0,0 @@
-#!/bin/bash
-
-# Revive Differential Tests - Quick Start Script
-# This script clones the test repository, sets up the corpus file, and runs the tool
-
-set -e  # Exit on any error
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
-
-# Configuration
-TEST_REPO_URL="https://github.com/paritytech/resolc-compiler-tests"
-TEST_REPO_DIR="resolc-compiler-tests"
-CORPUS_FILE="./corpus.json"
-WORKDIR="workdir"
-
-# Optional positional argument: path to polkadot-sdk directory
-POLKADOT_SDK_DIR="${1:-}"
-
-# Binary paths (default to names in $PATH)
-REVIVE_DEV_NODE_BIN="revive-dev-node"
-ETH_RPC_BIN="eth-rpc"
-SUBSTRATE_NODE_BIN="substrate-node"
-
-echo -e "${GREEN}=== Revive Differential Tests Quick Start ===${NC}"
-echo ""
-
-# Check if test repo already exists
-if [ -d "$TEST_REPO_DIR" ]; then
-    echo -e "${YELLOW}Test repository already exists. Pulling latest changes...${NC}"
-    cd "$TEST_REPO_DIR"
-    git pull
-    cd ..
-else
-    echo -e "${GREEN}Cloning test repository...${NC}"
-    git clone "$TEST_REPO_URL"
-fi
-
-# If polkadot-sdk path is provided, verify and use binaries from there; build if needed
-if [ -n "$POLKADOT_SDK_DIR" ]; then
-    if [ ! -d "$POLKADOT_SDK_DIR" ]; then
-        echo -e "${RED}Provided polkadot-sdk directory does not exist: $POLKADOT_SDK_DIR${NC}"
-        exit 1
-    fi
-
-    POLKADOT_SDK_DIR=$(realpath "$POLKADOT_SDK_DIR")
-    echo -e "${GREEN}Using polkadot-sdk at: $POLKADOT_SDK_DIR${NC}"
-
-    REVIVE_DEV_NODE_BIN="$POLKADOT_SDK_DIR/target/release/revive-dev-node"
-    ETH_RPC_BIN="$POLKADOT_SDK_DIR/target/release/eth-rpc"
-    SUBSTRATE_NODE_BIN="$POLKADOT_SDK_DIR/target/release/substrate-node"
-
-    if [ ! -x "$REVIVE_DEV_NODE_BIN" ] || [ ! -x "$ETH_RPC_BIN" ] || [ ! -x "$SUBSTRATE_NODE_BIN" ]; then
-        echo -e "${YELLOW}Required binaries not found in release target. Building...${NC}"
-        (cd "$POLKADOT_SDK_DIR" && cargo build --release --package staging-node-cli --package pallet-revive-eth-rpc --package revive-dev-node)
-    fi
-
-    for bin in "$REVIVE_DEV_NODE_BIN" "$ETH_RPC_BIN" "$SUBSTRATE_NODE_BIN"; do
-        if [ ! -x "$bin" ]; then
-            echo -e "${RED}Expected binary not found after build: $bin${NC}"
-            exit 1
-        fi
-    done
-else
-    echo -e "${YELLOW}No polkadot-sdk path provided. Using binaries from $PATH.${NC}"
-fi
-
-# Create corpus file with absolute path resolved at runtime
-echo -e "${GREEN}Creating corpus file...${NC}"
-ABSOLUTE_PATH=$(realpath "$TEST_REPO_DIR/fixtures/solidity/")
-
-cat > "$CORPUS_FILE" << EOF
-{
-  "name": "MatterLabs Solidity Simple, Complex, and Semantic Tests",
-  "path": "$ABSOLUTE_PATH"
-}
-EOF
-
-echo -e "${GREEN}Corpus file created: $CORPUS_FILE${NC}"
-
-# Create workdir if it doesn't exist
-mkdir -p "$WORKDIR"
-
-echo -e "${GREEN}Starting differential tests...${NC}"
-echo "This may take a while..."
-echo ""
-
-# Run the tool
-RUST_LOG="error" cargo run --release -- \
-    --corpus "$CORPUS_FILE" \
-    --workdir "$WORKDIR" \
-    --number-of-nodes 5 \
-    --kitchensink "$SUBSTRATE_NODE_BIN" \
-    --revive-dev-node "$REVIVE_DEV_NODE_BIN" \
-    --eth_proxy "$ETH_RPC_BIN" \
-    > logs.log \
-    2> output.log
-
-echo -e "${GREEN}=== Test run completed! ===${NC}"