Fix tests

Implement caller replacement

.github/workflows/test.yml

@@ -99,12 +99,9 @@ jobs:
       - name: Install Geth on Ubuntu
         if: matrix.os == 'ubuntu-24.04'
         run: |
-          sudo add-apt-repository -y ppa:ethereum/ethereum
           sudo apt-get update
           sudo apt-get install -y protobuf-compiler
 
-          sudo apt-get install -y solc
-
           # We were facing some issues in CI with the 1.16.* versions of geth, and specifically on
           # Ubuntu. Eventually, we found out that the last version of geth that worked in our CI was
           # version 1.15.11. Thus, this is the version that we want to use in CI. The PPA sadly does
@@ -125,22 +122,12 @@ jobs:
           wget -qO- "$URL" | sudo tar xz -C /usr/local/bin --strip-components=1
           geth --version
 
-          curl -sL https://github.com/paritytech/revive/releases/download/v0.3.0/resolc-x86_64-unknown-linux-musl -o resolc
-          chmod +x resolc
-          sudo mv resolc /usr/local/bin
-
       - name: Install Geth on macOS
         if: matrix.os == 'macos-14'
         run: |
           brew tap ethereum/ethereum
           brew install ethereum protobuf
 
-          brew install solidity
-
-          curl -sL https://github.com/paritytech/revive/releases/download/v0.3.0/resolc-universal-apple-darwin -o resolc
-          chmod +x resolc
-          sudo mv resolc /usr/local/bin
-
       - name: Machete
         uses: bnjbvr/cargo-machete@v0.7.1
 
@@ -156,8 +143,5 @@ jobs:
       - name: Check eth-rpc version
         run: eth-rpc --version
 
-      - name: Check resolc version
-        run: resolc --version
-
       - name: Test cargo workspace
         run: make test

Cargo.lock

@@ -339,7 +339,6 @@ dependencies = [
  "const-hex",
  "derive_more 2.0.1",
  "foldhash",
- "getrandom 0.3.3",
  "hashbrown 0.15.3",
  "indexmap 2.10.0",
  "itoa",
@@ -2228,66 +2227,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "foundry-compilers-artifacts"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2676d70082ed23680fe2d08c0b750d5f7f2438c6d946f1cb140a76c5e5e0392"
-dependencies = [
- "foundry-compilers-artifacts-solc",
- "foundry-compilers-artifacts-vyper",
-]
-
-[[package]]
-name = "foundry-compilers-artifacts-solc"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3ada94dc5946334bb08df574855ba345ab03ba8c6f233560c72c8d61fa9db80"
-dependencies = [
- "alloy-json-abi",
- "alloy-primitives",
- "foundry-compilers-core",
- "path-slash",
- "regex",
- "semver 1.0.26",
- "serde",
- "serde_json",
- "thiserror 2.0.12",
- "tracing",
- "yansi",
-]
-
-[[package]]
-name = "foundry-compilers-artifacts-vyper"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372052af72652e375a6e7eed22179bd8935114e25e1c5a8cca7f00e8f20bd94c"
-dependencies = [
- "alloy-json-abi",
- "alloy-primitives",
- "foundry-compilers-artifacts-solc",
- "foundry-compilers-core",
- "path-slash",
- "semver 1.0.26",
- "serde",
-]
-
-[[package]]
-name = "foundry-compilers-core"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf0962c46855979300f6526ed57f987ccf6a025c2b92ce574b281d9cb2ef666b"
-dependencies = [
- "alloy-primitives",
- "cfg-if",
- "dunce",
- "path-slash",
- "semver 1.0.26",
- "serde",
- "serde_json",
- "thiserror 2.0.12",
-]
-
 [[package]]
 name = "fs-err"
 version = "2.11.0"
@@ -2713,7 +2652,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.5.10",
+ "socket2",
  "system-configuration",
  "tokio",
  "tower-service",
@@ -2953,17 +2892,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "io-uring"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
-dependencies = [
- "bitflags 2.9.1",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "ipnet"
 version = "2.11.0"
@@ -3528,12 +3456,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
-[[package]]
-name = "path-slash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
-
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
@@ -3980,7 +3902,9 @@ dependencies = [
  "base64",
  "bytes",
  "encoding_rs",
+ "futures-channel",
  "futures-core",
+ "futures-util",
  "h2",
  "http",
  "http-body",
@@ -4024,31 +3948,17 @@ dependencies = [
  "serde_stacker",
 ]
 
-[[package]]
-name = "revive-dt-common"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "semver 1.0.26",
-]
-
 [[package]]
 name = "revive-dt-compiler"
 version = "0.1.0"
 dependencies = [
- "alloy",
- "alloy-primitives",
  "anyhow",
- "foundry-compilers-artifacts",
  "revive-common",
- "revive-dt-common",
  "revive-dt-config",
  "revive-dt-solc-binaries",
  "revive-solc-json-interface",
  "semver 1.0.26",
- "serde",
  "serde_json",
- "tokio",
  "tracing",
 ]
 
@@ -4070,18 +3980,17 @@ dependencies = [
  "alloy",
  "anyhow",
  "clap",
- "futures",
  "indexmap 2.10.0",
- "revive-dt-common",
+ "rayon",
  "revive-dt-compiler",
  "revive-dt-config",
  "revive-dt-format",
  "revive-dt-node",
  "revive-dt-node-interaction",
  "revive-dt-report",
- "semver 1.0.26",
+ "revive-solc-json-interface",
+ "serde_json",
  "temp-dir",
- "tokio",
  "tracing",
  "tracing-subscriber",
 ]
@@ -4094,11 +4003,10 @@ dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
  "anyhow",
- "revive-dt-common",
+ "revive-dt-node-interaction",
  "semver 1.0.26",
  "serde",
  "serde_json",
- "tokio",
  "tracing",
 ]
 
@@ -4108,9 +4016,7 @@ version = "0.1.0"
 dependencies = [
  "alloy",
  "anyhow",
- "revive-dt-common",
  "revive-dt-config",
- "revive-dt-format",
  "revive-dt-node-interaction",
  "serde",
  "serde_json",
@@ -4127,6 +4033,10 @@ version = "0.1.0"
 dependencies = [
  "alloy",
  "anyhow",
+ "futures",
+ "once_cell",
+ "tokio",
+ "tracing",
 ]
 
 [[package]]
@@ -4134,9 +4044,9 @@ name = "revive-dt-report"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "revive-dt-compiler",
  "revive-dt-config",
  "revive-dt-format",
+ "revive-solc-json-interface",
  "serde",
  "serde_json",
  "tracing",
@@ -4149,11 +4059,9 @@ dependencies = [
  "anyhow",
  "hex",
  "reqwest",
- "revive-dt-common",
  "semver 1.0.26",
  "serde",
  "sha2 0.10.9",
- "tokio",
  "tracing",
 ]
 
@@ -4248,9 +4156,6 @@ name = "rustc-hash"
 version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
-dependencies = [
- "rand 0.8.5",
-]
 
 [[package]]
 name = "rustc-hex"
@@ -4710,15 +4615,6 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "signature"
 version = "2.2.0"
@@ -4763,16 +4659,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "socket2"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "sp-application-crypto"
 version = "40.1.0"
@@ -5432,21 +5318,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.47.0"
+version = "1.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35"
+checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
 dependencies = [
  "backtrace",
  "bytes",
- "io-uring",
  "libc",
  "mio",
  "pin-project-lite",
- "signal-hook-registry",
+ "socket2",
- "slab",
- "socket2 0.6.0",
  "tokio-macros",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -6323,12 +6206,6 @@ dependencies = [
  "tap",
 ]
 
-[[package]]
-name = "yansi"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
-
 [[package]]
 name = "yoke"
 version = "0.8.0"

Cargo.toml

@@ -11,7 +11,6 @@ repository = "https://github.com/paritytech/revive-differential-testing.git"
 rust-version = "1.85.0"
 
 [workspace.dependencies]
-revive-dt-common = { version = "0.1.0", path = "crates/common" }
 revive-dt-compiler = { version = "0.1.0", path = "crates/compiler" }
 revive-dt-config = { version = "0.1.0", path = "crates/config" }
 revive-dt-core = { version = "0.1.0", path = "crates/core" }
@@ -26,11 +25,11 @@ alloy-primitives = "1.2.1"
 alloy-sol-types = "1.2.1"
 anyhow = "1.0"
 clap = { version = "4", features = ["derive"] }
-foundry-compilers-artifacts = { version = "0.18.0" }
 futures = { version = "0.3.31" }
 hex = "0.4.3"
-reqwest = { version = "0.12.15", features = ["json"] }
+reqwest = { version = "0.12.15", features = ["blocking", "json"] }
 once_cell = "1.21"
+rayon = { version = "1.10" }
 semver = { version = "1.0", features = ["serde"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0", default-features = false, features = [
@@ -42,10 +41,8 @@ sp-core = "36.1.0"
 sp-runtime = "41.1.0"
 temp-dir = { version = "0.1.16" }
 tempfile = "3.3"
-tokio = { version = "1.47.0", default-features = false, features = [
+tokio = { version = "1", default-features = false, features = [
     "rt-multi-thread",
-    "process",
-    "rt",
 ] }
 uuid = { version = "1.8", features = ["v4"] }
 tracing = "0.1.41"

crates/common/Cargo.toml

@@ -1,13 +0,0 @@
-[package]
-name = "revive-dt-common"
-description = "A library containing common concepts that other crates in the workspace can rely on"
-version.workspace = true
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-repository.workspace = true
-rust-version.workspace = true
-
-[dependencies]
-anyhow = { workspace = true }
-semver = { workspace = true }

crates/common/src/fs/clear_dir.rs

@@ -1,22 +0,0 @@
-use std::{
-    fs::{read_dir, remove_dir_all, remove_file},
-    path::Path,
-};
-
-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())? {
-        let entry = entry?;
-        let entry_path = entry.path();
-
-        if entry_path.is_file() {
-            remove_file(entry_path)?
-        } else {
-            remove_dir_all(entry_path)?
-        }
-    }
-    Ok(())
-}

crates/common/src/fs/mod.rs

@@ -1,3 +0,0 @@
-mod clear_dir;
-
-pub use clear_dir::*;

crates/common/src/iterators/mod.rs

@@ -1,3 +0,0 @@
-mod files_with_extension_iterator;
-
-pub use files_with_extension_iterator::*;

crates/common/src/lib.rs

@@ -1,7 +0,0 @@
-//! This crate provides common concepts, functionality, types, macros, and more that other crates in
-//! the workspace can benefit from.
-
-pub mod fs;
-pub mod iterators;
-pub mod macros;
-pub mod types;

crates/common/src/macros/mod.rs

@@ -1,3 +0,0 @@
-mod define_wrapper_type;
-
-pub use define_wrapper_type::*;

crates/common/src/types/mod.rs

@@ -1,3 +0,0 @@
-mod version_or_requirement;
-
-pub use version_or_requirement::*;

crates/common/src/types/version_or_requirement.rs

@@ -1,41 +0,0 @@
-use semver::{Version, VersionReq};
-
-#[derive(Clone, Debug)]
-pub enum VersionOrRequirement {
-    Version(Version),
-    Requirement(VersionReq),
-}
-
-impl From<Version> for VersionOrRequirement {
-    fn from(value: Version) -> Self {
-        Self::Version(value)
-    }
-}
-
-impl From<VersionReq> for VersionOrRequirement {
-    fn from(value: VersionReq) -> Self {
-        Self::Requirement(value)
-    }
-}
-
-impl TryFrom<VersionOrRequirement> for Version {
-    type Error = anyhow::Error;
-
-    fn try_from(value: VersionOrRequirement) -> Result<Self, Self::Error> {
-        let VersionOrRequirement::Version(version) = value else {
-            anyhow::bail!("Version or requirement was not a version");
-        };
-        Ok(version)
-    }
-}
-
-impl TryFrom<VersionOrRequirement> for VersionReq {
-    type Error = anyhow::Error;
-
-    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

@@ -9,18 +9,11 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
+anyhow = { workspace = true }
 revive-solc-json-interface = { workspace = true }
-revive-dt-common = { workspace = true }
 revive-dt-config = { workspace = true }
 revive-dt-solc-binaries = { workspace = true }
 revive-common = { workspace = true }
-
-alloy = { workspace = true }
-alloy-primitives = { workspace = true }
-anyhow = { workspace = true }
-foundry-compilers-artifacts = { workspace = true }
 semver = { workspace = true }
-serde = { workspace = true }
 serde_json = { workspace = true }
 tracing = { workspace = true }
-tokio = { workspace = true }

crates/compiler/src/lib.rs

@@ -4,20 +4,20 @@
 //! - Polkadot revive Wasm compiler
 
 use std::{
-    collections::HashMap,
     fs::read_to_string,
     hash::Hash,
     path::{Path, PathBuf},
 };
 
-use alloy::json_abi::JsonAbi;
+use revive_dt_config::Arguments;
-use alloy_primitives::Address;
-use semver::Version;
-use serde::{Deserialize, Serialize};
 
 use revive_common::EVMVersion;
-use revive_dt_common::types::VersionOrRequirement;
+use revive_solc_json_interface::{
-use revive_dt_config::Arguments;
+    SolcStandardJsonInput, SolcStandardJsonInputLanguage, SolcStandardJsonInputSettings,
+    SolcStandardJsonInputSettingsOptimizer, SolcStandardJsonInputSettingsSelection,
+    SolcStandardJsonOutput,
+};
+use semver::Version;
 
 pub mod revive_js;
 pub mod revive_resolc;
@@ -31,44 +31,63 @@ pub trait SolidityCompiler {
     /// The low-level compiler interface.
     fn build(
         &self,
-        input: CompilerInput,
+        input: CompilerInput<Self::Options>,
-        additional_options: Self::Options,
+    ) -> anyhow::Result<CompilerOutput<Self::Options>>;
-    ) -> impl Future<Output = anyhow::Result<CompilerOutput>>;
 
     fn new(solc_executable: PathBuf) -> Self;
 
-    fn get_compiler_executable(
+    fn get_compiler_executable(config: &Arguments, version: Version) -> anyhow::Result<PathBuf>;
-        config: &Arguments,
-        version: impl Into<VersionOrRequirement>,
-    ) -> impl Future<Output = anyhow::Result<PathBuf>>;
-
-    fn version(&self) -> anyhow::Result<Version>;
 }
 
 /// The generic compilation input configuration.
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug)]
-pub struct CompilerInput {
+pub struct CompilerInput<T: PartialEq + Eq + Hash> {
-    pub enable_optimization: Option<bool>,
+    pub extra_options: T,
-    pub via_ir: Option<bool>,
+    pub input: SolcStandardJsonInput,
-    pub evm_version: Option<EVMVersion>,
     pub allow_paths: Vec<PathBuf>,
     pub base_path: Option<PathBuf>,
-    pub sources: HashMap<PathBuf, String>,
-    pub libraries: HashMap<PathBuf, HashMap<String, Address>>,
 }
 
 /// The generic compilation output configuration.
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug)]
-pub struct CompilerOutput {
+pub struct CompilerOutput<T: PartialEq + Eq + Hash> {
-    /// The compiled contracts. The bytecode of the contract is kept as a string incase linking is
+    /// The solc standard JSON input.
-    /// required and the compiled source has placeholders.
+    pub input: CompilerInput<T>,
-    pub contracts: HashMap<PathBuf, HashMap<String, (String, JsonAbi)>>,
+    /// The produced solc standard JSON output.
+    pub output: SolcStandardJsonOutput,
+    /// The error message in case the compiler returns abnormally.
+    pub error: Option<String>,
 }
 
-/// A generic builder style interface for configuring the supported compiler options.
+impl<T> PartialEq for CompilerInput<T>
+where
+    T: PartialEq + Eq + Hash,
+{
+    fn eq(&self, other: &Self) -> bool {
+        let self_input = serde_json::to_vec(&self.input).unwrap_or_default();
+        let other_input = serde_json::to_vec(&self.input).unwrap_or_default();
+        self.extra_options.eq(&other.extra_options) && self_input == other_input
+    }
+}
+
+impl<T> Eq for CompilerInput<T> where T: PartialEq + Eq + Hash {}
+
+impl<T> Hash for CompilerInput<T>
+where
+    T: PartialEq + Eq + Hash,
+{
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.extra_options.hash(state);
+        state.write(&serde_json::to_vec(&self.input).unwrap_or_default());
+    }
+}
+
+/// A generic builder style interface for configuring all compiler options.
 pub struct Compiler<T: SolidityCompiler> {
-    input: CompilerInput,
+    input: SolcStandardJsonInput,
-    additional_options: T::Options,
+    extra_options: T::Options,
+    allow_paths: Vec<PathBuf>,
+    base_path: Option<PathBuf>,
 }
 
 impl Default for Compiler<solc::Solc> {
@@ -83,80 +102,73 @@ where
 {
     pub fn new() -> Self {
         Self {
-            input: CompilerInput {
+            input: SolcStandardJsonInput {
-                enable_optimization: Default::default(),
+                language: SolcStandardJsonInputLanguage::Solidity,
-                via_ir: Default::default(),
-                evm_version: Default::default(),
-                allow_paths: Default::default(),
-                base_path: Default::default(),
                 sources: Default::default(),
-                libraries: Default::default(),
+                settings: SolcStandardJsonInputSettings::new(
+                    None,
+                    Default::default(),
+                    None,
+                    SolcStandardJsonInputSettingsSelection::new_required(),
+                    SolcStandardJsonInputSettingsOptimizer::new(
+                        false,
+                        None,
+                        &Version::new(0, 0, 0),
+                        false,
+                    ),
+                    None,
+                    None,
+                ),
             },
-            additional_options: T::Options::default(),
+            extra_options: Default::default(),
+            allow_paths: Default::default(),
+            base_path: None,
         }
     }
 
-    pub fn with_optimization(mut self, value: impl Into<Option<bool>>) -> Self {
+    pub fn solc_optimizer(mut self, enabled: bool) -> Self {
-        self.input.enable_optimization = value.into();
+        self.input.settings.optimizer.enabled = enabled;
         self
     }
 
-    pub fn with_via_ir(mut self, value: impl Into<Option<bool>>) -> Self {
+    pub fn with_source(mut self, path: &Path) -> anyhow::Result<Self> {
-        self.input.via_ir = value.into();
-        self
-    }
-
-    pub fn with_evm_version(mut self, version: impl Into<Option<EVMVersion>>) -> Self {
-        self.input.evm_version = version.into();
-        self
-    }
-
-    pub fn with_allow_path(mut self, path: impl AsRef<Path>) -> Self {
-        self.input.allow_paths.push(path.as_ref().into());
-        self
-    }
-
-    pub fn with_base_path(mut self, path: impl Into<Option<PathBuf>>) -> Self {
-        self.input.base_path = path.into();
-        self
-    }
-
-    pub fn with_source(mut self, path: impl AsRef<Path>) -> anyhow::Result<Self> {
         self.input
             .sources
-            .insert(path.as_ref().to_path_buf(), read_to_string(path.as_ref())?);
+            .insert(path.display().to_string(), read_to_string(path)?.into());
         Ok(self)
     }
 
-    pub fn with_library(
+    pub fn evm_version(mut self, evm_version: EVMVersion) -> Self {
-        mut self,
+        self.input.settings.evm_version = Some(evm_version);
-        path: impl AsRef<Path>,
-        name: impl AsRef<str>,
-        address: Address,
-    ) -> Self {
-        self.input
-            .libraries
-            .entry(path.as_ref().to_path_buf())
-            .or_default()
-            .insert(name.as_ref().into(), address);
         self
     }
 
-    pub fn with_additional_options(mut self, options: impl Into<T::Options>) -> Self {
+    pub fn extra_options(mut self, extra_options: T::Options) -> Self {
-        self.additional_options = options.into();
+        self.extra_options = extra_options;
         self
     }
 
-    pub async fn try_build(
+    pub fn allow_path(mut self, path: PathBuf) -> Self {
-        self,
+        self.allow_paths.push(path);
-        compiler_path: impl AsRef<Path>,
+        self
-    ) -> anyhow::Result<CompilerOutput> {
-        T::new(compiler_path.as_ref().to_path_buf())
-            .build(self.input, self.additional_options)
-            .await
     }
 
-    pub fn input(&self) -> CompilerInput {
+    pub fn base_path(mut self, base_path: PathBuf) -> Self {
+        self.base_path = Some(base_path);
+        self
+    }
+
+    pub fn try_build(self, solc_path: PathBuf) -> anyhow::Result<CompilerOutput<T::Options>> {
+        T::new(solc_path).build(CompilerInput {
+            extra_options: self.extra_options,
+            input: self.input,
+            allow_paths: self.allow_paths,
+            base_path: self.base_path,
+        })
+    }
+
+    /// Returns the compiler JSON input.
+    pub fn input(&self) -> SolcStandardJsonInput {
         self.input.clone()
     }
 }

crates/compiler/src/revive_resolc.rs

@@ -6,24 +6,9 @@ use std::{
     process::{Command, Stdio},
 };
 
-use revive_dt_common::types::VersionOrRequirement;
-use revive_dt_config::Arguments;
-use revive_solc_json_interface::{
-    SolcStandardJsonInput, SolcStandardJsonInputLanguage, SolcStandardJsonInputSettings,
-    SolcStandardJsonInputSettingsOptimizer, SolcStandardJsonInputSettingsSelection,
-    SolcStandardJsonOutput,
-};
-
 use crate::{CompilerInput, CompilerOutput, SolidityCompiler};
-
+use revive_dt_config::Arguments;
-use alloy::json_abi::JsonAbi;
+use revive_solc_json_interface::SolcStandardJsonOutput;
-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)]
@@ -36,71 +21,24 @@ impl SolidityCompiler for Resolc {
     type Options = Vec<String>;
 
     #[tracing::instrument(level = "debug", ret)]
-    async fn build(
+    fn build(
         &self,
-        CompilerInput {
+        input: CompilerInput<Self::Options>,
-            enable_optimization,
+    ) -> anyhow::Result<CompilerOutput<Self::Options>> {
-            // Ignored and not honored since this is required for the resolc compilation.
+        let mut command = Command::new(&self.resolc_path);
-            via_ir: _via_ir,
-            evm_version,
-            allow_paths,
-            base_path,
-            sources,
-            libraries,
-        }: CompilerInput,
-        additional_options: Self::Options,
-    ) -> anyhow::Result<CompilerOutput> {
-        let input = SolcStandardJsonInput {
-            language: SolcStandardJsonInputLanguage::Solidity,
-            sources: sources
-                .into_iter()
-                .map(|(path, source)| (path.display().to_string(), source.into()))
-                .collect(),
-            settings: SolcStandardJsonInputSettings {
-                evm_version,
-                libraries: Some(
-                    libraries
-                        .into_iter()
-                        .map(|(source_code, libraries_map)| {
-                            (
-                                source_code.display().to_string(),
-                                libraries_map
-                                    .into_iter()
-                                    .map(|(library_ident, library_address)| {
-                                        (library_ident, library_address.to_string())
-                                    })
-                                    .collect(),
-                            )
-                        })
-                        .collect(),
-                ),
-                remappings: None,
-                output_selection: Some(SolcStandardJsonInputSettingsSelection::new_required()),
-                via_ir: Some(true),
-                optimizer: SolcStandardJsonInputSettingsOptimizer::new(
-                    enable_optimization.unwrap_or(false),
-                    None,
-                    &Version::new(0, 0, 0),
-                    false,
-                ),
-                metadata: None,
-                polkavm: None,
-            },
-        };
-
-        let mut command = AsyncCommand::new(&self.resolc_path);
         command
             .stdin(Stdio::piped())
             .stdout(Stdio::piped())
             .stderr(Stdio::piped())
             .arg("--standard-json");
 
-        if let Some(ref base_path) = base_path {
+        if let Some(ref base_path) = input.base_path {
             command.arg("--base-path").arg(base_path);
         }
-        if !allow_paths.is_empty() {
+        if !input.allow_paths.is_empty() {
             command.arg("--allow-paths").arg(
-                allow_paths
+                input
+                    .allow_paths
                     .iter()
                     .map(|path| path.display().to_string())
                     .collect::<Vec<_>>()
@@ -110,96 +48,102 @@ impl SolidityCompiler for Resolc {
         let mut child = command.spawn()?;
 
         let stdin_pipe = child.stdin.as_mut().expect("stdin must be piped");
-        let serialized_input = serde_json::to_vec(&input)?;
+        serde_json::to_writer(stdin_pipe, &input.input)?;
-        stdin_pipe.write_all(&serialized_input).await?;
 
-        let output = child.wait_with_output().await?;
+        let json_in = serde_json::to_string_pretty(&input.input)?;
+
+        let output = child.wait_with_output()?;
         let stdout = output.stdout;
         let stderr = output.stderr;
 
         if !output.status.success() {
-            let json_in = serde_json::to_string_pretty(&input)?;
             let message = String::from_utf8_lossy(&stderr);
             tracing::error!(
-                status = %output.status,
+                "resolc failed exit={} stderr={} JSON-in={} ",
-                message = %message,
+                output.status,
-                json_input = json_in,
+                &message,
-                "Compilation using resolc failed"
+                json_in,
             );
-            anyhow::bail!("Compilation failed with an error: {message}");
+            return Ok(CompilerOutput {
+                input,
+                output: Default::default(),
+                error: Some(message.into()),
+            });
         }
 
-        let parsed = serde_json::from_slice::<SolcStandardJsonOutput>(&stdout).map_err(|e| {
+        let mut parsed =
+            serde_json::from_slice::<SolcStandardJsonOutput>(&stdout).map_err(|e| {
                 anyhow::anyhow!(
                     "failed to parse resolc JSON output: {e}\nstderr: {}",
                     String::from_utf8_lossy(&stderr)
                 )
             })?;
 
+        // Detecting if the compiler output contained errors and reporting them through logs and
+        // errors instead of returning the compiler output that might contain errors.
+        for error in parsed.errors.iter().flatten() {
+            if error.severity == "error" {
+                tracing::error!(?error, ?input, "Encountered an error in the compilation");
+                anyhow::bail!("Encountered an error in the compilation: {error}")
+            }
+        }
+
+        // We need to do some post processing on the output to make it in the same format that solc
+        // outputs. More specifically, for each contract, the `.metadata` field should be replaced
+        // with the `.metadata.solc_metadata` field which contains the ABI and other information
+        // about the compiled contracts. We do this because we do not want any downstream logic to
+        // need to differentiate between which compiler is being used when extracting the ABI of the
+        // contracts.
+        if let Some(ref mut contracts) = parsed.contracts {
+            for (contract_path, contracts_map) in contracts.iter_mut() {
+                for (contract_name, contract_info) in contracts_map.iter_mut() {
+                    let Some(metadata) = contract_info.metadata.take() else {
+                        continue;
+                    };
+
+                    // Get the `solc_metadata` in the metadata of the contract.
+                    let Some(solc_metadata) = metadata
+                        .get("solc_metadata")
+                        .and_then(|metadata| metadata.as_str())
+                    else {
+                        tracing::error!(
+                            contract_path,
+                            contract_name,
+                            metadata = serde_json::to_string(&metadata).unwrap(),
+                            "Encountered a contract compiled with resolc that has no solc_metadata"
+                        );
+                        anyhow::bail!(
+                            "Contract {} compiled with resolc that has no solc_metadata",
+                            contract_name
+                        );
+                    };
+
+                    // Replace the original metadata with the new solc_metadata.
+                    contract_info.metadata =
+                        Some(serde_json::Value::String(solc_metadata.to_string()));
+                }
+            }
+        }
+
         tracing::debug!(
             output = %serde_json::to_string(&parsed).unwrap(),
             "Compiled successfully"
         );
 
-        // Detecting if the compiler output contained errors and reporting them through logs and
+        Ok(CompilerOutput {
-        // errors instead of returning the compiler output that might contain errors.
+            input,
-        for error in parsed.errors.iter().flatten() {
+            output: parsed,
-            if error.severity == "error" {
+            error: None,
-                tracing::error!(
-                    ?error,
-                    ?input,
-                    output = %serde_json::to_string(&parsed).unwrap(),
-                    "Encountered an error in the compilation"
-                );
-                anyhow::bail!("Encountered an error in the compilation: {error}")
-            }
-        }
-
-        let Some(contracts) = parsed.contracts else {
-            anyhow::bail!("Unexpected error - resolc output doesn't have a contracts section");
-        };
-
-        let mut compiler_output = CompilerOutput::default();
-        for (source_path, contracts) in contracts.into_iter() {
-            let source_path = PathBuf::from(source_path).canonicalize()?;
-
-            let map = compiler_output.contracts.entry(source_path).or_default();
-            for (contract_name, contract_information) in contracts.into_iter() {
-                let bytecode = contract_information
-                    .evm
-                    .and_then(|evm| evm.bytecode.clone())
-                    .context("Unexpected - Contract compiled with resolc has no bytecode")?;
-                let abi = contract_information
-                    .metadata
-                    .as_ref()
-                    .and_then(|metadata| metadata.as_object())
-                    .and_then(|metadata| metadata.get("solc_metadata"))
-                    .and_then(|solc_metadata| solc_metadata.as_str())
-                    .and_then(|metadata| serde_json::from_str::<serde_json::Value>(metadata).ok())
-                    .and_then(|metadata| {
-                        metadata.get("output").and_then(|output| {
-                            output
-                                .get("abi")
-                                .and_then(|abi| serde_json::from_value::<JsonAbi>(abi.clone()).ok())
         })
-                    })
-                    .context(
-                        "Unexpected - Failed to get the ABI for a contract compiled with resolc",
-                    )?;
-                map.insert(contract_name, (bytecode.object, abi));
-            }
-        }
-
-        Ok(compiler_output)
     }
 
     fn new(resolc_path: PathBuf) -> Self {
         Resolc { resolc_path }
     }
 
-    async fn get_compiler_executable(
+    fn get_compiler_executable(
         config: &Arguments,
-        _version: impl Into<VersionOrRequirement>,
+        _version: semver::Version,
     ) -> anyhow::Result<PathBuf> {
         if !config.resolc.as_os_str().is_empty() {
             return Ok(config.resolc.clone());
@@ -207,47 +151,4 @@ impl SolidityCompiler for Resolc {
 
         Ok(PathBuf::from("resolc"))
     }
-
-    fn version(&self) -> anyhow::Result<semver::Version> {
-        // Logic for parsing the resolc version from the following string:
-        // Solidity frontend for the revive compiler version 0.3.0+commit.b238913.llvm-18.1.8
-
-        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")?;
-
-        Version::parse(version_string).map_err(Into::into)
-    }
-}
-
-#[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();
-
-        // Assert
-        let _ = version.expect("Failed to get version");
-    }
 }

crates/compiler/src/solc.rs

@@ -6,22 +6,10 @@ use std::{
     process::{Command, Stdio},
 };
 
-use revive_dt_common::types::VersionOrRequirement;
+use crate::{CompilerInput, CompilerOutput, SolidityCompiler};
 use revive_dt_config::Arguments;
 use revive_dt_solc_binaries::download_solc;
-
+use revive_solc_json_interface::SolcStandardJsonOutput;
-use crate::{CompilerInput, CompilerOutput, SolidityCompiler};
-
-use anyhow::Context;
-use foundry_compilers_artifacts::{
-    output_selection::{
-        BytecodeOutputSelection, ContractOutputSelection, EvmOutputSelection, OutputSelection,
-    },
-    solc::CompilerOutput as SolcOutput,
-    solc::*,
-};
-use semver::Version;
-use tokio::{io::AsyncWriteExt, process::Command as AsyncCommand};
 
 #[derive(Debug)]
 pub struct Solc {
@@ -32,78 +20,24 @@ impl SolidityCompiler for Solc {
     type Options = ();
 
     #[tracing::instrument(level = "debug", ret)]
-    async fn build(
+    fn build(
         &self,
-        CompilerInput {
+        input: CompilerInput<Self::Options>,
-            enable_optimization,
+    ) -> anyhow::Result<CompilerOutput<Self::Options>> {
-            via_ir,
+        let mut command = Command::new(&self.solc_path);
-            evm_version,
-            allow_paths,
-            base_path,
-            sources,
-            libraries,
-        }: CompilerInput,
-        _: Self::Options,
-    ) -> anyhow::Result<CompilerOutput> {
-        let input = SolcInput {
-            language: SolcLanguage::Solidity,
-            sources: Sources(
-                sources
-                    .into_iter()
-                    .map(|(source_path, source_code)| (source_path, Source::new(source_code)))
-                    .collect(),
-            ),
-            settings: Settings {
-                optimizer: Optimizer {
-                    enabled: enable_optimization,
-                    details: Some(Default::default()),
-                    ..Default::default()
-                },
-                output_selection: OutputSelection::common_output_selection(
-                    [
-                        ContractOutputSelection::Abi,
-                        ContractOutputSelection::Evm(EvmOutputSelection::ByteCode(
-                            BytecodeOutputSelection::Object,
-                        )),
-                    ]
-                    .into_iter()
-                    .map(|item| item.to_string()),
-                ),
-                evm_version: evm_version.map(|version| version.to_string().parse().unwrap()),
-                via_ir,
-                libraries: Libraries {
-                    libs: libraries
-                        .into_iter()
-                        .map(|(file_path, libraries)| {
-                            (
-                                file_path,
-                                libraries
-                                    .into_iter()
-                                    .map(|(library_name, library_address)| {
-                                        (library_name, library_address.to_string())
-                                    })
-                                    .collect(),
-                            )
-                        })
-                        .collect(),
-                },
-                ..Default::default()
-            },
-        };
-
-        let mut command = AsyncCommand::new(&self.solc_path);
         command
             .stdin(Stdio::piped())
             .stdout(Stdio::piped())
             .stderr(Stdio::piped())
             .arg("--standard-json");
 
-        if let Some(ref base_path) = base_path {
+        if let Some(ref base_path) = input.base_path {
             command.arg("--base-path").arg(base_path);
         }
-        if !allow_paths.is_empty() {
+        if !input.allow_paths.is_empty() {
             command.arg("--allow-paths").arg(
-                allow_paths
+                input
+                    .allow_paths
                     .iter()
                     .map(|path| path.display().to_string())
                     .collect::<Vec<_>>()
@@ -113,23 +47,21 @@ impl SolidityCompiler for Solc {
         let mut child = command.spawn()?;
 
         let stdin = child.stdin.as_mut().expect("should be piped");
-        let serialized_input = serde_json::to_vec(&input)?;
+        serde_json::to_writer(stdin, &input.input)?;
-        stdin.write_all(&serialized_input).await?;
+        let output = child.wait_with_output()?;
-        let output = child.wait_with_output().await?;
 
         if !output.status.success() {
-            let json_in = serde_json::to_string_pretty(&input)?;
             let message = String::from_utf8_lossy(&output.stderr);
-            tracing::error!(
+            tracing::error!("solc failed exit={} stderr={}", output.status, &message);
-                status = %output.status,
+            return Ok(CompilerOutput {
-                message = %message,
+                input,
-                json_input = json_in,
+                output: Default::default(),
-                "Compilation using solc failed"
+                error: Some(message.into()),
-            );
+            });
-            anyhow::bail!("Compilation failed with an error: {message}");
         }
 
-        let parsed = serde_json::from_slice::<SolcOutput>(&output.stdout).map_err(|e| {
+        let parsed =
+            serde_json::from_slice::<SolcStandardJsonOutput>(&output.stdout).map_err(|e| {
                 anyhow::anyhow!(
                     "failed to parse resolc JSON output: {e}\nstderr: {}",
                     String::from_utf8_lossy(&output.stdout)
@@ -138,8 +70,8 @@ impl SolidityCompiler for Solc {
 
         // Detecting if the compiler output contained errors and reporting them through logs and
         // errors instead of returning the compiler output that might contain errors.
-        for error in parsed.errors.iter() {
+        for error in parsed.errors.iter().flatten() {
-            if error.severity == Severity::Error {
+            if error.severity == "error" {
                 tracing::error!(?error, ?input, "Encountered an error in the compilation");
                 anyhow::bail!("Encountered an error in the compilation: {error}")
             }
@@ -150,92 +82,22 @@ impl SolidityCompiler for Solc {
             "Compiled successfully"
         );
 
-        let mut compiler_output = CompilerOutput::default();
+        Ok(CompilerOutput {
-        for (contract_path, contracts) in parsed.contracts {
+            input,
-            let map = compiler_output
+            output: parsed,
-                .contracts
+            error: None,
-                .entry(contract_path.canonicalize()?)
-                .or_default();
-            for (contract_name, contract_info) in contracts.into_iter() {
-                let source_code = contract_info
-                    .evm
-                    .and_then(|evm| evm.bytecode)
-                    .map(|bytecode| match bytecode.object {
-                        BytecodeObject::Bytecode(bytecode) => bytecode.to_string(),
-                        BytecodeObject::Unlinked(unlinked) => unlinked,
         })
-                    .context("Unexpected - contract compiled with solc has no source code")?;
-                let abi = contract_info
-                    .abi
-                    .context("Unexpected - contract compiled with solc as no ABI")?;
-                map.insert(contract_name, (source_code, abi));
-            }
-        }
-
-        Ok(compiler_output)
     }
 
     fn new(solc_path: PathBuf) -> Self {
         Self { solc_path }
     }
 
-    async fn get_compiler_executable(
+    fn get_compiler_executable(
         config: &Arguments,
-        version: impl Into<VersionOrRequirement>,
+        version: semver::Version,
     ) -> anyhow::Result<PathBuf> {
-        let path = download_solc(config.directory(), version, config.wasm).await?;
+        let path = download_solc(config.directory(), version, config.wasm)?;
         Ok(path)
     }
-
-    fn version(&self) -> anyhow::Result<semver::Version> {
-        // 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")?;
-
-        Version::parse(version_string).map_err(Into::into)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[tokio::test]
-    async fn compiler_version_can_be_obtained() {
-        // Arrange
-        let args = Arguments::default();
-        println!("Getting compiler path");
-        let path = Solc::get_compiler_executable(&args, Version::new(0, 7, 6))
-            .await
-            .unwrap();
-        println!("Got compiler path");
-        let compiler = Solc::new(path);
-
-        // Act
-        let version = compiler.version();
-
-        // Assert
-        assert_eq!(
-            version.expect("Failed to get version"),
-            Version::new(0, 7, 6)
-        )
-    }
 }

crates/compiler/tests/assets/array_one_element/callable.sol

@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity >=0.6.9;
-
-contract Callable {
-    function f(uint[1] memory p1) public pure returns(uint) {
-        return p1[0];
-    }
-}

crates/compiler/tests/assets/array_one_element/main.sol

@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-// Report https://linear.app/matterlabs/issue/CPR-269/call-with-calldata-variable-bug
-
-pragma solidity >=0.6.9;
-
-import "./callable.sol";
-
-contract Main {
-    function main(uint[1] calldata p1, Callable callable) public returns(uint) {
-        return callable.f(p1);
-    }
-}

crates/compiler/tests/assets/array_one_element/test.json

@@ -1,21 +0,0 @@
-{ "cases": [ {
-    "name": "first",
-    "inputs": [
-        {
-            "instance": "Main",
-            "method": "main",
-            "calldata": [
-                "1",
-                "Callable.address"
-            ]
-        }
-    ],
-    "expected": [
-        "1"
-    ]
-} ],
-    "contracts": {
-        "Main": "main.sol:Main",
-        "Callable": "callable.sol:Callable"
-    }
-}

crates/compiler/tests/lib.rs

@@ -1,88 +0,0 @@
-use std::path::PathBuf;
-
-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();
-    println!("About to assert");
-
-    // Act
-    let output = Compiler::<Solc>::new()
-        .with_source("./tests/assets/array_one_element/callable.sol")
-        .unwrap()
-        .with_source("./tests/assets/array_one_element/main.sol")
-        .unwrap()
-        .try_build(compiler_path)
-        .await;
-
-    // Assert
-    let output = output.expect("Failed to compile");
-    assert_eq!(output.contracts.len(), 2);
-
-    let main_file_contracts = output
-        .contracts
-        .get(
-            &PathBuf::from("./tests/assets/array_one_element/main.sol")
-                .canonicalize()
-                .unwrap(),
-        )
-        .unwrap();
-    let callable_file_contracts = output
-        .contracts
-        .get(
-            &PathBuf::from("./tests/assets/array_one_element/callable.sol")
-                .canonicalize()
-                .unwrap(),
-        )
-        .unwrap();
-    assert!(main_file_contracts.contains_key("Main"));
-    assert!(callable_file_contracts.contains_key("Callable"));
-}
-
-#[tokio::test]
-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()
-        .with_source("./tests/assets/array_one_element/callable.sol")
-        .unwrap()
-        .with_source("./tests/assets/array_one_element/main.sol")
-        .unwrap()
-        .try_build(compiler_path)
-        .await;
-
-    // Assert
-    let output = output.expect("Failed to compile");
-    assert_eq!(output.contracts.len(), 2);
-
-    let main_file_contracts = output
-        .contracts
-        .get(
-            &PathBuf::from("./tests/assets/array_one_element/main.sol")
-                .canonicalize()
-                .unwrap(),
-        )
-        .unwrap();
-    let callable_file_contracts = output
-        .contracts
-        .get(
-            &PathBuf::from("./tests/assets/array_one_element/callable.sol")
-                .canonicalize()
-                .unwrap(),
-        )
-        .unwrap();
-    assert!(main_file_contracts.contains_key("Main"));
-    assert!(callable_file_contracts.contains_key("Callable"));
-}

crates/config/src/lib.rs

@@ -3,7 +3,6 @@
 use std::{
     fmt::Display,
     path::{Path, PathBuf},
-    sync::LazyLock,
 };
 
 use alloy::{network::EthereumWallet, signers::local::PrivateKeySigner};
@@ -55,7 +54,7 @@ pub struct Arguments {
     pub geth: PathBuf,
 
     /// The maximum time in milliseconds to wait for geth to start.
-    #[arg(long = "geth-start-timeout", default_value = "5000")]
+    #[arg(long = "geth-start-timeout", default_value = "2000")]
     pub geth_start_timeout: u64,
 
     /// The test network chain ID.
@@ -77,7 +76,7 @@ pub struct Arguments {
     /// This argument controls which private keys the nodes should have access to and be added to
     /// its wallet signers. With a value of N, private keys (0, N] will be added to the signer set
     /// of the node.
-    #[arg(long = "private-keys-count", default_value_t = 15_000)]
+    #[arg(long = "private-keys-count", default_value_t = 30)]
     pub private_keys_to_add: usize,
 
     /// The differential testing leader node implementation.
@@ -92,13 +91,9 @@ pub struct Arguments {
     #[arg(long = "compile-only")]
     pub compile_only: Option<TestingPlatform>,
 
-    /// Determines the amount of nodes that will be spawned for each chain.
+    /// Determines the amount of tests that are executed in parallel.
-    #[arg(long, default_value = "1")]
+    #[arg(long = "workers", default_value = "12")]
-    pub number_of_nodes: usize,
+    pub workers: usize,
-
-    /// Determines the amount of threads that will will be used.
-    #[arg(long, default_value = "12")]
-    pub number_of_threads: usize,
 
     /// Extract problems back to the test corpus.
     #[arg(short, long = "extract-problems")]
@@ -149,23 +144,14 @@ impl Arguments {
 
 impl Default for Arguments {
     fn default() -> Self {
-        static TEMP_DIR: LazyLock<TempDir> = LazyLock::new(|| TempDir::new().unwrap());
+        Arguments::parse_from(["retester"])
-
-        let default = Arguments::parse_from(["retester"]);
-
-        Arguments {
-            temp_dir: Some(&TEMP_DIR),
-            ..default
-        }
     }
 }
 
 /// The Solidity compatible node implementation.
 ///
 /// This describes the solutions to be tested against on a high level.
-#[derive(
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, ValueEnum, Serialize, Deserialize)]
-    Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, ValueEnum, Serialize, Deserialize,
-)]
 #[clap(rename_all = "lower")]
 pub enum TestingPlatform {
     /// The go-ethereum reference full node EVM implementation.

crates/core/Cargo.toml

@@ -13,7 +13,6 @@ name = "retester"
 path = "src/main.rs"
 
 [dependencies]
-revive-dt-common = { workspace = true }
 revive-dt-compiler = { workspace = true }
 revive-dt-config = { workspace = true }
 revive-dt-format = { workspace = true }
@@ -24,10 +23,10 @@ revive-dt-report = { workspace = true }
 alloy = { workspace = true }
 anyhow = { workspace = true }
 clap = { workspace = true }
-futures = { workspace = true }
 indexmap = { workspace = true }
-tokio = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true }
-semver = { workspace = true }
+rayon = { workspace = true }
+revive-solc-json-interface = { workspace = true }
+serde_json = { workspace = true }
 temp-dir = { workspace = true }

crates/core/src/lib.rs

@@ -5,17 +5,17 @@
 
 use revive_dt_compiler::{SolidityCompiler, revive_resolc, solc};
 use revive_dt_config::TestingPlatform;
-use revive_dt_format::traits::ResolverApi;
 use revive_dt_node::{Node, geth, kitchensink::KitchensinkNode};
 use revive_dt_node_interaction::EthereumNode;
 
+pub mod common;
 pub mod driver;
 
 /// One platform can be tested differentially against another.
 ///
 /// For this we need a blockchain node implementation and a compiler.
 pub trait Platform {
-    type Blockchain: EthereumNode + Node + ResolverApi;
+    type Blockchain: EthereumNode + Node;
     type Compiler: SolidityCompiler;
 
     /// Returns the matching [TestingPlatform] of the [revive_dt_config::Arguments].
@@ -26,7 +26,7 @@ pub trait Platform {
 pub struct Geth;
 
 impl Platform for Geth {
-    type Blockchain = geth::GethNode;
+    type Blockchain = geth::Instance;
     type Compiler = solc::Solc;
 
     fn config_id() -> TestingPlatform {

crates/core/src/main.rs

@@ -1,75 +1,37 @@
-use std::{
+use std::{collections::HashMap, sync::LazyLock};
-    collections::HashMap,
-    path::Path,
-    sync::{Arc, LazyLock},
-};
 
-use alloy::{
-    json_abi::JsonAbi,
-    network::{Ethereum, TransactionBuilder},
-    primitives::Address,
-    rpc::types::TransactionRequest,
-};
-use anyhow::Context;
 use clap::Parser;
-use futures::StreamExt;
+use rayon::{ThreadPoolBuilder, prelude::*};
-use revive_dt_common::iterators::FilesWithExtensionIterator;
-use revive_dt_node_interaction::EthereumNode;
-use semver::Version;
-use temp_dir::TempDir;
-use tokio::sync::{Mutex, RwLock};
-use tracing::{Instrument, Level};
-use tracing_subscriber::{EnvFilter, FmtSubscriber};
 
-use revive_dt_compiler::SolidityCompiler;
-use revive_dt_compiler::{Compiler, CompilerOutput};
 use revive_dt_config::*;
 use revive_dt_core::{
     Geth, Kitchensink, Platform,
-    driver::{CaseDriver, CaseState},
+    driver::{Driver, State},
-};
-use revive_dt_format::{
-    case::{Case, CaseIdx},
-    corpus::Corpus,
-    input::Input,
-    metadata::{ContractInstance, ContractPathAndIdent, Metadata, MetadataFile},
-    mode::SolcMode,
 };
+use revive_dt_format::{corpus::Corpus, metadata::MetadataFile};
 use revive_dt_node::pool::NodePool;
 use revive_dt_report::reporter::{Report, Span};
+use temp_dir::TempDir;
+use tracing::Level;
+use tracing_subscriber::{EnvFilter, FmtSubscriber};
 
 static TEMP_DIR: LazyLock<TempDir> = LazyLock::new(|| TempDir::new().unwrap());
 
-type CompilationCache<'a> = Arc<
-    RwLock<
-        HashMap<
-            (&'a Path, SolcMode, TestingPlatform),
-            Arc<Mutex<Option<Arc<(Version, CompilerOutput)>>>>,
-        >,
-    >,
->;
-
 fn main() -> anyhow::Result<()> {
     let args = init_cli()?;
 
-    let body = async {
     for (corpus, tests) in collect_corpora(&args)? {
         let span = Span::new(corpus, args.clone())?;
+
         match &args.compile_only {
-                Some(platform) => compile_corpus(&args, &tests, platform, span).await,
+            Some(platform) => compile_corpus(&args, &tests, platform, span),
-                None => execute_corpus(&args, &tests, span).await?,
+            None => execute_corpus(&args, &tests, span)?,
         }
+
         Report::save()?;
     }
-        Ok(())
-    };
 
-    tokio::runtime::Builder::new_multi_thread()
+    Ok(())
-        .worker_threads(args.number_of_threads)
-        .enable_all()
-        .build()
-        .expect("Failed building the Runtime")
-        .block_on(body)
 }
 
 fn init_cli() -> anyhow::Result<Arguments> {
@@ -100,6 +62,10 @@ fn init_cli() -> anyhow::Result<Arguments> {
     }
     tracing::info!("workdir: {}", args.directory().display());
 
+    ThreadPoolBuilder::new()
+        .num_threads(args.workers)
+        .build_global()?;
+
     Ok(args)
 }
 
@@ -117,11 +83,7 @@ fn collect_corpora(args: &Arguments) -> anyhow::Result<HashMap<Corpus, Vec<Metad
     Ok(corpora)
 }
 
-async fn run_driver<L, F>(
+fn run_driver<L, F>(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()>
-    args: &Arguments,
-    tests: &[MetadataFile],
-    span: Span,
-) -> anyhow::Result<()>
 where
     L: Platform,
     F: Platform,
@@ -131,495 +93,61 @@ where
     let leader_nodes = NodePool::<L::Blockchain>::new(args)?;
     let follower_nodes = NodePool::<F::Blockchain>::new(args)?;
 
-    let test_cases = tests
+    tests.par_iter().for_each(
-        .iter()
-        .flat_map(
         |MetadataFile {
-                 path,
              content: metadata,
+             path: metadata_file_path,
          }| {
-                metadata
+            // Starting a new tracing span for this metadata file. This allows our logs to be clear
-                    .cases
+            // about which metadata file the logs belong to. We can add other information into this
-                    .iter()
+            // as well to be able to associate the logs with the correct metadata file and case
-                    .enumerate()
+            // that's being executed.
-                    .flat_map(move |(case_idx, case)| {
-                        metadata
-                            .solc_modes()
-                            .into_iter()
-                            .map(move |solc_mode| (path, metadata, case_idx, case, solc_mode))
-                    })
-            },
-        )
-        .collect::<Vec<_>>();
-
-    let metadata_case_status = Arc::new(RwLock::new(test_cases.iter().fold(
-        HashMap::<_, HashMap<_, _>>::new(),
-        |mut map, (path, _, case_idx, case, solc_mode)| {
-            map.entry((path.to_path_buf(), solc_mode.clone()))
-                .or_default()
-                .insert((CaseIdx::new(*case_idx), case.name.clone()), None::<bool>);
-            map
-        },
-    )));
-    let status_reporter_task = {
-        let metadata_case_status = metadata_case_status.clone();
-        async move {
-            const GREEN: &str = "\x1B[32m";
-            const RED: &str = "\x1B[31m";
-            const RESET: &str = "\x1B[0m";
-
-            let mut entries_to_delete = Vec::new();
-            loop {
-                let metadata_case_status_read = metadata_case_status.read().await;
-                if metadata_case_status_read.is_empty() {
-                    break;
-                }
-
-                for ((metadata_file_path, solc_mode), case_status) in
-                    metadata_case_status_read.iter()
-                {
-                    if case_status.values().any(|value| value.is_none()) {
-                        continue;
-                    }
-
-                    let contains_failures = case_status
-                        .values()
-                        .any(|value| value.is_some_and(|value| !value));
-
-                    if !contains_failures {
-                        eprintln!(
-                            "{}Succeeded:{} {} - {:?}",
-                            GREEN,
-                            RESET,
-                            metadata_file_path.display(),
-                            solc_mode
-                        )
-                    } else {
-                        eprintln!(
-                            "{}Failed:{} {} - {:?}",
-                            RED,
-                            RESET,
-                            metadata_file_path.display(),
-                            solc_mode
-                        )
-                    };
-
-                    let mut case_status = case_status
-                        .iter()
-                        .map(|((case_idx, case_name), case_status)| {
-                            (case_idx.into_inner(), case_name, case_status.unwrap())
-                        })
-                        .collect::<Vec<_>>();
-                    case_status.sort_by(|a, b| a.0.cmp(&b.0));
-                    for (_, case_name, case_status) in case_status.into_iter() {
-                        if case_status {
-                            eprintln!(
-                                "{GREEN}  Case Succeeded:{RESET} {}",
-                                case_name
-                                    .as_ref()
-                                    .map(|string| string.as_str())
-                                    .unwrap_or("Unnamed case")
-                            )
-                        } else {
-                            eprintln!(
-                                "{RED}  Case Failed:{RESET} {}",
-                                case_name
-                                    .as_ref()
-                                    .map(|string| string.as_str())
-                                    .unwrap_or("Unnamed case")
-                            )
-                        };
-                    }
-                    eprintln!();
-
-                    entries_to_delete.push((metadata_file_path.clone(), solc_mode.clone()));
-                }
-
-                drop(metadata_case_status_read);
-                let mut metadata_case_status_write = metadata_case_status.write().await;
-                for entry in entries_to_delete.drain(..) {
-                    metadata_case_status_write.remove(&entry);
-                }
-
-                tokio::time::sleep(std::time::Duration::from_secs(3)).await;
-            }
-        }
-    };
-
-    let compilation_cache = Arc::new(RwLock::new(HashMap::new()));
-    let driver_task = futures::stream::iter(test_cases).for_each_concurrent(
-        None,
-        |(metadata_file_path, metadata, case_idx, case, solc_mode)| {
-            let compilation_cache = compilation_cache.clone();
-            let leader_node = leader_nodes.round_robbin();
-            let follower_node = follower_nodes.round_robbin();
             let tracing_span = tracing::span!(
                 Level::INFO,
                 "Running driver",
-                metadata_file_path = %metadata_file_path.display(),
+                metadata_file_path = metadata_file_path.display().to_string(),
-                case_idx = case_idx,
-                solc_mode = ?solc_mode,
             );
-            let metadata_case_status = metadata_case_status.clone();
+            let _guard = tracing_span.enter();
-            async move {
+
-                let result = handle_case_driver::<L, F>(
+            let mut driver = Driver::<L, F>::new(
-                    metadata_file_path.as_path(),
                 metadata,
-                    case_idx.into(),
-                    case,
-                    solc_mode.clone(),
                 args,
-                    compilation_cache.clone(),
+                leader_nodes.round_robbin(),
-                    leader_node,
+                follower_nodes.round_robbin(),
-                    follower_node,
-                    span,
-                )
-                .await;
-                let mut metadata_case_status = metadata_case_status.write().await;
-                match result {
-                    Ok(inputs_executed) => {
-                        tracing::info!(inputs_executed, "Execution succeeded");
-                        metadata_case_status
-                            .entry((metadata_file_path.clone(), solc_mode))
-                            .or_default()
-                            .insert((CaseIdx::new(case_idx), case.name.clone()), Some(true));
-                    }
-                    Err(error) => {
-                        metadata_case_status
-                            .entry((metadata_file_path.clone(), solc_mode))
-                            .or_default()
-                            .insert((CaseIdx::new(case_idx), case.name.clone()), Some(false));
-                        tracing::info!(%error, "Execution failed")
-                    }
-                }
-                tracing::info!("Execution completed");
-            }
-            .instrument(tracing_span)
-        },
             );
 
-    tokio::join!(status_reporter_task, driver_task);
+            let execution_result = driver.execute(span);
+            tracing::info!(
+                case_success_count = execution_result.successful_cases_count,
+                case_failure_count = execution_result.failed_cases_count,
+                "Execution completed"
+            );
+
+            let mut error_count = 0;
+            for result in execution_result.results.iter() {
+                if !result.is_success() {
+                    tracing::error!(execution_error = ?result, "Encountered an error");
+                    error_count += 1;
+                }
+            }
+            if error_count == 0 {
+                tracing::info!("Execution succeeded");
+            } else {
+                tracing::info!("Execution failed");
+            }
+        },
+    );
 
     Ok(())
 }
 
-#[allow(clippy::too_many_arguments)]
+fn execute_corpus(args: &Arguments, tests: &[MetadataFile], span: Span) -> anyhow::Result<()> {
-async fn handle_case_driver<'a, L, F>(
-    metadata_file_path: &'a Path,
-    metadata: &'a Metadata,
-    case_idx: CaseIdx,
-    case: &Case,
-    mode: SolcMode,
-    config: &Arguments,
-    compilation_cache: CompilationCache<'a>,
-    leader_node: &L::Blockchain,
-    follower_node: &F::Blockchain,
-    _: Span,
-) -> anyhow::Result<usize>
-where
-    L: Platform,
-    F: Platform,
-    L::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
-    F::Blockchain: revive_dt_node::Node + Send + Sync + 'static,
-{
-    let leader_pre_link_contracts = get_or_build_contracts::<L>(
-        metadata,
-        metadata_file_path,
-        mode.clone(),
-        config,
-        compilation_cache.clone(),
-        &HashMap::new(),
-    )
-    .await?;
-    let follower_pre_link_contracts = get_or_build_contracts::<F>(
-        metadata,
-        metadata_file_path,
-        mode.clone(),
-        config,
-        compilation_cache.clone(),
-        &HashMap::new(),
-    )
-    .await?;
-
-    let mut leader_deployed_libraries = HashMap::new();
-    let mut follower_deployed_libraries = HashMap::new();
-    let mut contract_sources = metadata.contract_sources()?;
-    for library_instance in metadata
-        .libraries
-        .iter()
-        .flatten()
-        .flat_map(|(_, map)| map.values())
-    {
-        let ContractPathAndIdent {
-            contract_source_path: library_source_path,
-            contract_ident: library_ident,
-        } = contract_sources
-            .remove(library_instance)
-            .context("Failed to find the contract source")?;
-
-        let (leader_code, leader_abi) = leader_pre_link_contracts
-            .1
-            .contracts
-            .get(&library_source_path)
-            .and_then(|contracts| contracts.get(library_ident.as_str()))
-            .context("Declared library was not compiled")?;
-        let (follower_code, follower_abi) = follower_pre_link_contracts
-            .1
-            .contracts
-            .get(&library_source_path)
-            .and_then(|contracts| contracts.get(library_ident.as_str()))
-            .context("Declared library was not compiled")?;
-
-        let leader_code = match alloy::hex::decode(leader_code) {
-            Ok(code) => code,
-            Err(error) => {
-                tracing::error!(
-                    ?error,
-                    contract_source_path = library_source_path.display().to_string(),
-                    contract_ident = library_ident.as_ref(),
-                    "Failed to hex-decode byte code - This could possibly mean that the bytecode requires linking"
-                );
-                anyhow::bail!("Failed to hex-decode the byte code {}", error)
-            }
-        };
-        let follower_code = match alloy::hex::decode(follower_code) {
-            Ok(code) => code,
-            Err(error) => {
-                tracing::error!(
-                    ?error,
-                    contract_source_path = library_source_path.display().to_string(),
-                    contract_ident = library_ident.as_ref(),
-                    "Failed to hex-decode byte code - This could possibly mean that the bytecode requires linking"
-                );
-                anyhow::bail!("Failed to hex-decode the byte code {}", error)
-            }
-        };
-
-        // Getting the deployer address from the cases themselves. This is to ensure that we're
-        // doing the deployments from different accounts and therefore we're not slowed down by
-        // the nonce.
-        let deployer_address = case
-            .inputs
-            .iter()
-            .map(|input| input.caller)
-            .next()
-            .unwrap_or(Input::default_caller());
-        let leader_tx = TransactionBuilder::<Ethereum>::with_deploy_code(
-            TransactionRequest::default().from(deployer_address),
-            leader_code,
-        );
-        let follower_tx = TransactionBuilder::<Ethereum>::with_deploy_code(
-            TransactionRequest::default().from(deployer_address),
-            follower_code,
-        );
-
-        let leader_receipt = match leader_node.execute_transaction(leader_tx).await {
-            Ok(receipt) => receipt,
-            Err(error) => {
-                tracing::error!(
-                    node = std::any::type_name::<L>(),
-                    ?error,
-                    "Contract deployment transaction failed."
-                );
-                return Err(error);
-            }
-        };
-        let follower_receipt = match follower_node.execute_transaction(follower_tx).await {
-            Ok(receipt) => receipt,
-            Err(error) => {
-                tracing::error!(
-                    node = std::any::type_name::<F>(),
-                    ?error,
-                    "Contract deployment transaction failed."
-                );
-                return Err(error);
-            }
-        };
-
-        let Some(leader_library_address) = leader_receipt.contract_address else {
-            tracing::error!("Contract deployment transaction didn't return an address");
-            anyhow::bail!("Contract deployment didn't return an address");
-        };
-        let Some(follower_library_address) = follower_receipt.contract_address else {
-            tracing::error!("Contract deployment transaction didn't return an address");
-            anyhow::bail!("Contract deployment didn't return an address");
-        };
-
-        leader_deployed_libraries.insert(
-            library_instance.clone(),
-            (leader_library_address, leader_abi.clone()),
-        );
-        follower_deployed_libraries.insert(
-            library_instance.clone(),
-            (follower_library_address, follower_abi.clone()),
-        );
-    }
-
-    let metadata_file_contains_libraries = metadata
-        .libraries
-        .iter()
-        .flat_map(|map| map.iter())
-        .flat_map(|(_, value)| value.iter())
-        .next()
-        .is_some();
-    let compiled_contracts_require_linking = leader_pre_link_contracts
-        .1
-        .contracts
-        .values()
-        .chain(follower_pre_link_contracts.1.contracts.values())
-        .flat_map(|value| value.values())
-        .any(|(code, _)| !code.chars().all(|char| char.is_ascii_hexdigit()));
-    let (leader_compiled_contracts, follower_compiled_contracts) =
-        if metadata_file_contains_libraries && compiled_contracts_require_linking {
-            let leader_key = (metadata_file_path, mode.clone(), L::config_id());
-            let follower_key = (metadata_file_path, mode.clone(), L::config_id());
-            {
-                let mut cache = compilation_cache.write().await;
-                cache.remove(&leader_key);
-                cache.remove(&follower_key);
-            }
-
-            let leader_post_link_contracts = get_or_build_contracts::<L>(
-                metadata,
-                metadata_file_path,
-                mode.clone(),
-                config,
-                compilation_cache.clone(),
-                &leader_deployed_libraries,
-            )
-            .await?;
-            let follower_post_link_contracts = get_or_build_contracts::<F>(
-                metadata,
-                metadata_file_path,
-                mode.clone(),
-                config,
-                compilation_cache,
-                &follower_deployed_libraries,
-            )
-            .await?;
-
-            (leader_post_link_contracts, follower_post_link_contracts)
-        } else {
-            (leader_pre_link_contracts, follower_pre_link_contracts)
-        };
-
-    let leader_state = CaseState::<L>::new(
-        leader_compiled_contracts.0.clone(),
-        leader_compiled_contracts.1.contracts.clone(),
-        leader_deployed_libraries,
-    );
-    let follower_state = CaseState::<F>::new(
-        follower_compiled_contracts.0.clone(),
-        follower_compiled_contracts.1.contracts.clone(),
-        follower_deployed_libraries,
-    );
-
-    let mut driver = CaseDriver::<L, F>::new(
-        metadata,
-        case,
-        case_idx,
-        leader_node,
-        follower_node,
-        leader_state,
-        follower_state,
-    );
-    driver.execute().await
-}
-
-async fn get_or_build_contracts<'a, P: Platform>(
-    metadata: &'a Metadata,
-    metadata_file_path: &'a Path,
-    mode: SolcMode,
-    config: &Arguments,
-    compilation_cache: CompilationCache<'a>,
-    deployed_libraries: &HashMap<ContractInstance, (Address, JsonAbi)>,
-) -> anyhow::Result<Arc<(Version, CompilerOutput)>> {
-    let key = (metadata_file_path, mode.clone(), P::config_id());
-    if let Some(compilation_artifact) = compilation_cache.read().await.get(&key).cloned() {
-        let mut compilation_artifact = compilation_artifact.lock().await;
-        match *compilation_artifact {
-            Some(ref compiled_contracts) => {
-                tracing::debug!(?key, "Compiled contracts cache hit");
-                return Ok(compiled_contracts.clone());
-            }
-            None => {
-                tracing::debug!(?key, "Compiled contracts cache miss");
-                let compiled_contracts = Arc::new(
-                    compile_contracts::<P>(metadata, &mode, config, deployed_libraries).await?,
-                );
-                *compilation_artifact = Some(compiled_contracts.clone());
-                return Ok(compiled_contracts.clone());
-            }
-        }
-    };
-
-    tracing::debug!(?key, "Compiled contracts cache miss");
-    let mutex = {
-        let mut compilation_cache = compilation_cache.write().await;
-        let mutex = Arc::new(Mutex::new(None));
-        compilation_cache.insert(key, mutex.clone());
-        mutex
-    };
-    let mut compilation_artifact = mutex.lock().await;
-    let compiled_contracts =
-        Arc::new(compile_contracts::<P>(metadata, &mode, config, deployed_libraries).await?);
-    *compilation_artifact = Some(compiled_contracts.clone());
-    Ok(compiled_contracts.clone())
-}
-
-async fn compile_contracts<P: Platform>(
-    metadata: &Metadata,
-    mode: &SolcMode,
-    config: &Arguments,
-    deployed_libraries: &HashMap<ContractInstance, (Address, JsonAbi)>,
-) -> anyhow::Result<(Version, CompilerOutput)> {
-    let compiler_version_or_requirement = mode.compiler_version_to_use(config.solc.clone());
-    let compiler_path =
-        P::Compiler::get_compiler_executable(config, compiler_version_or_requirement).await?;
-    let compiler_version = P::Compiler::new(compiler_path.clone()).version()?;
-
-    let compiler = Compiler::<P::Compiler>::new()
-        .with_allow_path(metadata.directory()?)
-        .with_optimization(mode.solc_optimize());
-    let mut compiler = metadata
-        .files_to_compile()?
-        .try_fold(compiler, |compiler, path| compiler.with_source(&path))?;
-    for (library_instance, (library_address, _)) in deployed_libraries.iter() {
-        let library_ident = &metadata
-            .contracts
-            .as_ref()
-            .and_then(|contracts| contracts.get(library_instance))
-            .expect("Impossible for library to not be found in contracts")
-            .contract_ident;
-
-        // Note the following: we need to tell solc which files require the libraries to be
-        // linked into them. We do not have access to this information and therefore we choose
-        // an easier, yet more compute intensive route, of telling solc that all of the files
-        // need to link the library and it will only perform the linking for the files that do
-        // actually need the library.
-        compiler = FilesWithExtensionIterator::new(metadata.directory()?)
-            .with_allowed_extension("sol")
-            .fold(compiler, |compiler, path| {
-                compiler.with_library(&path, library_ident.as_str(), *library_address)
-            });
-    }
-
-    let compiler_output = compiler.try_build(compiler_path).await?;
-
-    Ok((compiler_version, compiler_output))
-}
-
-async fn execute_corpus(
-    args: &Arguments,
-    tests: &[MetadataFile],
-    span: Span,
-) -> anyhow::Result<()> {
     match (&args.leader, &args.follower) {
         (TestingPlatform::Geth, TestingPlatform::Kitchensink) => {
-            run_driver::<Geth, Kitchensink>(args, tests, span).await?
+            run_driver::<Geth, Kitchensink>(args, tests, span)?
         }
         (TestingPlatform::Geth, TestingPlatform::Geth) => {
-            run_driver::<Geth, Geth>(args, tests, span).await?
+            run_driver::<Geth, Geth>(args, tests, span)?
         }
         _ => unimplemented!(),
     }
@@ -627,41 +155,24 @@ async fn execute_corpus(
     Ok(())
 }
 
-async fn compile_corpus(
+fn compile_corpus(
     config: &Arguments,
     tests: &[MetadataFile],
     platform: &TestingPlatform,
-    _: Span,
+    span: Span,
 ) {
-    let tests = tests.iter().flat_map(|metadata| {
+    tests.par_iter().for_each(|metadata| {
-        metadata
+        for mode in &metadata.solc_modes() {
-            .solc_modes()
-            .into_iter()
-            .map(move |solc_mode| (metadata, solc_mode))
-    });
-
-    futures::stream::iter(tests)
-        .for_each_concurrent(None, |(metadata, mode)| async move {
             match platform {
                 TestingPlatform::Geth => {
-                    let _ = compile_contracts::<Geth>(
+                    let mut state = State::<Geth>::new(config, span);
-                        &metadata.content,
+                    let _ = state.build_contracts(mode, metadata);
-                        &mode,
-                        config,
-                        &Default::default(),
-                    )
-                    .await;
                 }
                 TestingPlatform::Kitchensink => {
-                    let _ = compile_contracts::<Geth>(
+                    let mut state = State::<Kitchensink>::new(config, span);
-                        &metadata.content,
+                    let _ = state.build_contracts(mode, metadata);
-                        &mode,
-                        config,
-                        &Default::default(),
-                    )
-                    .await;
                 }
+            };
         }
-        })
+    });
-        .await;
 }

crates/format/Cargo.toml

@@ -9,7 +9,7 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-revive-dt-common = { workspace = true }
+revive-dt-node-interaction = { workspace = true }
 
 alloy = { workspace = true }
 alloy-primitives = { workspace = true }
@@ -19,6 +19,3 @@ tracing = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-
-[dev-dependencies]
-tokio = { workspace = true }

crates/format/src/case.rs

@@ -1,8 +1,7 @@
 use serde::Deserialize;
 
-use revive_dt_common::macros::define_wrapper_type;
-
 use crate::{
+    define_wrapper_type,
     input::{Expected, Input},
     mode::Mode,
 };
@@ -46,5 +45,5 @@ impl Case {
 define_wrapper_type!(
     /// A wrapper type for the index of test cases found in metadata file.
     #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-    pub struct CaseIdx(usize);
+    CaseIdx(usize);
 );

crates/format/src/corpus.rs

@@ -17,25 +17,7 @@ impl Corpus {
     /// Try to read and parse the corpus definition file at given `path`.
     pub fn try_from_path(path: &Path) -> anyhow::Result<Self> {
         let file = File::open(path)?;
-        let mut corpus: Corpus = serde_json::from_reader(file)?;
+        Ok(serde_json::from_reader(file)?)
-
-        // Ensure that the path mentioned in the corpus is relative to the corpus file.
-        // Canonicalizing also helps make the path in any errors unambiguous.
-        corpus.path = path
-            .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(corpus.path);
-
-        Ok(corpus)
     }
 
     /// Scan the corpus base directory and return all tests found.
@@ -53,7 +35,6 @@ impl Corpus {
 ///
 /// `path` is expected to be a directory.
 pub fn collect_metadata(path: &Path, tests: &mut Vec<MetadataFile>) {
-    if path.is_dir() {
     let dir_entry = match std::fs::read_dir(path) {
         Ok(dir_entry) => dir_entry,
         Err(error) => {
@@ -83,17 +64,4 @@ pub fn collect_metadata(path: &Path, tests: &mut Vec<MetadataFile>) {
             }
         }
     }
-    } else {
-        let Some(extension) = path.extension() else {
-            tracing::error!("Failed to get file extension");
-            return;
-        };
-        if extension.eq_ignore_ascii_case("sol") || extension.eq_ignore_ascii_case("json") {
-            if let Some(metadata) = MetadataFile::try_from_file(path) {
-                tests.push(metadata)
-            }
-        } else {
-            tracing::error!(?extension, "Unsupported file extension");
-        }
-    }
 }

crates/format/src/lib.rs

@@ -3,6 +3,6 @@
 pub mod case;
 pub mod corpus;
 pub mod input;
+pub mod macros;
 pub mod metadata;
 pub mod mode;
-pub mod traits;

crates/format/src/macros.rs

@@ -12,9 +12,11 @@
 /// pub struct CaseId(usize);
 /// ```
 ///
-/// And would also implement a number of methods on this type making it easier to use.
+/// And would also implement a number of methods on this type making it easier
+/// to use.
 ///
-/// These wrapper types become very useful as they make the code a lot easier to read.
+/// These wrapper types become very useful as they make the code a lot easier
+/// to read.
 ///
 /// Take the following as an example:
 ///
@@ -24,31 +26,33 @@
 /// }
 /// ```
 ///
-/// In the above code it's hard to understand what the various types refer to or what to expect them
+/// In the above code it's hard to understand what the various types refer to or
-/// to contain.
+/// what to expect them to contain.
 ///
-/// With these wrapper types we're able to create code that's self-documenting in that the types
+/// With these wrapper types we're able to create code that's self-documenting
-/// tell us what the code is referring to. The above code is transformed into
+/// in that the types tell us what the code is referring to. The above code is
+/// transformed into
 ///
 /// ```rust,ignore
 /// struct State {
 ///     contracts: HashMap<CaseId, HashMap<ContractName, ContractByteCode>>
 /// }
 /// ```
-///
-/// Note that we follow the same syntax for defining wrapper structs but we do not permit the use of
-/// generics.
 #[macro_export]
 macro_rules! define_wrapper_type {
     (
         $(#[$meta: meta])*
-        $vis:vis struct $ident: ident($ty: ty);
+        $ident: ident($ty: ty) $(;)?
     ) => {
         $(#[$meta])*
-        $vis struct $ident($ty);
+        pub struct $ident($ty);
 
         impl $ident {
-            pub fn new(value: impl Into<$ty>) -> Self {
+            pub fn new(value: $ty) -> Self {
+                Self(value)
+            }
+
+            pub fn new_from<T: Into<$ty>>(value: T) -> Self {
                 Self(value.into())
             }
 
@@ -100,7 +104,3 @@ macro_rules! define_wrapper_type {
         }
     };
 }
-
-/// Technically not needed but this allows for the macro to be found in the `macros` module of the
-/// crate in addition to being found in the root of the crate.
-pub use define_wrapper_type;

crates/format/src/metadata.rs

@@ -9,10 +9,9 @@ use std::{
 
 use serde::{Deserialize, Serialize};
 
-use revive_dt_common::{iterators::FilesWithExtensionIterator, macros::define_wrapper_type};
-
 use crate::{
     case::Case,
+    define_wrapper_type,
     mode::{Mode, SolcMode},
 };
 
@@ -47,9 +46,9 @@ impl Deref for MetadataFile {
 pub struct Metadata {
     pub targets: Option<Vec<String>>,
     pub cases: Vec<Case>,
-    pub contracts: Option<BTreeMap<ContractInstance, ContractPathAndIdent>>,
+    pub contracts: Option<BTreeMap<ContractInstance, ContractPathAndIdentifier>>,
     // TODO: Convert into wrapper types for clarity.
-    pub libraries: Option<BTreeMap<PathBuf, BTreeMap<ContractIdent, ContractInstance>>>,
+    pub libraries: Option<BTreeMap<String, BTreeMap<String, String>>>,
     pub ignore: Option<bool>,
     pub modes: Option<Vec<Mode>>,
     pub file_path: Option<PathBuf>,
@@ -86,7 +85,7 @@ impl Metadata {
     /// Returns the contract sources with canonicalized paths for the files
     pub fn contract_sources(
         &self,
-    ) -> anyhow::Result<BTreeMap<ContractInstance, ContractPathAndIdent>> {
+    ) -> anyhow::Result<BTreeMap<ContractInstance, ContractPathAndIdentifier>> {
         let directory = self.directory()?;
         let mut sources = BTreeMap::new();
         let Some(contracts) = &self.contracts else {
@@ -95,7 +94,7 @@ impl Metadata {
 
         for (
             alias,
-            ContractPathAndIdent {
+            ContractPathAndIdentifier {
                 contract_source_path,
                 contract_ident,
             },
@@ -107,7 +106,7 @@ impl Metadata {
 
             sources.insert(
                 alias,
-                ContractPathAndIdent {
+                ContractPathAndIdentifier {
                     contract_source_path: absolute_path,
                     contract_ident,
                 },
@@ -193,10 +192,10 @@ impl Metadata {
                 metadata.file_path = Some(path.to_path_buf());
                 metadata.contracts = Some(
                     [(
-                        ContractInstance::new("Test"),
+                        ContractInstance::new_from("test"),
-                        ContractPathAndIdent {
+                        ContractPathAndIdentifier {
                             contract_source_path: path.to_path_buf(),
-                            contract_ident: ContractIdent::new("Test"),
+                            contract_ident: ContractIdent::new_from("Test"),
                         },
                     )]
                     .into(),
@@ -212,51 +211,24 @@ impl Metadata {
             }
         }
     }
-
-    /// Returns an iterator over all of the solidity files that needs to be compiled for this
-    /// [`Metadata`] object
-    ///
-    /// Note: if the metadata is contained within a solidity file then this is the only file that
-    /// we wish to compile since this is a self-contained test. Otherwise, if it's a JSON file
-    /// then we need to compile all of the contracts that are in the directory since imports are
-    /// allowed in there.
-    pub fn files_to_compile(&self) -> anyhow::Result<Box<dyn Iterator<Item = PathBuf>>> {
-        let Some(ref metadata_file_path) = self.file_path else {
-            anyhow::bail!("The metadata file path is not defined");
-        };
-        if metadata_file_path
-            .extension()
-            .is_some_and(|extension| extension.eq_ignore_ascii_case("sol"))
-        {
-            Ok(Box::new(std::iter::once(metadata_file_path.clone())))
-        } else {
-            Ok(Box::new(
-                FilesWithExtensionIterator::new(self.directory()?).with_allowed_extension("sol"),
-            ))
-        }
-    }
 }
 
 define_wrapper_type!(
     /// Represents a contract instance found a metadata file.
     ///
     /// Typically, this is used as the key to the "contracts" field of metadata files.
-    #[derive(
+    #[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-        Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize,
-    )]
     #[serde(transparent)]
-    pub struct ContractInstance(String);
+    ContractInstance(String);
 );
 
 define_wrapper_type!(
     /// Represents a contract identifier found a metadata file.
     ///
     /// A contract identifier is the name of the contract in the source code.
-    #[derive(
+    #[derive(Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-        Clone, Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize,
-    )]
     #[serde(transparent)]
-    pub struct ContractIdent(String);
+    ContractIdent(String);
 );
 
 /// Represents an identifier used for contracts.
@@ -268,7 +240,7 @@ define_wrapper_type!(
 /// ```
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 #[serde(try_from = "String", into = "String")]
-pub struct ContractPathAndIdent {
+pub struct ContractPathAndIdentifier {
     /// The path of the contract source code relative to the directory containing the metadata file.
     pub contract_source_path: PathBuf,
 
@@ -276,7 +248,7 @@ pub struct ContractPathAndIdent {
     pub contract_ident: ContractIdent,
 }
 
-impl Display for ContractPathAndIdent {
+impl Display for ContractPathAndIdentifier {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
@@ -287,7 +259,7 @@ impl Display for ContractPathAndIdent {
     }
 }
 
-impl FromStr for ContractPathAndIdent {
+impl FromStr for ContractPathAndIdentifier {
     type Err = anyhow::Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
@@ -310,26 +282,20 @@ impl FromStr for ContractPathAndIdent {
                 identifier = Some(next_item.to_owned())
             }
         }
-        match (path, identifier) {
+        let Some(path) = path else {
-            (Some(path), Some(identifier)) => Ok(Self {
+            anyhow::bail!("Path is not defined");
-                contract_source_path: PathBuf::from(path),
+        };
-                contract_ident: ContractIdent::new(identifier),
+        let Some(identifier) = identifier else {
-            }),
+            anyhow::bail!("Contract identifier is not defined")
-            (None, Some(path)) | (Some(path), None) => {
-                let Some(identifier) = path.split(".").next().map(ToOwned::to_owned) else {
-                    anyhow::bail!("Failed to find identifier");
         };
         Ok(Self {
             contract_source_path: PathBuf::from(path),
             contract_ident: ContractIdent::new(identifier),
         })
     }
-            (None, None) => anyhow::bail!("Failed to find the path and identifier"),
-        }
-    }
 }
 
-impl TryFrom<String> for ContractPathAndIdent {
+impl TryFrom<String> for ContractPathAndIdentifier {
     type Error = anyhow::Error;
 
     fn try_from(value: String) -> Result<Self, Self::Error> {
@@ -337,8 +303,8 @@ impl TryFrom<String> for ContractPathAndIdent {
     }
 }
 
-impl From<ContractPathAndIdent> for String {
+impl From<ContractPathAndIdentifier> for String {
-    fn from(value: ContractPathAndIdent) -> Self {
+    fn from(value: ContractPathAndIdentifier) -> Self {
         value.to_string()
     }
 }
@@ -353,7 +319,7 @@ mod test {
         let string = "ERC20/ERC20.sol:ERC20";
 
         // Act
-        let identifier = ContractPathAndIdent::from_str(string);
+        let identifier = ContractPathAndIdentifier::from_str(string);
 
         // Assert
         let identifier = identifier.expect("Failed to parse");

crates/format/src/mode.rs

@@ -1,4 +1,3 @@
-use revive_dt_common::types::VersionOrRequirement;
 use semver::Version;
 use serde::de::Deserializer;
 use serde::{Deserialize, Serialize};
@@ -79,15 +78,6 @@ impl SolcMode {
 
         None
     }
-
-    /// Resolves the [`SolcMode`]'s solidity version requirement into a [`VersionOrRequirement`] if
-    /// the requirement is present on the object. Otherwise, the passed default version is used.
-    pub fn compiler_version_to_use(&self, default: Version) -> VersionOrRequirement {
-        match self.solc_version {
-            Some(ref requirement) => requirement.clone().into(),
-            None => default.into(),
-        }
-    }
 }
 
 impl<'de> Deserialize<'de> for Mode {

crates/format/src/traits.rs

@@ -1,33 +0,0 @@
-use alloy::eips::BlockNumberOrTag;
-use alloy::primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, ChainId, U256};
-use anyhow::Result;
-
-/// A trait of the interface are required to implement to be used by the resolution logic that this
-/// crate implements to go from string calldata and into the bytes calldata.
-pub trait ResolverApi {
-    /// Returns the ID of the chain that the node is on.
-    fn chain_id(&self) -> impl Future<Output = Result<ChainId>>;
-
-    // TODO: This is currently a u128 due to Kitchensink needing more than 64 bits for its gas limit
-    // when we implement the changes to the gas we need to adjust this to be a u64.
-    /// Returns the gas limit of the specified block.
-    fn block_gas_limit(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<u128>>;
-
-    /// Returns the coinbase of the specified block.
-    fn block_coinbase(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<Address>>;
-
-    /// Returns the difficulty of the specified block.
-    fn block_difficulty(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<U256>>;
-
-    /// Returns the hash of the specified block.
-    fn block_hash(&self, number: BlockNumberOrTag) -> impl Future<Output = Result<BlockHash>>;
-
-    /// Returns the timestamp of the specified block,
-    fn block_timestamp(
-        &self,
-        number: BlockNumberOrTag,
-    ) -> impl Future<Output = Result<BlockTimestamp>>;
-
-    /// Returns the number of the last block.
-    fn last_block_number(&self) -> impl Future<Output = Result<BlockNumber>>;
-}

crates/node-interaction/Cargo.toml

@@ -11,3 +11,7 @@ rust-version.workspace = true
 [dependencies]
 alloy = { workspace = true }
 anyhow = { workspace = true }
+futures = { workspace = true }
+tracing = { workspace = true }
+once_cell = { workspace = true }
+tokio = { workspace = true }

crates/node-interaction/src/blocking_executor.rs

@@ -0,0 +1,228 @@
+//! The alloy crate __requires__ a tokio runtime.
+//! We contain any async rust right here.
+
+use std::{any::Any, panic::AssertUnwindSafe, pin::Pin, thread};
+
+use futures::FutureExt;
+use once_cell::sync::Lazy;
+use tokio::{
+    runtime::Builder,
+    sync::{mpsc::UnboundedSender, oneshot},
+};
+use tracing::Instrument;
+
+/// A blocking async executor.
+///
+/// This struct exposes the abstraction of a blocking async executor. It is a global and static
+/// executor which means that it doesn't require for new instances of it to be created, it's a
+/// singleton and can be accessed by any thread that wants to perform some async computation on the
+/// blocking executor thread.
+///
+/// The API of the blocking executor is created in a way so that it's very natural, simple to use,
+/// and unbounded to specific tasks or return types. The following is an example of using this
+/// executor to drive an async computation:
+///
+/// ```rust
+/// use revive_dt_node_interaction::*;
+///
+/// fn blocking_function() {
+///     let result = BlockingExecutor::execute(async move {
+///         tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+///         0xFFu8
+///     })
+///     .expect("Computation failed");
+///
+///     assert_eq!(result, 0xFF);
+/// }
+/// ```
+///
+/// Users get to pass in their async tasks without needing to worry about putting them in a [`Box`],
+/// [`Pin`], needing to perform down-casting, or the internal channel mechanism used by the runtime.
+/// To the user, it just looks like a function that converts some async code into sync code.
+///
+/// This struct also handled panics that occur in the passed futures and converts them into errors
+/// that can be handled by the user. This is done to allow the executor to be robust.
+///
+/// Internally, the executor communicates with the tokio runtime thread through channels which carry
+/// the [`TaskMessage`] and the results of the execution.
+pub struct BlockingExecutor;
+
+impl BlockingExecutor {
+    pub fn execute<R>(future: impl Future<Output = R> + Send + 'static) -> Result<R, anyhow::Error>
+    where
+        R: Send + 'static,
+    {
+        // Note: The blocking executor is a singleton and therefore we store its state in a static
+        // so that it's assigned only once. Additionally, when we set the state of the executor we
+        // spawn the thread where the async runtime runs.
+        static STATE: Lazy<ExecutorState> = Lazy::new(|| {
+            tracing::trace!("Initializing the BlockingExecutor state");
+
+            // All communication with the tokio runtime thread happens over mspc channels where the
+            // producers here are the threads that want to run async tasks and the consumer here is
+            // the tokio runtime thread.
+            let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel::<TaskMessage>();
+
+            thread::spawn(move || {
+                tracing::info!(
+                    thread_id = ?std::thread::current().id(),
+                    "Starting async runtime thread"
+                );
+
+                let runtime = Builder::new_current_thread()
+                    .enable_all()
+                    .build()
+                    .expect("Failed to create the async runtime");
+
+                runtime.block_on(async move {
+                    while let Some(TaskMessage {
+                        future: task,
+                        response_tx: response_channel,
+                    }) = rx.recv().await
+                    {
+                        tracing::trace!("Received a new future to execute");
+                        tokio::spawn(async move {
+                            // One of the things that the blocking executor does is that it allows
+                            // us to catch panics if they occur. By wrapping the given future in an
+                            // AssertUnwindSafe::catch_unwind we are able to catch all panic unwinds
+                            // in the given future and convert them into errors.
+                            let task = AssertUnwindSafe(task).catch_unwind();
+
+                            let result = task.await;
+                            let _ = response_channel.send(result);
+                        });
+                    }
+                })
+            });
+
+            ExecutorState { tx }
+        });
+
+        // We need to perform blocking synchronous communication between the current thread and the
+        // tokio runtime thread with the result of the async computation and the oneshot channels
+        // from tokio allows us to do that. The sender side of the channel will be given to the
+        // tokio runtime thread to send the result when the computation is completed and the receive
+        // side of the channel will be kept with this thread to await for the response of the async
+        // task to come back.
+        let (response_tx, response_rx) =
+            oneshot::channel::<Result<Box<dyn Any + Send>, Box<dyn Any + Send>>>();
+
+        // The tokio runtime thread expects a Future<Output = Box<dyn Any + Send>> + Send to be
+        // sent to it to execute. However, this function has a typed Future<Output = R> + Send and
+        // therefore we need to change the type of the future to fit what the runtime thread expects
+        // in the task message. In doing this conversion, we lose some of the type information since
+        // we're converting R => dyn Any. However, we will perform down-casting on the result to
+        // convert it back into R.
+        let future = Box::pin(
+            async move { Box::new(future.await) as Box<dyn Any + Send> }.in_current_span(),
+        );
+
+        let task = TaskMessage::new(future, response_tx);
+        if let Err(error) = STATE.tx.send(task) {
+            tracing::error!(?error, "Failed to send the task to the blocking executor");
+            anyhow::bail!("Failed to send the task to the blocking executor: {error:?}")
+        }
+
+        let result = match response_rx.blocking_recv() {
+            Ok(result) => result,
+            Err(error) => {
+                tracing::error!(
+                    ?error,
+                    "Failed to get the response from the blocking executor"
+                );
+                anyhow::bail!("Failed to get the response from the blocking executor: {error:?}")
+            }
+        };
+
+        match result.map(|result| {
+            *result
+                .downcast::<R>()
+                .expect("Type mismatch in the downcast")
+        }) {
+            Ok(result) => Ok(result),
+            Err(error) => {
+                tracing::error!(
+                    ?error,
+                    "Failed to downcast the returned result into the expected type"
+                );
+                anyhow::bail!(
+                    "Failed to downcast the returned result into the expected type: {error:?}"
+                )
+            }
+        }
+    }
+}
+/// Represents the state of the async runtime. This runtime is designed to be a singleton runtime
+/// which means that in the current running program there's just a single thread that has an async
+/// runtime.
+struct ExecutorState {
+    /// The sending side of the task messages channel. This is used by all of the other threads to
+    /// communicate with the async runtime thread.
+    tx: UnboundedSender<TaskMessage>,
+}
+
+/// Represents a message that contains an asynchronous task that's to be executed by the runtime
+/// as well as a way for the runtime to report back on the result of the execution.
+struct TaskMessage {
+    /// The task that's being requested to run. This is a future that returns an object that does
+    /// implement [`Any`] and [`Send`] to allow it to be sent between the requesting thread and the
+    /// async thread.
+    future: Pin<Box<dyn Future<Output = Box<dyn Any + Send>> + Send>>,
+
+    /// A one shot sender channel where the sender of the task is expecting to hear back on the
+    /// result of the task.
+    response_tx: oneshot::Sender<Result<Box<dyn Any + Send>, Box<dyn Any + Send>>>,
+}
+
+impl TaskMessage {
+    pub fn new(
+        future: Pin<Box<dyn Future<Output = Box<dyn Any + Send>> + Send>>,
+        response_tx: oneshot::Sender<Result<Box<dyn Any + Send>, Box<dyn Any + Send>>>,
+    ) -> Self {
+        Self {
+            future,
+            response_tx,
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn simple_future_works() {
+        // Act
+        let result = BlockingExecutor::execute(async move {
+            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+            0xFFu8
+        })
+        .unwrap();
+
+        // Assert
+        assert_eq!(result, 0xFFu8);
+    }
+
+    #[test]
+    #[allow(unreachable_code, clippy::unreachable)]
+    fn panics_in_futures_are_caught() {
+        // Act
+        let result = BlockingExecutor::execute(async move {
+            panic!("This is a panic!");
+            0xFFu8
+        });
+
+        // Assert
+        assert!(result.is_err());
+
+        // Act
+        let result = BlockingExecutor::execute(async move {
+            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+            0xFFu8
+        })
+        .unwrap();
+
+        // Assert
+        assert_eq!(result, 0xFFu8)
+    }
+}

crates/node-interaction/src/lib.rs

@@ -1,24 +1,49 @@
 //! This crate implements all node interactions.
 
+use alloy::eips::BlockNumberOrTag;
+use alloy::primitives::{Address, BlockHash, BlockNumber, BlockTimestamp, ChainId, U256};
 use alloy::rpc::types::trace::geth::{DiffMode, GethDebugTracingOptions, GethTrace};
 use alloy::rpc::types::{TransactionReceipt, TransactionRequest};
 use anyhow::Result;
 
+mod blocking_executor;
+pub use blocking_executor::*;
+
 /// An interface for all interactions with Ethereum compatible nodes.
 pub trait EthereumNode {
     /// Execute the [TransactionRequest] and return a [TransactionReceipt].
-    fn execute_transaction(
+    fn execute_transaction(&self, transaction: TransactionRequest) -> Result<TransactionReceipt>;
-        &self,
-        transaction: TransactionRequest,
-    ) -> impl Future<Output = Result<TransactionReceipt>>;
 
     /// Trace the transaction in the [TransactionReceipt] and return a [GethTrace].
     fn trace_transaction(
         &self,
         receipt: &TransactionReceipt,
         trace_options: GethDebugTracingOptions,
-    ) -> impl Future<Output = Result<GethTrace>>;
+    ) -> Result<GethTrace>;
 
     /// Returns the state diff of the transaction hash in the [TransactionReceipt].
-    fn state_diff(&self, receipt: &TransactionReceipt) -> impl Future<Output = Result<DiffMode>>;
+    fn state_diff(&self, receipt: &TransactionReceipt) -> Result<DiffMode>;
+
+    /// Returns the ID of the chain that the node is on.
+    fn chain_id(&self) -> Result<ChainId>;
+
+    // TODO: This is currently a u128 due to Kitchensink needing more than 64 bits for its gas limit
+    // when we implement the changes to the gas we need to adjust this to be a u64.
+    /// Returns the gas limit of the specified block.
+    fn block_gas_limit(&self, number: BlockNumberOrTag) -> Result<u128>;
+
+    /// Returns the coinbase of the specified block.
+    fn block_coinbase(&self, number: BlockNumberOrTag) -> Result<Address>;
+
+    /// Returns the difficulty of the specified block.
+    fn block_difficulty(&self, number: BlockNumberOrTag) -> Result<U256>;
+
+    /// Returns the hash of the specified block.
+    fn block_hash(&self, number: BlockNumberOrTag) -> Result<BlockHash>;
+
+    /// Returns the timestamp of the specified block,
+    fn block_timestamp(&self, number: BlockNumberOrTag) -> Result<BlockTimestamp>;
+
+    /// Returns the number of the last block.
+    fn last_block_number(&self) -> Result<BlockNumber>;
 }

crates/node/Cargo.toml

@@ -14,10 +14,8 @@ alloy = { workspace = true }
 tracing = { workspace = true }
 tokio = { workspace = true }
 
-revive-dt-common = { workspace = true }
-revive-dt-config = { workspace = true }
-revive-dt-format = { workspace = true }
 revive-dt-node-interaction = { workspace = true }
+revive-dt-config = { workspace = true }
 
 serde = { workspace = true }
 serde_json = { workspace = true }

crates/node/src/constants.rs

@@ -1,5 +1,5 @@
 /// This constant defines how much Wei accounts are pre-seeded with in genesis.
 ///
-/// Note: After changing this number, check that the tests for kitchensink work as we encountered
+/// We use [`u128::MAX`] here which means that accounts will be given 2^128 - 1 WEI which is
-/// some issues with different values of the initial balance on Kitchensink.
+/// (2^128 - 1) / 10^18 ETH.
-pub const INITIAL_BALANCE: u128 = 10u128.pow(37);
+pub const INITIAL_BALANCE: u128 = u128::MAX;

crates/node/src/geth.rs

@@ -25,10 +25,8 @@ use alloy::{
     },
     signers::local::PrivateKeySigner,
 };
-use revive_dt_common::fs::clear_directory;
 use revive_dt_config::Arguments;
-use revive_dt_format::traits::ResolverApi;
+use revive_dt_node_interaction::{BlockingExecutor, EthereumNode};
-use revive_dt_node_interaction::EthereumNode;
 use tracing::Level;
 
 use crate::{Node, common::FallbackGasFiller, constants::INITIAL_BALANCE};
@@ -43,7 +41,7 @@ static NODE_COUNT: AtomicU32 = AtomicU32::new(0);
 ///
 /// Prunes the child process and the base directory on drop.
 #[derive(Debug)]
-pub struct GethNode {
+pub struct Instance {
     connection_string: String,
     base_directory: PathBuf,
     data_directory: PathBuf,
@@ -62,7 +60,7 @@ pub struct GethNode {
     logs_file_to_flush: Vec<File>,
 }
 
-impl GethNode {
+impl Instance {
     const BASE_DIRECTORY: &str = "geth";
     const DATA_DIRECTORY: &str = "data";
     const LOGS_DIRECTORY: &str = "logs";
@@ -76,14 +74,9 @@ impl GethNode {
     const GETH_STDOUT_LOG_FILE_NAME: &str = "node_stdout.log";
     const GETH_STDERR_LOG_FILE_NAME: &str = "node_stderr.log";
 
-    const TRANSACTION_INDEXING_ERROR: &str = "transaction indexing is in progress";
-
     /// Create the node directory and call `geth init` to configure the genesis.
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn init(&mut self, genesis: String) -> anyhow::Result<&mut Self> {
-        let _ = clear_directory(&self.base_directory);
-        let _ = clear_directory(&self.logs_directory);
-
         create_dir_all(&self.base_directory)?;
         create_dir_all(&self.logs_directory)?;
 
@@ -91,8 +84,6 @@ impl GethNode {
         for signer_address in
             <EthereumWallet as NetworkWallet<Ethereum>>::signer_addresses(&self.wallet)
         {
-            // Note, the use of the entry API here means that we only modify the entries for any
-            // account that is not in the `alloc` field of the genesis state.
             genesis
                 .alloc
                 .entry(signer_address)
@@ -155,10 +146,6 @@ impl GethNode {
             .arg("--nodiscover")
             .arg("--maxpeers")
             .arg("0")
-            .arg("--txlookuplimit")
-            .arg("0")
-            .arg("--cache.blocklogs")
-            .arg("512")
             .stderr(stderr_logs_file.try_clone()?)
             .stdout(stdout_logs_file.try_clone()?)
             .spawn()?
@@ -247,16 +234,18 @@ impl GethNode {
     }
 }
 
-impl EthereumNode for GethNode {
+impl EthereumNode for Instance {
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn execute_transaction(
+    fn execute_transaction(
         &self,
         transaction: TransactionRequest,
     ) -> anyhow::Result<alloy::rpc::types::TransactionReceipt> {
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
             let outer_span = tracing::debug_span!("Submitting transaction", ?transaction);
             let _outer_guard = outer_span.enter();
 
-        let provider = self.provider().await?;
+            let provider = provider.await?;
 
             let pending_transaction = provider.send_transaction(transaction).await?;
             let transaction_hash = pending_transaction.tx_hash();
@@ -276,154 +265,176 @@ impl EthereumNode for GethNode {
             // it eventually works, but we only do that if the error we get back is the "transaction
             // indexing is in progress" error or if the receipt is None.
             //
-        // Getting the transaction indexed and taking a receipt can take a long time especially
+            // At the moment we do not allow for the 60 seconds to be modified and we take it as
-        // when a lot of transactions are being submitted to the node. Thus, while initially we
+            // being an implementation detail that's invisible to anything outside of this module.
-        // only allowed for 60 seconds of waiting with a 1 second delay in polling, we need to
+            //
-        // allow for a larger wait time. Therefore, in here we allow for 5 minutes of waiting
+            // We allow a total of 60 retries for getting the receipt with one second between each
-        // with exponential backoff each time we attempt to get the receipt and find that it's
+            // retry and the next which means that we allow for a total of 60 seconds of waiting
-        // not available.
+            // before we consider that we're unable to get the transaction receipt.
             let mut retries = 0;
-        let mut total_wait_duration = Duration::from_secs(0);
-        let max_allowed_wait_duration = Duration::from_secs(5 * 60);
             loop {
-            if total_wait_duration >= max_allowed_wait_duration {
-                tracing::error!(
-                    ?total_wait_duration,
-                    ?max_allowed_wait_duration,
-                    retry_count = retries,
-                    "Failed to get receipt after polling for it"
-                );
-                anyhow::bail!(
-                    "Polled for receipt for {total_wait_duration:?} but failed to get it"
-                );
-            }
-
                 match provider.get_transaction_receipt(*transaction_hash).await {
                     Ok(Some(receipt)) => {
-                    tracing::info!(?total_wait_duration, "Found receipt");
+                        tracing::info!("Obtained the transaction receipt");
                         break Ok(receipt);
                     }
-                Ok(None) => {}
+                    Ok(None) => {
+                        if retries == 60 {
+                            tracing::error!(
+                                "Polled for transaction receipt for 60 seconds but failed to get it"
+                            );
+                            break Err(anyhow::anyhow!("Failed to get the transaction receipt"));
+                        } else {
+                            tracing::trace!(
+                                retries,
+                                "Sleeping for 1 second and trying to get the receipt again"
+                            );
+                            retries += 1;
+                            tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+                            continue;
+                        }
+                    }
                     Err(error) => {
                         let error_string = error.to_string();
-                    if !error_string.contains(Self::TRANSACTION_INDEXING_ERROR) {
+                        if error_string.contains("transaction indexing is in progress") {
+                            if retries == 60 {
+                                tracing::error!(
+                                    "Polled for transaction receipt for 60 seconds but failed to get it"
+                                );
+                                break Err(error.into());
+                            } else {
+                                tracing::trace!(
+                                    retries,
+                                    "Sleeping for 1 second and trying to get the receipt again"
+                                );
+                                retries += 1;
+                                tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+                                continue;
+                            }
+                        } else {
                             break Err(error.into());
                         }
                     }
-            };
-
-            let next_wait_duration = Duration::from_secs(2u64.pow(retries))
-                .min(max_allowed_wait_duration - total_wait_duration);
-            total_wait_duration += next_wait_duration;
-            retries += 1;
-
-            tokio::time::sleep(next_wait_duration).await;
                 }
             }
+        })?
+    }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn trace_transaction(
+    fn trace_transaction(
         &self,
         transaction: &TransactionReceipt,
         trace_options: GethDebugTracingOptions,
     ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
         let tx_hash = transaction.transaction_hash;
-        Ok(self
+        let provider = self.provider();
-            .provider()
+        BlockingExecutor::execute(async move {
+            Ok(provider
                 .await?
                 .debug_trace_transaction(tx_hash, trace_options)
                 .await?)
+        })?
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
+    fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
         let trace_options = GethDebugTracingOptions::prestate_tracer(PreStateConfig {
             diff_mode: Some(true),
             disable_code: None,
             disable_storage: None,
         });
         match self
-            .trace_transaction(transaction, trace_options)
+            .trace_transaction(transaction, trace_options)?
-            .await?
             .try_into_pre_state_frame()?
         {
             PreStateFrame::Diff(diff) => Ok(diff),
             _ => anyhow::bail!("expected a diff mode trace"),
         }
     }
-}
 
-impl ResolverApi for GethNode {
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
+    fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
-        self.provider()
+        let provider = self.provider();
-            .await?
+        BlockingExecutor::execute(async move {
-            .get_chain_id()
+            provider.await?.get_chain_id().await.map_err(Into::into)
-            .await
+        })?
-            .map_err(Into::into)
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
+    fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
-        self.provider()
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
+            provider
                 .await?
                 .get_block_by_number(number)
                 .await?
                 .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
                 .map(|block| block.header.gas_limit as _)
+        })?
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
+    fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
-        self.provider()
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
+            provider
                 .await?
                 .get_block_by_number(number)
                 .await?
                 .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
                 .map(|block| block.header.beneficiary)
+        })?
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
+    fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
-        self.provider()
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
+            provider
                 .await?
                 .get_block_by_number(number)
                 .await?
                 .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
                 .map(|block| block.header.difficulty)
+        })?
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
+    fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
-        self.provider()
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
+            provider
                 .await?
                 .get_block_by_number(number)
                 .await?
                 .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
                 .map(|block| block.header.hash)
+        })?
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
+    fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
-        self.provider()
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
+            provider
                 .await?
                 .get_block_by_number(number)
                 .await?
                 .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
                 .map(|block| block.header.timestamp)
+        })?
     }
 
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
+    fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
-        self.provider()
+        let provider = self.provider();
-            .await?
+        BlockingExecutor::execute(async move {
-            .get_block_number()
+            provider.await?.get_block_number().await.map_err(Into::into)
-            .await
+        })?
-            .map_err(Into::into)
     }
 }
 
-impl Node for GethNode {
+impl Node for Instance {
     fn new(config: &Arguments) -> Self {
         let geth_directory = config.directory().join(Self::BASE_DIRECTORY);
         let id = NODE_COUNT.fetch_add(1, Ordering::SeqCst);
@@ -511,7 +522,7 @@ impl Node for GethNode {
     }
 }
 
-impl Drop for GethNode {
+impl Drop for Instance {
     #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
     fn drop(&mut self) {
         self.shutdown().expect("Failed to shutdown")
@@ -536,9 +547,9 @@ mod tests {
         (config, temp_dir)
     }
 
-    fn new_node() -> (GethNode, TempDir) {
+    fn new_node() -> (Instance, TempDir) {
         let (args, temp_dir) = test_config();
-        let mut node = GethNode::new(&args);
+        let mut node = Instance::new(&args);
         node.init(GENESIS_JSON.to_owned())
             .expect("Failed to initialize the node")
             .spawn_process()
@@ -548,110 +559,110 @@ mod tests {
 
     #[test]
     fn init_works() {
-        GethNode::new(&test_config().0)
+        Instance::new(&test_config().0)
             .init(GENESIS_JSON.to_string())
             .unwrap();
     }
 
     #[test]
     fn spawn_works() {
-        GethNode::new(&test_config().0)
+        Instance::new(&test_config().0)
             .spawn(GENESIS_JSON.to_string())
             .unwrap();
     }
 
     #[test]
     fn version_works() {
-        let version = GethNode::new(&test_config().0).version().unwrap();
+        let version = Instance::new(&test_config().0).version().unwrap();
         assert!(
             version.starts_with("geth version"),
             "expected version string, got: '{version}'"
         );
     }
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_chain_id_from_node() {
+    fn can_get_chain_id_from_node() {
         // Arrange
         let (node, _temp_dir) = new_node();
 
         // Act
-        let chain_id = node.chain_id().await;
+        let chain_id = node.chain_id();
 
         // Assert
         let chain_id = chain_id.expect("Failed to get the chain id");
         assert_eq!(chain_id, 420_420_420);
     }
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_gas_limit_from_node() {
+    fn can_get_gas_limit_from_node() {
         // Arrange
         let (node, _temp_dir) = new_node();
 
         // Act
-        let gas_limit = node.block_gas_limit(BlockNumberOrTag::Latest).await;
+        let gas_limit = node.block_gas_limit(BlockNumberOrTag::Latest);
 
         // Assert
         let gas_limit = gas_limit.expect("Failed to get the gas limit");
         assert_eq!(gas_limit, u32::MAX as u128)
     }
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_coinbase_from_node() {
+    fn can_get_coinbase_from_node() {
         // Arrange
         let (node, _temp_dir) = new_node();
 
         // Act
-        let coinbase = node.block_coinbase(BlockNumberOrTag::Latest).await;
+        let coinbase = node.block_coinbase(BlockNumberOrTag::Latest);
 
         // Assert
         let coinbase = coinbase.expect("Failed to get the coinbase");
         assert_eq!(coinbase, Address::new([0xFF; 20]))
     }
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_difficulty_from_node() {
+    fn can_get_block_difficulty_from_node() {
         // Arrange
         let (node, _temp_dir) = new_node();
 
         // Act
-        let block_difficulty = node.block_difficulty(BlockNumberOrTag::Latest).await;
+        let block_difficulty = node.block_difficulty(BlockNumberOrTag::Latest);
 
         // Assert
         let block_difficulty = block_difficulty.expect("Failed to get the block difficulty");
         assert_eq!(block_difficulty, U256::ZERO)
     }
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_hash_from_node() {
+    fn can_get_block_hash_from_node() {
         // Arrange
         let (node, _temp_dir) = new_node();
 
         // Act
-        let block_hash = node.block_hash(BlockNumberOrTag::Latest).await;
+        let block_hash = node.block_hash(BlockNumberOrTag::Latest);
 
         // Assert
         let _ = block_hash.expect("Failed to get the block hash");
     }
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_timestamp_from_node() {
+    fn can_get_block_timestamp_from_node() {
         // Arrange
         let (node, _temp_dir) = new_node();
 
         // Act
-        let block_timestamp = node.block_timestamp(BlockNumberOrTag::Latest).await;
+        let block_timestamp = node.block_timestamp(BlockNumberOrTag::Latest);
 
         // Assert
         let _ = block_timestamp.expect("Failed to get the block timestamp");
     }
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_number_from_node() {
+    fn can_get_block_number_from_node() {
         // Arrange
         let (node, _temp_dir) = new_node();
 
         // Act
-        let block_number = node.last_block_number().await;
+        let block_number = node.last_block_number();
 
         // Assert
         let block_number = block_number.expect("Failed to get the block number");

crates/node/src/kitchensink.rs

@@ -30,8 +30,6 @@ use alloy::{
     },
     signers::local::PrivateKeySigner,
 };
-use revive_dt_common::fs::clear_directory;
-use revive_dt_format::traits::ResolverApi;
 use serde::{Deserialize, Serialize};
 use serde_json::{Value as JsonValue, json};
 use sp_core::crypto::Ss58Codec;
@@ -39,7 +37,7 @@ use sp_runtime::AccountId32;
 use tracing::Level;
 
 use revive_dt_config::Arguments;
-use revive_dt_node_interaction::EthereumNode;
+use revive_dt_node_interaction::{BlockingExecutor, EthereumNode};
 
 use crate::{Node, common::FallbackGasFiller, constants::INITIAL_BALANCE};
 
@@ -86,9 +84,6 @@ impl KitchensinkNode {
 
     #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
     fn init(&mut self, genesis: &str) -> anyhow::Result<&mut Self> {
-        let _ = clear_directory(&self.base_directory);
-        let _ = clear_directory(&self.logs_directory);
-
         create_dir_all(&self.base_directory)?;
         create_dir_all(&self.logs_directory)?;
 
@@ -136,8 +131,6 @@ impl KitchensinkNode {
             for signer_address in
                 <EthereumWallet as NetworkWallet<Ethereum>>::signer_addresses(&self.wallet)
             {
-                // Note, the use of the entry API here means that we only modify the entries for any
-                // account that is not in the `alloc` field of the genesis state.
                 genesis
                     .alloc
                     .entry(signer_address)
@@ -380,121 +373,135 @@ impl KitchensinkNode {
 
 impl EthereumNode for KitchensinkNode {
     #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    async fn execute_transaction(
+    fn execute_transaction(
         &self,
         transaction: alloy::rpc::types::TransactionRequest,
     ) -> anyhow::Result<TransactionReceipt> {
         tracing::debug!(?transaction, "Submitting transaction");
-        let receipt = self
+        let provider = self.provider();
-            .provider()
+        let receipt = BlockingExecutor::execute(async move {
+            Ok(provider
                 .await?
                 .send_transaction(transaction)
                 .await?
                 .get_receipt()
-            .await?;
+                .await?)
+        })?;
         tracing::info!(?receipt, "Submitted tx to kitchensink");
-        Ok(receipt)
+        receipt
     }
 
     #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    async fn trace_transaction(
+    fn trace_transaction(
         &self,
         transaction: &TransactionReceipt,
         trace_options: GethDebugTracingOptions,
     ) -> anyhow::Result<alloy::rpc::types::trace::geth::GethTrace> {
         let tx_hash = transaction.transaction_hash;
-        Ok(self
+        let provider = self.provider();
-            .provider()
+        BlockingExecutor::execute(async move {
+            Ok(provider
                 .await?
                 .debug_trace_transaction(tx_hash, trace_options)
                 .await?)
+        })?
     }
 
     #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
-    async fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
+    fn state_diff(&self, transaction: &TransactionReceipt) -> anyhow::Result<DiffMode> {
         let trace_options = GethDebugTracingOptions::prestate_tracer(PreStateConfig {
             diff_mode: Some(true),
             disable_code: None,
             disable_storage: None,
         });
         match self
-            .trace_transaction(transaction, trace_options)
+            .trace_transaction(transaction, trace_options)?
-            .await?
             .try_into_pre_state_frame()?
         {
             PreStateFrame::Diff(diff) => Ok(diff),
             _ => anyhow::bail!("expected a diff mode trace"),
         }
     }
-}
 
-impl ResolverApi for KitchensinkNode {
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
-    async fn chain_id(&self) -> anyhow::Result<alloy::primitives::ChainId> {
+        let provider = self.provider();
-        self.provider()
+        BlockingExecutor::execute(async move {
-            .await?
+            provider.await?.get_chain_id().await.map_err(Into::into)
-            .get_chain_id()
+        })?
-            .await
-            .map_err(Into::into)
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
+    fn block_gas_limit(&self, number: BlockNumberOrTag) -> anyhow::Result<u128> {
-        self.provider()
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
+            provider
                 .await?
                 .get_block_by_number(number)
                 .await?
                 .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
-            .map(|block| block.header.gas_limit as _)
+                .map(|block| block.header.gas_limit)
+        })?
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
+    fn block_coinbase(&self, number: BlockNumberOrTag) -> anyhow::Result<Address> {
-        self.provider()
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
+            provider
                 .await?
                 .get_block_by_number(number)
                 .await?
                 .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
                 .map(|block| block.header.beneficiary)
+        })?
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
+    fn block_difficulty(&self, number: BlockNumberOrTag) -> anyhow::Result<U256> {
-        self.provider()
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
+            provider
                 .await?
                 .get_block_by_number(number)
                 .await?
                 .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
                 .map(|block| block.header.difficulty)
+        })?
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
+    fn block_hash(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockHash> {
-        self.provider()
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
+            provider
                 .await?
                 .get_block_by_number(number)
                 .await?
                 .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
                 .map(|block| block.header.hash)
+        })?
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
+    fn block_timestamp(&self, number: BlockNumberOrTag) -> anyhow::Result<BlockTimestamp> {
-        self.provider()
+        let provider = self.provider();
+        BlockingExecutor::execute(async move {
+            provider
                 .await?
                 .get_block_by_number(number)
                 .await?
                 .ok_or(anyhow::Error::msg("Blockchain has no blocks"))
                 .map(|block| block.header.timestamp)
+        })?
     }
 
-    #[tracing::instrument(skip_all, fields(kitchensink_node_id = self.id))]
+    #[tracing::instrument(skip_all, fields(geth_node_id = self.id))]
-    async fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
+    fn last_block_number(&self) -> anyhow::Result<BlockNumber> {
-        self.provider()
+        let provider = self.provider();
-            .await?
+        BlockingExecutor::execute(async move {
-            .get_block_number()
+            provider.await?.get_block_number().await.map_err(Into::into)
-            .await
+        })?
-            .map_err(Into::into)
     }
 }
 
@@ -1030,21 +1037,26 @@ mod tests {
     use revive_dt_config::Arguments;
     use std::path::PathBuf;
     use std::sync::{LazyLock, Mutex};
+    use temp_dir::TempDir;
 
     use std::fs;
 
     use super::*;
     use crate::{GENESIS_JSON, Node};
 
-    fn test_config() -> Arguments {
+    fn test_config() -> (Arguments, TempDir) {
-        Arguments {
+        let mut config = Arguments::default();
-            kitchensink: PathBuf::from("substrate-node"),
+        let temp_dir = TempDir::new().unwrap();
-            eth_proxy: PathBuf::from("eth-rpc"),
+
-            ..Default::default()
+        config.working_directory = temp_dir.path().to_path_buf().into();
-        }
+
+        config.kitchensink = PathBuf::from("substrate-node");
+        config.eth_proxy = PathBuf::from("eth-rpc");
+
+        (config, temp_dir)
     }
 
-    fn new_node() -> (KitchensinkNode, Arguments) {
+    fn new_node() -> (KitchensinkNode, Arguments, TempDir) {
         // Note: When we run the tests in the CI we found that if they're all
         // run in parallel then the CI is unable to start all of the nodes in
         // time and their start up times-out. Therefore, we want all of the
@@ -1063,20 +1075,20 @@ mod tests {
         static NODE_START_MUTEX: Mutex<()> = Mutex::new(());
         let _guard = NODE_START_MUTEX.lock().unwrap();
 
-        let args = test_config();
+        let (args, temp_dir) = test_config();
         let mut node = KitchensinkNode::new(&args);
         node.init(GENESIS_JSON)
             .expect("Failed to initialize the node")
             .spawn_process()
             .expect("Failed to spawn the node process");
-        (node, args)
+        (node, args, temp_dir)
     }
 
     /// A shared node that multiple tests can use. It starts up once.
     fn shared_node() -> &'static KitchensinkNode {
-        static NODE: LazyLock<(KitchensinkNode, Arguments)> = LazyLock::new(|| {
+        static NODE: LazyLock<(KitchensinkNode, TempDir)> = LazyLock::new(|| {
-            let (node, args) = new_node();
+            let (node, _, temp_dir) = new_node();
-            (node, args)
+            (node, temp_dir)
         });
         &NODE.0
     }
@@ -1084,7 +1096,7 @@ mod tests {
     #[tokio::test]
     async fn node_mines_simple_transfer_transaction_and_returns_receipt() {
         // Arrange
-        let (node, args) = new_node();
+        let (node, args, _temp_dir) = new_node();
 
         let provider = node.provider().await.expect("Failed to create provider");
 
@@ -1119,7 +1131,7 @@ mod tests {
         }
         "#;
 
-        let mut dummy_node = KitchensinkNode::new(&test_config());
+        let mut dummy_node = KitchensinkNode::new(&test_config().0);
 
         // Call `init()`
         dummy_node.init(genesis_content).expect("init failed");
@@ -1163,7 +1175,7 @@ mod tests {
         }
         "#;
 
-        let node = KitchensinkNode::new(&test_config());
+        let node = KitchensinkNode::new(&test_config().0);
 
         let result = node
             .extract_balance_from_genesis_file(&serde_json::from_str(genesis_json).unwrap())
@@ -1234,16 +1246,15 @@ mod tests {
 
     #[test]
     fn spawn_works() {
-        let config = test_config();
+        let (config, _temp_dir) = test_config();
 
         let mut node = KitchensinkNode::new(&config);
-
         node.spawn(GENESIS_JSON.to_string()).unwrap();
     }
 
     #[test]
     fn version_works() {
-        let config = test_config();
+        let (config, _temp_dir) = test_config();
 
         let node = KitchensinkNode::new(&config);
         let version = node.version().unwrap();
@@ -1256,7 +1267,7 @@ mod tests {
 
     #[test]
     fn eth_rpc_version_works() {
-        let config = test_config();
+        let (config, _temp_dir) = test_config();
 
         let node = KitchensinkNode::new(&config);
         let version = node.eth_rpc_version().unwrap();
@@ -1267,86 +1278,86 @@ mod tests {
         );
     }
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_chain_id_from_node() {
+    fn can_get_chain_id_from_node() {
         // Arrange
         let node = shared_node();
 
         // Act
-        let chain_id = node.chain_id().await;
+        let chain_id = node.chain_id();
 
         // Assert
         let chain_id = chain_id.expect("Failed to get the chain id");
         assert_eq!(chain_id, 420_420_420);
     }
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_gas_limit_from_node() {
+    fn can_get_gas_limit_from_node() {
         // Arrange
         let node = shared_node();
 
         // Act
-        let gas_limit = node.block_gas_limit(BlockNumberOrTag::Latest).await;
+        let gas_limit = node.block_gas_limit(BlockNumberOrTag::Latest);
 
         // Assert
         let _ = gas_limit.expect("Failed to get the gas limit");
     }
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_coinbase_from_node() {
+    fn can_get_coinbase_from_node() {
         // Arrange
         let node = shared_node();
 
         // Act
-        let coinbase = node.block_coinbase(BlockNumberOrTag::Latest).await;
+        let coinbase = node.block_coinbase(BlockNumberOrTag::Latest);
 
         // Assert
         let _ = coinbase.expect("Failed to get the coinbase");
     }
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_difficulty_from_node() {
+    fn can_get_block_difficulty_from_node() {
         // Arrange
         let node = shared_node();
 
         // Act
-        let block_difficulty = node.block_difficulty(BlockNumberOrTag::Latest).await;
+        let block_difficulty = node.block_difficulty(BlockNumberOrTag::Latest);
 
         // Assert
         let _ = block_difficulty.expect("Failed to get the block difficulty");
     }
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_hash_from_node() {
+    fn can_get_block_hash_from_node() {
         // Arrange
         let node = shared_node();
 
         // Act
-        let block_hash = node.block_hash(BlockNumberOrTag::Latest).await;
+        let block_hash = node.block_hash(BlockNumberOrTag::Latest);
 
         // Assert
         let _ = block_hash.expect("Failed to get the block hash");
     }
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_timestamp_from_node() {
+    fn can_get_block_timestamp_from_node() {
         // Arrange
         let node = shared_node();
 
         // Act
-        let block_timestamp = node.block_timestamp(BlockNumberOrTag::Latest).await;
+        let block_timestamp = node.block_timestamp(BlockNumberOrTag::Latest);
 
         // Assert
         let _ = block_timestamp.expect("Failed to get the block timestamp");
     }
 
-    #[tokio::test]
+    #[test]
-    async fn can_get_block_number_from_node() {
+    fn can_get_block_number_from_node() {
         // Arrange
         let node = shared_node();
 
         // Act
-        let block_number = node.last_block_number().await;
+        let block_number = node.last_block_number();
 
         // Assert
         let _ = block_number.expect("Failed to get the block number");

crates/node/src/pool.rs

@@ -24,7 +24,7 @@ where
 {
     /// Create a new Pool. This will start as many nodes as there are workers in `config`.
     pub fn new(config: &Arguments) -> anyhow::Result<Self> {
-        let nodes = config.number_of_nodes;
+        let nodes = config.workers;
         let genesis = read_to_string(&config.genesis_file).context(format!(
             "can not read genesis file: {}",
             config.genesis_file.display()

crates/report/Cargo.toml

@@ -10,9 +10,9 @@ rust-version.workspace = true
 [dependencies]
 revive-dt-config = { workspace = true }
 revive-dt-format = { workspace = true }
-revive-dt-compiler = { workspace = true }
 
 anyhow = { workspace = true }
 tracing = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
+revive-solc-json-interface = { workspace = true }

crates/report/src/analyzer.rs

@@ -1,6 +1,5 @@
 //! The report analyzer enriches the raw report data.
 
-use revive_dt_compiler::CompilerOutput;
 use serde::{Deserialize, Serialize};
 
 use crate::reporter::CompilationTask;
@@ -14,27 +13,41 @@ pub struct CompilerStatistics {
     pub mean_code_size: usize,
     /// The mean size of the optimized YUL IR.
     pub mean_yul_size: usize,
-    /// Is a proxy because the YUL also contains a lot of comments.
+    /// Is a proxy because the YUL also containes a lot of comments.
     pub yul_to_bytecode_size_ratio: f32,
 }
 
 impl CompilerStatistics {
     /// Cumulatively update the statistics with the next compiler task.
     pub fn sample(&mut self, compilation_task: &CompilationTask) {
-        let Some(CompilerOutput { contracts }) = &compilation_task.json_output else {
+        let Some(output) = &compilation_task.json_output else {
+            return;
+        };
+
+        let Some(contracts) = &output.contracts else {
             return;
         };
 
         for (_solidity, contracts) in contracts.iter() {
-            for (_name, (bytecode, _)) in contracts.iter() {
+            for (_name, contract) in contracts.iter() {
+                let Some(evm) = &contract.evm else {
+                    continue;
+                };
+                let Some(deploy_code) = &evm.deployed_bytecode else {
+                    continue;
+                };
+
                 // The EVM bytecode can be unlinked and thus is not necessarily a decodable hex
                 // string; for our statistics this is a good enough approximation.
-                let bytecode_size = bytecode.len() / 2;
+                let bytecode_size = deploy_code.object.len() / 2;
 
-                // TODO: for the time being we set the yul_size to be zero. We need to change this
+                let yul_size = contract
-                // when we overhaul the reporting.
+                    .ir_optimized
+                    .as_ref()
+                    .expect("if the contract has a deploy code it should also have the opimized IR")
+                    .len();
 
-                self.update_sizes(bytecode_size, 0);
+                self.update_sizes(bytecode_size, yul_size);
             }
         }
     }

crates/report/src/reporter.rs

@@ -12,11 +12,11 @@ use std::{
 };
 
 use anyhow::Context;
-use revive_dt_compiler::{CompilerInput, CompilerOutput};
 use serde::{Deserialize, Serialize};
 
 use revive_dt_config::{Arguments, TestingPlatform};
 use revive_dt_format::{corpus::Corpus, mode::SolcMode};
+use revive_solc_json_interface::{SolcStandardJsonInput, SolcStandardJsonOutput};
 
 use crate::analyzer::CompilerStatistics;
 
@@ -44,9 +44,9 @@ pub struct Report {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct CompilationTask {
     /// The observed compiler input.
-    pub json_input: CompilerInput,
+    pub json_input: SolcStandardJsonInput,
     /// The observed compiler output.
-    pub json_output: Option<CompilerOutput>,
+    pub json_output: Option<SolcStandardJsonOutput>,
     /// The observed compiler mode.
     pub mode: SolcMode,
     /// The observed compiler version.
@@ -152,7 +152,15 @@ impl Report {
         for (platform, results) in self.compiler_results.iter() {
             for result in results {
                 // ignore if there were no errors
-                if result.compilation_task.error.is_none() {
+                if result.compilation_task.error.is_none()
+                    && result
+                        .compilation_task
+                        .json_output
+                        .as_ref()
+                        .and_then(|output| output.errors.as_ref())
+                        .map(|errors| errors.is_empty())
+                        .unwrap_or(true)
+                {
                     continue;
                 }
 

crates/solc-binaries/Cargo.toml

@@ -9,12 +9,9 @@ repository.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-revive-dt-common = { workspace = true }
-
 anyhow = { workspace = true }
 hex = { workspace = true }
 tracing = { workspace = true }
-tokio = { workspace = true }
 reqwest = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true }

crates/solc-binaries/src/cache.rs

@@ -6,17 +6,15 @@ use std::{
     io::{BufWriter, Write},
     os::unix::fs::PermissionsExt,
     path::{Path, PathBuf},
-    sync::LazyLock,
+    sync::{LazyLock, Mutex},
 };
 
-use tokio::sync::Mutex;
-
 use crate::download::GHDownloader;
 
 pub const SOLC_CACHE_DIRECTORY: &str = "solc";
 pub(crate) static SOLC_CACHER: LazyLock<Mutex<HashSet<PathBuf>>> = LazyLock::new(Default::default);
 
-pub(crate) async fn get_or_download(
+pub(crate) fn get_or_download(
     working_directory: &Path,
     downloader: &GHDownloader,
 ) -> anyhow::Result<PathBuf> {
@@ -25,20 +23,20 @@ pub(crate) async fn get_or_download(
         .join(downloader.version.to_string());
     let target_file = target_directory.join(downloader.target);
 
-    let mut cache = SOLC_CACHER.lock().await;
+    let mut cache = SOLC_CACHER.lock().unwrap();
     if cache.contains(&target_file) {
         tracing::debug!("using cached solc: {}", target_file.display());
         return Ok(target_file);
     }
 
     create_dir_all(target_directory)?;
-    download_to_file(&target_file, downloader).await?;
+    download_to_file(&target_file, downloader)?;
     cache.insert(target_file.clone());
 
     Ok(target_file)
 }
 
-async fn download_to_file(path: &Path, downloader: &GHDownloader) -> anyhow::Result<()> {
+fn download_to_file(path: &Path, downloader: &GHDownloader) -> anyhow::Result<()> {
     tracing::info!("caching file: {}", path.display());
 
     let Ok(file) = File::create_new(path) else {
@@ -54,7 +52,7 @@ async fn download_to_file(path: &Path, downloader: &GHDownloader) -> anyhow::Res
     }
 
     let mut file = BufWriter::new(file);
-    file.write_all(&downloader.download().await?)?;
+    file.write_all(&downloader.download()?)?;
     file.flush()?;
     drop(file);
 

crates/solc-binaries/src/download.rs

@@ -5,8 +5,6 @@ use std::{
     sync::{LazyLock, Mutex},
 };
 
-use revive_dt_common::types::VersionOrRequirement;
-
 use semver::Version;
 use sha2::{Digest, Sha256};
 
@@ -25,12 +23,12 @@ impl List {
     ///
     /// Caches the list retrieved from the `url` into [LIST_CACHE],
     /// subsequent calls with the same `url` will return the cached list.
-    pub async fn download(url: &'static str) -> anyhow::Result<Self> {
+    pub fn download(url: &'static str) -> anyhow::Result<Self> {
         if let Some(list) = LIST_CACHE.lock().unwrap().get(url) {
             return Ok(list.clone());
         }
 
-        let body: List = reqwest::get(url).await?.json().await?;
+        let body: List = reqwest::blocking::get(url)?.json()?;
 
         LIST_CACHE.lock().unwrap().insert(url, body.clone());
 
@@ -54,52 +52,28 @@ impl GHDownloader {
     pub const WINDOWS_NAME: &str = "solc-windows.exe";
     pub const WASM_NAME: &str = "soljson.js";
 
-    async fn new(
+    fn new(version: Version, target: &'static str, list: &'static str) -> Self {
-        version: impl Into<VersionOrRequirement>,
+        Self {
-        target: &'static str,
-        list: &'static str,
-    ) -> anyhow::Result<Self> {
-        let version_or_requirement = version.into();
-        match version_or_requirement {
-            VersionOrRequirement::Version(version) => Ok(Self {
             version,
             target,
             list,
-            }),
-            VersionOrRequirement::Requirement(requirement) => {
-                let Some(version) = List::download(list)
-                    .await?
-                    .builds
-                    .into_iter()
-                    .map(|build| build.version)
-                    .filter(|version| requirement.matches(version))
-                    .max()
-                else {
-                    anyhow::bail!("Failed to find a version that satisfies {requirement:?}");
-                };
-                Ok(Self {
-                    version,
-                    target,
-                    list,
-                })
-            }
         }
     }
 
-    pub async fn linux(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
+    pub fn linux(version: Version) -> Self {
-        Self::new(version, Self::LINUX_NAME, List::LINUX_URL).await
+        Self::new(version, Self::LINUX_NAME, List::LINUX_URL)
     }
 
-    pub async fn macosx(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
+    pub fn macosx(version: Version) -> Self {
-        Self::new(version, Self::MACOSX_NAME, List::MACOSX_URL).await
+        Self::new(version, Self::MACOSX_NAME, List::MACOSX_URL)
     }
 
-    pub async fn windows(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
+    pub fn windows(version: Version) -> Self {
-        Self::new(version, Self::WINDOWS_NAME, List::WINDOWS_URL).await
+        Self::new(version, Self::WINDOWS_NAME, List::WINDOWS_URL)
     }
 
-    pub async fn wasm(version: impl Into<VersionOrRequirement>) -> anyhow::Result<Self> {
+    pub fn wasm(version: Version) -> Self {
-        Self::new(version, Self::WASM_NAME, List::WASM_URL).await
+        Self::new(version, Self::WASM_NAME, List::WASM_URL)
     }
 
     /// Returns the download link.
@@ -111,17 +85,16 @@ impl GHDownloader {
     ///
     /// 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>> {
+    pub fn download(&self) -> anyhow::Result<Vec<u8>> {
         tracing::info!("downloading solc: {self:?}");
-        let expected_digest = List::download(self.list)
+        let expected_digest = List::download(self.list)?
-            .await?
             .builds
             .iter()
             .find(|build| build.version == self.version)
             .ok_or_else(|| anyhow::anyhow!("solc v{} not found builds", self.version))
             .map(|b| b.sha256.strip_prefix("0x").unwrap_or(&b.sha256).to_string())?;
 
-        let file = reqwest::get(self.url()).await?.bytes().await?.to_vec();
+        let file = reqwest::blocking::get(self.url())?.bytes()?.to_vec();
 
         if hex::encode(Sha256::digest(&file)) != expected_digest {
             anyhow::bail!("sha256 mismatch for solc version {}", self.version);
@@ -135,56 +108,27 @@ impl GHDownloader {
 mod tests {
     use crate::{download::GHDownloader, list::List};
 
-    #[tokio::test]
+    #[test]
-    async fn try_get_windows() {
+    fn try_get_windows() {
-        let version = List::download(List::WINDOWS_URL)
+        let version = List::download(List::WINDOWS_URL).unwrap().latest_release;
-            .await
+        GHDownloader::windows(version).download().unwrap();
-            .unwrap()
-            .latest_release;
-        GHDownloader::windows(version)
-            .await
-            .unwrap()
-            .download()
-            .await
-            .unwrap();
     }
 
-    #[tokio::test]
+    #[test]
-    async fn try_get_macosx() {
+    fn try_get_macosx() {
-        let version = List::download(List::MACOSX_URL)
+        let version = List::download(List::MACOSX_URL).unwrap().latest_release;
-            .await
+        GHDownloader::macosx(version).download().unwrap();
-            .unwrap()
-            .latest_release;
-        GHDownloader::macosx(version)
-            .await
-            .unwrap()
-            .download()
-            .await
-            .unwrap();
     }
 
-    #[tokio::test]
+    #[test]
-    async fn try_get_linux() {
+    fn try_get_linux() {
-        let version = List::download(List::LINUX_URL)
+        let version = List::download(List::LINUX_URL).unwrap().latest_release;
-            .await
+        GHDownloader::linux(version).download().unwrap();
-            .unwrap()
-            .latest_release;
-        GHDownloader::linux(version)
-            .await
-            .unwrap()
-            .download()
-            .await
-            .unwrap();
     }
 
-    #[tokio::test]
+    #[test]
-    async fn try_get_wasm() {
+    fn try_get_wasm() {
-        let version = List::download(List::WASM_URL).await.unwrap().latest_release;
+        let version = List::download(List::WASM_URL).unwrap().latest_release;
-        GHDownloader::wasm(version)
+        GHDownloader::wasm(version).download().unwrap();
-            .await
-            .unwrap()
-            .download()
-            .await
-            .unwrap();
     }
 }

crates/solc-binaries/src/lib.rs

@@ -7,8 +7,7 @@ use std::path::{Path, PathBuf};
 
 use cache::get_or_download;
 use download::GHDownloader;
-
+use semver::Version;
-use revive_dt_common::types::VersionOrRequirement;
 
 pub mod cache;
 pub mod download;
@@ -19,22 +18,22 @@ pub mod list;
 ///
 /// Subsequent calls for the same version will use a cached artifact
 /// and not download it again.
-pub async fn download_solc(
+pub fn download_solc(
     cache_directory: &Path,
-    version: impl Into<VersionOrRequirement>,
+    version: Version,
     wasm: bool,
 ) -> anyhow::Result<PathBuf> {
     let downloader = if wasm {
-        GHDownloader::wasm(version).await
+        GHDownloader::wasm(version)
     } else if cfg!(target_os = "linux") {
-        GHDownloader::linux(version).await
+        GHDownloader::linux(version)
     } else if cfg!(target_os = "macos") {
-        GHDownloader::macosx(version).await
+        GHDownloader::macosx(version)
     } else if cfg!(target_os = "windows") {
-        GHDownloader::windows(version).await
+        GHDownloader::windows(version)
     } else {
         unimplemented!()
-    }?;
+    };
 
-    get_or_download(cache_directory, &downloader).await
+    get_or_download(cache_directory, &downloader)
 }

genesis.json

@@ -33,5 +33,9 @@
     "mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "timestamp": "0x00",
-    "alloc": {}
+    "alloc": {
+        "90F8bf6A479f320ead074411a4B0e7944Ea8c9C1": {
+            "balance": "10000000000000000000000"
+        }
+    }
 }